Skip to content

Commit bd1b194

Browse files
apolcynapolcyn
committed
Revert "Update .NET 9 SDK and resolve warnings (grpc#2502)"
This reverts commit cd875d9.
1 parent c397bc7 commit bd1b194

29 files changed

+46
-400
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ launchSettings.json
3434
BenchmarkDotNet.Artifacts/
3535
BDN.Generated/
3636
binaries/
37+
global.json
3738
.vscode/
3839
*.binlog
3940
build/feed

‎Directory.Packages.props

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<MicrosoftAspNetCoreAppPackageVersion>9.0.0-preview.5.24306.11</MicrosoftAspNetCoreAppPackageVersion>
55
<MicrosoftAspNetCoreApp8PackageVersion>8.0.6</MicrosoftAspNetCoreApp8PackageVersion>
66
<MicrosoftAspNetCoreApp7PackageVersion>7.0.5</MicrosoftAspNetCoreApp7PackageVersion>
7-
<MicrosoftAspNetCoreApp6PackageVersion>6.0.33</MicrosoftAspNetCoreApp6PackageVersion>
7+
<MicrosoftAspNetCoreApp6PackageVersion>6.0.11</MicrosoftAspNetCoreApp6PackageVersion>
88
<GrpcDotNetPackageVersion>2.63.0</GrpcDotNetPackageVersion>
99
<OpenTelemetryPackageVersion>1.6.0</OpenTelemetryPackageVersion>
1010
<OpenTelemetryIntergationPackageVersion>1.8.1</OpenTelemetryIntergationPackageVersion>
@@ -57,20 +57,21 @@
5757
<PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="$(OpenTelemetryIntergationPackageVersion)" />
5858

5959
<!-- Other -->
60-
<PackageVersion Include="BenchmarkDotNet" Version="0.14.0" />
60+
<PackageVersion Include="BenchmarkDotNet" Version="0.13.1" />
6161
<PackageVersion Include="CommandLineParser" Version="2.5.0" />
6262
<PackageVersion Include="Google.Api.CommonProtos" Version="2.15.0" />
63-
<PackageVersion Include="Google.Apis.Auth" Version="1.68.0" />
63+
<PackageVersion Include="Google.Apis.Auth" Version="1.46.0" />
6464
<PackageVersion Include="Google.Protobuf" Version="3.27.0" />
6565
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="6.0.0" />
6666
<PackageVersion Include="Microsoft.Build.Locator" Version="1.5.5" />
67-
<PackageVersion Include="Microsoft.Build" Version="17.3.2" />
67+
<PackageVersion Include="Microsoft.Build" Version="16.9.0" />
6868
<PackageVersion Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="9.0.0-preview.24216.2" />
6969
<PackageVersion Include="Microsoft.Crank.EventSources" Version="0.2.0-alpha.21255.1" />
70+
<PackageVersion Include="Microsoft.Extensions.Logging.Testing" Version="2.1.1" />
7071
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
7172
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
7273
<PackageVersion Include="Microsoft.Win32.Registry" Version="4.6.0" />
73-
<PackageVersion Include="Moq" Version="4.20.70" />
74+
<PackageVersion Include="Moq" Version="4.16.1" />
7475
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
7576
<PackageVersion Include="Nunit" Version="4.1.0" />
7677
<PackageVersion Include="NUnit3TestAdapter" Version="4.5.0" />
@@ -79,9 +80,10 @@
7980
<PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
8081
<PackageVersion Include="System.CommandLine.Rendering" Version="0.4.0-alpha.22272.1" />
8182
<PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="6.0.1" />
83+
<PackageVersion Include="System.IO.Pipelines" Version="5.0.1" />
8284
<PackageVersion Include="System.Memory" Version="4.5.3" />
8385
<PackageVersion Include="System.Net.Http.WinHttpHandler" Version="8.0.0" />
84-
<PackageVersion Include="System.Security.Principal.Windows" Version="5.0.0" />
86+
<PackageVersion Include="System.Security.Principal.Windows" Version="4.7.0" />
8587
<PackageVersion Include="System.Threading.Channels" Version="4.6.0" />
8688
</ItemGroup>
8789
</Project>

‎examples/Certifier/Client/Program.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ static HttpClientHandler CreateHttpHandler(bool includeClientCertificate)
7373
// Load client certificate
7474
var basePath = Path.GetDirectoryName(typeof(Program).Assembly.Location);
7575
var certPath = Path.Combine(basePath!, "Certs", "client.pfx");
76-
var clientCertificate = X509CertificateLoader.LoadPkcs12FromFile(certPath, "1111");
76+
var clientCertificate = new X509Certificate2(certPath, "1111");
7777
handler.ClientCertificates.Add(clientCertificate);
7878
}
7979

‎examples/Container/Frontend/Frontend.csproj

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
1-
<Project Sdk="Microsoft.NET.Sdk.Web">
1+
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
44
<TargetFramework>net9.0</TargetFramework>
5-
<!-- Suppress obsolete error in code generated by Razor. -->
6-
<!-- CS0618: 'Router.PreferExactMatches' is obsolete: 'This property is obsolete and configuring it has not effect.' -->
7-
<NoWarn>$(NoWarn);CS0618</NoWarn>
85
</PropertyGroup>
96

107
<ItemGroup>

‎examples/Container/deploy.ps1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
docker compose -f .\docker-compose.yml build container-frontend
2-
docker compose -f .\docker-compose.yml build container-backend
1+
docker-compose -f .\docker-compose.yml build container-frontend
2+
docker-compose -f .\docker-compose.yml build container-backend
33

44
kubectl delete -f .\Kubernetes\deploy-backend.yml
55
kubectl apply -f .\Kubernetes\deploy-backend.yml
66

77
kubectl delete -f .\Kubernetes\deploy-frontend.yml
8-
kubectl apply -f .\Kubernetes\deploy-frontend.yml
8+
kubectl apply -f .\Kubernetes\deploy-frontend.yml

‎global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "9.0.100-preview.7.24407.12",
3+
"version": "9.0.100-preview.5.24305.3",
44
"rollForward": "latestFeature"
55
}
66
}

‎grpcweb_interoptests.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ set -ex
1717

1818
echo "Starting gRPC-Web interop test containers"
1919

20-
docker compose -f docker-compose.yml build grpcweb-server
21-
docker compose -f docker-compose.yml build grpcweb-client
20+
docker-compose -f docker-compose.yml build grpcweb-server
21+
docker-compose -f docker-compose.yml build grpcweb-client
2222

23-
docker compose -f docker-compose.yml up -d grpcweb-server
24-
docker compose -f docker-compose.yml up -d grpcweb-client
23+
docker-compose -f docker-compose.yml up -d grpcweb-server
24+
docker-compose -f docker-compose.yml up -d grpcweb-client
2525

2626
sleep 5
2727

@@ -34,6 +34,6 @@ cd ../../..
3434

3535
echo "Remove all containers"
3636

37-
docker compose down
37+
docker-compose down
3838

39-
echo "gRPC-Web interop tests finished"
39+
echo "gRPC-Web interop tests finished"

‎perf/Grpc.AspNetCore.Microbenchmarks/Grpc.AspNetCore.Microbenchmarks.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
<FrameworkReference Include="Microsoft.AspNetCore.App" />
2626

2727
<PackageReference Include="BenchmarkDotNet" />
28+
<PackageReference Include="System.IO.Pipelines" />
2829
</ItemGroup>
2930

3031
</Project>

‎perf/benchmarkapps/GrpcClient/Program.cs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -476,8 +476,11 @@ private static ChannelBase CreateChannel(string target)
476476
{
477477
var basePath = Path.GetDirectoryName(AppContext.BaseDirectory);
478478
var certPath = Path.Combine(basePath!, "Certs", "client.pfx");
479-
var clientCertificates = X509CertificateLoader.LoadPkcs12CollectionFromFile(certPath, "1111");
480-
httpClientHandler.SslOptions.ClientCertificates = clientCertificates;
479+
var clientCertificate = new X509Certificate2(certPath, "1111");
480+
httpClientHandler.SslOptions.ClientCertificates = new X509CertificateCollection
481+
{
482+
clientCertificate
483+
};
481484
}
482485
#if NET5_0_OR_GREATER
483486
if (!string.IsNullOrEmpty(_options.UdsFileName))

‎test/FunctionalTests/Balancer/ConnectionTests.cs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -432,11 +432,7 @@ Task<HelloReply> UnaryMethod(HelloRequest request, ServerCallContext context)
432432
// even after specifying the correct host override.
433433
var basePath = Path.GetDirectoryName(typeof(InProcessTestServer).Assembly.Location);
434434
var certPath = Path.Combine(basePath!, "localhost.pfx");
435-
#if NET9_0_OR_GREATER
436-
var cert = X509CertificateLoader.LoadPkcs12FromFile(certPath, "11111");
437-
#else
438435
var cert = new X509Certificate2(certPath, "11111");
439-
#endif
440436

441437
// Arrange
442438
using var endpoint1 = BalancerHelpers.CreateGrpcEndpoint<HelloRequest, HelloReply>(UnaryMethod, nameof(UnaryMethod), HttpProtocols.Http1AndHttp2, isHttps: true, certificate: cert);

‎test/FunctionalTests/Grpc.AspNetCore.FunctionalTests.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
<Compile Include="..\Shared\BalancerWaitHelpers.cs" Link="Infrastructure\Balancer\BalancerWaitHelpers.cs" />
2828
<Compile Include="..\Shared\CallbackInterceptor.cs" Link="Infrastructure\CallbackInterceptor.cs" />
2929
<Compile Include="..\Shared\HttpEventSourceListener.cs" Link="Infrastructure\HttpEventSourceListener.cs" />
30-
<Compile Include="..\Shared\Logging\*.cs" LinkBase="Infrastructure\Logging" />
3130
</ItemGroup>
3231

3332
<ItemGroup>
@@ -38,6 +37,8 @@
3837

3938
<ProjectReference Include="..\..\testassets\FunctionalTestsWebsite\FunctionalTestsWebsite.csproj" />
4039

40+
<PackageReference Include="Microsoft.Extensions.Logging.Testing" />
41+
4142
<None Update="server1.pfx">
4243
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
4344
</None>

‎test/Grpc.AspNetCore.Server.ClientFactory.Tests/Grpc.AspNetCore.Server.ClientFactory.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@
2020
<Compile Include="..\Shared\TaskExtensions.cs" Link="Infrastructure\TaskExtensions.cs" />
2121
<Compile Include="..\Shared\TestHttpMessageHandler.cs" Link="Infrastructure\TestHttpMessageHandler.cs" />
2222
<Compile Include="..\Shared\TestServerCallContext.cs" Link="Infrastructure\TestServerCallContext.cs" />
23-
<Compile Include="..\Shared\Logging\*.cs" LinkBase="Infrastructure\Logging" />
2423

2524
<ProjectReference Include="..\..\src\Grpc.Core.Api\Grpc.Core.Api.csproj" />
2625
<ProjectReference Include="..\..\src\Grpc.AspNetCore.Server.ClientFactory\Grpc.AspNetCore.Server.ClientFactory.csproj" />
2726

2827
<PackageReference Include="Google.Protobuf" />
2928
<PackageReference Include="Grpc.Tools" PrivateAssets="All" />
29+
<PackageReference Include="Microsoft.Extensions.Logging.Testing" />
3030
</ItemGroup>
3131

3232
</Project>

‎test/Grpc.AspNetCore.Server.Tests/Grpc.AspNetCore.Server.Tests.csproj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
<Compile Include="..\Shared\TestResponseBodyFeature.cs" Link="Infrastructure\TestResponseBodyFeature.cs" />
2828
<Compile Include="..\Shared\TestServerCallContext.cs" Link="Infrastructure\TestServerCallContext.cs" />
2929
<Compile Include="..\Shared\NUnitLogger.cs" Link="Infrastructure\NUnitLogger.cs" />
30-
<Compile Include="..\Shared\Logging\*.cs" LinkBase="Infrastructure\Logging" />
3130
</ItemGroup>
3231

3332
<ItemGroup>
@@ -37,6 +36,9 @@
3736
<ProjectReference Include="..\..\src\Grpc.AspNetCore\Grpc.AspNetCore.csproj" />
3837
<ProjectReference Include="..\..\src\Grpc.AspNetCore.HealthChecks\Grpc.AspNetCore.HealthChecks.csproj" />
3938
<ProjectReference Include="..\..\src\Grpc.AspNetCore.Server.Reflection\Grpc.AspNetCore.Server.Reflection.csproj" />
39+
40+
<PackageReference Include="System.IO.Pipelines" />
41+
<PackageReference Include="Microsoft.Extensions.Logging.Testing" />
4042
</ItemGroup>
4143

4244
<ItemGroup>

‎test/Grpc.AspNetCore.Server.Tests/GrpcProtocolHelpersTests.cs

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#region Copyright notice and license
1+
#region Copyright notice and license
22

33
// Copyright 2019 The gRPC Authors
44
//
@@ -30,7 +30,7 @@ public class GrpcProtocolHelpersTests
3030
public void CreateAuthContext_CertWithAlternativeNames_UseAlternativeNamesAsPeerIdentity()
3131
{
3232
// Arrange
33-
var certificate = LoadCertificate(TestHelpers.ResolvePath(@"Certs/outlookcom.crt"));
33+
X509Certificate2 certificate = new X509Certificate2(TestHelpers.ResolvePath(@"Certs/outlookcom.crt"));
3434

3535
// Act
3636
var authContext = GrpcProtocolHelpers.CreateAuthContext(certificate);
@@ -57,7 +57,7 @@ public void CreateAuthContext_CertWithAlternativeNames_UseAlternativeNamesAsPeer
5757
public void CreateAuthContext_CertWithCommonName_UseCommonNameAsPeerIdentity()
5858
{
5959
// Arrange
60-
var certificate = LoadCertificate(TestHelpers.ResolvePath(@"Certs/client.crt"));
60+
var certificate = new X509Certificate2(TestHelpers.ResolvePath(@"Certs/client.crt"));
6161

6262
// Act
6363
var authContext = GrpcProtocolHelpers.CreateAuthContext(certificate);
@@ -99,13 +99,4 @@ public void TryDecodeTimeout_WithVariousUnits_ShouldMatchExpected(string timeout
9999
Assert.AreEqual(expectedSuccesfullyDecoded, successfullyDecoded);
100100
Assert.AreEqual(expectedTimespan, timeSpan);
101101
}
102-
103-
public static X509Certificate2 LoadCertificate(string path)
104-
{
105-
#if NET9_0_OR_GREATER
106-
return X509CertificateLoader.LoadCertificateFromFile(path);
107-
#else
108-
return new X509Certificate2(path);
109-
#endif
110-
}
111102
}

‎test/Grpc.AspNetCore.Server.Tests/HttpContextServerCallContextTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#region Copyright notice and license
1+
#region Copyright notice and license
22

33
// Copyright 2019 The gRPC Authors
44
//
@@ -537,7 +537,7 @@ public void AuthContext_HasClientCertificate_Authenticated()
537537
{
538538
// Arrange
539539
var httpContext = new DefaultHttpContext();
540-
var certificate = GrpcProtocolHelpersTests.LoadCertificate(TestHelpers.ResolvePath(@"Certs/client.crt"));
540+
var certificate = new X509Certificate2(TestHelpers.ResolvePath(@"Certs/client.crt"));
541541
httpContext.Connection.ClientCertificate = certificate;
542542
var serverCallContext = CreateServerCallContext(httpContext);
543543

‎test/Grpc.Net.Client.Tests/Grpc.Net.Client.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
<Compile Include="..\Shared\TestResolver.cs" Link="Infrastructure\Balancer\TestResolver.cs" />
3333
<Compile Include="..\Shared\TestResolverFactory.cs" Link="Infrastructure\Balancer\TestResolverFactory.cs" />
3434
<Compile Include="..\Shared\BalancerWaitHelpers.cs" Link="Infrastructure\Balancer\BalancerWaitHelpers.cs" />
35-
<Compile Include="..\Shared\Logging\*.cs" LinkBase="Infrastructure\Logging" />
3635
</ItemGroup>
3736

3837
<ItemGroup>
@@ -41,6 +40,7 @@
4140

4241
<PackageReference Include="Google.Protobuf" />
4342
<PackageReference Include="Grpc.Tools" PrivateAssets="All" />
43+
<PackageReference Include="Microsoft.Extensions.Logging.Testing" />
4444
<PackageReference Include="Microsoft.Extensions.Logging" />
4545
</ItemGroup>
4646

‎test/Grpc.Net.ClientFactory.Tests/Grpc.Net.ClientFactory.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@
2323
<Compile Include="..\Shared\ResponseUtils.cs" Link="Infrastructure\ResponseUtils.cs" />
2424
<Compile Include="..\Shared\TaskExtensions.cs" Link="Infrastructure\TaskExtensions.cs" />
2525
<Compile Include="..\Shared\TestHttpMessageHandler.cs" Link="Infrastructure\TestHttpMessageHandler.cs" />
26-
<Compile Include="..\Shared\Logging\*.cs" LinkBase="Infrastructure\Logging" />
2726

2827
<ProjectReference Include="..\..\src\Grpc.Net.ClientFactory\Grpc.Net.ClientFactory.csproj" />
2928

3029
<PackageReference Include="Google.Protobuf" />
3130
<PackageReference Include="Grpc.Tools" PrivateAssets="All" />
31+
<PackageReference Include="Microsoft.Extensions.Logging.Testing" />
3232
<PackageReference Include="Microsoft.Extensions.Http" />
3333
</ItemGroup>
3434

‎test/Shared/Logging/BeginScopeContext.cs

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎test/Shared/Logging/ITestSink.cs

Lines changed: 0 additions & 29 deletions
This file was deleted.

‎test/Shared/Logging/LogLevelAttribute.cs

Lines changed: 0 additions & 20 deletions
This file was deleted.

0 commit comments

Comments
 (0)