From 524321cc279cd29659cc32f0dc66b343f84ea98b Mon Sep 17 00:00:00 2001
From: Steve Pfister <steve.pfister@microsoft.com>
Date: Tue, 19 Oct 2021 12:42:46 -0400
Subject: [PATCH 1/4] Tweak workload build to use _GenerateMsiVersionString
 target

Replaces GenerateVersions that wasn't quite accurate enough for what we need
---
 src/workloads/workloads.csproj | 27 +--------------------------
 1 file changed, 1 insertion(+), 26 deletions(-)

diff --git a/src/workloads/workloads.csproj b/src/workloads/workloads.csproj
index c1f6b4bb419ff2..38414aa5b60de0 100644
--- a/src/workloads/workloads.csproj
+++ b/src/workloads/workloads.csproj
@@ -48,7 +48,7 @@
 
   <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" />
 
-  <Target Name="Build" DependsOnTargets="GenerateVersions">
+  <Target Name="Build" DependsOnTargets="_GenerateMsiVersionString">
     <ItemGroup>
       <!-- Overrides for Visual Studio setup generation. If the workload definition IDs change,
            these must be updated. -->
@@ -194,29 +194,4 @@
 
     <MSBuild Projects="@(VisualStudioManifestProjects)" BuildInParallel="true" Properties="SwixBuildTargets=$(SwixBuildTargets);ManifestOutputPath=$(VersionedVisualStudioSetupInsertionPath);OutputPath=$(VersionedVisualStudioSetupInsertionPath)" />
   </Target>
-
-  <Target Name="GenerateVersions" DependsOnTargets="GetAssemblyVersion">
-    <Exec Command="git rev-list --count HEAD"
-          ConsoleToMSBuild="true"
-          Condition=" '$(GitCommitCount)' == '' ">
-      <Output TaskParameter="ConsoleOutput" PropertyName="GitCommitCount" />
-    </Exec>
-
-    <Error Condition=" '$(OfficialBuild)' == 'true' And '$(_PatchNumber)' == '' "
-           Text="_PatchNumber should not be empty in an official build. Check if there were changes in Arcade." />
-
-    <PropertyGroup>
-      <GitCommitCount>$(GitCommitCount.PadLeft(6,'0'))</GitCommitCount>
-
-      <!-- This number comes from arcade and combines the date based build number id and the revision (incremental number per day) -->
-      <CombinedBuildNumberAndRevision>$(_PatchNumber)</CombinedBuildNumberAndRevision>
-      <!-- Fallback to commit count when patch number is not set. This happens only during CI. -->
-      <CombinedBuildNumberAndRevision Condition=" '$(CombinedBuildNumberAndRevision)' == '' ">$(GitCommitCount)</CombinedBuildNumberAndRevision>
-
-      <!-- This number comes from arcade and combines the date based build number id and the revision (incremental number per day) -->
-      <SDKBundleVersion>$(FileVersion)</SDKBundleVersion>
-      <!-- Fallback to commit count when patch number is not set. This happens only during CI. -->
-      <SDKBundleVersion Condition=" '$(SDKBundleVersion)' == '' ">$(VersionPrefix).$(CombinedBuildNumberAndRevision)</SDKBundleVersion>
-    </PropertyGroup>
-  </Target>
 </Project>

From 59cb47b0ebbb70a09b0b44514a8059dc3250e3b4 Mon Sep 17 00:00:00 2001
From: Steve Pfister <steve.pfister@microsoft.com>
Date: Tue, 19 Oct 2021 15:55:38 -0400
Subject: [PATCH 2/4] Pulled in arcade target that will be removed at a later
 date

---
 src/workloads/workloads.csproj | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/src/workloads/workloads.csproj b/src/workloads/workloads.csproj
index 38414aa5b60de0..fdfa39ca7be2f9 100644
--- a/src/workloads/workloads.csproj
+++ b/src/workloads/workloads.csproj
@@ -194,4 +194,30 @@
 
     <MSBuild Projects="@(VisualStudioManifestProjects)" BuildInParallel="true" Properties="SwixBuildTargets=$(SwixBuildTargets);ManifestOutputPath=$(VersionedVisualStudioSetupInsertionPath);OutputPath=$(VersionedVisualStudioSetupInsertionPath)" />
   </Target>
+
+  <Target Name="_GenerateMsiVersionString">
+    <PropertyGroup>
+      <VersionPadding Condition="'$(VersionPadding)'==''">5</VersionPadding>
+      <!-- Using the following default comparison date will produce versions that align with our internal build system. -->
+      <VersionComparisonDate Condition="'$(VersionComparisonDate)'==''">1996-04-01</VersionComparisonDate>
+    </PropertyGroup>
+
+    <GenerateCurrentVersion
+      SeedDate="$([System.DateTime]::Now.ToString(yyyy-MM-dd))"
+      OfficialBuildId="$(OfficialBuildId)"
+      ComparisonDate="$(VersionComparisonDate)"
+      Padding="$(VersionPadding)">
+      <Output PropertyName="BuildNumberMajor" TaskParameter="GeneratedVersion" />
+      <Output PropertyName="BuildNumberMinor" TaskParameter="GeneratedRevision" />
+    </GenerateCurrentVersion>
+
+    <GenerateMsiVersion
+      Major="$(MajorVersion)"
+      Minor="$(MinorVersion)"
+      Patch="$(PatchVersion)"
+      BuildNumberMajor="$(BuildNumberMajor)"
+      BuildNumberMinor="$(BuildNumberMinor)">
+      <Output TaskParameter="MsiVersion" PropertyName="MsiVersionString" />
+    </GenerateMsiVersion>
+  </Target>
 </Project>

From 09ce688f4e2a1533eeaa6a89a2a7bba12d552b3b Mon Sep 17 00:00:00 2001
From: Steve Pfister <steve.pfister@microsoft.com>
Date: Tue, 19 Oct 2021 16:37:05 -0400
Subject: [PATCH 3/4] More tweaks

---
 src/workloads/workloads.csproj | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/workloads/workloads.csproj b/src/workloads/workloads.csproj
index fdfa39ca7be2f9..ad1539a37e90e5 100644
--- a/src/workloads/workloads.csproj
+++ b/src/workloads/workloads.csproj
@@ -48,7 +48,7 @@
 
   <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" />
 
-  <Target Name="Build" DependsOnTargets="_GenerateMsiVersionString">
+  <Target Name="Build" DependsOnTargets="_GetVersionProps;_GenerateMsiVersionString">
     <ItemGroup>
       <!-- Overrides for Visual Studio setup generation. If the workload definition IDs change,
            these must be updated. -->
@@ -106,14 +106,6 @@
       <ManifestPackages Include="$(PackageSource)Microsoft.NET.Workload.Mono.ToolChain.Manifest-*.nupkg" />
     </ItemGroup>
 
-    <GenerateMsiVersion
-        Major="$([System.Version]::Parse('$(SDKBundleVersion)').Major)"
-        Minor="$([System.Version]::Parse('$(SDKBundleVersion)').Minor)"
-        Patch="$([System.Version]::Parse('$(SDKBundleVersion)').Build)"
-        BuildNumber="$([System.Version]::Parse('$(SDKBundleVersion)').Revision)" >
-      <Output TaskParameter="MsiVersion" PropertyName="MsiVersion" />
-    </GenerateMsiVersion>
-
     <GenerateManifestMsi
         IntermediateBaseOutputPath="$(IntermediateOutputPath)"
         OutputPath="$(OutputPath)"
@@ -195,6 +187,15 @@
     <MSBuild Projects="@(VisualStudioManifestProjects)" BuildInParallel="true" Properties="SwixBuildTargets=$(SwixBuildTargets);ManifestOutputPath=$(VersionedVisualStudioSetupInsertionPath);OutputPath=$(VersionedVisualStudioSetupInsertionPath)" />
   </Target>
 
+  <Target Name="_GetVersionProps">
+    <PropertyGroup>
+      <_MajorVersion>$([System.Version]::Parse('$(AssemblyVersion)').Major)</_MajorVersion>
+      <_MinorVersion>$([System.Version]::Parse('$(AssemblyVersion)').Minor)</_MinorVersion>
+      <_PatchVersion>$([System.Version]::Parse('$(AssemblyVersion)').Build)</_PatchVersion>
+      <_BuildNumber>$([System.Version]::Parse('$(AssemblyVersion)').Revision)</_BuildNumber>
+    </PropertyGroup>
+  </Target>
+
   <Target Name="_GenerateMsiVersionString">
     <PropertyGroup>
       <VersionPadding Condition="'$(VersionPadding)'==''">5</VersionPadding>
@@ -212,12 +213,12 @@
     </GenerateCurrentVersion>
 
     <GenerateMsiVersion
-      Major="$(MajorVersion)"
-      Minor="$(MinorVersion)"
-      Patch="$(PatchVersion)"
+      Major="$(_MajorVersion)"
+      Minor="$(_MinorVersion)"
+      Patch="$(_PatchVersion)"
       BuildNumberMajor="$(BuildNumberMajor)"
       BuildNumberMinor="$(BuildNumberMinor)">
-      <Output TaskParameter="MsiVersion" PropertyName="MsiVersionString" />
+      <Output TaskParameter="MsiVersion" PropertyName="MsiVersion" />
     </GenerateMsiVersion>
   </Target>
 </Project>

From fb7ce1b923d6616b909695b4016ffbe0af42acf6 Mon Sep 17 00:00:00 2001
From: Steve Pfister <steve.pfister@microsoft.com>
Date: Tue, 19 Oct 2021 18:07:50 -0400
Subject: [PATCH 4/4] Forget dependsontargets

---
 src/workloads/workloads.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/workloads/workloads.csproj b/src/workloads/workloads.csproj
index ad1539a37e90e5..f64d641604674d 100644
--- a/src/workloads/workloads.csproj
+++ b/src/workloads/workloads.csproj
@@ -48,7 +48,7 @@
 
   <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" />
 
-  <Target Name="Build" DependsOnTargets="_GetVersionProps;_GenerateMsiVersionString">
+  <Target Name="Build" DependsOnTargets="GetAssemblyVersion;_GetVersionProps;_GenerateMsiVersionString">
     <ItemGroup>
       <!-- Overrides for Visual Studio setup generation. If the workload definition IDs change,
            these must be updated. -->