Skip to content

Commit 658c550

Browse files
committed
Start flowing Microsoft.NETCore.App dependency
Fixes #22304
1 parent 08474f1 commit 658c550

File tree

7 files changed

+27
-5
lines changed

7 files changed

+27
-5
lines changed

Directory.Build.targets

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
11
<Project>
22
<Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" />
3+
4+
<ItemGroup>
5+
<KnownFrameworkReference Update="Microsoft.NETCore.App">
6+
<LatestRuntimeFrameworkVersion Condition="'%(TargetFramework)' == '$(DefaultNetCoreTargetFramework)'">$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)</LatestRuntimeFrameworkVersion>
7+
<DefaultRuntimeFrameworkVersion Condition="'%(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' and '$(IsServicingBuild)' != 'true'">$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)</DefaultRuntimeFrameworkVersion>
8+
<TargetingPackVersion Condition="'%(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' and '$(IsServicingBuild)' != 'true'">$(MicrosoftNETCoreAppRefPackageVersion)</TargetingPackVersion>
9+
</KnownFrameworkReference>
10+
</ItemGroup>
311
</Project>

eng/Version.Details.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,14 @@
3737
<Uri>https://github.com/dotnet/runtime</Uri>
3838
<Sha>4328059b4e2eafe1bc62d23147fa06e4431d9d5c</Sha>
3939
</Dependency>
40+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="5.0.0-rc.1.20431.5">
41+
<Uri>https://github.com/dotnet/runtime</Uri>
42+
<Sha>4328059b4e2eafe1bc62d23147fa06e4431d9d5c</Sha>
43+
</Dependency>
44+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="5.0.0-rc.1.20431.5">
45+
<Uri>https://github.com/dotnet/runtime</Uri>
46+
<Sha>4328059b4e2eafe1bc62d23147fa06e4431d9d5c</Sha>
47+
</Dependency>
4048
<Dependency Name="System.Collections.Immutable" Version="5.0.0-rc.1.20431.5">
4149
<Uri>https://github.com/dotnet/runtime</Uri>
4250
<Sha>4328059b4e2eafe1bc62d23147fa06e4431d9d5c</Sha>

eng/Versions.props

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@
2727
<MicrosoftExtensionsDependencyModelVersion>5.0.0-rc.1.20431.5</MicrosoftExtensionsDependencyModelVersion>
2828
<MicrosoftExtensionsHostFactoryResolverSourcesVersion>5.0.0-rc.1.20431.5</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
2929
<MicrosoftExtensionsLoggingVersion>5.0.0-rc.1.20431.5</MicrosoftExtensionsLoggingVersion>
30+
<MicrosoftNETCoreAppRefPackageVersion>5.0.0-rc.1.20431.5</MicrosoftNETCoreAppRefPackageVersion>
31+
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>5.0.0-rc.1.20431.5</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
3032
</PropertyGroup>
3133
<PropertyGroup Label="Other dependencies">
3234
<MicrosoftCodeAnalysisVersion>3.7.0</MicrosoftCodeAnalysisVersion>

global.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
"dotnet": "5.0.100-preview.8.20417.9",
44
"runtimes": {
55
"dotnet": [
6+
"$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)",
67
"3.1.7"
78
],
89
"aspnetcore": [

test/EFCore.Cosmos.FunctionalTests/TestUtilities/CosmosDbConfiguredConditionAttribute.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
using System;
55
using System.Linq;
6+
using System.Net;
67
using System.Net.Http;
78
using System.Net.Sockets;
89
using System.Threading.Tasks;
@@ -67,7 +68,9 @@ private static async Task<bool> TryConnectAsync()
6768
private static bool IsNotConfigured(Exception exception)
6869
=> exception switch
6970
{
70-
HttpRequestException re => re.InnerException is SocketException,
71+
HttpRequestException re => re.InnerException is SocketException
72+
|| (re.InnerException is NetworkException networkException
73+
&& networkException.InnerException is SocketException),
7174
_ => exception.Message.Contains(
7275
"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.",
7376
StringComparison.Ordinal),

test/EFCore.Design.Tests/DesignExceptionTest.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,12 @@ private TException SerializeAndDeserialize<TException>(TException exception)
5353
var stream = new MemoryStream();
5454
var formatter = new BinaryFormatter();
5555

56-
#pragma warning disable MSLIB0003 // Issue https://github.com/dotnet/runtime/issues/39289 tracks finding an alternative to BinaryFormatter
56+
#pragma warning disable SYSLIB0011 // Issue https://github.com/dotnet/runtime/issues/39289 tracks finding an alternative to BinaryFormatter
5757
formatter.Serialize(stream, exception);
5858
stream.Seek(0, SeekOrigin.Begin);
5959

6060
return (TException)formatter.Deserialize(stream);
61-
#pragma warning restore MSLIB0003
61+
#pragma warning restore SYSLIB0011
6262
}
6363
}
6464
}

test/EFCore.Tests/ExceptionTest.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -226,12 +226,12 @@ private TException SerializeAndDeserialize<TException>(TException exception)
226226
var stream = new MemoryStream();
227227
var formatter = new BinaryFormatter();
228228

229-
#pragma warning disable MSLIB0003 // Issue https://github.com/dotnet/runtime/issues/39289 tracks finding an alternative to BinaryFormatter
229+
#pragma warning disable SYSLIB0011 // Issue https://github.com/dotnet/runtime/issues/39289 tracks finding an alternative to BinaryFormatter
230230
formatter.Serialize(stream, exception);
231231
stream.Seek(0, SeekOrigin.Begin);
232232

233233
return (TException)formatter.Deserialize(stream);
234-
#pragma warning restore MSLIB0003
234+
#pragma warning restore SYSLIB0011
235235
}
236236
}
237237
}

0 commit comments

Comments
 (0)