From 3becae962f3e16341b65d873c0b1c2cc3a87686c Mon Sep 17 00:00:00 2001 From: dotnet-bot Date: Tue, 23 Apr 2019 22:44:58 +0000 Subject: [PATCH 1/4] Update to ProdCon 20190417-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 0cc84f3c35..a9be6381d5 100644 --- a/ProdConFeed.txt +++ b/ProdConFeed.txt @@ -1 +1 @@ -https://dotnetfeed.blob.core.windows.net/orchestrated-release-2-2/20190321-02/final/index.json +https://dotnetfeed.blob.core.windows.net/orchestrated-release-2-2/20190417-03/final/index.json diff --git a/dependencies.props b/dependencies.props index a67f7ee663..9cb9595b8e 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.2.4 - 2.2.4 + 2.2.5 + 2.2.5 2.2.0 diff --git a/repos/core-setup.proj b/repos/core-setup.proj index b3c747c2a2..50b3981020 100644 --- a/repos/core-setup.proj +++ b/repos/core-setup.proj @@ -22,7 +22,7 @@ $(ProjectDirectory)/build$(ShellExtension) $(BuildArguments) $(ArmEnvironmentVariables) $(BuildCommand) - 20190322-01 + 20190418-02 $(SourceBuiltPackagesPath) diff --git a/repos/coreclr.proj b/repos/coreclr.proj index 52849a1e17..0b5adc9cb7 100644 --- a/repos/coreclr.proj +++ b/repos/coreclr.proj @@ -18,7 +18,7 @@ $(ArmEnvironmentVariables) $(BuildCommand) $(ProjectDirectory)/clean$(ShellExtension) - 20190321-02 + 20190417-05 diff --git a/repos/corefx.proj b/repos/corefx.proj index 1225b0a2d1..adbd6fb8a9 100644 --- a/repos/corefx.proj +++ b/repos/corefx.proj @@ -24,7 +24,7 @@ $(ProjectDirectory)/bin/packages/$(Configuration) $(ProjectDirectory)/clean$(ShellExtension) - 20190321-01 + 20190418-01 diff --git a/src/cli b/src/cli index aa79b139a8..8757db13ec 160000 --- a/src/cli +++ b/src/cli @@ -1 +1 @@ -Subproject commit aa79b139a88470129aaeb95102f7b2b8863a39f4 +Subproject commit 8757db13ec59d17f1e8c5f1e54dd10c7faf0befc diff --git a/src/core-setup b/src/core-setup index f95848e524..0a3c9209c0 160000 --- a/src/core-setup +++ b/src/core-setup @@ -1 +1 @@ -Subproject commit f95848e5243fafee7e535d6db4f8a7d227346cc3 +Subproject commit 0a3c9209c044e7772631cd0b926630c75ac13319 diff --git a/src/coreclr b/src/coreclr index 0aea0a9763..921f25a036 160000 --- a/src/coreclr +++ b/src/coreclr @@ -1 +1 @@ -Subproject commit 0aea0a9763b73b3ca34033dfbc8991ca26dc6d1b +Subproject commit 921f25a036a1292db14e682c86c1d4dcf2c5740a diff --git a/src/corefx b/src/corefx index 450283bf59..9b5053f09f 160000 --- a/src/corefx +++ b/src/corefx @@ -1 +1 @@ -Subproject commit 450283bf597d21770b3999a07d07a69ab5394739 +Subproject commit 9b5053f09fac4a2d615619197924072b9571da78 From 2f1fb526fc7994ca7abb9d68f9b9a06e2b6ae40f Mon Sep 17 00:00:00 2001 From: Dan Seefeldt Date: Fri, 26 Apr 2019 11:48:39 -0500 Subject: [PATCH 2/4] Update cli sha to one from 2.2.107 manifest --- src/cli | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cli b/src/cli index 8757db13ec..2212cac826 160000 --- a/src/cli +++ b/src/cli @@ -1 +1 @@ -Subproject commit 8757db13ec59d17f1e8c5f1e54dd10c7faf0befc +Subproject commit 2212cac826eafb7115f79363a698b738e3636ef4 From a0bf92d5e86eb95bb4ab163f801e0d8d651da525 Mon Sep 17 00:00:00 2001 From: Dan Seefeldt Date: Fri, 26 Apr 2019 19:23:58 +0000 Subject: [PATCH 3/4] Updated prebuilt-baseline-offline.xml --- tools-local/prebuilt-baseline-offline.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tools-local/prebuilt-baseline-offline.xml b/tools-local/prebuilt-baseline-offline.xml index 8db58dcb94..450cf18566 100755 --- a/tools-local/prebuilt-baseline-offline.xml +++ b/tools-local/prebuilt-baseline-offline.xml @@ -1,5 +1,5 @@ - rhel.7-x64 + centos.7-x64 src/application-insights/ src/arcade/ @@ -224,12 +224,12 @@ - - + + - + - + From 56ee7dc80e1eed3fd8510b2473c2475a1e08c18d Mon Sep 17 00:00:00 2001 From: Dan Seefeldt Date: Fri, 26 Apr 2019 19:25:16 +0000 Subject: [PATCH 4/4] Updated prebuilt-baseline-online.xml --- tools-local/prebuilt-baseline-online.xml | 25 ++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/tools-local/prebuilt-baseline-online.xml b/tools-local/prebuilt-baseline-online.xml index 9b7caf6667..57989c168d 100755 --- a/tools-local/prebuilt-baseline-online.xml +++ b/tools-local/prebuilt-baseline-online.xml @@ -1,5 +1,5 @@ - rhel.7-x64 + centos.7-x64 src/application-insights/ src/arcade/ @@ -97,9 +97,9 @@ - - - + + + @@ -124,23 +124,23 @@ - + - + - + - + @@ -154,6 +154,7 @@ + @@ -281,12 +282,12 @@ - - + + - + - +