From e4f402bcdec54a3b1824e8904928ffe1f87a62df Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Tue, 23 Feb 2021 16:25:40 -0600 Subject: [PATCH 1/6] Update to 2.1.26/2.1.522 build 20210212-02-4489682. --- DotnetCLIVersion.txt | 2 +- dependencies.props | 4 +-- ...02-Remove-feed-that-no-longer-exists.patch | 24 ----------------- repos/core-setup.proj | 2 +- repos/coreclr.proj | 2 +- repos/corefx.proj | 2 +- src/cli | 2 +- src/core-setup | 2 +- src/coreclr | 2 +- src/corefx | 2 +- tools-local/prebuilt-baseline-offline.xml | 10 +++---- tools-local/prebuilt-baseline-online.xml | 27 ++++++++++--------- 12 files changed, 29 insertions(+), 52 deletions(-) delete mode 100644 patches/cli/0002-Remove-feed-that-no-longer-exists.patch diff --git a/DotnetCLIVersion.txt b/DotnetCLIVersion.txt index 47a35868cd..798af42a1a 100644 --- a/DotnetCLIVersion.txt +++ b/DotnetCLIVersion.txt @@ -1 +1 @@ -2.1.520 +2.1.521 diff --git a/dependencies.props b/dependencies.props index 7bfaca3137..673a8f3bca 100644 --- a/dependencies.props +++ b/dependencies.props @@ -22,8 +22,8 @@ the product as version strings to be used by the SDK to fetch extra content. --> - 2.1.25 - 2.1.25 + 2.1.26 + 2.1.26 2.2.0 diff --git a/patches/cli/0002-Remove-feed-that-no-longer-exists.patch b/patches/cli/0002-Remove-feed-that-no-longer-exists.patch deleted file mode 100644 index f9f3cc3302..0000000000 --- a/patches/cli/0002-Remove-feed-that-no-longer-exists.patch +++ /dev/null @@ -1,24 +0,0 @@ -From aba730c0c172afe5324315ae99e5ad7c7f771c9b Mon Sep 17 00:00:00 2001 -From: Chris Rummel -Date: Sun, 24 May 2020 17:11:35 +0000 -Subject: [PATCH] Remove feed that no longer exists. - ---- - build/NugetConfigFile.targets | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/build/NugetConfigFile.targets b/build/NugetConfigFile.targets -index 0cae8455a..535665c79 100644 ---- a/build/NugetConfigFile.targets -+++ b/build/NugetConfigFile.targets -@@ -30,7 +30,6 @@ - - - -- - ]]> - - --- -2.18.2 - diff --git a/repos/core-setup.proj b/repos/core-setup.proj index e835ea724c..e6f7c7f54a 100644 --- a/repos/core-setup.proj +++ b/repos/core-setup.proj @@ -21,7 +21,7 @@ $(ProjectDirectory)/build$(ShellExtension) $(BuildArguments) $(ArmEnvironmentVariables) $(BuildCommand) - 20210120-01 + 20210212-01 $(SourceBuiltPackagesPath) diff --git a/repos/coreclr.proj b/repos/coreclr.proj index 1a98549655..8856baed14 100644 --- a/repos/coreclr.proj +++ b/repos/coreclr.proj @@ -18,7 +18,7 @@ $(ArmEnvironmentVariables) $(BuildCommand) $(ProjectDirectory)/clean$(ShellExtension) - 20210119-03 + 20210212-02 diff --git a/repos/corefx.proj b/repos/corefx.proj index 6e1fd06a81..44172401c4 100644 --- a/repos/corefx.proj +++ b/repos/corefx.proj @@ -24,7 +24,7 @@ $(ProjectDirectory)/bin/packages/$(Configuration) $(ProjectDirectory)/clean$(ShellExtension) - 20210119-01 + 20210212-01 diff --git a/src/cli b/src/cli index cd4ef06421..294ef0b078 160000 --- a/src/cli +++ b/src/cli @@ -1 +1 @@ -Subproject commit cd4ef064211a29930689300a7a99474a88efc195 +Subproject commit 294ef0b0789701633285397e25ab7ebe2fc1f5b1 diff --git a/src/core-setup b/src/core-setup index 7b9c946f57..c5668293c2 160000 --- a/src/core-setup +++ b/src/core-setup @@ -1 +1 @@ -Subproject commit 7b9c946f574dc8c2831a7d1bc29fb7832b4de528 +Subproject commit c5668293c2ec0cbac24739f64067d0de0e0c63c9 diff --git a/src/coreclr b/src/coreclr index 06806c7498..8e60a67217 160000 --- a/src/coreclr +++ b/src/coreclr @@ -1 +1 @@ -Subproject commit 06806c7498071be463096188815d4b3996bb13b8 +Subproject commit 8e60a6721767dfa0e5834658bc2532292deec091 diff --git a/src/corefx b/src/corefx index 43e382ec54..627093c87f 160000 --- a/src/corefx +++ b/src/corefx @@ -1 +1 @@ -Subproject commit 43e382ec5469a9a81d9a57f09dd08e500b0cf7af +Subproject commit 627093c87fea3d92b28d0deb53d1259e79b45088 diff --git a/tools-local/prebuilt-baseline-offline.xml b/tools-local/prebuilt-baseline-offline.xml index cfa30fe594..84016dff73 100755 --- a/tools-local/prebuilt-baseline-offline.xml +++ b/tools-local/prebuilt-baseline-offline.xml @@ -207,12 +207,12 @@ - - + + - + - + @@ -501,4 +501,4 @@ - \ No newline at end of file + diff --git a/tools-local/prebuilt-baseline-online.xml b/tools-local/prebuilt-baseline-online.xml index cbbb48533d..d03f6321cc 100644 --- a/tools-local/prebuilt-baseline-online.xml +++ b/tools-local/prebuilt-baseline-online.xml @@ -95,9 +95,9 @@ - - - + + + @@ -116,16 +116,16 @@ - + - + - + @@ -133,13 +133,13 @@ - + - + @@ -154,6 +154,7 @@ + @@ -260,14 +261,14 @@ - + - - + + - + - + From 52ac842903e3ac8f4996eaea1a05b4255da54ce9 Mon Sep 17 00:00:00 2001 From: Chris Rummel Date: Wed, 10 Mar 2021 14:19:12 -0600 Subject: [PATCH 2/6] Remove another legacy feed. --- repos/dir.targets | 3 +++ 1 file changed, 3 insertions(+) diff --git a/repos/dir.targets b/repos/dir.targets index 7bb887f771..79ca0d8b40 100644 --- a/repos/dir.targets +++ b/repos/dir.targets @@ -223,6 +223,9 @@ + Date: Thu, 11 Mar 2021 10:54:38 -0600 Subject: [PATCH 3/6] Another legacy feed. --- repos/dir.targets | 3 +++ 1 file changed, 3 insertions(+) diff --git a/repos/dir.targets b/repos/dir.targets index 79ca0d8b40..79cb661cc4 100644 --- a/repos/dir.targets +++ b/repos/dir.targets @@ -226,6 +226,9 @@ + Date: Thu, 11 Mar 2021 13:59:03 -0600 Subject: [PATCH 4/6] Another legacy feed. --- repos/dir.targets | 3 +++ 1 file changed, 3 insertions(+) diff --git a/repos/dir.targets b/repos/dir.targets index 79cb661cc4..47bbedf4c0 100644 --- a/repos/dir.targets +++ b/repos/dir.targets @@ -229,6 +229,9 @@ + Date: Fri, 12 Mar 2021 10:01:14 -0600 Subject: [PATCH 5/6] Another legacy feed. --- repos/dir.targets | 3 +++ 1 file changed, 3 insertions(+) diff --git a/repos/dir.targets b/repos/dir.targets index 47bbedf4c0..dcdc71cfb1 100644 --- a/repos/dir.targets +++ b/repos/dir.targets @@ -232,6 +232,9 @@ + Date: Fri, 12 Mar 2021 14:48:30 -0600 Subject: [PATCH 6/6] Another legacy feed. --- repos/dir.targets | 3 +++ 1 file changed, 3 insertions(+) diff --git a/repos/dir.targets b/repos/dir.targets index dcdc71cfb1..177ab01b9e 100644 --- a/repos/dir.targets +++ b/repos/dir.targets @@ -235,6 +235,9 @@ +