From 4a98f5a3841be63ab7a74043880d0f67f615d028 Mon Sep 17 00:00:00 2001
From: Santiago Fernandez Madero <safern@microsoft.com>
Date: Wed, 15 Dec 2021 09:01:58 -0800
Subject: [PATCH 1/2] Fix Microsoft.VisualBasic.Core file version

---
 src/libraries/Microsoft.VisualBasic.Core/Directory.Build.props | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/libraries/Microsoft.VisualBasic.Core/Directory.Build.props b/src/libraries/Microsoft.VisualBasic.Core/Directory.Build.props
index fac4b55f49cd7d..d2b2f565339516 100644
--- a/src/libraries/Microsoft.VisualBasic.Core/Directory.Build.props
+++ b/src/libraries/Microsoft.VisualBasic.Core/Directory.Build.props
@@ -2,6 +2,7 @@
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
     <AssemblyVersion>$([MSBuild]::Add($(MajorVersion), 5)).$(MinorVersion).0.0</AssemblyVersion>
+    <MajorVersion>$([MSBuild]::Add($(MajorVersion), 6))</MajorVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IncludePlatformAttributes>true</IncludePlatformAttributes>
   </PropertyGroup>

From 3ee035907474652dbc5eef93829cafa0c84b53f3 Mon Sep 17 00:00:00 2001
From: Santiago Fernandez Madero <safern@microsoft.com>
Date: Wed, 15 Dec 2021 15:24:26 -0800
Subject: [PATCH 2/2] PR Feedback

---
 .../Microsoft.VisualBasic.Core/Directory.Build.props        | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/libraries/Microsoft.VisualBasic.Core/Directory.Build.props b/src/libraries/Microsoft.VisualBasic.Core/Directory.Build.props
index d2b2f565339516..e1dd239477f25a 100644
--- a/src/libraries/Microsoft.VisualBasic.Core/Directory.Build.props
+++ b/src/libraries/Microsoft.VisualBasic.Core/Directory.Build.props
@@ -1,8 +1,10 @@
 <Project>
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
-    <AssemblyVersion>$([MSBuild]::Add($(MajorVersion), 5)).$(MinorVersion).0.0</AssemblyVersion>
-    <MajorVersion>$([MSBuild]::Add($(MajorVersion), 6))</MajorVersion>
+    <!-- We need to set MajorVersion so that FileVersion is set correctly and is
+    greater than the one in the previous release -->
+    <MajorVersion>$([MSBuild]::Add($(MajorVersion), 5))</MajorVersion>
+    <AssemblyVersion>$(MajorVersion).$(MinorVersion).0.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IncludePlatformAttributes>true</IncludePlatformAttributes>
   </PropertyGroup>