Skip to content

Commit f5e4ad7

Browse files
authored
Add .NET 7 package source to fix benchmarks (#1496)
1 parent 7ef184f commit f5e4ad7

File tree

3 files changed

+22
-6
lines changed

3 files changed

+22
-6
lines changed

build/dependencies.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
<GoogleProtobufPackageVersion>3.18.0</GoogleProtobufPackageVersion>
55
<GrpcDotNetPackageVersion>2.39.0-pre1</GrpcDotNetPackageVersion> <!-- Used by example projects -->
66
<GrpcPackageVersion>2.41.0</GrpcPackageVersion>
7-
<MicrosoftAspNetCoreAppPackageVersion>6.0.0-rc.1.21367.4</MicrosoftAspNetCoreAppPackageVersion>
7+
<MicrosoftAspNetCoreAppPackageVersion>6.0.0</MicrosoftAspNetCoreAppPackageVersion>
88
<MicrosoftAspNetCoreApp5PackageVersion>5.0.3</MicrosoftAspNetCoreApp5PackageVersion>
99
<MicrosoftAspNetCoreApp31PackageVersion>3.1.3</MicrosoftAspNetCoreApp31PackageVersion>
1010
<MicrosoftBuildLocatorPackageVersion>1.2.2</MicrosoftBuildLocatorPackageVersion>
1111
<MicrosoftBuildPackageVersion>16.0.461</MicrosoftBuildPackageVersion>
12-
<MicrosoftCodeAnalysisNetAnalyzersPackageVersion>6.0.0-rc1.21366.3</MicrosoftCodeAnalysisNetAnalyzersPackageVersion>
12+
<MicrosoftCodeAnalysisNetAnalyzersPackageVersion>6.0.0</MicrosoftCodeAnalysisNetAnalyzersPackageVersion>
1313
<MicrosoftCrankEventSourcesPackageVersion>0.2.0-alpha.21255.1</MicrosoftCrankEventSourcesPackageVersion>
1414
<MicrosoftExtensionsLoggingTestingPackageVersion>2.1.1</MicrosoftExtensionsLoggingTestingPackageVersion>
1515
<MicrosoftExtensionsPackageVersion>3.0.3</MicrosoftExtensionsPackageVersion>
@@ -28,7 +28,7 @@
2828
<SystemDiagnosticsDiagnosticSourcePackageVersion>4.5.1</SystemDiagnosticsDiagnosticSourcePackageVersion>
2929
<SystemIOPipelinesPackageVersion>5.0.1</SystemIOPipelinesPackageVersion>
3030
<SystemMemoryPackageVersion>4.5.3</SystemMemoryPackageVersion>
31-
<SystemNetHttpWinHttpHandlerPackageVersion>6.0.0-preview.3.21201.4</SystemNetHttpWinHttpHandlerPackageVersion>
31+
<SystemNetHttpWinHttpHandlerPackageVersion>6.0.0</SystemNetHttpWinHttpHandlerPackageVersion>
3232
<SystemSecurityPrincipalWindowsPackageVersion>4.6.0</SystemSecurityPrincipalWindowsPackageVersion>
3333
</PropertyGroup>
3434
</Project>

build/sources.props

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44
$(RestoreSources);
55
https://api.nuget.org/v3/index.json;
66
https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json;
7-
https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json;
8-
https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json;
7+
https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7/nuget/v3/index.json;
98
</RestoreSources>
109
<RestoreSources Condition="Exists('$(MSBuildThisFileDirectory)feed')">
1110
$(RestoreSources);

test/FunctionalTests/Balancer/PickFirstBalancerTests.cs

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,24 @@ Task<HelloReply> UnaryMethod(HelloRequest request, ServerCallContext context)
140140
() => client.UnaryCall(new HelloRequest { Name = "Balancer" }).ResponseAsync).DefaultTimeout();
141141

142142
Assert.AreEqual(StatusCode.Unavailable, ex.StatusCode);
143-
Assert.IsInstanceOf(typeof(SocketException), ex.Status.DebugException);
143+
144+
// Sometimes SocketException is wrapped by HttpRequestException.
145+
Assert.IsTrue(HasExceptionInStack<SocketException>(ex.Status.DebugException), $"Unexpected exception: {ex.Status.DebugException}");
146+
147+
static bool HasExceptionInStack<T>(Exception? ex)
148+
{
149+
while (ex != null)
150+
{
151+
if (ex is T)
152+
{
153+
return true;
154+
}
155+
156+
ex = ex.InnerException;
157+
}
158+
159+
return false;
160+
}
144161
}
145162

146163
[Test]

0 commit comments

Comments
 (0)