From 0a47706f8eccd58c28b3d921f781c7909e7461bd Mon Sep 17 00:00:00 2001 From: Andy Ayers Date: Tue, 5 Jun 2018 07:52:35 -0700 Subject: [PATCH] Update SDK used to build jitutils to 2.1 RC (#18290) In anticipation of taking a dependence on netcoreapp2.1 for the forthcoming PMI work from jitutils. Also make sure to shut down build servers before cleaning up the SDK. --- tests/scripts/format.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/tests/scripts/format.py b/tests/scripts/format.py index 9c7f351..7401afd 100644 --- a/tests/scripts/format.py +++ b/tests/scripts/format.py @@ -85,13 +85,13 @@ def main(argv): print("Downloading .Net CLI") if platform == 'Linux': - dotnetcliUrl = "https://dotnetcli.azureedge.net/dotnet/Sdk/2.0.0/dotnet-sdk-2.0.0-linux-x64.tar.gz" + dotnetcliUrl = "https://dotnetcli.azureedge.net/dotnet/Sdk/2.1.300/dotnet-sdk-2.1.300-linux-x64.tar.gz" dotnetcliFilename = os.path.join(dotnetcliPath, 'dotnetcli-jitutils.tar.gz') elif platform == 'OSX': - dotnetcliUrl = "https://dotnetcli.azureedge.net/dotnet/Sdk/2.0.0/dotnet-sdk-2.0.0-macos-x64.tar.gz" + dotnetcliUrl = "https://dotnetcli.azureedge.net/dotnet/Sdk/2.1.300/dotnet-sdk-2.1.300-osx-x64.tar.gz" dotnetcliFilename = os.path.join(dotnetcliPath, 'dotnetcli-jitutils.tar.gz') elif platform == 'Windows_NT': - dotnetcliUrl = "https://dotnetcli.azureedge.net/dotnet/Sdk/2.0.0/dotnet-sdk-2.0.0-win-x64.zip" + dotnetcliUrl = "https://dotnetcli.azureedge.net/dotnet/Sdk/2.1.300/dotnet-sdk-2.1.300-win-x64.zip" dotnetcliFilename = os.path.join(dotnetcliPath, 'dotnetcli-jitutils.zip') else: print('Unknown os ', os) @@ -223,6 +223,10 @@ def main(argv): proc = subprocess.Popen(["git", "diff", "--patch", "-U20"], env=my_env, stdout=patchFile) output,error = proc.communicate() + # shutdown the dotnet build servers before cleaning things up + proc = subprocess.Popen(["dotnet", "build-server", "shutdown"], env=my_env) + output,error = proc.communicate() + if os.path.isdir(jitUtilsPath): print("Deleting " + jitUtilsPath) shutil.rmtree(jitUtilsPath, onerror=del_rw) -- 2.7.4