From 2d982175800e11e1b3ba682911f676891403c0f5 Mon Sep 17 00:00:00 2001
From: Doug Bunting <6431421+dougbu@users.noreply.github.com>
Date: Wed, 7 Oct 2020 16:20:18 -0700
Subject: [PATCH 1/3] Upgrade to a 6.0 SDK - without this, generated assemblies
 are unusable in aspnetcore after that brands to 6.0.0 - in other words, this
 is needed for dotnet/aspnetcore#24983 to test correctly

---
 global.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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"
   },

From 889e2951ebf951d684dcbb4a4434b5688d050314 Mon Sep 17 00:00:00 2001
From: Doug Bunting <6431421+dougbu@users.noreply.github.com>
Date: Sat, 10 Oct 2020 15:19:45 -0700
Subject: [PATCH 2/3] Check for `IOException` instead of missing
 `NetworkException` - `NetworkException` unavailable in shared framework or a
 shipping package

---
 .../TestUtilities/CosmosDbConfiguredConditionAttribute.cs     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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
                     ,

From 8bbc8c494f22768485b9367e3cbf04a8f0d27046 Mon Sep 17 00:00:00 2001
From: Doug Bunting <6431421+dougbu@users.noreply.github.com>
Date: Sat, 10 Oct 2020 16:35:59 -0700
Subject: [PATCH 3/3] Update .NET SDK version used in Helix tests - eliminate
 need to change the .NET SDK version in two files - `$(DotNetCliVersion)` must
 be set explicitly   - Helix SDK does not pick up .NET SDK version from our
 global.json - fortunately, `$(NETCoreSdkVersion)` is available in helix.proj

---
 eng/helix.proj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 @@
 
     <IncludeDotNetCli>true</IncludeDotNetCli>
     <DotNetCliPackageType>sdk</DotNetCliPackageType>
-    <DotNetCliVersion>5.0.100-rc.1.20452.10</DotNetCliVersion>
+    <DotNetCliVersion>$(NETCoreSdkVersion)</DotNetCliVersion>
 
     <EnableAzurePipelinesReporter>true</EnableAzurePipelinesReporter>
     <FailOnTestFailure>true</FailOnTestFailure>