From 99b15ac2902841b4629467ff640071d12657ba28 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 9 Mar 2021 21:11:58 +0000 Subject: [PATCH 1/5] [internal/release/5.0] Update dependencies from dnceng/internal/dotnet-runtime --- NuGet.config | 2 ++ eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 6 +++--- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index c48dc08f42..0b7e5b85d3 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,6 +8,7 @@ + @@ -21,6 +22,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2a163cc3eb..9e12d4d9ec 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -268,7 +268,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f27d33729518f5aa478aa818b7b4f54a4d50bef1 + e6b30911ce808668d81d926b0744f1dd02a43840 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -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 - f27d33729518f5aa478aa818b7b4f54a4d50bef1 + e6b30911ce808668d81d926b0744f1dd02a43840 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f27d33729518f5aa478aa818b7b4f54a4d50bef1 + e6b30911ce808668d81d926b0744f1dd02a43840 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f27d33729518f5aa478aa818b7b4f54a4d50bef1 + e6b30911ce808668d81d926b0744f1dd02a43840 diff --git a/eng/Versions.props b/eng/Versions.props index e8ff7e89d5..fa2f2204c9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -59,10 +59,10 @@ 5.0.0 - 5.0.4-servicing.21116.14 + 5.0.5-servicing.21159.6 5.0.0 - 5.0.4 - 5.0.4-servicing.21116.14 + 5.0.5 + 5.0.5-servicing.21159.6 5.0.0 5.0.0 5.0.0 From eed62b95e534a8513942401bf57c53c2e46ca0c8 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 16 Mar 2021 14:07:29 +0000 Subject: [PATCH 2/5] [internal/release/5.0] Update dependencies from dnceng/internal/dotnet-efcore --- NuGet.config | 3 +-- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 3 files changed, 25 insertions(+), 26 deletions(-) diff --git a/NuGet.config b/NuGet.config index d7bcbe5ea4..f0594ae712 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,9 +4,9 @@ + - @@ -23,7 +23,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index db7f4ddf14..4b16d54f49 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,37 +9,37 @@ --> - + https://github.com/dotnet/efcore - cfd206aa4bc7c878dbbd91959f1c9edada70da93 + 54203510db732a088a3e7e58d49b98ada7c14227 - + https://github.com/dotnet/efcore - cfd206aa4bc7c878dbbd91959f1c9edada70da93 + 54203510db732a088a3e7e58d49b98ada7c14227 - + https://github.com/dotnet/efcore - cfd206aa4bc7c878dbbd91959f1c9edada70da93 + 54203510db732a088a3e7e58d49b98ada7c14227 - + https://github.com/dotnet/efcore - cfd206aa4bc7c878dbbd91959f1c9edada70da93 + 54203510db732a088a3e7e58d49b98ada7c14227 - + https://github.com/dotnet/efcore - cfd206aa4bc7c878dbbd91959f1c9edada70da93 + 54203510db732a088a3e7e58d49b98ada7c14227 - + https://github.com/dotnet/efcore - cfd206aa4bc7c878dbbd91959f1c9edada70da93 + 54203510db732a088a3e7e58d49b98ada7c14227 - + https://github.com/dotnet/efcore - cfd206aa4bc7c878dbbd91959f1c9edada70da93 + 54203510db732a088a3e7e58d49b98ada7c14227 - + https://github.com/dotnet/efcore - cfd206aa4bc7c878dbbd91959f1c9edada70da93 + 54203510db732a088a3e7e58d49b98ada7c14227 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 64d7b1a5f0..52c2a3e127 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -127,14 +127,14 @@ 5.0.1 - 5.0.4 - 5.0.4 - 5.0.4 - 5.0.4 - 5.0.4 - 5.0.4 - 5.0.4 - 5.0.4 + 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.0-beta.21159.7 From b7a2ec8c7ed6b48857af0a69688a73e8c14fe6cb Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 17 Mar 2021 20:13:50 +0000 Subject: [PATCH 3/5] [internal/release/5.0] Update dependencies from dnceng/internal/dotnet-runtime - Pin System.Text.Json compilation version too - Updated Versions.props --- NuGet.config | 4 ++-- eng/Version.Details.xml | 30 +++++++++++++++--------------- eng/Versions.props | 14 ++++++++------ 3 files changed, 25 insertions(+), 23 deletions(-) diff --git a/NuGet.config b/NuGet.config index f0594ae712..266cc16542 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -22,7 +22,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4b16d54f49..a0e7834ed0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -145,9 +145,9 @@ https://github.com/dotnet/runtime cf258a14b70ad9069470a108f13765e0e5988f51 - - https://github.com/dotnet/runtime - cf258a14b70ad9069470a108f13765e0e5988f51 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 2f740adc1457e8a28c1c072993b66f515977eb51 https://github.com/dotnet/runtime @@ -173,9 +173,9 @@ https://github.com/dotnet/runtime cf258a14b70ad9069470a108f13765e0e5988f51 - - https://github.com/dotnet/runtime - cf258a14b70ad9069470a108f13765e0e5988f51 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 2f740adc1457e8a28c1c072993b66f515977eb51 https://github.com/dotnet/runtime @@ -270,9 +270,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime e6b30911ce808668d81d926b0744f1dd02a43840 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cb5f173b9696d9d00a544b953d95190ab3b56df2 + 2f740adc1457e8a28c1c072993b66f515977eb51 https://github.com/dotnet/runtime @@ -296,22 +296,22 @@ --> https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e6b30911ce808668d81d926b0744f1dd02a43840 + 2f740adc1457e8a28c1c072993b66f515977eb51 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e6b30911ce808668d81d926b0744f1dd02a43840 + 2f740adc1457e8a28c1c072993b66f515977eb51 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e6b30911ce808668d81d926b0744f1dd02a43840 + 2f740adc1457e8a28c1c072993b66f515977eb51 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c636bbdc8a2d393d07c0e9407a4f8923ba1a21cb + 2f740adc1457e8a28c1c072993b66f515977eb51 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 52c2a3e127..c364bc726f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -59,10 +59,10 @@ 5.0.0 - 5.0.5-servicing.21159.6 + 5.0.5-servicing.21166.9 5.0.0 5.0.5 - 5.0.5-servicing.21159.6 + 5.0.5-servicing.21166.9 5.0.0 5.0.0 5.0.0 @@ -91,14 +91,14 @@ 5.0.0 5.0.0 5.0.0 - 5.0.0 + 5.0.1 5.0.0 5.0.0 5.0.0 5.0.0 5.0.0 5.0.0 - 5.0.0 + 5.0.1 5.0.0-rtm.20519.4 5.0.0 5.0.1 @@ -121,11 +121,11 @@ 5.0.0 5.0.0 5.0.1 - 5.0.1 + 5.0.2 5.0.0 5.0.0 - 5.0.1 + 5.0.2 5.0.5 5.0.5 @@ -182,6 +182,8 @@ $(SystemSecurityCryptographyXmlPackageVersion.Split('.')[0]).$(SystemSecurityCryptographyXmlPackageVersion.Split('.')[1]).0 $(SystemSecurityPermissionsPackageVersion.Split('.')[0]).$(SystemSecurityPermissionsPackageVersion.Split('.')[1]).0 $(SystemSecurityPrincipalWindowsPackageVersion.Split('.')[0]).$(SystemSecurityPrincipalWindowsPackageVersion.Split('.')[1]).0 + $(SystemTextJsonPackageVersion.Split('.')[0]).$(SystemTextJsonPackageVersion.Split('.')[1]).0 + $(SystemTextEncodingsWebPackageVersion.Split('.')[0]).$(SystemTextEncodingsWebPackageVersion.Split('.')[1]).0 $(SystemWindowsExtensionsPackageVersion.Split('.')[0]).$(SystemWindowsExtensionsPackageVersion.Split('.')[1]).0 From 87b81636f7359d148d8e580d5ea5c0de69b3616f Mon Sep 17 00:00:00 2001 From: Will Godbe Date: Tue, 13 Apr 2021 10:18:01 -0700 Subject: [PATCH 4/5] Update baseline, SDK --- eng/Baseline.Designer.props | 430 ++++++++++++++++++------------------ eng/Baseline.xml | 202 ++++++++--------- eng/Versions.props | 2 +- global.json | 8 +- 4 files changed, 321 insertions(+), 321 deletions(-) diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props index 00cdc1685b..b5513e6d2e 100644 --- a/eng/Baseline.Designer.props +++ b/eng/Baseline.Designer.props @@ -2,28 +2,28 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - - - + + + @@ -37,108 +37,108 @@ - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - - + + - 5.0.4 + 5.0.5 - - + + - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - + - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 @@ -146,110 +146,110 @@ - 5.0.4 + 5.0.5 - + - + - + - 5.0.4 + 5.0.5 - + - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - + - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - - + + - 5.0.4 + 5.0.5 - + - 5.0.4 + 5.0.5 - - - + + + - 5.0.4 + 5.0.5 - - + + - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - - + + - 5.0.4 + 5.0.5 - - + + - 5.0.4 + 5.0.5 @@ -257,86 +257,86 @@ - 5.0.4 + 5.0.5 - + - + - + - + - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - + - + - + - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - - + + - 5.0.4 + 5.0.5 - + - + - + - 5.0.4 + 5.0.5 - + - + - 5.0.4 + 5.0.5 - - + + @@ -346,8 +346,8 @@ - - + + @@ -356,8 +356,8 @@ - - + + @@ -368,14 +368,14 @@ - 5.0.4 + 5.0.5 - + - 5.0.4 + 5.0.5 @@ -383,86 +383,86 @@ - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - + - + - + - 5.0.4 + 5.0.5 - - + + - + - - + + - 5.0.4 + 5.0.5 - + - + - + - 5.0.4 + 5.0.5 - - + + - - + + - 5.0.4 + 5.0.5 - - + + - 5.0.4 + 5.0.5 @@ -474,185 +474,185 @@ - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - + - 5.0.4 + 5.0.5 - - + + - 5.0.4 + 5.0.5 - - + + - 5.0.4 + 5.0.5 - + - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - + - 5.0.4 + 5.0.5 - + - 5.0.4 + 5.0.5 - - + + - - + + - - + + - 5.0.4 + 5.0.5 - - + + - - + + - 5.0.4 + 5.0.5 - + - + - + - + - + - 5.0.4 + 5.0.5 - + - + - + - 5.0.4 + 5.0.5 - + - + - 5.0.4 + 5.0.5 - + - + - 5.0.4 + 5.0.5 - - - - + + + + - 5.0.4 + 5.0.5 @@ -661,65 +661,65 @@ - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - + - 5.0.4 + 5.0.5 - + - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 @@ -735,42 +735,42 @@ - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - - - + + + - 5.0.4 + 5.0.5 - + - + - + - 5.0.4 + 5.0.5 @@ -780,73 +780,73 @@ - 5.0.4 + 5.0.5 - + - + - + - 5.0.4 + 5.0.5 - + - + - + - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 - + - + - + - 5.0.4 + 5.0.5 @@ -867,11 +867,11 @@ - 5.0.4 + 5.0.5 - 5.0.4 + 5.0.5 @@ -889,13 +889,13 @@ - 5.0.4 + 5.0.5 - + - 5.0.4 + 5.0.5 \ No newline at end of file diff --git a/eng/Baseline.xml b/eng/Baseline.xml index dc276a967c..6f97d86722 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/Versions.props b/eng/Versions.props index ef9faa609d..bc317253ec 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -9,7 +9,7 @@ 5 0 6 - false + true diff --git a/global.json b/global.json index 3bfb4e1341..173a607908 100644 --- a/global.json +++ b/global.json @@ -1,19 +1,19 @@ { "sdk": { - "version": "5.0.104" + "version": "5.0.105" }, "tools": { - "dotnet": "5.0.104", + "dotnet": "5.0.105", "runtimes": { "dotnet/x64": [ - "2.1.26", + "2.1.27", "$(MicrosoftNETCoreAppInternalPackageVersion)" ], "dotnet/x86": [ "$(MicrosoftNETCoreAppInternalPackageVersion)" ], "aspnetcore/x64": [ - "3.1.13" + "3.1.14" ] }, "Git": "2.22.0", From 943df8c85ac6355710abbeb6aecfaff289e31735 Mon Sep 17 00:00:00 2001 From: Will Godbe Date: Tue, 13 Apr 2021 10:21:29 -0700 Subject: [PATCH 5/5] Fix SDK version --- global.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/global.json b/global.json index 173a607908..bf9c352d57 100644 --- a/global.json +++ b/global.json @@ -1,9 +1,9 @@ { "sdk": { - "version": "5.0.105" + "version": "5.0.202" }, "tools": { - "dotnet": "5.0.105", + "dotnet": "5.0.202", "runtimes": { "dotnet/x64": [ "2.1.27",