From 9c73e9511a8c84607b9fecfe16a8f59d77fd0d71 Mon Sep 17 00:00:00 2001
From: carlossanlop <carlossanlop@users.noreply.github.com>
Date: Mon, 15 Aug 2022 18:02:00 -0700
Subject: [PATCH 1/4] eng/Versions.props

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

diff --git a/eng/Versions.props b/eng/Versions.props
index 72f17c83aa2662..d4bb3e42d8e6a2 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -1,17 +1,18 @@
 <Project>
   <PropertyGroup>
     <!-- The .NET product branding version -->
-    <ProductVersion>7.0.0</ProductVersion>
+    <ProductVersion>8.0.0</ProductVersion>
     <!-- File version numbers -->
-    <MajorVersion>7</MajorVersion>
+    <MajorVersion>8</MajorVersion>
     <MinorVersion>0</MinorVersion>
     <PatchVersion>0</PatchVersion>
     <SdkBandVersion>7.0.100</SdkBandVersion>
-    <PreReleaseVersionLabel>rc</PreReleaseVersionLabel>
+    <PreReleaseVersionLabel>alpha</PreReleaseVersionLabel>
     <PreReleaseVersionIteration>1</PreReleaseVersionIteration>
+    <PreviousReleaseMajorVersion>7</PreviousReleaseMajorVersion>
     <!-- Set assembly version to align with major and minor version,
          as for the patches and revisions should be manually updated per assembly if it is serviced. -->
-    <AssemblyVersion>$(MajorVersion).$(MinorVersion).0.0</AssemblyVersion>
+    <AssemblyVersion>$(PreviousReleaseMajorVersion).$(MinorVersion).0.0</AssemblyVersion>
     <!-- Enable to remove prerelease label. -->
     <StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
     <DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>

From cfae3a08d6f80961972d71a4bf3b70c7e49d9caa Mon Sep 17 00:00:00 2001
From: carlossanlop <carlossanlop@users.noreply.github.com>
Date: Mon, 15 Aug 2022 18:02:16 -0700
Subject: [PATCH 2/4] Directory.Build.props

---
 Directory.Build.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 60a661e66ca444..1ee7ac5edf9da0 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -47,7 +47,7 @@
 
   <!-- The TFMs to build and test against. -->
   <PropertyGroup>
-    <NetCoreAppCurrentVersion>7.0</NetCoreAppCurrentVersion>
+    <NetCoreAppCurrentVersion>$(PreviousReleaseMajorVersion).$(MinorVersion)</NetCoreAppCurrentVersion>
     <NetCoreAppCurrentIdentifier>.NETCoreApp</NetCoreAppCurrentIdentifier>
     <NetCoreAppCurrentTargetFrameworkMoniker>$(NetCoreAppCurrentIdentifier),Version=v$(NetCoreAppCurrentVersion)</NetCoreAppCurrentTargetFrameworkMoniker>
     <MicrosoftNetCoreAppFrameworkName>Microsoft.NETCore.App</MicrosoftNetCoreAppFrameworkName>

From 6180aaa23266fe2edb86817717f5c0717b5716ae Mon Sep 17 00:00:00 2001
From: carlossanlop <carlossanlop@users.noreply.github.com>
Date: Mon, 15 Aug 2022 18:05:25 -0700
Subject: [PATCH 3/4] 
 src/libraries/Microsoft.VisualBasic.Core/Directory.Build.props

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

diff --git a/src/libraries/Microsoft.VisualBasic.Core/Directory.Build.props b/src/libraries/Microsoft.VisualBasic.Core/Directory.Build.props
index e1dd239477f25a..a5f64a79125e43 100644
--- a/src/libraries/Microsoft.VisualBasic.Core/Directory.Build.props
+++ b/src/libraries/Microsoft.VisualBasic.Core/Directory.Build.props
@@ -3,8 +3,8 @@
   <PropertyGroup>
     <!-- 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>
+    <MajorVersion>$([MSBuild]::Add($(PreviousReleaseMajorVersion), 5))</MajorVersion>
+    <AssemblyVersion>$(PreviousReleaseMajorVersion).$(MinorVersion).0.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IncludePlatformAttributes>true</IncludePlatformAttributes>
   </PropertyGroup>

From 0af6bdfd379fcbab4fce9989c4ab6a8fb46e10fd Mon Sep 17 00:00:00 2001
From: Carlos Sanchez <1175054+carlossanlop@users.noreply.github.com>
Date: Tue, 16 Aug 2022 10:15:32 -0700
Subject: [PATCH 4/4] Apply suggestions from code review

Co-authored-by: Viktor Hofer <viktor.hofer@microsoft.com>
---
 Directory.Build.props                                        | 2 +-
 eng/Versions.props                                           | 3 +--
 .../Microsoft.VisualBasic.Core/Directory.Build.props         | 5 +++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 1ee7ac5edf9da0..60a661e66ca444 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -47,7 +47,7 @@
 
   <!-- The TFMs to build and test against. -->
   <PropertyGroup>
-    <NetCoreAppCurrentVersion>$(PreviousReleaseMajorVersion).$(MinorVersion)</NetCoreAppCurrentVersion>
+    <NetCoreAppCurrentVersion>7.0</NetCoreAppCurrentVersion>
     <NetCoreAppCurrentIdentifier>.NETCoreApp</NetCoreAppCurrentIdentifier>
     <NetCoreAppCurrentTargetFrameworkMoniker>$(NetCoreAppCurrentIdentifier),Version=v$(NetCoreAppCurrentVersion)</NetCoreAppCurrentTargetFrameworkMoniker>
     <MicrosoftNetCoreAppFrameworkName>Microsoft.NETCore.App</MicrosoftNetCoreAppFrameworkName>
diff --git a/eng/Versions.props b/eng/Versions.props
index d4bb3e42d8e6a2..5db7905b7db16e 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -9,10 +9,9 @@
     <SdkBandVersion>7.0.100</SdkBandVersion>
     <PreReleaseVersionLabel>alpha</PreReleaseVersionLabel>
     <PreReleaseVersionIteration>1</PreReleaseVersionIteration>
-    <PreviousReleaseMajorVersion>7</PreviousReleaseMajorVersion>
     <!-- Set assembly version to align with major and minor version,
          as for the patches and revisions should be manually updated per assembly if it is serviced. -->
-    <AssemblyVersion>$(PreviousReleaseMajorVersion).$(MinorVersion).0.0</AssemblyVersion>
+    <AssemblyVersion>7.$(MinorVersion).0.0</AssemblyVersion>
     <!-- Enable to remove prerelease label. -->
     <StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
     <DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>
diff --git a/src/libraries/Microsoft.VisualBasic.Core/Directory.Build.props b/src/libraries/Microsoft.VisualBasic.Core/Directory.Build.props
index a5f64a79125e43..03812cb3386763 100644
--- a/src/libraries/Microsoft.VisualBasic.Core/Directory.Build.props
+++ b/src/libraries/Microsoft.VisualBasic.Core/Directory.Build.props
@@ -3,8 +3,9 @@
   <PropertyGroup>
     <!-- We need to set MajorVersion so that FileVersion is set correctly and is
     greater than the one in the previous release -->
-    <MajorVersion>$([MSBuild]::Add($(PreviousReleaseMajorVersion), 5))</MajorVersion>
-    <AssemblyVersion>$(PreviousReleaseMajorVersion).$(MinorVersion).0.0</AssemblyVersion>
+    <MajorVersion>$([MSBuild]::Add($(MajorVersion), 5))</MajorVersion>
+    <!-- TODO: Change back to $(MajorVersion) when assembly versions are updated. -->
+    <AssemblyVersion>12.$(MinorVersion).0.0</AssemblyVersion>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IncludePlatformAttributes>true</IncludePlatformAttributes>
   </PropertyGroup>