From 494ed69bcf53975b7329de3761ca3cb261419422 Mon Sep 17 00:00:00 2001
From: "Miss Islington (bot)"
 <31488909+miss-islington@users.noreply.github.com>
Date: Mon, 29 Jul 2019 11:41:37 -0700
Subject: [PATCH] Fix publishing of Windows release (GH-15006)

(cherry picked from commit fe330fc4ad3b8218a84216a824af7d7007dcb85b)

Co-authored-by: Steve Dower <steve.dower@python.org>
---
 .azure-pipelines/windows-release/stage-publish-nugetorg.yml | 2 +-
 Tools/msi/uploadrelease.ps1                                 | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/.azure-pipelines/windows-release/stage-publish-nugetorg.yml b/.azure-pipelines/windows-release/stage-publish-nugetorg.yml
index 296eb28648b..570cdb3ec57 100644
--- a/.azure-pipelines/windows-release/stage-publish-nugetorg.yml
+++ b/.azure-pipelines/windows-release/stage-publish-nugetorg.yml
@@ -36,6 +36,6 @@ jobs:
     condition: and(succeeded(), eq(variables['SigningCertificate'], variables['__RealSigningCertificate']))
     inputs:
       command: push
-      packagesToPush: $(Build.BinariesDirectory)\nuget\*.nupkg'
+      packagesToPush: '$(Build.BinariesDirectory)\nuget\*.nupkg'
       nuGetFeedType: external
       publishFeedCredentials: 'Python on Nuget'
diff --git a/Tools/msi/uploadrelease.ps1 b/Tools/msi/uploadrelease.ps1
index 469a96818a1..d3673b45829 100644
--- a/Tools/msi/uploadrelease.ps1
+++ b/Tools/msi/uploadrelease.ps1
@@ -92,6 +92,7 @@ if (-not $skipupload) {
     & $plink -batch $user@$server chgrp downloads $d
     & $plink -batch $user@$server chmod g-x,o+rx $d
     & $pscp -batch $chm.FullName "$user@${server}:$d"
+    if (-not $?) { throw "Failed to upload $chm" }
 
     $dirs = gci "$build" -Directory
     if ($embed) {
@@ -107,6 +108,7 @@ if (-not $skipupload) {
 
         if ($exe) {
             & $pscp -batch $exe.FullName "$user@${server}:$d"
+            if (-not $?) { throw "Failed to upload $exe" }
         }
 
         if ($msi) {
@@ -115,6 +117,7 @@ if (-not $skipupload) {
             & $plink -batch $user@$server chgrp downloads $sd
             & $plink -batch $user@$server chmod g-x,o+rx $sd
             & $pscp -batch $msi.FullName "$user@${server}:$sd"
+            if (-not $?) { throw "Failed to upload $msi" }
             & $plink -batch $user@$server chgrp downloads $sd*
             & $plink -batch $user@$server chmod g-x,o+r $sd*
         }
@@ -122,6 +125,7 @@ if (-not $skipupload) {
 
     & $plink -batch $user@$server chgrp downloads $d*
     & $plink -batch $user@$server chmod g-x,o+r $d*
+    & $pscp -ls "$user@${server}:$d"
 }
 
 if (-not $skippurge) {