From 9c0cafb3bb65e13ee8734ffc72fc28617a71b860 Mon Sep 17 00:00:00 2001
From: Vatsan Madhavan <vatsan.madhavan@gmail.com>
Date: Fri, 3 Apr 2020 12:39:41 -0700
Subject: [PATCH 1/2] Enable single-file for win-x86

---
 src/redist/targets/GenerateLayout.targets | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets
index 33c0d0fd..4c2a980b 100644
--- a/src/redist/targets/GenerateLayout.targets
+++ b/src/redist/targets/GenerateLayout.targets
@@ -3,7 +3,6 @@
     <DotnetCoreUninstallOutputDirectory>$(ArtifactsDir)layout\dotnet-core-uninstall\</DotnetCoreUninstallOutputDirectory>
     <DownloadsFolder>$(IntermediateOutputPath)downloads\</DownloadsFolder>
     <_PublishSingleFileForRid>true</_PublishSingleFileForRid>
-    <_PublishSingleFileForRid Condition="'$(RID)' == 'win-x86'">false</_PublishSingleFileForRid>
     <_GenerateLayoutDependsOnTargets>CleanLayoutPath;PublishDotnetCoreUninstallProject</_GenerateLayoutDependsOnTargets>
     <_GenerateLayoutDependsOnTargets Condition="'$(RID)' == 'win-x86'">CleanLayoutPath;PublishDotnetCoreUninstallProject;SignLayout</_GenerateLayoutDependsOnTargets>
   </PropertyGroup>

From 90ae220f2573bfa2956d17a9570803e0970313c1 Mon Sep 17 00:00:00 2001
From: Vatsan Madhavan <vatsan.madhavan@gmail.com>
Date: Fri, 3 Apr 2020 13:34:32 -0700
Subject: [PATCH 2/2] Enable shipping dotnet-core-uninstall on Windows as a
 single-exe zip tool

---
 .vsts-ci.yml                              | 9 +++++++++
 src/redist/targets/GenerateLayout.targets | 7 +++++++
 src/redist/targets/Signing.targets        | 8 +++++++-
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/.vsts-ci.yml b/.vsts-ci.yml
index 68a5e0f0..f9508276 100644
--- a/.vsts-ci.yml
+++ b/.vsts-ci.yml
@@ -82,12 +82,21 @@ jobs:
           /p:RID=$(_RID)
         displayName: Build and Publish
       - task: CopyFiles@2
+        displayName: Copy MSI to Staging Directory
         condition: and(eq(variables['system.pullrequest.isfork'], false), eq(variables['_BuildConfig'], 'Release'))
         inputs:
           sourceFolder: 'artifacts/packages/$(_BuildConfig)/Shipping/'
           contents: '*.msi'
           targetFolder: '$(Build.ArtifactStagingDirectory)'
+      - task: CopyFiles@2
+        displayName: Copy ZIP to Staging Directory
+        condition: and(eq(variables['system.pullrequest.isfork'], false), eq(variables['_BuildConfig'], 'Release'))
+        inputs:
+          sourceFolder: 'artifacts/packages/$(_BuildConfig)/Shipping/'
+          contents: '*.zip'
+          targetFolder: '$(Build.ArtifactStagingDirectory)'
       - task: PublishBuildArtifacts@1
+        displayName: Publish Build Artifacts
         condition: and(eq(variables['system.pullrequest.isfork'], false), eq(variables['_BuildConfig'], 'Release'))
         inputs:
           pathtoPublish: '$(Build.ArtifactStagingDirectory)'
diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets
index 4c2a980b..b833ffa5 100644
--- a/src/redist/targets/GenerateLayout.targets
+++ b/src/redist/targets/GenerateLayout.targets
@@ -25,5 +25,12 @@
       Properties="PublishDir=$(DotnetCoreUninstallOutputDirectory);PublishSingleFile=$(_PublishSingleFileForRid);RuntimeIdentifier=$(RID);PublishTrimmed=true;SelfContained=true"
       Targets="Publish">
     </MSBuild>
+
+    <MakeDir Directories="$(ArtifactsShippingPackagesDir)"
+             Condition="'$(RID)' == 'win-x86'" />
+    <ZipDirectory SourceDirectory="$(DotnetCoreUninstallOutputDirectory)" 
+                  DestinationFile="$(ArtifactsShippingPackagesDir)dotnet-core-uninstall.zip"
+                  Condition="'$(RID)' == 'win-x86'"
+                  Overwrite="true" />
   </Target>
 </Project>
diff --git a/src/redist/targets/Signing.targets b/src/redist/targets/Signing.targets
index ad27dc2d..d31656c9 100644
--- a/src/redist/targets/Signing.targets
+++ b/src/redist/targets/Signing.targets
@@ -11,6 +11,7 @@
       <ExternalCertificateId Condition="'$(ExternalCertificateId)' == ''">3PartySHA2</ExternalCertificateId>
       <InternalCertificateId Condition="'$(InternalCertificateId)' == ''">Microsoft400</InternalCertificateId>
       <NugetCertificateId Condition="'$(NugetCertificateId)' == ''">NuGet</NugetCertificateId>
+      <ZipCertificateId Condition="'$(ZipCertificateId)' == ''">None</ZipCertificateId>
     </PropertyGroup>
 
 
@@ -76,7 +77,7 @@
   </Target>
 
   <Target Name="SignLayout" Condition="'$(SignCoreDotnetCoreUninstall)' == 'true'" DependsOnTargets="SetSignProps">
-
+    
     <ItemGroup>
       <!-- External files -->
       <LayoutFilesToSign Include="$(DotnetCoreUninstallOutputDirectory)**/Newtonsoft.Json.dll">
@@ -88,6 +89,11 @@
         <CertificateName>$(InternalCertificateId)</CertificateName>
       </LayoutFilesToSign>
 
+      <!-- Zip file in Packages directory -->
+      <LayoutFilesToSign Include="$(ArtifactsShippingPackagesDir)dotnet-core-uninstall.zip"
+                         Condition="'$(RID)' == 'win-x86'">
+        <CertificateName>$(ZipCertificateId)</CertificateName>
+      </LayoutFilesToSign>
 
       <LayoutFileSignInfo Include="@(LayoutFilesToSign->'%(Filename)%(Extension)')">
         <CertificateName>%(CertificateName)</CertificateName>