Start flowing Microsoft.NETCore.App dependency

Fixes dotnet#22304
bricelam · Aug 31, 2020 · ec73b3d · ec73b3d
1 parent 08474f1
commit ec73b3d
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 5 deletions.
diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -1,3 +1,11 @@
 <Project>
   <Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" />
+
+  <ItemGroup>
+    <KnownFrameworkReference Update="Microsoft.NETCore.App">
+      <LatestRuntimeFrameworkVersion Condition="'%(TargetFramework)' == '$(DefaultNetCoreTargetFramework)'">$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)</LatestRuntimeFrameworkVersion>
+      <DefaultRuntimeFrameworkVersion Condition="'%(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' and '$(IsServicingBuild)' != 'true'">$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)</DefaultRuntimeFrameworkVersion>
+      <TargetingPackVersion Condition="'%(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' and '$(IsServicingBuild)' != 'true'">$(MicrosoftNETCoreAppRefPackageVersion)</TargetingPackVersion>
+    </KnownFrameworkReference>
+  </ItemGroup>
 </Project>
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -37,6 +37,14 @@
       <Uri>https://github.com/dotnet/runtime</Uri>
       <Sha>4328059b4e2eafe1bc62d23147fa06e4431d9d5c</Sha>
     </Dependency>
+    <Dependency Name="Microsoft.NETCore.App.Ref" Version="5.0.0-rc.1.20431.5">
+      <Uri>https://github.com/dotnet/runtime</Uri>
+      <Sha>4328059b4e2eafe1bc62d23147fa06e4431d9d5c</Sha>
+    </Dependency>
+    <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="5.0.0-rc.1.20431.5">
+      <Uri>https://github.com/dotnet/runtime</Uri>
+      <Sha>4328059b4e2eafe1bc62d23147fa06e4431d9d5c</Sha>
+    </Dependency>
     <Dependency Name="System.Collections.Immutable" Version="5.0.0-rc.1.20431.5">
       <Uri>https://github.com/dotnet/runtime</Uri>
       <Sha>4328059b4e2eafe1bc62d23147fa06e4431d9d5c</Sha>

diff --git a/eng/Versions.props b/eng/Versions.props
@@ -27,6 +27,8 @@
     <MicrosoftExtensionsDependencyModelVersion>5.0.0-rc.1.20431.5</MicrosoftExtensionsDependencyModelVersion>
     <MicrosoftExtensionsHostFactoryResolverSourcesVersion>5.0.0-rc.1.20431.5</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
     <MicrosoftExtensionsLoggingVersion>5.0.0-rc.1.20431.5</MicrosoftExtensionsLoggingVersion>
+    <MicrosoftNETCoreAppRefPackageVersion>5.0.0-rc.1.20431.5</MicrosoftNETCoreAppRefPackageVersion>
+    <MicrosoftNETCoreAppRuntimewinx64PackageVersion>5.0.0-rc.1.20431.5</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
   </PropertyGroup>
   <PropertyGroup Label="Other dependencies">
     <MicrosoftCodeAnalysisVersion>3.7.0</MicrosoftCodeAnalysisVersion>

diff --git a/global.json b/global.json
@@ -3,6 +3,7 @@
     "dotnet": "5.0.100-preview.8.20417.9",
     "runtimes": {
       "dotnet": [
+        "$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)",
         "3.1.7"
       ],
       "aspnetcore": [

diff --git a/test/EFCore.Cosmos.FunctionalTests/TestUtilities/CosmosDbConfiguredConditionAttribute.cs b/test/EFCore.Cosmos.FunctionalTests/TestUtilities/CosmosDbConfiguredConditionAttribute.cs
@@ -67,7 +67,9 @@ 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
+                    || (re.InnerException is NetworkException networkException
+                        && networkException.InnerException is SocketException),
                 _ => 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
         }
     }
 }