making the build script work with latest msbuild bits

m0sa · m0sa · commit 6e3f228f9b4c · 2018-05-08T08:33:00.000+02:00
diff --git a/BuildAndPack.ps1 b/BuildAndPack.ps1
@@ -33,15 +33,14 @@ $defaultArgs = "/v:n", "/nologo",
     "/p:SolutionDir=$solutionDir",
     "/p:RepositoryCommit=$GitCommitId"
     "/p:Version=$version",
-    "/t:Restore,Build,Pack",
     "/p:Configuration=Release",
     "/p:SEPrecompilerPath=$solutionDir\StackExchange.Precompilation.Build\bin\Release\net462"
 if ($MsBuildArgs)
 {
     $defaultArgs += $MsBuildArgs
 }
-
-& msbuild $defaultArgs
+& msbuild ($defaultArgs + "/t:Restore")
+& msbuild ($defaultArgs + "/t:Build,Pack")
 
 if ($LastExitCode -ne 0)
 {

Original file line number	Diff line number	Diff line change
`@@ -33,15 +33,14 @@ $defaultArgs = "/v:n", "/nologo",`
`33`	`33`	`"/p:SolutionDir=$solutionDir",`
`34`	`34`	`"/p:RepositoryCommit=$GitCommitId"`
`35`	`35`	`"/p:Version=$version",`
`36`		`- "/t:Restore,Build,Pack",`
`37`	`36`	`"/p:Configuration=Release",`
`38`	`37`	`"/p:SEPrecompilerPath=$solutionDir\StackExchange.Precompilation.Build\bin\Release\net462"`
`39`	`38`	`if ($MsBuildArgs)`
`40`	`39`	`{`
`41`	`40`	`$defaultArgs += $MsBuildArgs`
`42`	`41`	`}`
`43`		`-`
`44`		`-& msbuild $defaultArgs`
	`42`	`+& msbuild ($defaultArgs + "/t:Restore")`
	`43`	`+& msbuild ($defaultArgs + "/t:Build,Pack")`
`45`	`44`
`46`	`45`	`if ($LastExitCode -ne 0)`
`47`	`46`	`{`