diff --git a/eng/helix.proj b/eng/helix.proj index a4f19c43084..79a4eb0c730 100644 --- a/eng/helix.proj +++ b/eng/helix.proj @@ -8,7 +8,7 @@ true sdk - 5.0.100-rc.1.20452.10 + $(NETCoreSdkVersion) true true diff --git a/global.json b/global.json index f002ac83a44..22692bdae1a 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "5.0.100-rc.1.20452.10", + "dotnet": "6.0.100-alpha.1.20472.11", "runtimes": { "dotnet": [ "3.1.8" @@ -11,7 +11,7 @@ } }, "sdk": { - "version": "5.0.100-rc.1.20452.10", + "version": "6.0.100-alpha.1.20472.11", "allowPrerelease": true, "rollForward": "latestMajor" }, diff --git a/test/EFCore.Cosmos.FunctionalTests/TestUtilities/CosmosDbConfiguredConditionAttribute.cs b/test/EFCore.Cosmos.FunctionalTests/TestUtilities/CosmosDbConfiguredConditionAttribute.cs index acae1b2af04..ca91b1850bf 100644 --- a/test/EFCore.Cosmos.FunctionalTests/TestUtilities/CosmosDbConfiguredConditionAttribute.cs +++ b/test/EFCore.Cosmos.FunctionalTests/TestUtilities/CosmosDbConfiguredConditionAttribute.cs @@ -9,7 +9,7 @@ using Microsoft.EntityFrameworkCore.TestUtilities.Xunit; #if NET5_0 -using System.Net; +using System.IO; #endif namespace Microsoft.EntityFrameworkCore.TestUtilities @@ -73,7 +73,7 @@ private static bool IsNotConfigured(Exception exception) { HttpRequestException re => re.InnerException is SocketException #if NET5_0 - || (re.InnerException is NetworkException networkException + || (re.InnerException is IOException networkException && networkException.InnerException is SocketException) #endif ,