From 58a4b1e79aea28115e66b06f850c83a3f1fcb6d3 Mon Sep 17 00:00:00 2001
From: Gen Lu <genlu@users.noreply.github.com>
Date: Fri, 31 May 2019 13:46:32 -0700
Subject: [PATCH 1/2] Fix assembly version to 3.1.0.0 for 16.1 servicing
 (#36089)

---
 eng/Versions.props | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index a5a8d33d1c016..8018647f5d786 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -16,7 +16,7 @@
       When building servicing set AssemblyVersion property to a fixed value to avoid updating binding redirects in VS.
       Keep the setting conditional. The toolset sets the assembly version to 42.42.42.42 if not set explicitly.
     -->
-    <AssemblyVersion Condition="'$(OfficialBuild)' == 'true' or '$(DotNetUseShippingVersions)' == 'true'">$(VersionPrefix).0</AssemblyVersion>
+    <AssemblyVersion Condition="'$(OfficialBuild)' == 'true' or '$(DotNetUseShippingVersions)' == 'true'">3.1.0.0</AssemblyVersion>
   </PropertyGroup>
   <!-- 
     Dependency versions
@@ -323,4 +323,4 @@
       https://dotnetfeed.blob.core.windows.net/dotnet-coreclr/index.json;
     </RestoreSources>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>

From b4e9b8f277d43b534780ace2d978766d8ba3d04f Mon Sep 17 00:00:00 2001
From: Joey Robichaud <joseph.robichaud@microsoft.com>
Date: Mon, 10 Jun 2019 21:46:11 -0700
Subject: [PATCH 2/2] Revert hardcoding the AssemblyVersion

---
 eng/Versions.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index 8018647f5d786..26dc0bc69beae 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -16,7 +16,7 @@
       When building servicing set AssemblyVersion property to a fixed value to avoid updating binding redirects in VS.
       Keep the setting conditional. The toolset sets the assembly version to 42.42.42.42 if not set explicitly.
     -->
-    <AssemblyVersion Condition="'$(OfficialBuild)' == 'true' or '$(DotNetUseShippingVersions)' == 'true'">3.1.0.0</AssemblyVersion>
+    <AssemblyVersion Condition="'$(OfficialBuild)' == 'true' or '$(DotNetUseShippingVersions)' == 'true'">$(VersionPrefix).0</AssemblyVersion>
   </PropertyGroup>
   <!-- 
     Dependency versions