Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Trim and update dependencies #1037

Merged
merged 2 commits into from
May 7, 2024
Merged

Trim and update dependencies #1037

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aaf2c14
Trim and update dependencies
AArnott May 6, 2024
fb9ed53
Fix test runner crash
AArnott May 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .github/dependabot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
11 changes: 5 additions & 6 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand All @@ -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" />
Expand All @@ -53,4 +52,4 @@
<ItemGroup>
<GlobalPackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
</ItemGroup>
</Project>
</Project>
10 changes: 9 additions & 1 deletion test/StreamJsonRpc.Tests/JsonRpcTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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();
Expand All @@ -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]
Expand Down
1 change: 0 additions & 1 deletion test/StreamJsonRpc.Tests/StreamJsonRpc.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,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" />
Expand Down