diff --git a/NuGet.config b/NuGet.config
index b89e70676f8e..5a69dbe9068f 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -4,13 +4,10 @@
-
-
-
+
-
-
+
@@ -29,13 +26,10 @@
-
-
-
+
-
-
+
diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props
index da411aa20037..9d5c3a5fb229 100644
--- a/eng/Baseline.Designer.props
+++ b/eng/Baseline.Designer.props
@@ -2,138 +2,138 @@
$(MSBuildAllProjects);$(MSBuildThisFileFullPath)
- 7.0.3
+ 7.0.4
- 7.0.3
+ 7.0.4
- 7.0.3
+ 7.0.4
- 7.0.3
+ 7.0.4
- 7.0.3
+ 7.0.4
-
-
-
+
+
+
-
+
- 7.0.3
+ 7.0.4
- 7.0.3
+ 7.0.4
- 7.0.3
+ 7.0.4
- 7.0.3
+ 7.0.4
- 7.0.3
+ 7.0.4
- 7.0.3
+ 7.0.4
- 7.0.3
+ 7.0.4
- 7.0.3
+ 7.0.4
- 7.0.3
+ 7.0.4
- 7.0.3
+ 7.0.4
- 7.0.3
+ 7.0.4
- 7.0.3
+ 7.0.4
- 7.0.3
+ 7.0.4
- 7.0.3
+ 7.0.4
- 7.0.3
+ 7.0.4
- 7.0.3
+ 7.0.4
- 7.0.3
+ 7.0.4
- 7.0.3
+ 7.0.4
- 7.0.3
+ 7.0.4
-
+
- 7.0.3
+ 7.0.4
- 7.0.3
+ 7.0.4
- 7.0.3
+ 7.0.4
@@ -141,129 +141,129 @@
- 7.0.3
+ 7.0.4
-
+
-
+
-
+
- 7.0.3
+ 7.0.4
-
+
- 7.0.3
+ 7.0.4
- 7.0.3
+ 7.0.4
-
+
- 7.0.3
+ 7.0.4
-
-
+
+
- 7.0.3
+ 7.0.4
- 7.0.3
+ 7.0.4
-
-
+
+
- 7.0.3
+ 7.0.4
-
+
- 7.0.3
+ 7.0.4
-
+
- 7.0.3
+ 7.0.4
-
-
-
+
+
+
- 7.0.3
+ 7.0.4
-
-
-
+
+
+
- 7.0.3
+ 7.0.4
-
-
+
+
- 7.0.3
+ 7.0.4
- 7.0.3
+ 7.0.4
- 7.0.3
+ 7.0.4
-
-
-
+
+
+
- 7.0.3
+ 7.0.4
@@ -272,50 +272,50 @@
- 7.0.3
+ 7.0.4
-
+
-
+
-
+
-
+
- 7.0.3
+ 7.0.4
- 7.0.3
+ 7.0.4
-
+
-
+
-
+
- 7.0.3
+ 7.0.4
-
-
+
+
@@ -325,8 +325,8 @@
-
-
+
+
@@ -334,8 +334,8 @@
-
-
+
+
@@ -346,58 +346,58 @@
- 7.0.3
+ 7.0.4
- 7.0.3
+ 7.0.4
-
-
+
+
- 7.0.3
+ 7.0.4
-
+
-
+
-
+
- 7.0.3
+ 7.0.4
-
+
-
+
-
+
- 7.0.3
+ 7.0.4
-
+
- 7.0.3
+ 7.0.4
@@ -414,7 +414,7 @@
- 7.0.3
+ 7.0.4
@@ -422,71 +422,71 @@
- 7.0.3
+ 7.0.4
- 7.0.3
+ 7.0.4
-
+
-
+
-
+
-
+
- 7.0.3
+ 7.0.4
-
+
-
+
-
+
- 7.0.3
+ 7.0.4
-
-
+
+
- 7.0.3
+ 7.0.4
-
-
+
+
- 7.0.3
+ 7.0.4
@@ -502,27 +502,27 @@
- 7.0.3
+ 7.0.4
- 7.0.3
+ 7.0.4
- 7.0.3
+ 7.0.4
-
+
- 7.0.3
+ 7.0.4
@@ -531,151 +531,151 @@
- 7.0.3
+ 7.0.4
-
+
- 7.0.3
+ 7.0.4
- 7.0.3
+ 7.0.4
- 7.0.3
+ 7.0.4
-
-
+
+
-
-
+
+
-
-
+
+
- 7.0.3
+ 7.0.4
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
- 7.0.3
+ 7.0.4
-
+
-
+
-
+
- 7.0.3
+ 7.0.4
-
+
-
+
-
+
- 7.0.3
+ 7.0.4
-
+
-
+
-
+
- 7.0.3
+ 7.0.4
-
+
-
+
-
+
- 7.0.3
+ 7.0.4
-
-
-
-
+
+
+
+
- 7.0.3
+ 7.0.4
@@ -684,60 +684,60 @@
- 7.0.3
+ 7.0.4
- 7.0.3
+ 7.0.4
- 7.0.3
+ 7.0.4
- 7.0.3
+ 7.0.4
-
+
- 7.0.3
+ 7.0.4
- 7.0.3
+ 7.0.4
- 7.0.3
+ 7.0.4
- 7.0.3
+ 7.0.4
- 7.0.3
+ 7.0.4
- 7.0.3
+ 7.0.4
- 7.0.3
+ 7.0.4
- 7.0.3
+ 7.0.4
@@ -756,7 +756,7 @@
- 7.0.3
+ 7.0.4
@@ -778,7 +778,7 @@
- 7.0.3
+ 7.0.4
@@ -794,46 +794,46 @@
- 7.0.3
+ 7.0.4
-
+
-
+
-
+
- 7.0.3
+ 7.0.4
- 7.0.3
+ 7.0.4
-
-
-
+
+
+
- 7.0.3
+ 7.0.4
- 7.0.3
+ 7.0.4
@@ -843,7 +843,7 @@
- 7.0.3
+ 7.0.4
@@ -852,73 +852,73 @@
- 7.0.3
+ 7.0.4
-
+
-
+
-
+
- 7.0.3
+ 7.0.4
-
+
-
+
-
+
- 7.0.3
+ 7.0.4
-
+
-
+
-
+
- 7.0.3
+ 7.0.4
- 7.0.3
+ 7.0.4
@@ -947,11 +947,11 @@
- 7.0.3
+ 7.0.4
- 7.0.3
+ 7.0.4
@@ -969,13 +969,13 @@
- 7.0.3
+ 7.0.4
- 7.0.3
+ 7.0.4
-
+
\ No newline at end of file
diff --git a/eng/Baseline.xml b/eng/Baseline.xml
index a0f8fab4c27d..c3f8a4aa0fc7 100644
--- a/eng/Baseline.xml
+++ b/eng/Baseline.xml
@@ -4,109 +4,109 @@ This file contains a list of all the packages and their versions which were rele
Update this list when preparing for a new patch.
-->
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 1e755d9d7e50..2314f2d65fa2 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -9,37 +9,37 @@
-->
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-efcore
- 01a74ccf9db71c23785f6a6ace038fed2ee7ae41
+ e2a4877d7a05d5cf6e6c790913a9aa73d4e89494
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-efcore
- 01a74ccf9db71c23785f6a6ace038fed2ee7ae41
+ e2a4877d7a05d5cf6e6c790913a9aa73d4e89494
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-efcore
- 01a74ccf9db71c23785f6a6ace038fed2ee7ae41
+ e2a4877d7a05d5cf6e6c790913a9aa73d4e89494
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-efcore
- 01a74ccf9db71c23785f6a6ace038fed2ee7ae41
+ e2a4877d7a05d5cf6e6c790913a9aa73d4e89494
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-efcore
- 01a74ccf9db71c23785f6a6ace038fed2ee7ae41
+ e2a4877d7a05d5cf6e6c790913a9aa73d4e89494
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-efcore
- 01a74ccf9db71c23785f6a6ace038fed2ee7ae41
+ e2a4877d7a05d5cf6e6c790913a9aa73d4e89494
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-efcore
- 01a74ccf9db71c23785f6a6ace038fed2ee7ae41
+ e2a4877d7a05d5cf6e6c790913a9aa73d4e89494
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-efcore
- 01a74ccf9db71c23785f6a6ace038fed2ee7ae41
+ e2a4877d7a05d5cf6e6c790913a9aa73d4e89494
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
@@ -53,9 +53,9 @@
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
d099f075e45d2aa6007a22b71b45a08758559f80
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 0a2bda10e81d901396c3cff95533529e3a93ad47
+ 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
@@ -177,9 +177,9 @@
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
d099f075e45d2aa6007a22b71b45a08758559f80
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 0a2bda10e81d901396c3cff95533529e3a93ad47
+ 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4
https://github.com/dotnet/source-build-externals
@@ -190,9 +190,9 @@
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
d099f075e45d2aa6007a22b71b45a08758559f80
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 0a2bda10e81d901396c3cff95533529e3a93ad47
+ 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
@@ -206,17 +206,17 @@
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
d099f075e45d2aa6007a22b71b45a08758559f80
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- d099f075e45d2aa6007a22b71b45a08758559f80
+ 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
d099f075e45d2aa6007a22b71b45a08758559f80
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- d099f075e45d2aa6007a22b71b45a08758559f80
+ 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
@@ -262,33 +262,33 @@
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
d099f075e45d2aa6007a22b71b45a08758559f80
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 0a2bda10e81d901396c3cff95533529e3a93ad47
+ 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 0a2bda10e81d901396c3cff95533529e3a93ad47
+ 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 0a2bda10e81d901396c3cff95533529e3a93ad47
+ 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 0a2bda10e81d901396c3cff95533529e3a93ad47
+ 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 0a2bda10e81d901396c3cff95533529e3a93ad47
+ 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 0a2bda10e81d901396c3cff95533529e3a93ad47
+ 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4
https://github.com/dotnet/xdt
@@ -298,9 +298,9 @@
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- d099f075e45d2aa6007a22b71b45a08758559f80
+ 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4
https://github.com/dotnet/arcade
diff --git a/eng/Versions.props b/eng/Versions.props
index 0c8f5189e727..fd7b8a2ebfff 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -9,7 +9,7 @@
7
0
5
- false
+ true
@@ -63,16 +63,16 @@
7.0.0
- 7.0.3
- 7.0.3
- 7.0.3
- 7.0.3
- 7.0.3
- 7.0.3-servicing.23069.10
+ 7.0.4
+ 7.0.4
+ 7.0.4
+ 7.0.4
+ 7.0.4
+ 7.0.4-servicing.23115.8
7.0.0
7.0.0
7.0.0
- 7.0.3
+ 7.0.4
7.0.0
7.0.0
7.0.0
@@ -103,15 +103,15 @@
7.0.0
7.0.1
7.0.0
- 7.0.3-servicing.23069.10
+ 7.0.4-servicing.23115.8
7.0.0
- 7.0.1
+ 7.0.2
7.0.0
7.0.0
7.0.0
- 7.0.0
+ 7.0.1
7.0.0
- 7.0.0
+ 7.0.1
7.0.0
7.0.1
7.0.1
@@ -123,16 +123,16 @@
7.0.0
7.0.0
- 7.0.0
+ 7.0.1
- 7.0.3
- 7.0.3
- 7.0.3
- 7.0.3
- 7.0.3
- 7.0.3
- 7.0.3
- 7.0.3
+ 7.0.4
+ 7.0.4
+ 7.0.4
+ 7.0.4
+ 7.0.4
+ 7.0.4
+ 7.0.4
+ 7.0.4
7.0.0-beta.23114.3
7.0.0-beta.23114.3
diff --git a/global.json b/global.json
index 4648b9ed9518..c6d53bae28ea 100644
--- a/global.json
+++ b/global.json
@@ -1,9 +1,9 @@
{
"sdk": {
- "version": "7.0.103"
+ "version": "7.0.104"
},
"tools": {
- "dotnet": "7.0.103",
+ "dotnet": "7.0.104",
"runtimes": {
"dotnet/x86": [
"$(MicrosoftNETCoreBrowserDebugHostTransportVersion)"
diff --git a/src/Framework/test/TargetingPackTests.cs b/src/Framework/test/TargetingPackTests.cs
index 76be10479af3..296eed5cb569 100644
--- a/src/Framework/test/TargetingPackTests.cs
+++ b/src/Framework/test/TargetingPackTests.cs
@@ -199,7 +199,10 @@ public void AssembliesAreReferenceAssemblies()
Assert.True(hasRefAssemblyAttribute, $"{path} should have {nameof(ReferenceAssemblyAttribute)}");
#pragma warning disable SYSLIB0037 // AssemblyName.ProcessorArchitecture is obsolete
- Assert.Equal(ProcessorArchitecture.None, assemblyName.ProcessorArchitecture);
+ // MSIL and None represent platform neutral assemblies such that reference assemblies can always be loaded.
+ Assert.True(assemblyName.ProcessorArchitecture == ProcessorArchitecture.MSIL ||
+ assemblyName.ProcessorArchitecture == ProcessorArchitecture.None
+ );
#pragma warning restore SYSLIB0037
});
}