From 0addbc03b56831df9ad5c2ba5996e0dca61ebf3c Mon Sep 17 00:00:00 2001 From: dotnet-bot Date: Thu, 24 Sep 2020 20:11:58 +0000 Subject: [PATCH 1/4] Update to ProdCon 20200921-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 +- src/corefx | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/ProdConFeed.txt b/ProdConFeed.txt index 8ca279e784..0ac60eeb71 100644 --- a/ProdConFeed.txt +++ b/ProdConFeed.txt @@ -1 +1 @@ -https://dotnetfeed.blob.core.windows.net/orchestrated-release-2-1/20200820-03/final/index.json +https://dotnetfeed.blob.core.windows.net/orchestrated-release-2-1/20200921-03/final/index.json diff --git a/dependencies.props b/dependencies.props index 98a5f07c6e..b1d072a02e 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.22 - 2.1.22 + 2.1.23 + 2.1.23 2.2.0 diff --git a/repos/core-setup.proj b/repos/core-setup.proj index 13e093a145..a3c8f72052 100644 --- a/repos/core-setup.proj +++ b/repos/core-setup.proj @@ -21,7 +21,7 @@ $(ProjectDirectory)/build$(ShellExtension) $(BuildArguments) $(ArmEnvironmentVariables) $(BuildCommand) - 20200821-01 + 20200922-01 $(SourceBuiltPackagesPath) diff --git a/repos/coreclr.proj b/repos/coreclr.proj index 9700035a69..7a9c72bcfc 100644 --- a/repos/coreclr.proj +++ b/repos/coreclr.proj @@ -18,7 +18,7 @@ $(ArmEnvironmentVariables) $(BuildCommand) $(ProjectDirectory)/clean$(ShellExtension) - 20200820-03 + 20200921-03 diff --git a/repos/corefx.proj b/repos/corefx.proj index 0898f2f986..3a05469960 100644 --- a/repos/corefx.proj +++ b/repos/corefx.proj @@ -24,7 +24,7 @@ $(ProjectDirectory)/bin/packages/$(Configuration) $(ProjectDirectory)/clean$(ShellExtension) - 20200820-01 + 20200921-01 diff --git a/src/cli b/src/cli index c9b5af2ec4..bb4b26853b 160000 --- a/src/cli +++ b/src/cli @@ -1 +1 @@ -Subproject commit c9b5af2ec4ba3f32c0f09aaa2d711d54fcac5509 +Subproject commit bb4b26853bd8880a90c0e1a22ff93a8ee941afe1 diff --git a/src/core-setup b/src/core-setup index 23677d3ee7..b61e1596d6 160000 --- a/src/core-setup +++ b/src/core-setup @@ -1 +1 @@ -Subproject commit 23677d3ee7d5160e2d6d420548cf58d74262df10 +Subproject commit b61e1596d6afb8168ebd9a46d560af4413c6d57f diff --git a/src/coreclr b/src/coreclr index 6de70ab25b..70cf9ff89f 160000 --- a/src/coreclr +++ b/src/coreclr @@ -1 +1 @@ -Subproject commit 6de70ab25b627e2d29729689d4d048f02ee77bc8 +Subproject commit 70cf9ff89fd001f8d1115f767c0842b1249fdeed diff --git a/src/corefx b/src/corefx index 4ead056ef9..fff0529a91 160000 --- a/src/corefx +++ b/src/corefx @@ -1 +1 @@ -Subproject commit 4ead056ef919192e80978c653f6777d7369b0fc4 +Subproject commit fff0529a910b9d6b4c7352cf65becf8a896bdcf3 From 0cb3565c1cca345a6e6fe46342afa1d60d51ed21 Mon Sep 17 00:00:00 2001 From: Davis Goodin Date: Thu, 24 Sep 2020 16:00:05 -0500 Subject: [PATCH 2/4] Update to N-1 SDK version --- DotnetCLIVersion.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DotnetCLIVersion.txt b/DotnetCLIVersion.txt index ec061d6296..55bf2c727b 100644 --- a/DotnetCLIVersion.txt +++ b/DotnetCLIVersion.txt @@ -1 +1 @@ -2.1.504 +2.1.518 From 7b03033cf4c5c25099822484795b949a122956bf Mon Sep 17 00:00:00 2001 From: Davis Goodin Date: Thu, 24 Sep 2020 16:11:16 -0500 Subject: [PATCH 3/4] Update Tools/crossgen.sh feed --- init-tools.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/init-tools.sh b/init-tools.sh index b52053332b..fdc63830a3 100755 --- a/init-tools.sh +++ b/init-tools.sh @@ -184,6 +184,9 @@ echo "Making all .sh files executable under Tools." ls "$__scriptpath/Tools/"*.sh | xargs chmod +x ls "$__scriptpath/Tools/scripts/docker/"*.sh | xargs chmod +x +# Get BuildTools crossgen dependencies from a better place. The script that's +# automatically downloaded points at MyGet, which doesn't have recent packages. +export BUILDTOOLS_CROSSGEN_FEED=https://api.nuget.org/v3/index.json "$__scriptpath/Tools/crossgen.sh" "$__scriptpath/Tools" From 61894e8010ad320cad9c9fbefa058204c4608da2 Mon Sep 17 00:00:00 2001 From: Davis Goodin Date: Fri, 25 Sep 2020 10:40:46 -0500 Subject: [PATCH 4/4] Update prebuilt baselines --- tools-local/prebuilt-baseline-offline.xml | 10 ++++---- tools-local/prebuilt-baseline-online.xml | 29 +++++++++++------------ 2 files changed, 19 insertions(+), 20 deletions(-) diff --git a/tools-local/prebuilt-baseline-offline.xml b/tools-local/prebuilt-baseline-offline.xml index 48836d35b0..74dbc998d6 100755 --- a/tools-local/prebuilt-baseline-offline.xml +++ b/tools-local/prebuilt-baseline-offline.xml @@ -33,7 +33,7 @@ - + @@ -217,12 +217,12 @@ - - + + - + - + diff --git a/tools-local/prebuilt-baseline-online.xml b/tools-local/prebuilt-baseline-online.xml index 70e3ea093c..4339d236f3 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,7 +154,6 @@ - @@ -271,14 +270,14 @@ - + - - + + - + - + @@ -448,7 +447,7 @@ - +