From a98d01cd1a1b2f29923fa26f5daafd82651bfd85 Mon Sep 17 00:00:00 2001
From: Matt Mitchell <mmitche@microsoft.com>
Date: Thu, 27 Aug 2020 16:06:30 -0700
Subject: [PATCH 1/2] Add light/lit command packages This adds light command
 package generation to aspnetcore. After build of a wix project, generate a
 light package based off of the inputs that are sent to light.exe/lit.exe.

---
 eng/Version.Details.xml                       |  4 +++
 eng/Versions.props                            |  2 ++
 .../SharedFrameworkLib.wixproj                | 19 ++++++++++
 src/Installers/Windows/Wix.props              |  8 +++++
 src/Installers/Windows/Wix.targets            | 35 +++++++++++++++++++
 5 files changed, 68 insertions(+)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index db9cc55f62af..03c32c23f6e2 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -317,6 +317,10 @@
       <Uri>https://github.com/dotnet/arcade</Uri>
       <Sha>56a95cc477558c1ccdf16d7abe962849ea970ba4</Sha>
     </Dependency>
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="5.0.0-beta.20419.21">
+      <Uri>https://github.com/dotnet/arcade</Uri>
+      <Sha>56a95cc477558c1ccdf16d7abe962849ea970ba4</Sha>
+    </Dependency>
     <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20419.21">
       <Uri>https://github.com/dotnet/arcade</Uri>
       <Sha>56a95cc477558c1ccdf16d7abe962849ea970ba4</Sha>
diff --git a/eng/Versions.props b/eng/Versions.props
index 9c2fd0000ebc..97225f87efea 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -142,6 +142,8 @@
     <MicrosoftEntityFrameworkCoreToolsPackageVersion>5.0.0-rc.1.20425.4</MicrosoftEntityFrameworkCoreToolsPackageVersion>
     <MicrosoftEntityFrameworkCorePackageVersion>5.0.0-rc.1.20425.4</MicrosoftEntityFrameworkCorePackageVersion>
     <MicrosoftEntityFrameworkCoreDesignPackageVersion>5.0.0-rc.1.20425.4</MicrosoftEntityFrameworkCoreDesignPackageVersion>
+    <!-- Packages from dotnet/arcade -->
+    <MicrosoftDotNetBuildTasksInstallersPackageVersion>5.0.0-beta.20419.21</MicrosoftDotNetBuildTasksInstallersPackageVersion>
   </PropertyGroup>
   <!--
 
diff --git a/src/Installers/Windows/SharedFrameworkLib/SharedFrameworkLib.wixproj b/src/Installers/Windows/SharedFrameworkLib/SharedFrameworkLib.wixproj
index 3b693fdf1642..83abf6036bba 100644
--- a/src/Installers/Windows/SharedFrameworkLib/SharedFrameworkLib.wixproj
+++ b/src/Installers/Windows/SharedFrameworkLib/SharedFrameworkLib.wixproj
@@ -40,4 +40,23 @@
   <PropertyGroup>
     <PackageFileName>$(InternalInstallerBaseName)-$(PackageVersion)-win-$(Platform)$(TargetExt)</PackageFileName>
   </PropertyGroup>
+
+  <!-- Overwrite the wix package drop creation target to create a lit
+       package instead. -->
+  <Target Name="CreateWixPackageDrop" AfterTargets="Build">
+    <CreateLitCommandPackageDrop
+      LitCommandWorkingDir="$(WixCommandObjDir)"
+      WixExtensions="@(WixExtension)"
+      Bf="true"
+      Out="$(InstallersOutputPath)$(OutputName).wixlib"
+      WixSrcFiles="@(CompileObjOutput);@(WixObject);@(WixLibProjects);@(WixLibrary)">
+      <Output TaskParameter="LitCommandPackageNameOutput" PropertyName="_LitCommandPackageNameOutput" />
+    </CreateLitCommandPackageDrop>
+    <MakeDir Directories="$(WixCommandPackagesDir)" />
+
+    <ZipDirectory
+      DestinationFile="$(WixCommandPackagesDir)/LitCommandPackage-$(_LitCommandPackageNameOutput).zip"
+      SourceDirectory="$(WixCommandObjDir)/$(_LitCommandPackageNameOutput)"
+      Overwrite="true" />
+  </Target>
 </Project>
diff --git a/src/Installers/Windows/Wix.props b/src/Installers/Windows/Wix.props
index c9b7565fe873..b3ad64d7ada4 100644
--- a/src/Installers/Windows/Wix.props
+++ b/src/Installers/Windows/Wix.props
@@ -28,4 +28,12 @@
     <GenerateNupkgPowershellScript>$(RepoRoot)\src\Installers\Windows\GenerateNugetPackageWithMsi.ps1</GenerateNupkgPowershellScript>
   </PropertyGroup>
 
+  <!-- Properties for light/lit command package drop generation -->
+  <PropertyGroup>
+    <!-- Directory for the unzipped directory -->
+    <WixCommandObjDir>$(ArtifactsObjDir)/WixCommandPackages</WixCommandObjDir>
+    <!-- Directory for the zipped up light/lit command package -->
+    <WixCommandPackagesDir>$(ArtifactsNonShippingPackagesDir)</WixCommandPackagesDir>
+  </PropertyGroup>
+
 </Project>
diff --git a/src/Installers/Windows/Wix.targets b/src/Installers/Windows/Wix.targets
index 17b41491fafc..ec321d4c41a6 100644
--- a/src/Installers/Windows/Wix.targets
+++ b/src/Installers/Windows/Wix.targets
@@ -24,6 +24,18 @@
     <GuidInputs>$(Version);$(Platform);$(VersionSuffix);$(_BuildNumberLabels)</GuidInputs>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Microsoft.DotNet.Build.Tasks.Installers" Version="$(MicrosoftDotNetBuildTasksInstallersPackageVersion)" />
+  </ItemGroup>
+  
+  <PropertyGroup>
+    <MicrosoftDotNetBuildTasksInstallersTaskAssembly Condition="'$(MSBuildRuntimeType)' == 'Core'">$(NuGetPackageRoot)microsoft.dotnet.build.tasks.installers\$(MicrosoftDotNetBuildTasksInstallersPackageVersion)\tools\netcoreapp2.0\Microsoft.DotNet.Build.Tasks.Installers.dll</MicrosoftDotNetBuildTasksInstallersTaskAssembly>
+    <MicrosoftDotNetBuildTasksInstallersTaskAssembly Condition="'$(MSBuildRuntimeType)' != 'Core'">$(NuGetPackageRoot)microsoft.dotnet.build.tasks.installers\$(MicrosoftDotNetBuildTasksInstallersPackageVersion)\tools\net472\Microsoft.DotNet.Build.Tasks.Installers.dll</MicrosoftDotNetBuildTasksInstallersTaskAssembly>
+  </PropertyGroup>
+
+  <UsingTask TaskName="CreateLightCommandPackageDrop" AssemblyFile="$(MicrosoftDotNetBuildTasksInstallersTaskAssembly)" />
+  <UsingTask TaskName="CreateLitCommandPackageDrop" AssemblyFile="$(MicrosoftDotNetBuildTasksInstallersTaskAssembly)" />
+
   <Target Name="GenerateGUIDs" BeforeTargets="BeforeBuild" DependsOnTargets="_GeneratePackageGuids;_GenerateBundleGuids" Condition=" '$(DisableGuidGeneration)' != 'true' " />
 
   <Target Name="_GeneratePackageGuids" Condition="'$(OutputType)' == 'package'">
@@ -72,4 +84,27 @@
     <Copy SourceFiles="@(_cabs)" DestinationFolder="$(InstallersOutputPath)" />
   </Target>
 
+  <Target Name="CreateWixPackageDrop" AfterTargets="Build">
+    <CreateLightCommandPackageDrop
+      LightCommandWorkingDir="$(WixCommandObjDir)"
+      NoLogo="true"
+      Cultures="en-us"
+      Out="$(InstallersOutputPath)$(PackageFileName)"
+      AdditionalBasePaths="$(MSBuildProjectDirectory)"
+      WixExtensions="@(WixExtension)"
+      Loc="@(EmbeddedResource)"
+      Sice="$(SuppressIces)"
+      WixProjectFile="$(MSBuildProjectFile)"
+      Fv="true"
+      WixSrcFiles="@(CompileObjOutput);@(WixObject);@(WixLibProjects);@(_ResolvedWixLibraryPaths)">
+      <Output TaskParameter="LightCommandPackageNameOutput" PropertyName="_LightCommandPackageNameOutput" />
+    </CreateLightCommandPackageDrop>
+    <MakeDir Directories="$(WixCommandPackagesDir)" />
+
+    <ZipDirectory
+      DestinationFile="$(WixCommandPackagesDir)/LightCommandPackage-$(_LightCommandPackageNameOutput).zip"
+      SourceDirectory="$(WixCommandObjDir)/$(_LightCommandPackageNameOutput)"
+      Overwrite="true" />
+  </Target>
+
 </Project>

From 63bea08ffbfabff4161f0e52c4b456eb38a3c777 Mon Sep 17 00:00:00 2001
From: Matt Mitchell <mmitche@microsoft.com>
Date: Fri, 28 Aug 2020 15:39:30 -0700
Subject: [PATCH 2/2] Update Versions.props

---
 eng/Versions.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index 3580d934e70e..55227ddf306b 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -145,7 +145,7 @@
     <MicrosoftEntityFrameworkCoreDesignPackageVersion>5.0.0-rc.1.20428.3</MicrosoftEntityFrameworkCoreDesignPackageVersion>
     
      <!-- Packages from dotnet/arcade -->
-    <MicrosoftDotNetBuildTasksInstallersPackageVersion>5.0.0-beta.20419.21</MicrosoftDotNetBuildTasksInstallersPackageVersion>
+    <MicrosoftDotNetBuildTasksInstallersPackageVersion>5.0.0-beta.20427.5</MicrosoftDotNetBuildTasksInstallersPackageVersion>
   </PropertyGroup>
   <!--