Merge pull request #1037 from AArnott/updateDeps

Trim and update dependencies
microsoft · May 7, 2024 · 5351fea · 5351fea
2 parents d0b5f95 + fb9ed53
commit 5351fea
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 8 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -10,3 +10,8 @@ updates:
   ignore:
   - dependency-name: Newtonsoft.Json # This has to match VS and VS rarely updates it
   - dependency-name: Microsoft.AspNetCore.TestHost # Later versions require .NET Core 3.1, which prevents our testing on net472
+  # We want to match the minimum target .NET runtime
+  - dependency-name: System.Threading.Tasks.Dataflow
+  - dependency-name: System.Collections.Immutable
+  - dependency-name: System.Diagnostics.DiagnosticSource
+  - dependency-name: System.Text.Json
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -6,7 +6,7 @@
     <CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
     <MessagePackVersion>2.5.108</MessagePackVersion>
     <MicroBuildVersion>2.0.149</MicroBuildVersion>
-    <VisualStudioThreadingVersion>17.9.28</VisualStudioThreadingVersion>
+    <VisualStudioThreadingVersion>17.10.48</VisualStudioThreadingVersion>
   </PropertyGroup>
   <ItemGroup>
     <PackageVersion Include="BenchmarkDotNet.Diagnostics.Windows" Version="0.13.10" />
@@ -22,15 +22,14 @@
     <PackageVersion Include="Microsoft.VisualStudio.Threading.Analyzers" Version="$(VisualStudioThreadingVersion)" />
     <PackageVersion Include="Microsoft.VisualStudio.Threading" Version="$(VisualStudioThreadingVersion)" />
     <PackageVersion Include="Microsoft.VisualStudio.Validation" Version="17.8.8" />
-    <PackageVersion Include="Nerdbank.Streams" Version="2.11.72" />
+    <PackageVersion Include="Nerdbank.Streams" Version="2.11.74" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageVersion Include="System.Collections.Immutable" Version="6.0.0" />
     <PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="6.0.1" />
-    <PackageVersion Include="System.IO.Pipelines" Version="7.0.0" />
+    <PackageVersion Include="System.IO.Pipelines" Version="8.0.0" />
     <PackageVersion Include="System.IO.Pipes" Version="4.3.0" />
     <PackageVersion Include="System.Net.Http" Version="4.3.4" />
-    <PackageVersion Include="System.Text.Json" Version="7.0.3" />
-    <PackageVersion Include="System.Text.Encodings.Web" Version="7.0.0" />
+    <PackageVersion Include="System.Text.Json" Version="8.0.3" />
     <PackageVersion Include="System.Threading.Tasks.Dataflow" Version="6.0.0" />
     <PackageVersion Include="System.ValueTuple" Version="4.5.0" />
     <PackageVersion Include="xunit.combinatorial" Version="1.6.24" />
@@ -53,4 +52,4 @@
   <ItemGroup>
     <GlobalPackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/test/StreamJsonRpc.Tests/JsonRpcTests.cs b/test/StreamJsonRpc.Tests/JsonRpcTests.cs
@@ -2969,6 +2969,11 @@ public void JoinableTaskFactory_IntegrationClientSideOnly_ManyConnections_Unique
         // Set up a main thread and JoinableTaskContext.
         JoinableTaskContext jtc = new();
 
+        // Track our async work so our test doesn't exit before our UI thread requests do,
+        // or the test process will crash.
+        JoinableTaskCollection jtCollection = jtc.CreateCollection();
+        JoinableTaskFactory jtf = jtc.CreateFactory(jtCollection);
+
         // Configure the client (only) to understand JTF.
         this.clientRpc.AllowModificationWhileListening = true;
         this.clientRpc.JoinableTaskFactory = jtc.Factory;
@@ -2997,7 +3002,7 @@ public void JoinableTaskFactory_IntegrationClientSideOnly_ManyConnections_Unique
         const string CallbackMethodName = "ClientNeedsMainThread";
         alternateClientRpc.AddLocalRpcMethod(CallbackMethodName, new Func<Task>(async delegate
         {
-            await jtc.Factory.SwitchToMainThreadAsync();
+            await jtf.SwitchToMainThreadAsync();
         }));
 
         alternateServerRpc.StartListening();
@@ -3007,6 +3012,9 @@ public void JoinableTaskFactory_IntegrationClientSideOnly_ManyConnections_Unique
         {
             await Assert.ThrowsAsync<OperationCanceledException>(() => this.clientRpc.InvokeWithCancellationAsync(nameof(this.server.CallbackOnAnotherConnection), new object?[] { CallbackMethodName }, this.TimeoutToken).WithCancellation(ExpectedTimeoutToken));
         });
+
+        // Drain any UI thread requests before exiting the test.
+        jtc.Factory.Run(jtCollection.JoinTillEmptyAsync);
     }
 
     [Fact]

diff --git a/test/StreamJsonRpc.Tests/StreamJsonRpc.Tests.csproj b/test/StreamJsonRpc.Tests/StreamJsonRpc.Tests.csproj
@@ -52,7 +52,6 @@
     <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" PrivateAssets="all" />
     <PackageReference Include="System.IO.Pipes" />
     <PackageReference Include="System.Net.Http" />
-    <PackageReference Include="System.Text.Encodings.Web" />
     <PackageReference Include="System.Threading.Tasks.Dataflow" />
     <PackageReference Include="System.ValueTuple" />
     <PackageReference Include="xunit.combinatorial" />