From aa0c5d4eb335cb87b979167e199ad855e30cfb98 Mon Sep 17 00:00:00 2001 From: ashwini Date: Thu, 9 May 2019 09:59:07 -0400 Subject: [PATCH 1/2] Remove old mono artifact --- external/buildscripts/buildDependencies.txt | 4 ---- 1 file changed, 4 deletions(-) diff --git a/external/buildscripts/buildDependencies.txt b/external/buildscripts/buildDependencies.txt index 77bde61ecae4..a3548137ac58 100644 --- a/external/buildscripts/buildDependencies.txt +++ b/external/buildscripts/buildDependencies.txt @@ -15,10 +15,6 @@ name : MacBuildEnvironment id : MacBuildEnvironment/9df1e3b3b120_2fc8e616a2e5dfb7907fc42d9576b427e692223c266dc3bc305de4bf03714e30.7z repo: testing -name : mono -id : mono/9df1e3b3b120_f81c172b91f45b2e045f4ba52d5f65cc54041da1527f2c854bf9db3a99495007.7z -repo: testing - name : MonoBleedingEdge id : MonoBleedingEdge/9df1e3b3b120_ab6d2f131e6bd4fe2aacafb0f683e8fa4e1ccba35552b6fe89bf359b6ee16215.7z repo: testing From 0574dd7652635be4adbdc23b316c20618d26c01b Mon Sep 17 00:00:00 2001 From: ashwini Date: Thu, 9 May 2019 13:30:05 -0400 Subject: [PATCH 2/2] Remove unnecessary check for extra build tools --- external/buildscripts/build_runtime_vs.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/buildscripts/build_runtime_vs.pl b/external/buildscripts/build_runtime_vs.pl index 41b6b65c9461..93bb065a9358 100644 --- a/external/buildscripts/build_runtime_vs.pl +++ b/external/buildscripts/build_runtime_vs.pl @@ -41,7 +41,7 @@ sub CompileVCProj my $msbuild = $ENV{"ProgramFiles(x86)"}."/MSBuild/$msBuildVersion/Bin/MSBuild.exe"; - if ((! -d $extraBuildTools) || ($ENV{YAMATO_PROJECT_ID}) || ($ENV{USERNAME} == "bokken")) + if (($ENV{YAMATO_PROJECT_ID}) || ($ENV{USERNAME} == "bokken")) { $msbuild = $ENV{"ProgramFiles(x86)"}."/Microsoft Visual Studio/2017/Professional/MSBuild/15.0/Bin/MSBuild.exe"; }