From d2cad6925dffd42a93408cc55ef83457688b44ae Mon Sep 17 00:00:00 2001 From: dotnet-bot Date: Mon, 29 Mar 2021 13:19:37 +0000 Subject: [PATCH 1/4] Update to ProdCon 20210316-03 --- ProdConFeed.txt | 2 +- dependencies.props | 4 ++-- repos/core-setup.proj | 2 +- repos/coreclr.proj | 2 +- repos/corefx.proj | 2 +- src/cli | 2 +- src/core-setup | 2 +- src/coreclr | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ProdConFeed.txt b/ProdConFeed.txt index 92e17f4f9b..3b33bf2fa8 100644 --- a/ProdConFeed.txt +++ b/ProdConFeed.txt @@ -1 +1 @@ -https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public%40Local/nuget/v3/index.json +https://dotnetfeed.blob.core.windows.net/orchestrated-release-2-1/20210316-03/final/index.json diff --git a/dependencies.props b/dependencies.props index 673a8f3bca..ca8dbfc4e6 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.26 - 2.1.26 + 2.1.27 + 2.1.27 2.2.0 diff --git a/repos/core-setup.proj b/repos/core-setup.proj index e6f7c7f54a..268fedb64c 100644 --- a/repos/core-setup.proj +++ b/repos/core-setup.proj @@ -21,7 +21,7 @@ $(ProjectDirectory)/build$(ShellExtension) $(BuildArguments) $(ArmEnvironmentVariables) $(BuildCommand) - 20210212-01 + 20210316-01 $(SourceBuiltPackagesPath) diff --git a/repos/coreclr.proj b/repos/coreclr.proj index 8856baed14..ae4ea59bc5 100644 --- a/repos/coreclr.proj +++ b/repos/coreclr.proj @@ -18,7 +18,7 @@ $(ArmEnvironmentVariables) $(BuildCommand) $(ProjectDirectory)/clean$(ShellExtension) - 20210212-02 + 20210316-01 diff --git a/repos/corefx.proj b/repos/corefx.proj index 44172401c4..fe26c76d40 100644 --- a/repos/corefx.proj +++ b/repos/corefx.proj @@ -24,7 +24,7 @@ $(ProjectDirectory)/bin/packages/$(Configuration) $(ProjectDirectory)/clean$(ShellExtension) - 20210212-01 + 20210316-03 diff --git a/src/cli b/src/cli index 294ef0b078..c294f2cbe4 160000 --- a/src/cli +++ b/src/cli @@ -1 +1 @@ -Subproject commit 294ef0b0789701633285397e25ab7ebe2fc1f5b1 +Subproject commit c294f2cbe4bac713c31bf640dc854703b95f3e29 diff --git a/src/core-setup b/src/core-setup index c5668293c2..37d16c2b4d 160000 --- a/src/core-setup +++ b/src/core-setup @@ -1 +1 @@ -Subproject commit c5668293c2ec0cbac24739f64067d0de0e0c63c9 +Subproject commit 37d16c2b4d50a6affc6886dd1d066b8e8aba2309 diff --git a/src/coreclr b/src/coreclr index 8e60a67217..c814243d7d 160000 --- a/src/coreclr +++ b/src/coreclr @@ -1 +1 @@ -Subproject commit 8e60a6721767dfa0e5834658bc2532292deec091 +Subproject commit c814243d7d94b640bc11972e0c588b97bc935e4d From 134e6b3fce68effc063224624cfd4fabf0676076 Mon Sep 17 00:00:00 2001 From: Dan Seefeldt Date: Mon, 29 Mar 2021 16:22:56 +0000 Subject: [PATCH 2/4] Update SDK version to N-1 --- DotnetCLIVersion.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DotnetCLIVersion.txt b/DotnetCLIVersion.txt index 798af42a1a..4844fa4f82 100644 --- a/DotnetCLIVersion.txt +++ b/DotnetCLIVersion.txt @@ -1 +1 @@ -2.1.521 +2.1.522 From a0e97c52bc3866f4c08f68dab67de3a108ec207e Mon Sep 17 00:00:00 2001 From: Dan Seefeldt Date: Mon, 29 Mar 2021 19:20:31 +0000 Subject: [PATCH 3/4] Updated prebuilt-baseline-online.xml --- tools-local/prebuilt-baseline-online.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tools-local/prebuilt-baseline-online.xml b/tools-local/prebuilt-baseline-online.xml index d03f6321cc..e4ce969681 100644 --- a/tools-local/prebuilt-baseline-online.xml +++ b/tools-local/prebuilt-baseline-online.xml @@ -95,9 +95,9 @@ - - - + + + @@ -116,7 +116,7 @@ - + @@ -261,7 +261,7 @@ - + @@ -438,7 +438,7 @@ - + From e6cc227b0f5c41bb54856d83a1d57d016bf87bad Mon Sep 17 00:00:00 2001 From: Dan Seefeldt Date: Mon, 29 Mar 2021 22:54:56 +0000 Subject: [PATCH 4/4] Add back ProdCon and smoke-test feed --- smoke-testNuGet.Config | 2 ++ 1 file changed, 2 insertions(+) diff --git a/smoke-testNuGet.Config b/smoke-testNuGet.Config index 20d4067a0a..6ad72a0e84 100644 --- a/smoke-testNuGet.Config +++ b/smoke-testNuGet.Config @@ -5,5 +5,7 @@ + +