From 1df57379443d3f3db20f28e66431e66ab5ff8529 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 14 Jan 2021 01:39:31 +0000 Subject: [PATCH 01/13] [internal/release/5.0] Update dependencies from dnceng/internal/dotnet-efcore --- NuGet.config | 12 ++++++------ eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1a73a851d5..8cdf4370e4 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,11 +4,8 @@ - + - - - @@ -19,11 +16,14 @@ - - + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2872d50879..ec1e27685f 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 + d5943e64a12b75a9059439c2c317e5cc75966f04 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 1ee6b629b3437c0d45bfe3aa5703abdcc449231f + d5943e64a12b75a9059439c2c317e5cc75966f04 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 1ee6b629b3437c0d45bfe3aa5703abdcc449231f + d5943e64a12b75a9059439c2c317e5cc75966f04 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 1ee6b629b3437c0d45bfe3aa5703abdcc449231f + d5943e64a12b75a9059439c2c317e5cc75966f04 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 1ee6b629b3437c0d45bfe3aa5703abdcc449231f + d5943e64a12b75a9059439c2c317e5cc75966f04 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 1ee6b629b3437c0d45bfe3aa5703abdcc449231f + d5943e64a12b75a9059439c2c317e5cc75966f04 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 1ee6b629b3437c0d45bfe3aa5703abdcc449231f + d5943e64a12b75a9059439c2c317e5cc75966f04 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 1ee6b629b3437c0d45bfe3aa5703abdcc449231f + d5943e64a12b75a9059439c2c317e5cc75966f04 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 307e2ad7fa..08744667d4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -126,14 +126,14 @@ 5.0.0 - 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.20621.10 From bdd83f02bc5094cf8556716fdbf2914f49aee174 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 14 Jan 2021 08:35:44 +0000 Subject: [PATCH 02/13] [internal/release/5.0] Update dependencies from dnceng/internal/dotnet-runtime --- NuGet.config | 8 ++++++-- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 8cdf4370e4..72cd60e683 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,6 +6,9 @@ + + + @@ -17,11 +20,12 @@ - - + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ec1e27685f..288328fc53 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -294,17 +294,17 @@ 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 + f37e9a07051328a2dde6fb33845523d1681c0c66 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cb5f173b9696d9d00a544b953d95190ab3b56df2 + f37e9a07051328a2dde6fb33845523d1681c0c66 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cb5f173b9696d9d00a544b953d95190ab3b56df2 + f37e9a07051328a2dde6fb33845523d1681c0c66 diff --git a/eng/Versions.props b/eng/Versions.props index 08744667d4..11d0bde235 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,10 +58,10 @@ 5.0.0 - 5.0.2-servicing.20611.20 + 5.0.3-servicing.21063.16 5.0.0 - 5.0.2 - 5.0.2-servicing.20611.20 + 5.0.3 + 5.0.3-servicing.21063.16 5.0.0 5.0.0 5.0.0 From ae430f3dab746751cbe83e7d1508b57f8e9871bf Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Thu, 14 Jan 2021 15:33:07 +0000 Subject: [PATCH 03/13] Merged PR 12027: [internal/release/5.0] Feed update Feed update --- NuGet.config | 2 +- src/Components/benchmarkapps/BlazingPizza.Server/NuGet.config | 2 +- src/Mvc/benchmarkapps/NuGet.config | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/NuGet.config b/NuGet.config index 72cd60e683..ac998c8032 100644 --- a/NuGet.config +++ b/NuGet.config @@ -14,7 +14,7 @@ - + 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/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 @@ - + From 8c48adb36f3ad95646e6db8d04eab80a8c720686 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 15 Jan 2021 19:14:51 +0000 Subject: [PATCH 04/13] [internal/release/5.0] Update dependencies from dnceng/internal/dotnet-efcore --- NuGet.config | 7 +++++-- eng/Version.Details.xml | 16 ++++++++-------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index ac998c8032..632ebf879b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + @@ -23,11 +23,14 @@ + + + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dfd98c428f..31fbefe74a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -11,35 +11,35 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - d5943e64a12b75a9059439c2c317e5cc75966f04 + efc2924e6e36db17611c7da480d5bc97a4514cb8 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - d5943e64a12b75a9059439c2c317e5cc75966f04 + efc2924e6e36db17611c7da480d5bc97a4514cb8 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - d5943e64a12b75a9059439c2c317e5cc75966f04 + efc2924e6e36db17611c7da480d5bc97a4514cb8 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - d5943e64a12b75a9059439c2c317e5cc75966f04 + efc2924e6e36db17611c7da480d5bc97a4514cb8 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - d5943e64a12b75a9059439c2c317e5cc75966f04 + efc2924e6e36db17611c7da480d5bc97a4514cb8 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - d5943e64a12b75a9059439c2c317e5cc75966f04 + efc2924e6e36db17611c7da480d5bc97a4514cb8 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - d5943e64a12b75a9059439c2c317e5cc75966f04 + efc2924e6e36db17611c7da480d5bc97a4514cb8 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - d5943e64a12b75a9059439c2c317e5cc75966f04 + efc2924e6e36db17611c7da480d5bc97a4514cb8 https://github.com/dotnet/runtime From d17c7b5d3d29a78db4c1273320c7bc9a2f3321c1 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 15 Jan 2021 21:57:55 +0000 Subject: [PATCH 05/13] [internal/release/5.0] Update dependencies from dnceng/internal/dotnet-runtime - Correct System.Diagnostics.EventLog.Messages workaround for servicing - Update tests to expect System.Diagnostics.EventLog.Messages - Merge remote-tracking branch 'dnceng/internal/release/5.0' into darc-internal/release/5.0-109c1e6f-a65e-448d-b842-9621f60826f6 --- NuGet.config | 6 ++++- eng/Version.Details.xml | 22 +++++++++---------- eng/Versions.props | 8 +++---- .../Microsoft.AspNetCore.App.UnitTests.csproj | 10 ++++++++- src/Framework/test/TestData.cs | 1 + 5 files changed, 30 insertions(+), 17 deletions(-) diff --git a/NuGet.config b/NuGet.config index 632ebf879b..402053fd88 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -28,6 +28,10 @@ + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 31fbefe74a..650fa89323 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,9 +197,9 @@ 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 + 75b9165595c9d88edbd452d06bbdc05f950a563b https://github.com/dotnet/runtime @@ -296,22 +296,22 @@ --> https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f37e9a07051328a2dde6fb33845523d1681c0c66 + 75b9165595c9d88edbd452d06bbdc05f950a563b - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f37e9a07051328a2dde6fb33845523d1681c0c66 + 75b9165595c9d88edbd452d06bbdc05f950a563b - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f37e9a07051328a2dde6fb33845523d1681c0c66 + 75b9165595c9d88edbd452d06bbdc05f950a563b - - https://github.com/dotnet/runtime - cf258a14b70ad9069470a108f13765e0e5988f51 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 75b9165595c9d88edbd452d06bbdc05f950a563b https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 8d13d33275..0e720463db 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,10 +58,10 @@ 5.0.0 - 5.0.3-servicing.21063.16 + 5.0.3-servicing.21064.20 5.0.0 5.0.3 - 5.0.3-servicing.21063.16 + 5.0.3-servicing.21064.20 5.0.0 5.0.0 5.0.0 @@ -101,7 +101,7 @@ 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 @@ -124,7 +124,7 @@ 5.0.0 5.0.0 - 5.0.0 + 5.0.1 5.0.3 5.0.3 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", From 1966f61396aab6989424a3a867ea49abd509a0a5 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 19 Jan 2021 21:35:54 +0000 Subject: [PATCH 06/13] [internal/release/5.0] Update dependencies from dnceng/internal/dotnet-runtime --- NuGet.config | 6 +++--- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index 402053fd88..446c2dee29 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -26,12 +26,12 @@ - - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 650fa89323..4f5f269fc6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -199,7 +199,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 75b9165595c9d88edbd452d06bbdc05f950a563b + 855283979d7835fadb6399369d0e47ae967d69f7 https://github.com/dotnet/runtime @@ -296,22 +296,22 @@ --> https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 75b9165595c9d88edbd452d06bbdc05f950a563b + 855283979d7835fadb6399369d0e47ae967d69f7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 75b9165595c9d88edbd452d06bbdc05f950a563b + 855283979d7835fadb6399369d0e47ae967d69f7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 75b9165595c9d88edbd452d06bbdc05f950a563b + 855283979d7835fadb6399369d0e47ae967d69f7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 75b9165595c9d88edbd452d06bbdc05f950a563b + 855283979d7835fadb6399369d0e47ae967d69f7 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 0e720463db..e906d48b0c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,10 +58,10 @@ 5.0.0 - 5.0.3-servicing.21064.20 + 5.0.3-servicing.21065.6 5.0.0 5.0.3 - 5.0.3-servicing.21064.20 + 5.0.3-servicing.21065.6 5.0.0 5.0.0 5.0.0 From 75f582f48b40ebc1138df5d147bc994b592c593b Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 21 Jan 2021 09:54:13 +0000 Subject: [PATCH 07/13] [internal/release/5.0] Update dependencies from dnceng/internal/dotnet-runtime --- NuGet.config | 5 +++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 446c2dee29..369b11831c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -30,8 +30,9 @@ - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4f5f269fc6..3306a19267 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -199,7 +199,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 855283979d7835fadb6399369d0e47ae967d69f7 + 44db96a62877a4056d28134c00e9228c12a03e7f https://github.com/dotnet/runtime @@ -296,22 +296,22 @@ --> https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 855283979d7835fadb6399369d0e47ae967d69f7 + 44db96a62877a4056d28134c00e9228c12a03e7f - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 855283979d7835fadb6399369d0e47ae967d69f7 + 44db96a62877a4056d28134c00e9228c12a03e7f - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 855283979d7835fadb6399369d0e47ae967d69f7 + 44db96a62877a4056d28134c00e9228c12a03e7f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 855283979d7835fadb6399369d0e47ae967d69f7 + 44db96a62877a4056d28134c00e9228c12a03e7f https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index e906d48b0c..b49568fa18 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,10 +58,10 @@ 5.0.0 - 5.0.3-servicing.21065.6 + 5.0.3-servicing.21070.15 5.0.0 5.0.3 - 5.0.3-servicing.21065.6 + 5.0.3-servicing.21070.15 5.0.0 5.0.0 5.0.0 From c414be3d46745c0edcbb98c3c02a79c3bf45fa43 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 22 Jan 2021 01:42:33 +0000 Subject: [PATCH 08/13] Merged PR 12345: [internal/release/5.0] Update dependencies from dnceng/internal/dotnet-runtime This pull request updates the following dependencies [marker]: <> (Begin:d7d10d70-26ab-4663-2902-08d89c6af29b) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - **Subscription**: d7d10d70-26ab-4663-2902-08d89c6af29b - **Build**: 20210121.10 - **Date Produced**: 1/21/2021 9:52 PM - **Commit**: fe8a2d0a4e37e58aa497ecb0a00bc61e9d8004c4 - **Branch**: refs/heads/internal/release/5.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **System.Diagnostics.EventLog**: [from 5.0.1 to 5.0.1][1] - **Microsoft.NETCore.App.Internal**: [from 5.0.3-servicing.21070.15 to 5.0.3-servicing.21071.10][1] - **System.Drawing.Common**: [from 5.0.0 to 5.0.1][2] - **Microsoft.NETCore.Platforms**: [from 5.0.1 to 5.0.1][1] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 5.0.3 to 5.0.3][1] - **Microsoft.NETCore.BrowserDebugHost.Transport**: [from 5.0.3-servicing.21070.15 to 5.0.3-servicing.21071.10][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC44db96a&targetVersion=GCfe8a2d0&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GCcf258a1&targetVersion=GCfe8a2d0&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:d7d10d70-26ab-4663-2902-08d89c6af29b) --- NuGet.config | 5 +++-- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/NuGet.config b/NuGet.config index 369b11831c..e3e19107e3 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -31,8 +31,9 @@ - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3306a19267..428c998c79 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -199,15 +199,15 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 44db96a62877a4056d28134c00e9228c12a03e7f + fe8a2d0a4e37e58aa497ecb0a00bc61e9d8004c4 https://github.com/dotnet/runtime cf258a14b70ad9069470a108f13765e0e5988f51 - - https://github.com/dotnet/runtime - cf258a14b70ad9069470a108f13765e0e5988f51 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + fe8a2d0a4e37e58aa497ecb0a00bc61e9d8004c4 https://github.com/dotnet/runtime @@ -296,22 +296,22 @@ --> https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 44db96a62877a4056d28134c00e9228c12a03e7f + fe8a2d0a4e37e58aa497ecb0a00bc61e9d8004c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 44db96a62877a4056d28134c00e9228c12a03e7f + fe8a2d0a4e37e58aa497ecb0a00bc61e9d8004c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 44db96a62877a4056d28134c00e9228c12a03e7f + fe8a2d0a4e37e58aa497ecb0a00bc61e9d8004c4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 44db96a62877a4056d28134c00e9228c12a03e7f + fe8a2d0a4e37e58aa497ecb0a00bc61e9d8004c4 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index b49568fa18..f82755d3b3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,10 +58,10 @@ 5.0.0 - 5.0.3-servicing.21070.15 + 5.0.3-servicing.21071.10 5.0.0 5.0.3 - 5.0.3-servicing.21070.15 + 5.0.3-servicing.21071.10 5.0.0 5.0.0 5.0.0 @@ -103,7 +103,7 @@ 5.0.1 5.0.1 5.0.0 - 5.0.0 + 5.0.1 5.0.1 5.0.0 5.0.0 From 37c0ed28bc1dacdecadf53715c05524d0c6d81be Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 22 Jan 2021 14:15:56 +0000 Subject: [PATCH 09/13] [internal/release/5.0] Update dependencies from dnceng/internal/dotnet-runtime --- NuGet.config | 5 +++-- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index e3e19107e3..bb31d5f0b7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -32,8 +32,9 @@ - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 428c998c79..b2a23e3a0a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -199,7 +199,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fe8a2d0a4e37e58aa497ecb0a00bc61e9d8004c4 + eae88cc11bcdd1d426f6c8328bb80330aa6ff674 https://github.com/dotnet/runtime @@ -207,7 +207,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fe8a2d0a4e37e58aa497ecb0a00bc61e9d8004c4 + eae88cc11bcdd1d426f6c8328bb80330aa6ff674 https://github.com/dotnet/runtime @@ -296,22 +296,22 @@ --> https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fe8a2d0a4e37e58aa497ecb0a00bc61e9d8004c4 + eae88cc11bcdd1d426f6c8328bb80330aa6ff674 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fe8a2d0a4e37e58aa497ecb0a00bc61e9d8004c4 + eae88cc11bcdd1d426f6c8328bb80330aa6ff674 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fe8a2d0a4e37e58aa497ecb0a00bc61e9d8004c4 + eae88cc11bcdd1d426f6c8328bb80330aa6ff674 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fe8a2d0a4e37e58aa497ecb0a00bc61e9d8004c4 + eae88cc11bcdd1d426f6c8328bb80330aa6ff674 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index f82755d3b3..d5bf98ead9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,10 +58,10 @@ 5.0.0 - 5.0.3-servicing.21071.10 + 5.0.3-servicing.21072.3 5.0.0 5.0.3 - 5.0.3-servicing.21071.10 + 5.0.3-servicing.21072.3 5.0.0 5.0.0 5.0.0 From d827c653b787c07de908240b7746ce34d3e6271e Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sat, 23 Jan 2021 12:11:24 +0000 Subject: [PATCH 10/13] [internal/release/5.0] Update dependencies from dnceng/internal/dotnet-runtime --- NuGet.config | 5 +++-- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index bb31d5f0b7..3745056e38 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -33,8 +33,9 @@ - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b2a23e3a0a..81118f21b4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -199,7 +199,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - eae88cc11bcdd1d426f6c8328bb80330aa6ff674 + c636bbdc8a2d393d07c0e9407a4f8923ba1a21cb https://github.com/dotnet/runtime @@ -207,7 +207,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - eae88cc11bcdd1d426f6c8328bb80330aa6ff674 + c636bbdc8a2d393d07c0e9407a4f8923ba1a21cb https://github.com/dotnet/runtime @@ -296,22 +296,22 @@ --> https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - eae88cc11bcdd1d426f6c8328bb80330aa6ff674 + c636bbdc8a2d393d07c0e9407a4f8923ba1a21cb - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - eae88cc11bcdd1d426f6c8328bb80330aa6ff674 + c636bbdc8a2d393d07c0e9407a4f8923ba1a21cb - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - eae88cc11bcdd1d426f6c8328bb80330aa6ff674 + c636bbdc8a2d393d07c0e9407a4f8923ba1a21cb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - eae88cc11bcdd1d426f6c8328bb80330aa6ff674 + c636bbdc8a2d393d07c0e9407a4f8923ba1a21cb https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index d5bf98ead9..fb3f936243 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,10 +58,10 @@ 5.0.0 - 5.0.3-servicing.21072.3 + 5.0.3-servicing.21072.12 5.0.0 5.0.3 - 5.0.3-servicing.21072.3 + 5.0.3-servicing.21072.12 5.0.0 5.0.0 5.0.0 From a8c77a90b1cae93becec812606d8ae6594761f78 Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Tue, 9 Feb 2021 14:56:06 -0800 Subject: [PATCH 11/13] Update to 5.0.3 SDK - also update downlevel runtimes --- global.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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", From ea168858653c6c9277bea15800527e0556e43a10 Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Tue, 9 Feb 2021 15:06:28 -0800 Subject: [PATCH 12/13] Update package baselines --- eng/Baseline.Designer.props | 416 ++++++++++++++++++------------------ eng/Baseline.xml | 200 ++++++++--------- 2 files changed, 308 insertions(+), 308 deletions(-) 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 From 2cd8730864691e78060aa13052750499bce65404 Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Tue, 9 Feb 2021 15:21:42 -0800 Subject: [PATCH 13/13] Update branding to 5.0.4 - move to latest Microsoft.AspNetCore.Azure.AppServices.SiteExtension.31 version --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index fb3f936243..b104e692f0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 5 0 - 3 + 4 @@ -235,7 +235,7 @@ 2.1.1 2.2.0 - 3.1.11-servicing-20569-15 + 3.1.12-servicing-21070-12 $(MicrosoftAspNetCoreAzureAppServicesSiteExtension31PackageVersion) $(MicrosoftAspNetCoreAzureAppServicesSiteExtension31PackageVersion)