From 1eec3fb087aa7effc96675eab8755776bd54c9b4 Mon Sep 17 00:00:00 2001
From: michael-hawker <24302614+michael-hawker@users.noreply.github.com>
Date: Mon, 21 Aug 2023 10:17:29 -0700
Subject: [PATCH 1/2] Add a DateForVersion property to separate out major/minor
 from the date

We will use this to ensure we provide a consistent date from the CI vs. relying on when the build/pack steps are kicked off
---
 ToolkitComponent.SourceProject.props | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ToolkitComponent.SourceProject.props b/ToolkitComponent.SourceProject.props
index 3c9ea580..5fac813f 100644
--- a/ToolkitComponent.SourceProject.props
+++ b/ToolkitComponent.SourceProject.props
@@ -7,7 +7,8 @@
   <Import Project="$(ToolingDirectory)\MultiTarget\Library.props" />
 
   <PropertyGroup>
-    <Version Condition="'$(Version)' == ''">$(MajorVersion).$(MinorVersion).$([System.DateTime]::UtcNow.ToString(yyMMdd))</Version>
+    <DateForVersion Condition="'$(DateForVersion)' == ''">$([System.DateTime]::UtcNow.ToString(yyMMdd))</DateForVersion>
+    <Version Condition="'$(Version)' == ''">$(MajorVersion).$(MinorVersion).$(DateForVersion)</Version>
     <Version Condition="'$(PreviewVersion)' != ''">$(Version)-$(PreviewVersion)</Version>
     <PackageId Condition="'$(PackageId)' == ''">$(PackageIdPrefix).$(PackageIdVariant).$(ToolkitComponentName)</PackageId>
   </PropertyGroup>

From 50a20f186b4451a5400ee6821c8687dcae21de71 Mon Sep 17 00:00:00 2001
From: michael-hawker <24302614+michael-hawker@users.noreply.github.com>
Date: Mon, 21 Aug 2023 14:30:57 -0700
Subject: [PATCH 2/2] Pass in date and postfix version tag explicitly to
 PackEachExperiment

---
 Scripts/PackEachExperiment.ps1 | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/Scripts/PackEachExperiment.ps1 b/Scripts/PackEachExperiment.ps1
index b71448de..f9e502b3 100644
--- a/Scripts/PackEachExperiment.ps1
+++ b/Scripts/PackEachExperiment.ps1
@@ -1,8 +1,11 @@
 Param (
-    [Parameter(HelpMessage = "Extra properties to pass to the msbuild pack command")]
-    [string]$extraBuildProperties
+    [Parameter(HelpMessage = "Date of Build/Package")]
+    [string]$date,
+
+    [Parameter(HelpMessage = "Any postfix after build number")]
+    [string]$postfix
 )
 
 foreach ($experimentProjPath in Get-ChildItem -Recurse -Path '../../components/*/src/*.csproj') {
-  & msbuild.exe -t:pack /p:Configuration=Release /p:DebugType=Portable $experimentProjPath $extraBuildProperties
+  & msbuild.exe -t:pack /p:Configuration=Release /p:DebugType=Portable /p:DateForVersion=$date /p:PreviewVersion=$postfix $experimentProjPath
 }