From a3cef5f604f2ad65931dafc8ac22b1649dec4d1a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 12 Nov 2020 19:46:20 +0000 Subject: [PATCH] [release/5.0] Update dependencies from dotnet/arcade (#27683) [release/5.0] Update dependencies from dotnet/arcade - Merge branch 'release/5.0' into darc-release/5.0-2a6d939a-e51f-4bb6-bbbd-50a66b29c1e7 --- NuGet.config | 7 +- eng/Version.Details.xml | 12 +- eng/Versions.props | 2 +- eng/common/build.ps1 | 2 - eng/common/build.sh | 9 +- .../dotnet-install-scripts/dotnet-install.ps1 | 774 ----------- .../dotnet-install-scripts/dotnet-install.sh | 1133 ----------------- .../templates/post-build/post-build.yml | 314 ++--- eng/common/tools.ps1 | 63 +- eng/common/tools.sh | 37 +- global.json | 4 +- 11 files changed, 210 insertions(+), 2147 deletions(-) delete mode 100644 eng/common/dotnet-install-scripts/dotnet-install.ps1 delete mode 100644 eng/common/dotnet-install-scripts/dotnet-install.sh diff --git a/NuGet.config b/NuGet.config index 7e9ca669f0..aac3942bff 100644 --- a/NuGet.config +++ b/NuGet.config @@ -3,6 +3,9 @@ + + + @@ -11,10 +14,6 @@ - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b2b50d5d28..b29671f8da 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -308,17 +308,17 @@ https://github.com/dotnet/runtime cf258a14b70ad9069470a108f13765e0e5988f51 - + https://github.com/dotnet/arcade - 6813f5aa511a7a4498fa217a54219b5704a01f83 + 6f54e001de0c52e52578e5252cb279f5bc9a2eb6 - + https://github.com/dotnet/arcade - 6813f5aa511a7a4498fa217a54219b5704a01f83 + 6f54e001de0c52e52578e5252cb279f5bc9a2eb6 - + https://github.com/dotnet/arcade - 6813f5aa511a7a4498fa217a54219b5704a01f83 + 6f54e001de0c52e52578e5252cb279f5bc9a2eb6 diff --git a/eng/Versions.props b/eng/Versions.props index f97d3e27d3..6f694f2763 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -133,7 +133,7 @@ 5.0.1 5.0.1 - 5.0.0-beta.20510.1 + 5.0.0-beta.20560.3