(build) use the dotnet installed on the host if possible - disabled for now

arturcic · arturcic · commit bd85931a20b2 · 2020-03-06T22:41:25.000+02:00
diff --git a/build.ps1 b/build.ps1
@@ -117,8 +117,8 @@ Function Add-PathVariable([string]$PathToAdd)
 
 Function Install-Dotnet($DotNetVersion)
 {
-    if (!(Check-DotnetInstalled $DotNetVersion))
-    {
+    #if (!(Check-DotnetInstalled $DotNetVersion))
+    #{
         if ($IsMacOS -or $IsLinux) {
             $ScriptPath = Join-Path $InstallPath 'dotnet-install.sh'
             if (!(Test-Path $ScriptPath)) {
@@ -135,7 +135,7 @@ Function Install-Dotnet($DotNetVersion)
 
             & $ScriptPath -Channel $DotNetChannel -Version $DotNetVersion -InstallDir $InstallPath;
         }
-    }
+    #}
 }
 
 Function Check-DotnetInstalled($version)

Original file line number	Diff line number	Diff line change
`@@ -117,8 +117,8 @@ Function Add-PathVariable([string]$PathToAdd)`
`117`	`117`
`118`	`118`	`Function Install-Dotnet($DotNetVersion)`
`119`	`119`	`{`
`120`		`- if (!(Check-DotnetInstalled $DotNetVersion))`
`121`		`- {`
	`120`	`+ #if (!(Check-DotnetInstalled $DotNetVersion))`
	`121`	`+ #{`
`122`	`122`	`if ($IsMacOS -or $IsLinux) {`
`123`	`123`	`$ScriptPath = Join-Path $InstallPath 'dotnet-install.sh'`
`124`	`124`	`if (!(Test-Path $ScriptPath)) {`
`@@ -135,7 +135,7 @@ Function Install-Dotnet($DotNetVersion)`
`135`	`135`
`136`	`136`	`& $ScriptPath -Channel $DotNetChannel -Version $DotNetVersion -InstallDir $InstallPath;`
`137`	`137`	`}`
`138`		`- }`
	`138`	`+ #}`
`139`	`139`	`}`
`140`	`140`
`141`	`141`	`Function Check-DotnetInstalled($version)`