Commit 2602fb6b authored by justcoding121's avatar justcoding121

revert experimental build script changes

parent fa24180b
...@@ -31,18 +31,17 @@ $NuGet = Join-Path $SolutionRoot ".nuget\nuget.exe" ...@@ -31,18 +31,17 @@ $NuGet = Join-Path $SolutionRoot ".nuget\nuget.exe"
$MSBuild14 = "${env:ProgramFiles(x86)}\MSBuild\14.0\Bin\msbuild.exe" $MSBuild14 = "${env:ProgramFiles(x86)}\MSBuild\14.0\Bin\msbuild.exe"
$MSBuild = & $Here\vswhere.exe -latest -products * -requires Microsoft.Component.MSBuild -property installationPath $MSBuild = "${env:ProgramFiles(x86)}\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin\msbuild.exe"
if ($MSBuild) { $MSBuild -replace ' ', '` '
$MSBuild = join-path $MSBuild 'MSBuild\15.0\Bin\MSBuild.exe'
}
FormatTaskName (("-"*25) + "[{0}]" + ("-"*25)) FormatTaskName (("-"*25) + "[{0}]" + ("-"*25))
Task default -depends Clean, Build, Package Task default -depends Clean, Build, Package
Task Build { Task Build {
exec { . $MSBuild14 $SolutionFile14 /t:Build /v:normal /p:Configuration=$Configuration }
& $MSBuild $SolutionFile /t:Build /v:normal /p:Configuration=$Configuration exec { . $MSBuild $SolutionFile /t:Build /v:normal /p:Configuration=$Configuration }
} }
Task Package -depends Build { Task Package -depends Build {
...@@ -51,14 +50,14 @@ Task Package -depends Build { ...@@ -51,14 +50,14 @@ Task Package -depends Build {
Task Clean -depends Install-BuildTools { Task Clean -depends Install-BuildTools {
Get-ChildItem .\ -include bin,obj -Recurse | foreach ($_) { Remove-Item $_.fullname -Force -Recurse } Get-ChildItem .\ -include bin,obj -Recurse | foreach ($_) { Remove-Item $_.fullname -Force -Recurse }
exec { . $MSBuild14 $SolutionFile14 /t:Clean /v:quiet }
& $MSBuild $SolutionFile /t:Clean /v:quiet exec { . $MSBuild $SolutionFile /t:Clean /v:quiet }
} }
Task Install-MSBuild { Task Install-MSBuild {
if(!(Test-Path $MSBuild14) -Or !(Test-Path $MSBuild)) if(!(Test-Path $MSBuild14))
{ {
cinst microsoft-build-tools -y cinst microsoft-build-tools -y
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment