From 658c5506a1b390096518e49887275d76a0eda98c Mon Sep 17 00:00:00 2001 From: Brice Lambson Date: Thu, 27 Aug 2020 10:33:15 -0700 Subject: [PATCH] Start flowing Microsoft.NETCore.App dependency Fixes #22304 --- Directory.Build.targets | 8 ++++++++ eng/Version.Details.xml | 8 ++++++++ eng/Versions.props | 2 ++ global.json | 1 + .../TestUtilities/CosmosDbConfiguredConditionAttribute.cs | 5 ++++- test/EFCore.Design.Tests/DesignExceptionTest.cs | 4 ++-- test/EFCore.Tests/ExceptionTest.cs | 4 ++-- 7 files changed, 27 insertions(+), 5 deletions(-) diff --git a/Directory.Build.targets b/Directory.Build.targets index e2bdf743c6c..9201f9d7122 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -1,3 +1,11 @@ + + + + $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) + $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) + $(MicrosoftNETCoreAppRefPackageVersion) + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3e693bed8d3..275a4efdc08 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -37,6 +37,14 @@ https://github.com/dotnet/runtime 4328059b4e2eafe1bc62d23147fa06e4431d9d5c + + https://github.com/dotnet/runtime + 4328059b4e2eafe1bc62d23147fa06e4431d9d5c + + + https://github.com/dotnet/runtime + 4328059b4e2eafe1bc62d23147fa06e4431d9d5c + https://github.com/dotnet/runtime 4328059b4e2eafe1bc62d23147fa06e4431d9d5c diff --git a/eng/Versions.props b/eng/Versions.props index c4c6d32da5a..71ce6657cb8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,6 +27,8 @@ 5.0.0-rc.1.20431.5 5.0.0-rc.1.20431.5 5.0.0-rc.1.20431.5 + 5.0.0-rc.1.20431.5 + 5.0.0-rc.1.20431.5 3.7.0 diff --git a/global.json b/global.json index cd5ee6b4cdf..46406f579bf 100644 --- 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 index 6da80768fbb..a1d8e35d756 100644 --- a/test/EFCore.Cosmos.FunctionalTests/TestUtilities/CosmosDbConfiguredConditionAttribute.cs +++ b/test/EFCore.Cosmos.FunctionalTests/TestUtilities/CosmosDbConfiguredConditionAttribute.cs @@ -3,6 +3,7 @@ using System; using System.Linq; +using System.Net; using System.Net.Http; using System.Net.Sockets; using System.Threading.Tasks; @@ -67,7 +68,9 @@ private static async Task 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 index 080d8ab7a0a..8c1908891f4 100644 --- a/test/EFCore.Design.Tests/DesignExceptionTest.cs +++ b/test/EFCore.Design.Tests/DesignExceptionTest.cs @@ -53,12 +53,12 @@ private TException SerializeAndDeserialize(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 index d8fa4849cf2..c789bbd159f 100644 --- a/test/EFCore.Tests/ExceptionTest.cs +++ b/test/EFCore.Tests/ExceptionTest.cs @@ -226,12 +226,12 @@ private TException SerializeAndDeserialize(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 } } }