Update clicommandlineparser to build offline (#11327)

This commit is contained in:
Dan Seefeldt 2021-07-28 16:07:24 -05:00 committed by GitHub
parent 6f4c77420e
commit b6e2615047
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -0,0 +1,44 @@
From 3110caf93828aad2ecfe9929e03dc4dd6dd85c5d Mon Sep 17 00:00:00 2001
From: dseefeld <dseefeld@microsoft.com>
Date: Wed, 28 Jul 2021 15:56:35 +0000
Subject: [PATCH] Remove installation of runtime 2.1.0 from build.sh
Installation of another runtime in build.sh doesn't work for source-build
when building offline.
---
build.sh | 3 ---
global.json | 7 ++++++-
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/build.sh b/build.sh
index d511e95..acc0e31 100755
--- a/build.sh
+++ b/build.sh
@@ -8,7 +8,4 @@ while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symli
done
ScriptRoot="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
-# install the 2.1.0 runtime for running tests
-"$ScriptRoot/eng/common/dotnet-install.sh" -runtime dotnet -version 2.1.0
-
. "$ScriptRoot/eng/common/build.sh" --build --restore $@
diff --git a/global.json b/global.json
index e276e30..347e455 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,11 @@
{
"tools": {
- "dotnet": "5.0.201"
+ "dotnet": "5.0.201",
+ "runtimes": {
+ "dotnet": [
+ "2.1.0"
+ ]
+ }
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21256.3"
--
2.31.1