diff --git a/NuGet.config b/NuGet.config index 9ed4593be0..3745056e38 100644 --- a/NuGet.config +++ b/NuGet.config @@ -2,20 +2,43 @@ + + + + + + + + - + - - - + + + + + + + + + + + + + + + + + + diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props index 456cfb56ce..3435aff1b4 100644 --- a/eng/Baseline.Designer.props +++ b/eng/Baseline.Designer.props @@ -2,28 +2,28 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 5.0.2 + 5.0.3 - 5.0.2 + 5.0.3 - 5.0.2 + 5.0.3 - 5.0.2 + 5.0.3 - 5.0.2 + 5.0.3 - - - + + + @@ -37,108 +37,108 @@ - 5.0.2 + 5.0.3 - 5.0.2 + 5.0.3 - 5.0.2 + 5.0.3 - 5.0.2 + 5.0.3 - 5.0.2 + 5.0.3 - 5.0.2 + 5.0.3 - 5.0.2 + 5.0.3 - 5.0.2 + 5.0.3 - 5.0.2 + 5.0.3 - 5.0.2 + 5.0.3 - 5.0.2 + 5.0.3 - - + + - 5.0.2 + 5.0.3 - - + + - 5.0.2 + 5.0.3 - 5.0.2 + 5.0.3 - 5.0.2 + 5.0.3 - 5.0.2 + 5.0.3 - 5.0.2 + 5.0.3 - 5.0.2 + 5.0.3 - + - 5.0.2 + 5.0.3 - 5.0.2 + 5.0.3 - 5.0.2 + 5.0.3 @@ -146,110 +146,110 @@ - 5.0.2 + 5.0.3 - + - + - + - 5.0.2 + 5.0.3 - + - 5.0.2 + 5.0.3 - 5.0.2 + 5.0.3 - + - 5.0.2 + 5.0.3 - 5.0.2 + 5.0.3 - - + + - 5.0.2 + 5.0.3 - + - 5.0.2 + 5.0.3 - - - + + + - 5.0.2 + 5.0.3 - - + + - 5.0.2 + 5.0.3 - 5.0.2 + 5.0.3 - 5.0.2 + 5.0.3 - - + + - 5.0.2 + 5.0.3 - - + + - 5.0.2 + 5.0.3 @@ -257,86 +257,86 @@ - 5.0.2 + 5.0.3 - + - + - + - + - 5.0.2 + 5.0.3 - 5.0.2 + 5.0.3 - + - + - + - 5.0.2 + 5.0.3 - 5.0.2 + 5.0.3 - - + + - 5.0.2 + 5.0.3 - + - + - + - 5.0.2 + 5.0.3 - + - + - 5.0.2 + 5.0.3 - - + + @@ -346,8 +346,8 @@ - - + + @@ -356,8 +356,8 @@ - - + + @@ -368,14 +368,14 @@ - 5.0.2 + 5.0.3 - + - 5.0.2 + 5.0.3 @@ -383,50 +383,50 @@ - 5.0.2 + 5.0.3 - 5.0.2 + 5.0.3 - + - + - + - 5.0.2 + 5.0.3 - + - + - + - 5.0.2 + 5.0.3 @@ -442,27 +442,27 @@ - 5.0.2 + 5.0.3 - - + + - - + + - 5.0.2 + 5.0.3 - - + + - 5.0.2 + 5.0.3 @@ -474,185 +474,185 @@ - 5.0.2 + 5.0.3 - 5.0.2 + 5.0.3 - 5.0.2 + 5.0.3 - + - 5.0.2 + 5.0.3 - - + + - 5.0.2 + 5.0.3 - - + + - 5.0.2 + 5.0.3 - + - 5.0.2 + 5.0.3 - 5.0.2 + 5.0.3 - 5.0.2 + 5.0.3 - + - 5.0.2 + 5.0.3 - + - 5.0.2 + 5.0.3 - - + + - - + + - - + + - 5.0.2 + 5.0.3 - - + + - - + + - 5.0.2 + 5.0.3 - + - + - + - 5.0.2 + 5.0.3 - + - + - + - 5.0.2 + 5.0.3 - + - + - 5.0.2 + 5.0.3 - + - + - 5.0.2 + 5.0.3 - - - - + + + + - 5.0.2 + 5.0.3 @@ -661,65 +661,65 @@ - 5.0.2 + 5.0.3 - 5.0.2 + 5.0.3 - 5.0.2 + 5.0.3 - + - 5.0.2 + 5.0.3 - + - 5.0.2 + 5.0.3 - 5.0.2 + 5.0.3 - 5.0.2 + 5.0.3 - 5.0.2 + 5.0.3 - 5.0.2 + 5.0.3 - 5.0.2 + 5.0.3 - 5.0.2 + 5.0.3 - 5.0.2 + 5.0.3 @@ -735,42 +735,42 @@ - 5.0.2 + 5.0.3 - 5.0.2 + 5.0.3 - - - + + + - 5.0.2 + 5.0.3 - + - + - + - 5.0.2 + 5.0.3 @@ -780,73 +780,73 @@ - 5.0.2 + 5.0.3 - + - + - + - 5.0.2 + 5.0.3 - + - + - + - 5.0.2 + 5.0.3 - 5.0.2 + 5.0.3 - + - + - + - 5.0.2 + 5.0.3 @@ -867,11 +867,11 @@ - 5.0.2 + 5.0.3 - 5.0.2 + 5.0.3 @@ -889,13 +889,13 @@ - 5.0.2 + 5.0.3 - + - 5.0.2 + 5.0.3 \ No newline at end of file diff --git a/eng/Baseline.xml b/eng/Baseline.xml index 19cbf790b6..f861709295 100644 --- a/eng/Baseline.xml +++ b/eng/Baseline.xml @@ -4,105 +4,105 @@ 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 74fa793963..81118f21b4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,37 +9,37 @@ --> - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 1ee6b629b3437c0d45bfe3aa5703abdcc449231f + efc2924e6e36db17611c7da480d5bc97a4514cb8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 1ee6b629b3437c0d45bfe3aa5703abdcc449231f + efc2924e6e36db17611c7da480d5bc97a4514cb8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 1ee6b629b3437c0d45bfe3aa5703abdcc449231f + efc2924e6e36db17611c7da480d5bc97a4514cb8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 1ee6b629b3437c0d45bfe3aa5703abdcc449231f + efc2924e6e36db17611c7da480d5bc97a4514cb8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 1ee6b629b3437c0d45bfe3aa5703abdcc449231f + efc2924e6e36db17611c7da480d5bc97a4514cb8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 1ee6b629b3437c0d45bfe3aa5703abdcc449231f + efc2924e6e36db17611c7da480d5bc97a4514cb8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 1ee6b629b3437c0d45bfe3aa5703abdcc449231f + efc2924e6e36db17611c7da480d5bc97a4514cb8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 1ee6b629b3437c0d45bfe3aa5703abdcc449231f + efc2924e6e36db17611c7da480d5bc97a4514cb8 https://github.com/dotnet/runtime @@ -197,17 +197,17 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime cb5f173b9696d9d00a544b953d95190ab3b56df2 - - https://github.com/dotnet/runtime - cf258a14b70ad9069470a108f13765e0e5988f51 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + c636bbdc8a2d393d07c0e9407a4f8923ba1a21cb https://github.com/dotnet/runtime cf258a14b70ad9069470a108f13765e0e5988f51 - - https://github.com/dotnet/runtime - cf258a14b70ad9069470a108f13765e0e5988f51 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + c636bbdc8a2d393d07c0e9407a4f8923ba1a21cb https://github.com/dotnet/runtime @@ -294,24 +294,24 @@ Win-x64 is used here because we have picked an arbitrary runtime identifier to flow the version of the latest NETCore.App runtime. All Runtime.$rid packages should have the same version. --> - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cb5f173b9696d9d00a544b953d95190ab3b56df2 + c636bbdc8a2d393d07c0e9407a4f8923ba1a21cb - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cb5f173b9696d9d00a544b953d95190ab3b56df2 + c636bbdc8a2d393d07c0e9407a4f8923ba1a21cb - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cb5f173b9696d9d00a544b953d95190ab3b56df2 + c636bbdc8a2d393d07c0e9407a4f8923ba1a21cb - - https://github.com/dotnet/runtime - cf258a14b70ad9069470a108f13765e0e5988f51 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + c636bbdc8a2d393d07c0e9407a4f8923ba1a21cb https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index b1c8dbdca4..b104e692f0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 5 0 - 3 + 4 @@ -58,10 +58,10 @@ 5.0.0 - 5.0.2-servicing.20611.20 + 5.0.3-servicing.21072.12 5.0.0 - 5.0.2 - 5.0.2-servicing.20611.20 + 5.0.3 + 5.0.3-servicing.21072.12 5.0.0 5.0.0 5.0.0 @@ -101,9 +101,9 @@ 5.0.0-rtm.20519.4 5.0.0 5.0.1 - 5.0.0 + 5.0.1 5.0.0 - 5.0.0 + 5.0.1 5.0.1 5.0.0 5.0.0 @@ -124,16 +124,16 @@ 5.0.0 5.0.0 - 5.0.0 + 5.0.1 - 5.0.2 - 5.0.2 - 5.0.2 - 5.0.2 - 5.0.2 - 5.0.2 - 5.0.2 - 5.0.2 + 5.0.3 + 5.0.3 + 5.0.3 + 5.0.3 + 5.0.3 + 5.0.3 + 5.0.3 + 5.0.3 5.0.0-beta.21063.3 @@ -235,7 +235,7 @@ 2.1.1 2.2.0 - 3.1.11-servicing-20569-15 + 3.1.12-servicing-21070-12 $(MicrosoftAspNetCoreAzureAppServicesSiteExtension31PackageVersion) $(MicrosoftAspNetCoreAzureAppServicesSiteExtension31PackageVersion) diff --git a/global.json b/global.json index a977635a25..35abd2e76c 100644 --- a/global.json +++ b/global.json @@ -1,19 +1,19 @@ { "sdk": { - "version": "5.0.102" + "version": "5.0.103" }, "tools": { - "dotnet": "5.0.102", + "dotnet": "5.0.103", "runtimes": { "dotnet/x64": [ - "2.1.24", + "2.1.25", "$(MicrosoftNETCoreAppInternalPackageVersion)" ], "dotnet/x86": [ "$(MicrosoftNETCoreAppInternalPackageVersion)" ], "aspnetcore/x64": [ - "3.1.11" + "3.1.12" ] }, "Git": "2.22.0", diff --git a/src/Components/benchmarkapps/BlazingPizza.Server/NuGet.config b/src/Components/benchmarkapps/BlazingPizza.Server/NuGet.config index 298193b812..5b60d8fb2e 100644 --- a/src/Components/benchmarkapps/BlazingPizza.Server/NuGet.config +++ b/src/Components/benchmarkapps/BlazingPizza.Server/NuGet.config @@ -7,6 +7,6 @@ - + diff --git a/src/Framework/test/Microsoft.AspNetCore.App.UnitTests.csproj b/src/Framework/test/Microsoft.AspNetCore.App.UnitTests.csproj index fae3483c22..6eba8717f4 100644 --- a/src/Framework/test/Microsoft.AspNetCore.App.UnitTests.csproj +++ b/src/Framework/test/Microsoft.AspNetCore.App.UnitTests.csproj @@ -12,7 +12,15 @@ <_SharedFrameworkBinariesFromRepo Include="@(AspNetCoreAppReference);@(AspNetCoreAppReferenceAndPackage)" /> - <_ExpectedSharedFrameworkBinaries Include="@(_SharedFrameworkBinariesFromRepo);@(ExternalAspNetCoreAppReference);@(_TransitiveExternalAspNetCoreAppReference)" /> + + <_ExpectedSharedFrameworkBinaries Include="@(_SharedFrameworkBinariesFromRepo); + @(ExternalAspNetCoreAppReference); + @(_TransitiveExternalAspNetCoreAppReference); + System.Diagnostics.EventLog.Messages" /> <_ExpectedSharedFrameworkBinaries Condition="'$(TargetOsName)' == 'win' AND '$(TargetArchitecture)' != 'arm'" Include="aspnetcorev2_inprocess" /> diff --git a/src/Framework/test/TestData.cs b/src/Framework/test/TestData.cs index 7d2237ffaa..4da187022b 100644 --- a/src/Framework/test/TestData.cs +++ b/src/Framework/test/TestData.cs @@ -143,6 +143,7 @@ namespace Microsoft.AspNetCore "Microsoft.Net.Http.Headers", "Microsoft.Win32.SystemEvents", "System.Diagnostics.EventLog", + "System.Diagnostics.EventLog.Messages", "System.Drawing.Common", "System.IO.Pipelines", "System.Security.Cryptography.Pkcs", diff --git a/src/Mvc/benchmarkapps/NuGet.config b/src/Mvc/benchmarkapps/NuGet.config index 298193b812..5b60d8fb2e 100644 --- a/src/Mvc/benchmarkapps/NuGet.config +++ b/src/Mvc/benchmarkapps/NuGet.config @@ -7,6 +7,6 @@ - +