From b926cc3fcf66bf464df3bb375bcb30d6a4f33b1f Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 6 Apr 2021 23:05:50 +0000 Subject: [PATCH 1/9] [internal/release/5.0] Update dependencies from dnceng/internal/dotnet-runtime --- NuGet.config | 9 ++++++++- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index 266cc16542..3f123231b2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,9 +4,12 @@ - + + + + @@ -23,6 +26,10 @@ + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a0e7834ed0..c3f8abed43 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 - 2f740adc1457e8a28c1c072993b66f515977eb51 + d512eab49a26c991648a9070f17995741d140ff9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2f740adc1457e8a28c1c072993b66f515977eb51 + d512eab49a26c991648a9070f17995741d140ff9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2f740adc1457e8a28c1c072993b66f515977eb51 + d512eab49a26c991648a9070f17995741d140ff9 diff --git a/eng/Versions.props b/eng/Versions.props index c364bc726f..0a11bc0814 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -59,10 +59,10 @@ 5.0.0 - 5.0.5-servicing.21166.9 + 5.0.6-servicing.21206.5 5.0.0 - 5.0.5 - 5.0.5-servicing.21166.9 + 5.0.6 + 5.0.6-servicing.21206.5 5.0.0 5.0.0 5.0.0 From 9e2892d353a8605855b1f604026bcfd397878e20 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 8 Apr 2021 21:34:43 +0000 Subject: [PATCH 2/9] [internal/release/5.0] Update dependencies from dnceng/internal/dotnet-runtime --- NuGet.config | 12 ++---------- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 4 ++-- 3 files changed, 9 insertions(+), 17 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3f123231b2..c38a127836 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,11 +6,7 @@ - - - - - + @@ -25,11 +21,7 @@ - - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c3f8abed43..6db034b051 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -296,15 +296,15 @@ --> https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d512eab49a26c991648a9070f17995741d140ff9 + a91ec1eb3fd15b3677226b1743e893e3c710f7d4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d512eab49a26c991648a9070f17995741d140ff9 + a91ec1eb3fd15b3677226b1743e893e3c710f7d4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d512eab49a26c991648a9070f17995741d140ff9 + a91ec1eb3fd15b3677226b1743e893e3c710f7d4 diff --git a/eng/Versions.props b/eng/Versions.props index da3f79ca45..6790a7b83b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -59,10 +59,10 @@ 5.0.0 - 5.0.6-servicing.21206.5 + 5.0.6-servicing.21208.5 5.0.0 5.0.6 - 5.0.6-servicing.21206.5 + 5.0.6-servicing.21208.5 5.0.0 5.0.0 5.0.0 From 8cfb92a31c1e36f93334f7640f2a7aaa5f9bf5dc Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 9 Apr 2021 22:36:09 +0000 Subject: [PATCH 3/9] [internal/release/5.0] Update dependencies from dnceng/internal/dotnet-runtime --- NuGet.config | 4 ++-- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/NuGet.config b/NuGet.config index c38a127836..e4e9c1ef42 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,7 +6,7 @@ - + @@ -21,7 +21,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6db034b051..9d106728b5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -296,15 +296,15 @@ --> https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a91ec1eb3fd15b3677226b1743e893e3c710f7d4 + 84b30748fccccc0247181b615946aac10870364d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a91ec1eb3fd15b3677226b1743e893e3c710f7d4 + 84b30748fccccc0247181b615946aac10870364d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a91ec1eb3fd15b3677226b1743e893e3c710f7d4 + 84b30748fccccc0247181b615946aac10870364d diff --git a/eng/Versions.props b/eng/Versions.props index 6790a7b83b..d9b26c286b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -59,10 +59,10 @@ 5.0.0 - 5.0.6-servicing.21208.5 + 5.0.6-servicing.21209.7 5.0.0 5.0.6 - 5.0.6-servicing.21208.5 + 5.0.6-servicing.21209.7 5.0.0 5.0.0 5.0.0 From f3eeec88e64270e9e783d713fea8503f28b1a932 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 21 Apr 2021 12:25:22 +0000 Subject: [PATCH 4/9] [internal/release/5.0] Update dependencies from dnceng/internal/dotnet-runtime --- NuGet.config | 4 ++-- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/NuGet.config b/NuGet.config index e4e9c1ef42..1b2b9ea5a4 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,7 +6,7 @@ - + @@ -21,7 +21,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bd6fc0e334..f46c74b028 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -296,15 +296,15 @@ --> https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 84b30748fccccc0247181b615946aac10870364d + 478b2f8c0e480665f6c52c95cd57830784dc9560 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 84b30748fccccc0247181b615946aac10870364d + 478b2f8c0e480665f6c52c95cd57830784dc9560 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 84b30748fccccc0247181b615946aac10870364d + 478b2f8c0e480665f6c52c95cd57830784dc9560 diff --git a/eng/Versions.props b/eng/Versions.props index 83b80b82f4..092e25220e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -59,10 +59,10 @@ 5.0.0 - 5.0.6-servicing.21209.7 + 5.0.6-servicing.21220.11 5.0.0 5.0.6 - 5.0.6-servicing.21209.7 + 5.0.6-servicing.21220.11 5.0.0 5.0.0 5.0.0 From dc5e11abdb05b322f4b74b3afbcfb352fe984b2e Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 23 Apr 2021 18:00:58 +0000 Subject: [PATCH 5/9] Merged PR 14467: [internal/release/5.0] Update dependencies from dnceng/internal/dotnet-efcore This pull request updates the following dependencies [marker]: <> (Begin:5283c4a7-f944-4af6-f8bd-08d89c6afc9d) ## From https://github.com/dotnet/efcore - **Subscription**: 5283c4a7-f944-4af6-f8bd-08d89c6afc9d - **Build**: 20210413.7 - **Date Produced**: 4/13/2021 9:44 PM - **Commit**: 42e81439158d5884dab24326c84ed95cd4baaa21 - **Branch**: refs/heads/internal/release/5.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.EntityFrameworkCore.Tools**: [from 5.0.5 to 5.0.6][1] - **dotnet-ef**: [from 5.0.5 to 5.0.6][1] - **Microsoft.EntityFrameworkCore**: [from 5.0.5 to 5.0.6][1] - **Microsoft.EntityFrameworkCore.SqlServer**: [from 5.0.5 to 5.0.6][1] - **Microsoft.EntityFrameworkCore.Design**: [from 5.0.5 to 5.0.6][1] - **Microsoft.EntityFrameworkCore.Relational**: [from 5.0.5 to 5.0.6][1] - **Microsoft.EntityFrameworkCore.Sqlite**: [from 5.0.5 to 5.0.6][1] - **Microsoft.EntityFrameworkCore.InMemory**: [from 5.0.5 to 5.0.6][1] [1]: https://github.com/dotnet/efcore/compare/5420351...42e8143 [DependencyUpdate]: <> (End) [marker]: <> (End:5283c4a7-f944-4af6-f8bd-08d89c6afc9d) --- NuGet.config | 6 ++++++ eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 3 files changed, 30 insertions(+), 24 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1b2b9ea5a4..014238cb75 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,8 +4,11 @@ + + + @@ -22,8 +25,11 @@ + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f46c74b028..234ca9bc2d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,37 +9,37 @@ --> - + https://github.com/dotnet/efcore - 54203510db732a088a3e7e58d49b98ada7c14227 + 42e81439158d5884dab24326c84ed95cd4baaa21 - + https://github.com/dotnet/efcore - 54203510db732a088a3e7e58d49b98ada7c14227 + 42e81439158d5884dab24326c84ed95cd4baaa21 - + https://github.com/dotnet/efcore - 54203510db732a088a3e7e58d49b98ada7c14227 + 42e81439158d5884dab24326c84ed95cd4baaa21 - + https://github.com/dotnet/efcore - 54203510db732a088a3e7e58d49b98ada7c14227 + 42e81439158d5884dab24326c84ed95cd4baaa21 - + https://github.com/dotnet/efcore - 54203510db732a088a3e7e58d49b98ada7c14227 + 42e81439158d5884dab24326c84ed95cd4baaa21 - + https://github.com/dotnet/efcore - 54203510db732a088a3e7e58d49b98ada7c14227 + 42e81439158d5884dab24326c84ed95cd4baaa21 - + https://github.com/dotnet/efcore - 54203510db732a088a3e7e58d49b98ada7c14227 + 42e81439158d5884dab24326c84ed95cd4baaa21 - + https://github.com/dotnet/efcore - 54203510db732a088a3e7e58d49b98ada7c14227 + 42e81439158d5884dab24326c84ed95cd4baaa21 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 092e25220e..042aa584ea 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -127,14 +127,14 @@ 5.0.2 - 5.0.5 - 5.0.5 - 5.0.5 - 5.0.5 - 5.0.5 - 5.0.5 - 5.0.5 - 5.0.5 + 5.0.6 + 5.0.6 + 5.0.6 + 5.0.6 + 5.0.6 + 5.0.6 + 5.0.6 + 5.0.6 5.0.0-beta.21160.3 From 0468fce801380a2c415075253ac93a10e44077c0 Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Tue, 11 May 2021 11:59:05 -0700 Subject: [PATCH 6/9] [release/5.0] Update SDK and runtimes --- global.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/global.json b/global.json index fcfeb734fd..1b6aca209f 100644 --- a/global.json +++ b/global.json @@ -1,19 +1,19 @@ { "sdk": { - "version": "5.0.202" + "version": "5.0.203" }, "tools": { - "dotnet": "5.0.202", + "dotnet": "5.0.203", "runtimes": { "dotnet/x64": [ - "2.1.27", + "2.1.28", "$(MicrosoftNETCoreAppInternalPackageVersion)" ], "dotnet/x86": [ "$(MicrosoftNETCoreAppInternalPackageVersion)" ], "aspnetcore/x64": [ - "3.1.14" + "3.1.15" ] }, "Git": "2.22.0", From 87006571f3f7e8401d5883079b9aeaf9a0ae66eb Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Tue, 11 May 2021 12:28:02 -0700 Subject: [PATCH 7/9] [release/5.0] 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 b5513e6d2e..87a2693fee 100644 --- a/eng/Baseline.Designer.props +++ b/eng/Baseline.Designer.props @@ -2,28 +2,28 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 5.0.5 + 5.0.6 - 5.0.5 + 5.0.6 - 5.0.5 + 5.0.6 - 5.0.5 + 5.0.6 - 5.0.5 + 5.0.6 - - - + + + @@ -37,108 +37,108 @@ - 5.0.5 + 5.0.6 - 5.0.5 + 5.0.6 - 5.0.5 + 5.0.6 - 5.0.5 + 5.0.6 - 5.0.5 + 5.0.6 - 5.0.5 + 5.0.6 - 5.0.5 + 5.0.6 - 5.0.5 + 5.0.6 - 5.0.5 + 5.0.6 - 5.0.5 + 5.0.6 - 5.0.5 + 5.0.6 - - + + - 5.0.5 + 5.0.6 - - + + - 5.0.5 + 5.0.6 - 5.0.5 + 5.0.6 - 5.0.5 + 5.0.6 - 5.0.5 + 5.0.6 - 5.0.5 + 5.0.6 - 5.0.5 + 5.0.6 - + - 5.0.5 + 5.0.6 - 5.0.5 + 5.0.6 - 5.0.5 + 5.0.6 @@ -146,110 +146,110 @@ - 5.0.5 + 5.0.6 - + - + - + - 5.0.5 + 5.0.6 - + - 5.0.5 + 5.0.6 - 5.0.5 + 5.0.6 - + - 5.0.5 + 5.0.6 - 5.0.5 + 5.0.6 - - + + - 5.0.5 + 5.0.6 - + - 5.0.5 + 5.0.6 - - - + + + - 5.0.5 + 5.0.6 - - + + - 5.0.5 + 5.0.6 - 5.0.5 + 5.0.6 - 5.0.5 + 5.0.6 - - + + - 5.0.5 + 5.0.6 - - + + - 5.0.5 + 5.0.6 @@ -257,86 +257,86 @@ - 5.0.5 + 5.0.6 - + - + - + - + - 5.0.5 + 5.0.6 - 5.0.5 + 5.0.6 - + - + - + - 5.0.5 + 5.0.6 - 5.0.5 + 5.0.6 - - + + - 5.0.5 + 5.0.6 - + - + - + - 5.0.5 + 5.0.6 - + - + - 5.0.5 + 5.0.6 - - + + @@ -346,8 +346,8 @@ - - + + @@ -356,8 +356,8 @@ - - + + @@ -368,14 +368,14 @@ - 5.0.5 + 5.0.6 - + - 5.0.5 + 5.0.6 @@ -383,50 +383,50 @@ - 5.0.5 + 5.0.6 - 5.0.5 + 5.0.6 - + - + - + - 5.0.5 + 5.0.6 - + - + - + - 5.0.5 + 5.0.6 @@ -442,27 +442,27 @@ - 5.0.5 + 5.0.6 - - + + - - + + - 5.0.5 + 5.0.6 - - + + - 5.0.5 + 5.0.6 @@ -474,185 +474,185 @@ - 5.0.5 + 5.0.6 - 5.0.5 + 5.0.6 - 5.0.5 + 5.0.6 - + - 5.0.5 + 5.0.6 - - + + - 5.0.5 + 5.0.6 - - + + - 5.0.5 + 5.0.6 - + - 5.0.5 + 5.0.6 - 5.0.5 + 5.0.6 - 5.0.5 + 5.0.6 - + - 5.0.5 + 5.0.6 - + - 5.0.5 + 5.0.6 - - + + - - + + - - + + - 5.0.5 + 5.0.6 - - + + - - + + - 5.0.5 + 5.0.6 - + - + - + - 5.0.5 + 5.0.6 - + - + - + - 5.0.5 + 5.0.6 - + - + - 5.0.5 + 5.0.6 - + - + - 5.0.5 + 5.0.6 - - - - + + + + - 5.0.5 + 5.0.6 @@ -661,65 +661,65 @@ - 5.0.5 + 5.0.6 - 5.0.5 + 5.0.6 - 5.0.5 + 5.0.6 - + - 5.0.5 + 5.0.6 - + - 5.0.5 + 5.0.6 - 5.0.5 + 5.0.6 - 5.0.5 + 5.0.6 - 5.0.5 + 5.0.6 - 5.0.5 + 5.0.6 - 5.0.5 + 5.0.6 - 5.0.5 + 5.0.6 - 5.0.5 + 5.0.6 @@ -735,42 +735,42 @@ - 5.0.5 + 5.0.6 - 5.0.5 + 5.0.6 - - - + + + - 5.0.5 + 5.0.6 - + - + - + - 5.0.5 + 5.0.6 @@ -780,73 +780,73 @@ - 5.0.5 + 5.0.6 - + - + - + - 5.0.5 + 5.0.6 - + - + - + - 5.0.5 + 5.0.6 - 5.0.5 + 5.0.6 - + - + - + - 5.0.5 + 5.0.6 @@ -867,11 +867,11 @@ - 5.0.5 + 5.0.6 - 5.0.5 + 5.0.6 @@ -889,13 +889,13 @@ - 5.0.5 + 5.0.6 - + - 5.0.5 + 5.0.6 \ No newline at end of file diff --git a/eng/Baseline.xml b/eng/Baseline.xml index 6f97d86722..0a3fdf2861 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. --> - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 5d73c92894b0054d60ecd714b5ac678d6cb98c29 Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Tue, 11 May 2021 12:32:23 -0700 Subject: [PATCH 8/9] [release/5.0] Update 3.1.x site extension version --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 227cc65414..f919af7ec5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -238,7 +238,7 @@ 2.1.1 2.2.0 - 3.1.14-servicing-21166-8 + 3.1.15-servicing-21215-12 $(MicrosoftAspNetCoreAzureAppServicesSiteExtension31PackageVersion) $(MicrosoftAspNetCoreAzureAppServicesSiteExtension31PackageVersion) From 2278169982517fd5cb6fa592d1dabe2f0265d63d Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Tue, 11 May 2021 14:56:14 -0700 Subject: [PATCH 9/9] [release/5.0] Re-enable baseline validation --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index f919af7ec5..f3abd87b00 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -9,7 +9,7 @@ 5 0 7 - false + true