Merge pull request #1175 from Unity-Technologies/remove-old-mono-stevedore

ashwinimurt · web-flow · commit b41442ce8200 · 2019-05-09T16:34:38.000-04:00
Remove old mono artifact
diff --git 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
diff --git 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";
 	}

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ sub CompileVCProj`
`41`	`41`
`42`	`42`	`my $msbuild = $ENV{"ProgramFiles(x86)"}."/MSBuild/$msBuildVersion/Bin/MSBuild.exe";`
`43`	`43`
`44`		`- if ((! -d $extraBuildTools) \|\| ($ENV{YAMATO_PROJECT_ID}) \|\| ($ENV{USERNAME} == "bokken"))`
	`44`	`+ if (($ENV{YAMATO_PROJECT_ID}) \|\| ($ENV{USERNAME} == "bokken"))`
`45`	`45`	`{`
`46`	`46`	`$msbuild = $ENV{"ProgramFiles(x86)"}."/Microsoft Visual Studio/2017/Professional/MSBuild/15.0/Bin/MSBuild.exe";`
`47`	`47`	`}`