Simplify redist-installer and build installers in the VMR (#47104)

Author: ViktorHofer

build.cmd

@@ -2,11 +2,11 @@
 
 echo %* | findstr /C:"-pack" >nul
 if %errorlevel%==0 (
-    set PackInstaller=
+    set SkipBuildingInstallers=
 ) else (
     REM disable crossgen for inner-loop builds to save a ton of time
-    set PackInstaller=/p:PackInstaller=false
+    set SkipBuildingInstallers=/p:SkipBuildingInstallers=true
     set DISABLE_CROSSGEN=true
 )
-powershell -NoLogo -NoProfile -ExecutionPolicy ByPass -command "& """%~dp0eng\common\build.ps1""" -restore -build -nativeToolsOnMachine -msbuildEngine dotnet %PackInstaller% %*"
+powershell -NoLogo -NoProfile -ExecutionPolicy ByPass -command "& """%~dp0eng\common\build.ps1""" -restore -build -nativeToolsOnMachine -msbuildEngine dotnet %SkipBuildingInstallers% %*"
 exit /b %ErrorLevel%

build.sh

@@ -11,9 +11,9 @@ ScriptRoot="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
 if [[ "$@" != *"-pack"* ]]; then
   # disable crossgen for inner-loop builds to save a ton of time
   export DISABLE_CROSSGEN=true
-  packInstallerFlag="/p:PackInstaller=false"
+  skipBuildingInstallersFlag="/p:SkipBuildingInstallers=true"
 else
-  packInstallerFlag=
+  skipBuildingInstallersFlag=
 fi
 
-. "$ScriptRoot/eng/common/build.sh" --build --restore $packInstallerFlag "$@"
+. "$ScriptRoot/eng/common/build.sh" --build --restore $skipBuildingInstallersFlag "$@"

eng/DotNetBuild.props

@@ -13,7 +13,6 @@
     <PropertyGroup>
       <InnerBuildArgs>$(InnerBuildArgs) /p:Projects="$(InnerSourceBuildRepoRoot)\source-build.slnf"</InnerBuildArgs>
       <InnerBuildArgs>$(InnerBuildArgs) /p:UseSharedCompilation=false</InnerBuildArgs>
-      <InnerBuildArgs>$(InnerBuildArgs) /p:SkipBuildingInstallers=true</InnerBuildArgs>
       <InnerBuildArgs>$(InnerBuildArgs) /p:IncludeAdditionalSharedFrameworks=false</InnerBuildArgs>
       <InnerBuildArgs Condition="'$(DotNetBuildUseMonoRuntime)' == 'true'">$(InnerBuildArgs) /p:DISABLE_CROSSGEN=true</InnerBuildArgs>
     </PropertyGroup>

eng/Signing.props

@@ -101,13 +101,11 @@
     <SdkArtifact Include="$(ArtifactsShippingPackagesDir)sdk-productVersion.txt" IsShipping="true" Condition="'$(PublishBinariesAndBadge)' == 'true' and '$(OS)' == 'Windows_NT' and '$(Architecture)' == 'x64' and '$(PgoInstrument)' != 'true'" />
     <SdkArtifact Include="$(ArtifactsShippingPackagesDir)productCommit-*.json" IsShipping="true" Condition="'$(PublishBinariesAndBadge)' == 'true'" />
     <SdkArtifact Include="$(ArtifactsShippingPackagesDir)productCommit-*.txt" IsShipping="true" Condition="'$(PublishBinariesAndBadge)' == 'true'" />
+
     <SdkArtifact Include="$(ArtifactsNonShippingPackagesDir)*.swr" IsShipping="false" />
     <SdkArtifact Include="$(ArtifactsNonShippingPackagesDir)*.msi" IsShipping="false" />
     <SdkArtifact Include="$(ArtifactsNonShippingPackagesDir)*.tar.gz" IsShipping="false" Condition="'$(PublishBinariesAndBadge)' == 'true'" />
-
-    <!-- dotnet-toolset zips are added above for specific builds only. -->
-    <SdkArtifact Include="$(ArtifactsNonShippingPackagesDir)dotnet-toolset*.zip" IsShipping="false" Condition="'$(PublishBinariesAndBadge)' == 'true' and '$(OS)' == 'Windows_NT' and '$(Architecture)' == 'x64' and '$(PgoInstrument)' != 'true'" />
-    <SdkArtifact Include="$(ArtifactsNonShippingPackagesDir)*.zip" IsShipping="false" Condition="'$(PublishBinariesAndBadge)' == 'true'" Exclude="$(ArtifactsNonShippingPackagesDir)dotnet-toolset*.zip" />
+    <SdkArtifact Include="$(ArtifactsNonShippingPackagesDir)*.zip" IsShipping="false" Condition="'$(PublishBinariesAndBadge)' == 'true'" />
     <SdkArtifact Include="$(ArtifactsNonShippingPackagesDir)*.pkg" IsShipping="false" />
 
     <Artifact Include="@(SdkArtifact)"

src/Installer/redist-installer/Directory.Build.props

@@ -28,14 +28,15 @@
   </PropertyGroup>
 
   <PropertyGroup>
+    <SkipBuildingInstallers Condition="'$(OS)' == 'Windows_NT' and '$(Architecture)' == 'arm'">true</SkipBuildingInstallers>
+    <SkipBuildingInstallers Condition="'$(DotNetBuildSourceOnly)' == 'true'">true</SkipBuildingInstallers>
     <SkipBuildingInstallers Condition="'$(PgoInstrument)' == 'true'">true</SkipBuildingInstallers>
-    <SkipBuildingInstallers Condition="'$(SkipBuildingInstallers)' == '' AND
+    <SkipBuildingInstallers Condition="
       (
        $(Rid.StartsWith('freebsd')) OR
        $(Rid.StartsWith('illumos')) OR
        $(Rid.StartsWith('linux-musl'))
       )">true</SkipBuildingInstallers>
-    <SkipBuildingInstallers Condition="'$(SkipBuildingInstallers)' == ''">false</SkipBuildingInstallers>
 
     <!-- Use the portable "linux-x64" Rid when downloading Linux shared framework compressed file. -->
     <UsePortableLinuxSharedFramework Condition="'$(UsePortableLinuxSharedFramework)' == '' AND '$(IsLinux)' == 'true' AND !$(Rid.StartsWith('linux-musl'))">true</UsePortableLinuxSharedFramework>

src/Installer/redist-installer/Directory.Build.targets

@@ -14,22 +14,22 @@
     <PgoTerm Condition="'$(PgoInstrument)' == 'true'">-pgo</PgoTerm>
     <ArtifactNameWithVersionSdk>dotnet-sdk-internal$(PgoTerm)-$(Version)-$(ProductMonikerRid)</ArtifactNameWithVersionSdk>
     <ArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk>dotnet-sdk$(PgoTerm)-$(Version)-$(ProductMonikerRid)</ArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk>
-    <!-- Warning: changing the value "ProductBandCombinedHostHostFxrFrameworkSdkName" can only occur on a product-band boundary [CliProductBandVersion],
-              Changing "ProductBandCombinedHostHostFxrFrameworkSdkName" mid-product-band will break the upgradability of the SDK bundle installer. -->
-    <ProductBandCombinedHostHostFxrFrameworkSdkName>Dotnet SDK Bundle Installer $(CliProductBandVersion) $(ProductMonikerRid)</ProductBandCombinedHostHostFxrFrameworkSdkName>
   </PropertyGroup>
 
   <Import Project="$(RepoRoot)src\Tasks\sdk-tasks\sdk-tasks.InTree.targets" />
+
+  <!-- Layout -->
   <Import Project="targets\BundledTemplates.targets" />
   <Import Project="targets\BundledManifests.targets" />
   <Import Project="targets\BundledDotnetTools.targets" />
   <Import Project="targets\GenerateBundledVersions.targets" />
   <Import Project="targets\Crossgen.targets" />
   <Import Project="targets\GenerateLayout.targets" />
-  <Import Project="targets\GenerateArchives.targets" Condition="'$(PackInstaller)' != 'false'"/>
-  <Import Project="targets\GenerateMSIs.targets" />
-  <Import Project="targets\GeneratePKG.targets" Condition="'$(PackInstaller)' != 'false'"/>
-  <Import Project="targets\GenerateInstallers.targets" Condition="'$(PackInstaller)' != 'false'"/>
   <Import Project="targets\Badge.targets" />
+  <Import Project="targets\GenerateArchives.targets" />
+
+  <!-- Installers -->
+  <Import Project="targets\GenerateMSIs.targets" Condition="'$(OS)' == 'Windows_NT' and '$(SkipBuildingInstallers)' != 'true'" />
+  <Import Project="targets\GeneratePKG.targets" Condition="'$(OSName)' == 'osx' and '$(SkipBuildingInstallers)' != 'true'" />
 
 </Project>

src/Installer/redist-installer/targets/BundledTemplates.targets

@@ -21,13 +21,19 @@
     <PackageDownload Include="@(BundledTemplates)" Version="[%(PackageVersion)]" />
   </ItemGroup>
 
-  <Target Name="CalculateTemplatesVersions" DependsOnTargets="SetupWixProperties">
+  <Target Name="CalculateTemplatesVersions" DependsOnTargets="GetAssemblyVersion">
+    <PropertyGroup>
+      <!-- This number comes from arcade and combines the date based build number id and the revision (incremental number per day)
+           Fallback to 0 when patch number is not set. This happens only during CI. -->
+      <_ArcadePatchNumber>$([MSBuild]::ValueOrDefault('$(_PatchNumber)', '000000'))</_ArcadePatchNumber>
+    </PropertyGroup>
+
     <CalculateTemplateVersions
       BundledTemplates="@(BundledTemplates)"
       FullNugetVersion="$(FullNugetVersion)"
       ProductMonikerRid="$(ProductMonikerRid)"
       InstallerExtension="$(InstallerExtension)"
-      CombinedBuildNumberAndRevision="$(CombinedBuildNumberAndRevision)">
+      CombinedBuildNumberAndRevision="$(_ArcadePatchNumber)">
       <Output TaskParameter="BundledTemplatesWithInstallPaths" ItemName="BundledTemplatesWithInstallPaths" />
       <Output TaskParameter="TemplatesComponents" ItemName="TemplatesComponents" />
     </CalculateTemplateVersions>