commit cefbd0101d4fd0a258be0c182cf27609ad26c100
author Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> Tue Feb 27 22:30:48 2018 -0800
committer GitHub <noreply@github.com> Tue Feb 27 22:30:48 2018 -0800
tree 593cec2a7843cf363708e70136932302709638a8
parent b2df4a006a756a494d33bccf06b44927a9a78297

Minor improvements to the Windows build/release process (GH-5935)

(cherry picked from commit 881323db717f9b6ffe30d14104a2925c77f28db7)

Co-authored-by: Steve Dower <steve.dower@microsoft.com>

Tools/msi/purge.py

diff --git a/Tools/msi/purge.py b/Tools/msi/purge.py
index 24fdae2..a8b8f4d 100644
--- a/Tools/msi/purge.py
+++ b/Tools/msi/purge.py
@@ -50,6 +50,7 @@
     "test_d.msi",
     "test_pdb.msi",
     "tools.msi",
+    "ucrt.msi",
     "Windows6.0-KB2999226-x64.msu",
     "Windows6.0-KB2999226-x86.msu",
     "Windows6.1-KB2999226-x64.msu",

Tools/msi/uploadrelease.bat

diff --git a/Tools/msi/uploadrelease.bat b/Tools/msi/uploadrelease.bat
index 3ae5dbc..f262489 100644
--- a/Tools/msi/uploadrelease.bat
+++ b/Tools/msi/uploadrelease.bat
@@ -31,13 +31,17 @@
 
 if not defined PLINK where plink > "%TEMP%\plink.loc" 2> nul && set /P PLINK= < "%TEMP%\plink.loc" & del "%TEMP%\plink.loc"
 if not defined PLINK where /R "%ProgramFiles(x86)%\PuTTY" plink > "%TEMP%\plink.loc" 2> nul && set /P PLINK= < "%TEMP%\plink.loc" & del "%TEMP%\plink.loc"
+if not defined PLINK where /R "%ProgramFiles%\PuTTY" plink > "%TEMP%\plink.loc" 2> nul && set /P PLINK= < "%TEMP%\plink.loc" & del "%TEMP%\plink.loc"
 if not defined PLINK where /R "%ProgramFiles(x86)%" plink > "%TEMP%\plink.loc" 2> nul && set /P PLINK= < "%TEMP%\plink.loc" & del "%TEMP%\plink.loc"
+if not defined PLINK where /R "%ProgramFiles%" plink > "%TEMP%\plink.loc" 2> nul && set /P PLINK= < "%TEMP%\plink.loc" & del "%TEMP%\plink.loc"
 if not defined PLINK echo Cannot locate plink.exe & exit /B 1
 echo Found plink.exe at %PLINK%
 
 if not defined PSCP where pscp > "%TEMP%\pscp.loc" 2> nul && set /P pscp= < "%TEMP%\pscp.loc" & del "%TEMP%\pscp.loc"
 if not defined PSCP where /R "%ProgramFiles(x86)%\PuTTY" pscp > "%TEMP%\pscp.loc" 2> nul && set /P pscp= < "%TEMP%\pscp.loc" & del "%TEMP%\pscp.loc"
+if not defined PSCP where /R "%ProgramFiles%\PuTTY" pscp > "%TEMP%\pscp.loc" 2> nul && set /P pscp= < "%TEMP%\pscp.loc" & del "%TEMP%\pscp.loc"
 if not defined PSCP where /R "%ProgramFiles(x86)%" pscp > "%TEMP%\pscp.loc" 2> nul && set /P pscp= < "%TEMP%\pscp.loc" & del "%TEMP%\pscp.loc"
+if not defined PSCP where /R "%ProgramFiles%" pscp > "%TEMP%\pscp.loc" 2> nul && set /P pscp= < "%TEMP%\pscp.loc" & del "%TEMP%\pscp.loc"
 if not defined PSCP echo Cannot locate pscp.exe & exit /B 1
 echo Found pscp.exe at %PSCP%