From 88b91f3855985ef9f48d45ab707f2dcdd5feddc7 Mon Sep 17 00:00:00 2001
From: oc-ratih <ysogabe@orange-cube.jp>
Date: Tue, 14 Nov 2017 10:19:12 +0900
Subject: [PATCH] build script update.

---
 build/Get-VsPath.ps1 | 30 ++++++++++++++++++++----------
 build/postbuild.ps1  |  4 ++--
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/build/Get-VsPath.ps1 b/build/Get-VsPath.ps1
index 2af7f9e..c68a8b4 100644
--- a/build/Get-VsPath.ps1
+++ b/build/Get-VsPath.ps1
@@ -1,4 +1,5 @@
-if (Test-Path ${env:ProgramFiles(x86)})
+# If Program Files (x86) is found, use Program Files (x86). If Program Files (x86) is not found it, use Program Files
+if (Test-Path ${env:ProgramFiles(x86)})
 {
     $Script:ProgramFiles = ${env:ProgramFiles(x86)}
 }
@@ -7,13 +8,22 @@ else
     $Script:ProgramFiles = $env:ProgramFiles
 }
 
-if (Test-Path $($Script:ProgramFiles + '\MSBuild\14.0\Bin\MSBuild.exe'))
-{
-    $Script:msbuild = $Script:ProgramFiles + '\MSBuild\14.0\Bin\MSBuild.exe'
-}
-else
-{
-    $Script:msbuild = $Script:ProgramFiles + '\MSBuild\12.0\Bin\MSBuild.exe'
-}
 
-$Script:msbuild
+# Candidates. Search from the top, return the first found
+$Script:items =
+    # VS 2017
+    '\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin\MSBuild.exe',
+    '\Microsoft Visual Studio\2017\Professional\MSBuild\15.0\Bin\MSBuild.exe',
+    '\Microsoft Visual Studio\2017\Enterprise\MSBuild\15.0\Bin\MSBuild.exe',
+    '\Microsoft Visual Studio\2017\BuildTools\MSBuild\15.0\Bin\MSBuild.exe',
+    # VS 2015
+    '\MSBuild\14.0\Bin\MSBuild.exe',
+    # VS 2013
+    '\MSBuild\12.0\Bin\MSBuild.exe'
+
+
+foreach ($Script:item in $Script:items)
+{
+    $Script:msbuild = $Script:ProgramFiles + $Script:item
+    if (Test-Path $Script:msbuild) { return $Script:msbuild }
+}
\ No newline at end of file
diff --git a/build/postbuild.ps1 b/build/postbuild.ps1
index 787ed18..61c305b 100644
--- a/build/postbuild.ps1
+++ b/build/postbuild.ps1
@@ -1,6 +1,6 @@
-pushd ..\src\MinimumAsyncBridge.Nuget
+pushd ..\src\nuspecs
 .\pack.bat
 popd
 
 if (-not (Test-Path ../../packages)) { mkdir ../../packages }
-cp ..\src\MinimumAsyncBridge.Nuget\*.nupkg ../../packages
+cp ..\src\nuspecs\*.nupkg ../../packages