From 9dea77fcd3b55effa2fda0548eea8ae5998a250d Mon Sep 17 00:00:00 2001
From: Jevan Saks <jevansa@microsoft.com>
Date: Fri, 14 Dec 2018 17:01:17 -0800
Subject: [PATCH 1/2] Update NugetWrapper.cmd to download nuget.exe from
 nuget.org and cache locally instead of using internal share

---
 tools/NugetWrapper.cmd | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/tools/NugetWrapper.cmd b/tools/NugetWrapper.cmd
index 18ebcf1c72..1bff077d75 100644
--- a/tools/NugetWrapper.cmd
+++ b/tools/NugetWrapper.cmd
@@ -3,6 +3,11 @@ setlocal
 
 set VisualStudioVersion=15.0
 
-\\edge-svcs\nuget\v4.6.2\NuGet.exe %*
+if not exist %TEMP%\nuget.4.9.2.exe (
+    echo Nuget.exe not found in the temp dir, downloading.
+    powershell -Command "& { Invoke-WebRequest https://dist.nuget.org/win-x86-commandline/v4.9.2/nuget.exe -outfile $env:TEMP\nuget.4.9.2.exe }"
+)
 
-exit /B %ERRORLEVEL%
\ No newline at end of file
+%TEMP%\nuget.4.9.2.exe %*
+
+exit /B %ERRORLEVEL%

From 90494850e9b8b1a7e1b1c40bc1fc96ec86a27f4a Mon Sep 17 00:00:00 2001
From: Jevan Saks <jevan.saks@gmail.com>
Date: Sat, 15 Dec 2018 12:40:38 -0800
Subject: [PATCH 2/2] Don't use SimpleSign unless set in the build definition
 too

---
 build/FrameworkPackage/MakeFrameworkPackage.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/FrameworkPackage/MakeFrameworkPackage.ps1 b/build/FrameworkPackage/MakeFrameworkPackage.ps1
index e54d84c41f..6188b0f70f 100644
--- a/build/FrameworkPackage/MakeFrameworkPackage.ps1
+++ b/build/FrameworkPackage/MakeFrameworkPackage.ps1
@@ -252,7 +252,7 @@ Write-Host $makeappx
 cmd /c $makeappx
 if ($LastExitCode -ne 0) { Exit 1 }
 
-if ($env:TFS_ToolsDirectory -and ($env:BUILD_DEFINITIONNAME -match "_release"))
+if ($env:TFS_ToolsDirectory -and ($env:BUILD_DEFINITIONNAME -match "_release") -and $env:UseSimpleSign)
 {
     # From MakeAppxBundle in the XES tools
     $signToolPath = $env:TFS_ToolsDirectory + "\bin\SimpleSign.exe"