Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions Directory.Build.targets
Original file line number Diff line number Diff line change
@@ -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>
8 changes: 8 additions & 0 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 2 additions & 0 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 1 addition & 0 deletions global.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"dotnet": "5.0.100-preview.8.20417.9",
"runtimes": {
"dotnet": [
"$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)",
"3.1.7"
],
"aspnetcore": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

using System;
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Net.Sockets;
using System.Threading.Tasks;
Expand Down Expand Up @@ -67,7 +68,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),
Expand Down
4 changes: 2 additions & 2 deletions test/EFCore.Design.Tests/DesignExceptionTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🎉

formatter.Serialize(stream, exception);
stream.Seek(0, SeekOrigin.Begin);

return (TException)formatter.Deserialize(stream);
#pragma warning restore MSLIB0003
#pragma warning restore SYSLIB0011
}
}
}
4 changes: 2 additions & 2 deletions test/EFCore.Tests/ExceptionTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
}