diff --git a/NuGet.config b/NuGet.config index 285fcd43b3b3..5a69dbe9068f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,12 +4,10 @@ - + - - - + @@ -28,12 +26,10 @@ - + - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1bee758c3383..2314f2d65fa2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -11,35 +11,35 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - d26d4e0c774f3bbff5733b13783032578baffba3 + e2a4877d7a05d5cf6e6c790913a9aa73d4e89494 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - d26d4e0c774f3bbff5733b13783032578baffba3 + e2a4877d7a05d5cf6e6c790913a9aa73d4e89494 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - d26d4e0c774f3bbff5733b13783032578baffba3 + e2a4877d7a05d5cf6e6c790913a9aa73d4e89494 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - d26d4e0c774f3bbff5733b13783032578baffba3 + e2a4877d7a05d5cf6e6c790913a9aa73d4e89494 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - d26d4e0c774f3bbff5733b13783032578baffba3 + e2a4877d7a05d5cf6e6c790913a9aa73d4e89494 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - d26d4e0c774f3bbff5733b13783032578baffba3 + e2a4877d7a05d5cf6e6c790913a9aa73d4e89494 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - d26d4e0c774f3bbff5733b13783032578baffba3 + e2a4877d7a05d5cf6e6c790913a9aa73d4e89494 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - d26d4e0c774f3bbff5733b13783032578baffba3 + 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 - 73c57f5de476f22b518813ef7f38929f12c39f26 + 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 - 73c57f5de476f22b518813ef7f38929f12c39f26 + 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 @@ -264,15 +264,15 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 73c57f5de476f22b518813ef7f38929f12c39f26 + 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 73c57f5de476f22b518813ef7f38929f12c39f26 + 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 73c57f5de476f22b518813ef7f38929f12c39f26 + 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 73c57f5de476f22b518813ef7f38929f12c39f26 + 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 73c57f5de476f22b518813ef7f38929f12c39f26 + 0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 73c57f5de476f22b518813ef7f38929f12c39f26 + 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 00ae257878fc..12deff6791ee 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -68,11 +68,11 @@ 7.0.4 7.0.4 7.0.4 - 7.0.4-servicing.23108.1 + 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.4-servicing.23108.1 + 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,7 +123,7 @@ 7.0.0 7.0.0 - 7.0.0 + 7.0.1 7.0.4 7.0.4 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 }); }