Skip to content

Commit c8568eb

Browse files
authored
Merge pull request #1167 from microsoft/dev/andarno/dropAnalyzers
Drop the vs-threading analyzers from our package
2 parents 0b63535 + 0c96ecb commit c8568eb

File tree

5 files changed

+9
-42
lines changed

5 files changed

+9
-42
lines changed

Directory.Packages.props

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
77
<MessagePackVersion>2.5.192</MessagePackVersion>
88
<MicroBuildVersion>2.0.187</MicroBuildVersion>
9-
<VisualStudioThreadingVersion>17.13.2</VisualStudioThreadingVersion>
9+
<VisualStudioThreadingVersion>17.14.2-alpha</VisualStudioThreadingVersion>
1010
<CodeAnalysisAnalyzerVersion>3.11.0-beta1.24629.2</CodeAnalysisAnalyzerVersion>
1111
</PropertyGroup>
1212
<ItemGroup>
@@ -18,9 +18,10 @@
1818
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
1919
<PackageVersion Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="$(CodeAnalysisAnalyzerVersion)" />
2020
<PackageVersion Include="Microsoft.VisualStudio.Threading.Analyzers" Version="$(VisualStudioThreadingVersion)" />
21+
<PackageVersion Include="Microsoft.VisualStudio.Threading.Only" Version="$(VisualStudioThreadingVersion)" />
2122
<PackageVersion Include="Microsoft.VisualStudio.Threading" Version="$(VisualStudioThreadingVersion)" />
2223
<PackageVersion Include="Microsoft.VisualStudio.Validation" Version="17.8.8" />
23-
<PackageVersion Include="Nerdbank.Streams" Version="2.11.79" />
24+
<PackageVersion Include="Nerdbank.Streams" Version="2.12.84-alpha" />
2425
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
2526
<PackageVersion Include="System.Collections.Immutable" Version="8.0.0" />
2627
<PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="8.0.1" />

doc/vs.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ When building a Visual Studio extension, you should not include StreamJsonRpc in
3333
| VS 2022.11 | 1.5.x, 2.19.x
3434
| VS 2022.12 | 1.5.x, 2.20.x
3535
| VS 2022.13 | 1.5.x, 2.21.x
36+
| VS 2022.14 | 1.5.x, 2.22.x
3637

3738
StreamJsonRpc versions are forwards and backwards compatible "over the wire". For example it is perfectly legitimate to use StreamJsonRpc 2.4 on the server-side even if the client only uses 1.0, or vice versa. If an RPC method utilizes a newer StreamJsonRpc feature (e.g. `IAsyncEnumerable<T>` return value) and an older client that doesn't support these specially marshaled objects is used to call that method, a memory leak on the server may result.
3839

src/StreamJsonRpc/StreamJsonRpc.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
<ItemGroup>
1616
<PackageReference Include="MessagePack" />
1717
<PackageReference Include="MessagePackAnalyzer" PrivateAssets="all" />
18-
<PackageReference Include="Microsoft.VisualStudio.Threading" />
18+
<PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" PrivateAssets="all"/>
19+
<PackageReference Include="Microsoft.VisualStudio.Threading.Only" />
1920
<PackageReference Include="Nerdbank.Streams" />
2021
<PackageReference Include="Newtonsoft.Json" />
2122
<PackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" PrivateAssets="all" />

test/StreamJsonRpc.Tests/DuplexPipeMarshalingTests.cs

Lines changed: 2 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -620,49 +620,13 @@ public async Task StreamClosesDeterministically()
620620
monitoredStream.Disposed += (s, e) => disposedEvent.Set();
621621

622622
bool writing = false;
623-
monitoredStream.WillWrite += (s, e) =>
624-
{
625-
Assert.False(writing);
626-
writing = true;
627-
this.Logger.WriteLine("Writing {0} bytes.", e.Count);
628-
};
629-
monitoredStream.WillWriteByte += (s, e) =>
630-
{
631-
Assert.False(writing);
632-
writing = true;
633-
this.Logger.WriteLine("Writing 1 byte.");
634-
};
635-
monitoredStream.WillWriteMemory += (s, e) =>
636-
{
637-
Assert.False(writing);
638-
writing = true;
639-
this.Logger.WriteLine("Writing {0} bytes.", e.Length);
640-
};
641-
monitoredStream.WillWriteSpan += (s, e) =>
623+
monitoredStream.WillWriteAny += (s, e) =>
642624
{
643625
Assert.False(writing);
644626
writing = true;
645627
this.Logger.WriteLine("Writing {0} bytes.", e.Length);
646628
};
647-
monitoredStream.DidWrite += (s, e) =>
648-
{
649-
Assert.True(writing);
650-
writing = false;
651-
this.Logger.WriteLine("Wrote {0} bytes.", e.Count);
652-
};
653-
monitoredStream.DidWriteByte += (s, e) =>
654-
{
655-
Assert.True(writing);
656-
writing = false;
657-
this.Logger.WriteLine("Wrote 1 byte.");
658-
};
659-
monitoredStream.DidWriteMemory += (s, e) =>
660-
{
661-
Assert.True(writing);
662-
writing = false;
663-
this.Logger.WriteLine("Wrote {0} bytes.", e.Length);
664-
};
665-
monitoredStream.DidWriteSpan += (s, e) =>
629+
monitoredStream.DidWriteAny += (s, e) =>
666630
{
667631
Assert.True(writing);
668632
writing = false;

version.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
3-
"version": "2.21",
3+
"version": "2.22-alpha",
44
"publicReleaseRefSpec": [
55
"^refs/heads/main$",
66
"^refs/heads/v\\d+(?:.\\d+)?$"

0 commit comments

Comments
 (0)