Changeset 16223 for trunk

Timestamp:

10/09/18 17:28:06 (6 years ago)

Author:

jkarder

Message:

#2951: updated build script

File:

• trunk/Build.ps1 (modified) (3 diffs)

trunk/Build.ps1

@@ -2 +2 @@
 $programFilesX86Dir = ($Env:ProgramFiles, ${Env:ProgramFiles(x86)})[[bool]${Env:ProgramFiles(x86)}]
 $locations = @(
-  [System.IO.Path]::Combine($programFilesX86Dir, "Microsoft Visual Studio", "2017", "Enterprise", "MSBuild", "15.0", "Bin", "amd64")
   [System.IO.Path]::Combine($programFilesX86Dir, "Microsoft Visual Studio", "2017", "Enterprise", "MSBuild", "15.0", "Bin")
-  [System.IO.Path]::Combine($programFilesX86Dir, "Microsoft Visual Studio", "2017", "Community", "MSBuild", "15.0", "Bin", "amd64")
   [System.IO.Path]::Combine($programFilesX86Dir, "Microsoft Visual Studio", "2017", "Community", "MSBuild", "15.0", "Bin")
-  [System.IO.Path]::Combine($programFilesX86Dir, "Microsoft Visual Studio", "2017", "BuildTools", "MSBuild", "15.0", "Bin", "amd64"),
   [System.IO.Path]::Combine($programFilesX86Dir, "Microsoft Visual Studio", "2017", "BuildTools", "MSBuild", "15.0", "Bin")
 )
@@ -87 +84 @@
         $solution.FullName,
         "/t:Clean",
-        "/p:Configuration=`"$config`",Platform=`"$([uri]::EscapeDataString($platform))`"",
+        "/p:Configuration=`"$config`",Platform=`"$platform`"",
         "/m", "/nologo", "/verbosity:q", "/clp:ErrorsOnly"
       )
@@ -97 +94 @@
   Foreach ($slnIndex in $slnIndices) {
     $solution = $slnFiles[$slnIndex]
-    "Building `"$($solution.Name)`" ..."
+    "Building `"$($solution.Name)`" ($config|$platform) ..."
     $args = @(
       $solution.FullName,
       "/t:Build",
-      "/p:Configuration=`"$config`",Platform=`"$([uri]::EscapeDataString($platform))`"",
+      "/p:Configuration=`"$config`",Platform=`"$platform`"",
       "/m", "/nologo", "/verbosity:q", "/clp:ErrorsOnly"
     )