⬆️ Update to .NET SDK 5.0 RC2

Fixes dotnet#22304
bricelam · Sep 15, 2020 · ff56c9e · ff56c9e
1 parent 90bca99
commit ff56c9e
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 10 deletions.
diff --git a/eng/helix.proj b/eng/helix.proj
@@ -8,7 +8,7 @@
 
     <IncludeDotNetCli>true</IncludeDotNetCli>
     <DotNetCliPackageType>sdk</DotNetCliPackageType>
-    <DotNetCliVersion>5.0.100-preview.8.20417.9</DotNetCliVersion>
+    <DotNetCliVersion>5.0.100-rc.1.20452.10</DotNetCliVersion>
 
     <EnableAzurePipelinesReporter>true</EnableAzurePipelinesReporter>
     <FailOnTestFailure>true</FailOnTestFailure>

diff --git a/global.json b/global.json
@@ -1,17 +1,17 @@
 {
   "tools": {
-    "dotnet": "5.0.100-preview.8.20417.9",
+    "dotnet": "5.0.100-rc.1.20452.10",
     "runtimes": {
       "dotnet": [
-        "3.1.7"
+        "3.1.8"
       ],
       "aspnetcore": [
-        "3.1.7"
+        "3.1.8"
       ]
     }
   },
   "sdk": {
-    "version": "5.0.100-preview.8.20417.9",
+    "version": "5.0.100-rc.1.20452.10",
     "allowPrerelease": true,
     "rollForward": "latestMajor"
   },

diff --git a/src/EFCore.Tools/EFCore.Tools.csproj b/src/EFCore.Tools/EFCore.Tools.csproj
@@ -22,6 +22,7 @@ Scaffold-DbContext
 Script-Migration
 Update-Database
   </Description>
+    <CheckEolTargetFramework>False</CheckEolTargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/ef/ef.csproj b/src/ef/ef.csproj
@@ -11,6 +11,7 @@
       which maximizes the machines on which this tool will be compatible.
     -->
     <TargetLatestDotNetRuntime Condition=" '$(IsServicingBuild)' == 'true' ">false</TargetLatestDotNetRuntime>
+    <CheckEolTargetFramework>False</CheckEolTargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/test/EFCore.Cosmos.FunctionalTests/TestUtilities/CosmosDbConfiguredConditionAttribute.cs b/test/EFCore.Cosmos.FunctionalTests/TestUtilities/CosmosDbConfiguredConditionAttribute.cs
@@ -8,6 +8,10 @@
 using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore.TestUtilities.Xunit;
 
+#if NET5_0
+using System.Net;
+#endif
+
 namespace Microsoft.EntityFrameworkCore.TestUtilities
 {
     [AttributeUsage(AttributeTargets.Method | AttributeTargets.Class | AttributeTargets.Assembly)]
@@ -67,7 +71,12 @@ private static async Task<bool> TryConnectAsync()
         private static bool IsNotConfigured(Exception exception)
             => exception switch
             {
-                HttpRequestException re => re.InnerException is SocketException,
+                HttpRequestException re => re.InnerException is SocketException
+#if NET5_0
+                    || (re.InnerException is NetworkException networkException
+                        && networkException.InnerException is SocketException)
+#endif
+                    ,
                 _ => exception.Message.Contains(
                     "The input authorization token can't serve the request. Please check that the expected payload is built as per the protocol, and check the key being used.",
                     StringComparison.Ordinal),

diff --git a/test/EFCore.Design.Tests/DesignExceptionTest.cs b/test/EFCore.Design.Tests/DesignExceptionTest.cs
@@ -53,12 +53,12 @@ private TException SerializeAndDeserialize<TException>(TException exception)
             var stream = new MemoryStream();
             var formatter = new BinaryFormatter();
 
-#pragma warning disable MSLIB0003 // Issue https://github.com/dotnet/runtime/issues/39289 tracks finding an alternative to BinaryFormatter
+#pragma warning disable SYSLIB0011 // Issue https://github.com/dotnet/runtime/issues/39289 tracks finding an alternative to BinaryFormatter
             formatter.Serialize(stream, exception);
             stream.Seek(0, SeekOrigin.Begin);
 
             return (TException)formatter.Deserialize(stream);
-#pragma warning restore MSLIB0003
+#pragma warning restore SYSLIB0011
         }
     }
 }
diff --git a/test/EFCore.Tests/ExceptionTest.cs b/test/EFCore.Tests/ExceptionTest.cs
@@ -226,12 +226,12 @@ private TException SerializeAndDeserialize<TException>(TException exception)
             var stream = new MemoryStream();
             var formatter = new BinaryFormatter();
 
-#pragma warning disable MSLIB0003 // Issue https://github.com/dotnet/runtime/issues/39289 tracks finding an alternative to BinaryFormatter
+#pragma warning disable SYSLIB0011 // Issue https://github.com/dotnet/runtime/issues/39289 tracks finding an alternative to BinaryFormatter
             formatter.Serialize(stream, exception);
             stream.Seek(0, SeekOrigin.Begin);
 
             return (TException)formatter.Deserialize(stream);
-#pragma warning restore MSLIB0003
+#pragma warning restore SYSLIB0011
         }
     }
 }