Fixes for the Installer packages (#15247)

Author: jkoritzinsky

src/Microsoft.DotNet.Build.Tasks.Installers/build/acquisition/Directory.Build.targets

@@ -4,11 +4,4 @@
   <!-- Set up build infra for the acquire-* projects. -->
 
   <Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" />
-
-  <PropertyGroup>
-    <GenerateInstallers>true</GenerateInstallers>
-  </PropertyGroup>
-
-  <Import Project="$(MSBuildThisFileDirectory)..\installer.singlerid.targets" Condition="'$(_InstallerTargetsImported)' != 'true'" />
-
 </Project>

src/Microsoft.DotNet.Build.Tasks.Installers/build/acquisition/acquire-nuget-exe/acquire-nuget-exe.proj

@@ -3,17 +3,26 @@
 
   <UsingTask TaskName="DownloadFile" AssemblyFile="$(ArcadeSdkBuildTasksAssembly)" />
 
+  <PropertyGroup>
+    <!-- Using 3.5.0 to workaround https://github.com/NuGet/Home/issues/5016 -->
+    <NuGetExeDownloadUrl>https://dist.nuget.org/win-x86-commandline/v3.5.0/nuget.exe</NuGetExeDownloadUrl>
+    <NuGetExeToolDir>$(BaseIntermediateOutputPath)nuget\</NuGetExeToolDir>
+    <NuGetExeFile>$(NuGetExeToolDir)NuGet.exe</NuGetExeFile>
+  </PropertyGroup>
   <!--
     Acquire NuGet.exe, if not present.
   -->
-  <Target Name="AcquireNuGetExeCore"
-          Condition="!Exists('$(NuGetExeFile)')"
-          DependsOnTargets="_GetAcquireNuGetExeProperties">
+  <Target Name="DownloadNugetExe"
+          Condition="!Exists('$(NuGetExeFile)')">
     <MakeDir Directories="$(NuGetExeToolDir)" />
     <DownloadFile
       Uri="$(NuGetExeDownloadUrl)"
       DestinationPath="$(NuGetExeFile)"
       Overwrite="true" />
   </Target>
 
+  <Target Name="AcquireNuGetExeCore"
+          DependsOnTargets="DownloadNugetExe"
+          Returns="$(NuGetExeFile)" />
+
 </Project>

src/Microsoft.DotNet.Build.Tasks.Installers/build/acquisition/acquire-wix/acquire-wix.proj

@@ -8,10 +8,23 @@
 
     Adapted from https://github.com/dotnet/core-sdk/blob/6aed0cd3614f9b740cfb3f21fdb795bab53ef7e9/src/redist/targets/GenerateMSIs.targets#L80-L102
   -->
+  <PropertyGroup>
+    <_WixIntermediateOutputPath>$(BaseIntermediateOutputPath)wix</_WixIntermediateOutputPath>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <WixVersion>3.14.1-9323.2545153</WixVersion>
+    <WixToolsDir>$(BaseIntermediateOutputPath)WixTools.$(WixVersion)/</WixToolsDir>
+
+    <WixDownloadFilename>Microsoft.Signed.Wix-$(WixVersion).zip</WixDownloadFilename>
+    <WixDownloadUrl>https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/wix/$(WixDownloadFilename)</WixDownloadUrl>
+    <WixDestinationPath>$(WixToolsDir)$(WixDownloadFilename)</WixDestinationPath>
+    <WixDownloadSentinel>$(WixToolsDir)$(WixDownloadFilename).sentinel</WixDownloadSentinel>
+  </PropertyGroup>
   <Target Name="AcquireWixCore"
-          DependsOnTargets="GetAcquireWixProperties"
           Inputs="$(WixDownloadSentinel)"
-          Outputs="$(WixDestinationPath)">
+          Outputs="$(WixDestinationPath)"
+          Returns="$(WixToolsDir)">
     <!-- Setup sentinel to take advantage of incrementality -->
     <MakeDir Directories="$(WixToolsDir)" />
     <WriteLinesToFile

src/Microsoft.DotNet.Build.Tasks.Installers/build/bundle.targets

@@ -80,14 +80,14 @@
     <ItemGroup Condition="'$(GenerateExeBundle)' == 'true'">
       <BundleComponentReference>
         <Targets>CreateWixInstaller</Targets>
-        <AdditionalProperties>GenerateMSI=true</AdditionalProperties>
+        <AdditionalProperties>_IsIndividualInstallerBuild=true;GenerateMSI=true</AdditionalProperties>
         <RemoveProperties>GenerateExeBundle</RemoveProperties>
       </BundleComponentReference>
     </ItemGroup>
     <ItemGroup Condition="'$(GeneratePkgBundle)' == 'true'">
       <BundleComponentReference>
         <Targets>CreatePkg</Targets>
-        <AdditionalProperties>GeneratePkg=true</AdditionalProperties>
+        <AdditionalProperties>_IsIndividualInstallerBuild=true;GeneratePkg=true</AdditionalProperties>
         <RemoveProperties>GeneratePkgBundle</RemoveProperties>
       </BundleComponentReference>
     </ItemGroup>

src/Microsoft.DotNet.Build.Tasks.Installers/build/installer.build.targets

@@ -55,8 +55,8 @@
     <InstallerBuildPart>$(Version)-$(TargetRuntimeOS)-$(InstallerTargetArchitecture)</InstallerBuildPart>
   </PropertyGroup>
   <PropertyGroup Condition="'$(GenerateDeb)' == 'true' or '$(GenerateRpm)' == 'true'">
-    <_InstallerArchSuffix>$(TargetArchitecture)</_InstallerArchSuffix>
-    <_InstallerArchSuffix Condition="'$(BuildRpmPackage)' == 'true' and '$(TargetArchitecture)' == 'arm64'">aarch64</_InstallerArchSuffix>
+    <_InstallerArchSuffix>$(InstallerTargetArchitecture)</_InstallerArchSuffix>
+    <_InstallerArchSuffix Condition="'$(BuildRpmPackage)' == 'true' and '$(InstallerTargetArchitecture)' == 'arm64'">aarch64</_InstallerArchSuffix>
     <InstallerBuildPart>$(Version)-$(_InstallerArchSuffix)</InstallerBuildPart>
     <InstallerBuildPart Condition="'$(PackageTargetOS)' != ''">$(Version)-$(PackageTargetOS)-$(_InstallerArchSuffix)</InstallerBuildPart>
   </PropertyGroup>
@@ -257,15 +257,21 @@
           DestinationFiles="$(_LayoutControlRoot)postinst"
           OverwriteReadOnlyFiles="True"
           SkipUnchangedFiles="True"
-          UseHardlinksIfPossible="True" />
+          UseHardlinksIfPossible="True"
+          Condition="'@(LinuxPostInstallScript)' != ''" />
+
+    <Exec Command="chmod ugo+x '$(_LayoutControlRoot)postinst'"
+          Condition="'@(LinuxPostInstallScript)' != ''" />
 
     <Copy SourceFiles="@(LinuxPostRemoveScript)"
           DestinationFiles="$(_LayoutControlRoot)postrm"
           OverwriteReadOnlyFiles="True"
           SkipUnchangedFiles="True"
-          UseHardlinksIfPossible="True" />
+          UseHardlinksIfPossible="True"
+          Condition="'@(LinuxPostRemoveScript)' != ''"/>
 
-    <Exec Command="chmod ugo+x '$(_LayoutControlRoot)postinst' '$(_LayoutControlRoot)postrm'" />
+    <Exec Command="chmod ugo+x '$(_LayoutControlRoot)postrm'"
+          Condition="'@(LinuxPostRemoveScript)' != ''" />
 
     <Exec Command="tar -C '$(_LayoutControlRoot)' -czf '$(_LayoutDirectory)/control.tar.gz' ."
           IgnoreExitCode="true"

src/Microsoft.DotNet.Build.Tasks.Installers/build/installer.targetos.targets

@@ -2,6 +2,7 @@
   <PropertyGroup>
     <TargetRuntimeOS>$(InstallerRuntimeIdentifier.Substring(0, $(InstallerRuntimeIdentifier.LastIndexOf('-'))))</TargetRuntimeOS>
     <TargetArchitecture Condition="'$(TargetArchitecture)' == ''">$(InstallerRuntimeIdentifier.Substring($(InstallerRuntimeIdentifier.LastIndexOf('-'))).TrimStart('-'))</TargetArchitecture>
+    <InstallerTargetArchitecture Condition="'$(InstallerTargetArchitecture)' == ''">$(TargetArchitecture)</InstallerTargetArchitecture>
   </PropertyGroup>
 
   <Target Name="_GetTargetOSArchInfo">

src/Microsoft.DotNet.Build.Tasks.Installers/build/wix/wix.targets

@@ -11,37 +11,26 @@
   <!--
     Acquire WiX tools, if not present.
   -->
-  <Target Name="AcquireWix"
-          DependsOnTargets="GetAcquireWixProperties">
+  <Target Name="_AcquireWix">
     <MSBuild
-      Projects="$(AcquireWixProjectFile)"
+      Projects="$(MSBuildThisFileDirectory)..\acquisition\acquire-wix\acquire-wix.proj"
       Targets="AcquireWixCore"
       Properties="BaseIntermediateOutputPath=$(BaseIntermediateOutputPath);
-                  RepoRoot=$(RepoRoot)" />
-  </Target>
-
-  <Target Name="GetAcquireWixProperties"> 
+                  RepoRoot=$(RepoRoot)">
+      <Output TaskParameter="TargetOutputs" PropertyName="WixToolsDir" />
+    </MSBuild>
 
     <PropertyGroup>
       <_WixIntermediateOutputPath>$(BaseIntermediateOutputPath)wix</_WixIntermediateOutputPath>
     </PropertyGroup>
 
     <PropertyGroup>
-      <WixVersion>3.14.1-9323.2545153</WixVersion>
-      <WixToolsDir>$(BaseIntermediateOutputPath)WixTools.$(WixVersion)/</WixToolsDir>
-      <!-- Used in WiX targets to locate files. -->
       <WixInstallPath>$(WixToolsDir)</WixInstallPath>
       <WixTargetsPath>$(WixToolsDir)wix.targets</WixTargetsPath>
       <WixObjDir>$(IntermediateOutputPath)/wix/</WixObjDir>
       <WixObjDir Condition="'$(RuntimeIdentifier)' == ''">$(IntermediateOutputPath)/$(InstallerRuntimeIdentifier)/wix/</WixObjDir>
       <LightCommandObjDir>$(IntermediateOutputPath)/lightcommand/</LightCommandObjDir>
       <MsiArch>$(InstallerTargetArchitecture)</MsiArch>
-
-      <AcquireWixProjectFile>$(MSBuildThisFileDirectory)..\acquisition\acquire-wix\acquire-wix.proj</AcquireWixProjectFile>
-      <WixDownloadFilename>Microsoft.Signed.Wix-$(WixVersion).zip</WixDownloadFilename>
-      <WixDownloadUrl>https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/wix/$(WixDownloadFilename)</WixDownloadUrl>
-      <WixDestinationPath>$(WixToolsDir)$(WixDownloadFilename)</WixDestinationPath>
-      <WixDownloadSentinel>$(WixToolsDir)$(WixDownloadFilename).sentinel</WixDownloadSentinel>
     </PropertyGroup>
   </Target>
 
@@ -206,7 +195,7 @@
   <!-- Set up information to pass to WiX, depending on the type of installer being created. -->
   <Target Name="GetWixBuildConfiguration"
           DependsOnTargets="
-            AcquireWix;
+            _AcquireWix;
             _GetInstallerProperties;
             _GenerateMsiVersionString;
             GetInstallerWixConfiguration;
@@ -447,29 +436,20 @@
   <!--
     Acquire NuGet.exe, if not present.
   -->
-  <Target Name="_AcquireNuGetExe"
-          DependsOnTargets="_GetAcquireNuGetExeProperties">
+  <Target Name="_AcquireNuGetExe">
     <MSBuild
-      Projects="$(AcquireNuGetExeProjectFile)"
+      Projects="$(MSBuildThisFileDirectory)..\acquisition\acquire-nuget-exe\acquire-nuget-exe.proj"
       Targets="AcquireNuGetExeCore"
       Properties="BaseIntermediateOutputPath=$(BaseIntermediateOutputPath);
-                  RepoRoot=$(RepoRoot)" />
-  </Target>
-
-  <Target Name="_GetAcquireNuGetExeProperties">
-    <PropertyGroup>
-      <AcquireNuGetExeProjectFile>$(MSBuildThisFileDirectory)..\acquisition\acquire-nuget-exe\acquire-nuget-exe.proj</AcquireNuGetExeProjectFile>
-      <!-- Using 3.5.0 to workaround https://github.com/NuGet/Home/issues/5016 -->
-      <NuGetExeDownloadUrl>https://dist.nuget.org/win-x86-commandline/v3.5.0/nuget.exe</NuGetExeDownloadUrl>
-      <NuGetExeToolDir>$(BaseIntermediateOutputPath)nuget\</NuGetExeToolDir>
-      <NuGetExeFile>$(NuGetExeToolDir)NuGet.exe</NuGetExeFile>
-    </PropertyGroup>
+                  RepoRoot=$(RepoRoot)">
+      <Output TaskParameter="TargetOutputs" PropertyName="NuGetExeFile" />
+    </MSBuild>
   </Target>
 
   <Target Name="GenerateVSInsertionNupkgCore"
           DependsOnTargets="
             _GetTargetOSArchInfo;
-            GetAcquireWixProperties;
+            _AcquireWix;
             _AcquireNuGetExe;
             _GetInstallerProperties;
             GetWixBuildConfiguration">