From 3cee2c1d65dff7ef96df87d0780844bc77698c93 Mon Sep 17 00:00:00 2001
From: Anirudh Agnihotry <anagniho@microsoft.com>
Date: Thu, 23 Sep 2021 12:25:18 -0700
Subject: [PATCH 1/3] throw errow if assembly version in the ref pack doesnot
 match last released version

---
 eng/Versions.props    | 1 +
 eng/packaging.targets | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/eng/Versions.props b/eng/Versions.props
index 6605627d73809c..910a613c661dc8 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -20,6 +20,7 @@
     <UsingToolMicrosoftNetILLinkTasks>true</UsingToolMicrosoftNetILLinkTasks>
     <UsingToolIbcOptimization>false</UsingToolIbcOptimization>
     <UsingToolXliff>false</UsingToolXliff>
+    <LastReleasedStableAssemblyVersion>6.0.0.0</LastReleasedStableAssemblyVersion>
   </PropertyGroup>
   <!--
     Servicing build settings for Setup/Installer packages. Instructions:
diff --git a/eng/packaging.targets b/eng/packaging.targets
index dc3c0ebae24f1a..aef147a96a7b2b 100644
--- a/eng/packaging.targets
+++ b/eng/packaging.targets
@@ -256,4 +256,10 @@
     </ItemGroup>
   </Target>
 
+  <Target Name="ValidateAssemblyVersionsInRefPack" 
+          Condition="$(_AssemblyInTargetingPack) == 'true' and '$(PreReleaseVersionLabel)' != 'servicing'" 
+          AfterTargets="CoreCompile" >
+    <Error Condition="'$(AssemblyVersion)' != '$(LastReleasedStableAssemblyVersion)'" Text="AssemblyVersion should match last released assembly version $(LastReleasedStableAssemblyVersion)" />
+  </Target>
+
 </Project>

From 26c670fa69caee1b29b0d98dad873d83a83d61e3 Mon Sep 17 00:00:00 2001
From: Anirudh Agnihotry <anirudhagnihotry098@gmail.com>
Date: Thu, 23 Sep 2021 12:45:03 -0700
Subject: [PATCH 2/3] Fix the condition

---
 eng/packaging.targets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/packaging.targets b/eng/packaging.targets
index aef147a96a7b2b..ecf74672ac856e 100644
--- a/eng/packaging.targets
+++ b/eng/packaging.targets
@@ -257,7 +257,7 @@
   </Target>
 
   <Target Name="ValidateAssemblyVersionsInRefPack" 
-          Condition="$(_AssemblyInTargetingPack) == 'true' and '$(PreReleaseVersionLabel)' != 'servicing'" 
+          Condition="$(_AssemblyInTargetingPack) == 'true' and '$(PreReleaseVersionLabel)' == 'servicing'" 
           AfterTargets="CoreCompile" >
     <Error Condition="'$(AssemblyVersion)' != '$(LastReleasedStableAssemblyVersion)'" Text="AssemblyVersion should match last released assembly version $(LastReleasedStableAssemblyVersion)" />
   </Target>

From 2cfa2a0478866b923d2b79ffdda5082d50e76a73 Mon Sep 17 00:00:00 2001
From: Anirudh Agnihotry <anirudhagnihotry098@gmail.com>
Date: Thu, 23 Sep 2021 12:58:01 -0700
Subject: [PATCH 3/3] Update eng/Versions.props

Co-authored-by: Viktor Hofer <viktor.hofer@microsoft.com>
---
 eng/Versions.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index 910a613c661dc8..20e02f16fdf2e4 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -20,7 +20,7 @@
     <UsingToolMicrosoftNetILLinkTasks>true</UsingToolMicrosoftNetILLinkTasks>
     <UsingToolIbcOptimization>false</UsingToolIbcOptimization>
     <UsingToolXliff>false</UsingToolXliff>
-    <LastReleasedStableAssemblyVersion>6.0.0.0</LastReleasedStableAssemblyVersion>
+    <LastReleasedStableAssemblyVersion>$(AssemblyVersion)</LastReleasedStableAssemblyVersion>
   </PropertyGroup>
   <!--
     Servicing build settings for Setup/Installer packages. Instructions: