From 0f3463223d127b36401a8e72025e130bbec30703 Mon Sep 17 00:00:00 2001
From: Ilya <darpa@yandex.ru>
Date: Tue, 15 Jun 2021 17:32:34 +0500
Subject: [PATCH 01/13] Use Source Code Generator for PSVersionInfo class

---
 PowerShell.Common.props                       |  7 ++
 .../PSVersionInfoGenerator.cs                 | 75 +++++++++++++++++++
 .../PSVersionInfoGenerator.csproj             | 17 +++++
 .../PSVersionInfoGenerator/README.md          |  1 +
 .../System.Management.Automation.csproj       | 19 +++++
 .../engine/PSVersionInfo.cs                   | 37 +++------
 6 files changed, 131 insertions(+), 25 deletions(-)
 create mode 100644 src/SourceGenerators/PSVersionInfoGenerator/PSVersionInfoGenerator.cs
 create mode 100644 src/SourceGenerators/PSVersionInfoGenerator/PSVersionInfoGenerator.csproj
 create mode 100644 src/SourceGenerators/PSVersionInfoGenerator/README.md

diff --git a/PowerShell.Common.props b/PowerShell.Common.props
index cf5c11c9ed2..27684a3580c 100644
--- a/PowerShell.Common.props
+++ b/PowerShell.Common.props
@@ -104,6 +104,13 @@
 
     </PropertyGroup>
 
+    <ItemGroup>
+      <!-- These properties are used by Source Code Generators. -->
+      <CompilerVisibleProperty Include="ProductVersion" />
+      <CompilerVisibleProperty Include="PowerShellVersion" />
+      <CompilerVisibleProperty Include="PSCoreBuildVersion" />
+    </ItemGroup>                                          
+
     <!-- Output For Debugging
       <WriteLinesToFile File="targetfile1.txt"
         Lines="ReleaseTag=$(ReleaseTag);
diff --git a/src/SourceGenerators/PSVersionInfoGenerator/PSVersionInfoGenerator.cs b/src/SourceGenerators/PSVersionInfoGenerator/PSVersionInfoGenerator.cs
new file mode 100644
index 00000000000..ef7785bc41a
--- /dev/null
+++ b/src/SourceGenerators/PSVersionInfoGenerator/PSVersionInfoGenerator.cs
@@ -0,0 +1,75 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+using System;
+using System.Globalization;
+
+using Microsoft.CodeAnalysis;
+
+namespace System.Management.Automation.Internal.Generators
+{
+    /// <summary>
+    /// Source Code Generator to create partial PSVersionInfo class.
+    /// </summary>
+    [Generator]
+    public class PSVersionInfoGenerator : ISourceGenerator
+    {
+        /// <summary>
+        /// Generate output PSVersionInfo.generated.cs file.
+        /// This allows to directly get ProductVersion and others without reflection.
+        /// </summary>
+        public void Execute(GeneratorExecutionContext context)
+        {
+            var result = CreatePSVersionInfoPartialClass(context);
+
+            // We must use specific file name suffix (*.g.cs,*.g, *.i.cs, *.generated.cs, *.designer.cs)
+            // so that Roslyng analizers skip the file.
+            context.AddSource("PSVersionInfo.generated.cs", result);
+        }
+
+        /// <summary>
+        /// Not used.
+        /// </summary>
+        public void Initialize(GeneratorInitializationContext context)
+        {
+            // No initialization required for this one.
+        }
+
+        /// <summary>
+        /// Create a string with partial PSVersionInfo class.
+        /// </summary>
+        private static string CreatePSVersionInfoPartialClass(GeneratorExecutionContext context)
+        {
+            // We must put "<auto-generated" on first line so that Roslyng analizers skip the file.
+            const string SourceTemplate = @"
+// <auto-generated>
+// This file is auto-generated by PSVersionInfoGenerator.
+// </auto-generated>
+
+    namespace System.Management.Automation
+{{
+    public static partial class PSVersionInfo
+    {{
+        // Defined in PowerShell.Common.props as ProductVersion
+        // '6.0.0-beta.7 Commits: 29 SHA: 52c6b...'
+        internal static string ProductVersion {{ get; }} = ""{0}"";
+
+        // Defined in PowerShell.Common.props as
+        // git describe --abbrev=60 --long
+        // 'v6.0.0-beta.7-29-g52c6b...'
+        private static readonly string _rawGitCommitId = ""{1}"";
+
+        // Defined in PowerShell.Common.props as PSCoreBuildVersion
+        // '6.0.0-beta.7'
+        private static readonly string _mainVersion = ""{2}"";
+    }}
+}}";
+
+            context.AnalyzerConfigOptions.GlobalOptions.TryGetValue("build_property.ProductVersion", out var productVersion);
+            context.AnalyzerConfigOptions.GlobalOptions.TryGetValue("build_property.PowerShellVersion", out var powerShellVersion);
+            context.AnalyzerConfigOptions.GlobalOptions.TryGetValue("build_property.PSCoreBuildVersion", out var mainVersion);
+
+            return string.Format(CultureInfo.InvariantCulture, SourceTemplate, productVersion, powerShellVersion, mainVersion);
+        }
+    }
+}
diff --git a/src/SourceGenerators/PSVersionInfoGenerator/PSVersionInfoGenerator.csproj b/src/SourceGenerators/PSVersionInfoGenerator/PSVersionInfoGenerator.csproj
new file mode 100644
index 00000000000..83a515c7559
--- /dev/null
+++ b/src/SourceGenerators/PSVersionInfoGenerator/PSVersionInfoGenerator.csproj
@@ -0,0 +1,17 @@
+<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
+
+  <PropertyGroup>
+    <Description>Generates properties and fields with constants for partial PSVersionInfo class</Description>
+    <AssemblyName>PSVersionInfoGenerator</AssemblyName>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <LangVersion>9.0</LangVersion>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.10.0" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.2" PrivateAssets="all" />
+  </ItemGroup>
+</Project>
diff --git a/src/SourceGenerators/PSVersionInfoGenerator/README.md b/src/SourceGenerators/PSVersionInfoGenerator/README.md
new file mode 100644
index 00000000000..b36964f7880
--- /dev/null
+++ b/src/SourceGenerators/PSVersionInfoGenerator/README.md
@@ -0,0 +1 @@
+# PSVersionInfoGenerator
diff --git a/src/System.Management.Automation/System.Management.Automation.csproj b/src/System.Management.Automation/System.Management.Automation.csproj
index 03414ef381b..d4699b47d78 100644
--- a/src/System.Management.Automation/System.Management.Automation.csproj
+++ b/src/System.Management.Automation/System.Management.Automation.csproj
@@ -11,6 +11,10 @@
   </ItemGroup>
 
   <ItemGroup>
+   <ProjectReference Include="..\SourceGenerators\PSVersionInfoGenerator\PSVersionInfoGenerator.csproj"
+                      OutputItemType="Analyzer"
+                      ReferenceOutputAssembly="false" />
+
     <!-- the following package(s) are from https://github.com/JamesNK/Newtonsoft.Json -->
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <!-- the Application Insights package -->
@@ -33,11 +37,26 @@
     <PackageReference Include="Microsoft.Security.Extensions" Version="1.2.0" />
   </ItemGroup>
 
+  <PropertyGroup>
+    <!--
+        Source Code Generators use following lines to write the generated files to disk.
+        We change the output path from obj/ to gen/ so that Visual Studio Code IntelliSense can find these files.
+    -->
+    <EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
+    <CompilerGeneratedFilesOutputPath>gen\SourceGeneratedFiles</CompilerGeneratedFilesOutputPath> 
+  </PropertyGroup>
+
   <PropertyGroup>
     <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
 
   <ItemGroup>
+    <!--
+        These files are included in the compilation by Source Code Generators
+        so remove them here to avoid "already contains" errors.
+    -->
+    <Compile Remove="$(CompilerGeneratedFilesOutputPath)\**\*.cs" />
+
     <Compile Remove="cimSupport\cmdletization\xml\cmdlets-over-objects.objectModel.autogen.cs" />
     <Compile Remove="cimSupport\cmdletization\xml\cmdlets-over-objects.xmlSerializer.autogen.cs" />
     <Compile Remove="engine\TransactedString.cs" />
diff --git a/src/System.Management.Automation/engine/PSVersionInfo.cs b/src/System.Management.Automation/engine/PSVersionInfo.cs
index 99740a44d13..fb2177babae 100644
--- a/src/System.Management.Automation/engine/PSVersionInfo.cs
+++ b/src/System.Management.Automation/engine/PSVersionInfo.cs
@@ -3,7 +3,6 @@
 
 using System.Collections;
 using System.Globalization;
-using System.Reflection;
 using System.Text;
 using System.Text.RegularExpressions;
 
@@ -27,7 +26,7 @@ namespace System.Management.Automation
     /// The above statement retrieves the PowerShell edition.
     /// </para>
     /// </summary>
-    public static class PSVersionInfo
+    public static partial class PSVersionInfo
     {
         internal const string PSVersionTableName = "PSVersionTable";
         internal const string PSRemotingProtocolVersionName = "PSRemotingProtocolVersion";
@@ -42,6 +41,13 @@ public static class PSVersionInfo
 
         private static readonly PSVersionHashTable s_psVersionTable;
 
+        /*
+            // The property and fields are generated by PSVersionInfoGenerator source generator.
+            internal static string ProductVersion { get; } = "...";
+            private static readonly string _rawGitCommitId = "...";
+            private static readonly string _mainVersion = "...";
+        */
+
         /// <summary>
         /// A constant to track current PowerShell Version.
         /// </summary>
@@ -78,12 +84,7 @@ static PSVersionInfo()
         {
             s_psVersionTable = new PSVersionHashTable(StringComparer.OrdinalIgnoreCase);
 
-            Assembly currentAssembly = typeof(PSVersionInfo).Assembly;
-            ProductVersion = currentAssembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>().InformationalVersion;
-
-            // Get 'GitCommitId' and 'PSVersion' from the 'productVersion' assembly attribute.
-            //
-            // The strings can be one of the following format examples:
+            // 'GitCommitId' and 'PSVersion' can be one of the following format examples:
             //    when powershell is built from a commit:
             //      productVersion = '6.0.0-beta.7 Commits: 29 SHA: 52c6b...' convert to GitCommitId = 'v6.0.0-beta.7-29-g52c6b...'
             //                                                                           PSVersion   = '6.0.0-beta.7'
@@ -93,25 +94,13 @@ static PSVersionInfo()
             //    when powershell is built from a release tag for RTM:
             //      productVersion = '6.0.0 SHA: f1ec9...'                    convert to GitCommitId = 'v6.0.0'
             //                                                                           PSVersion   = '6.0.0'
-            string rawGitCommitId;
-            string mainVersion = ProductVersion.Substring(0, ProductVersion.IndexOf(' '));
-
-            if (ProductVersion.Contains(" Commits: "))
-            {
-                rawGitCommitId = ProductVersion.Replace(" Commits: ", "-").Replace(" SHA: ", "-g");
-            }
-            else
-            {
-                rawGitCommitId = mainVersion;
-            }
-
-            s_psSemVersion = new SemanticVersion(mainVersion);
+            s_psSemVersion = new SemanticVersion(_mainVersion);
             s_psVersion = (Version)s_psSemVersion;
 
             s_psVersionTable[PSVersionInfo.PSVersionName] = s_psSemVersion;
             s_psVersionTable[PSVersionInfo.PSEditionName] = PSEditionValue;
-            s_psVersionTable[PSGitCommitIdName] = rawGitCommitId;
-            s_psVersionTable[PSCompatibleVersionsName] = new Version[] { s_psV1Version, s_psV2Version, s_psV3Version, s_psV4Version, s_psV5Version, s_psV51Version, s_psV6Version, s_psV61Version, s_psV62Version, s_psV7Version, s_psV71Version, s_psV72Version, s_psVersion };
+            s_psVersionTable[PSGitCommitIdName] = _rawGitCommitId;
+            s_psVersionTable[PSCompatibleVersionsName] = new Version[] { s_psV1Version, s_psV2Version, s_psV3Version, s_psV4Version, s_psV5Version, s_psV51Version, s_psV6Version, s_psV61Version, s_psV62Version, s_psV7Version, s_psV71Version, s_psVersion };
             s_psVersionTable[PSVersionInfo.SerializationVersionName] = new Version(InternalSerializer.DefaultVersion);
             s_psVersionTable[PSVersionInfo.PSRemotingProtocolVersionName] = RemotingConstants.ProtocolVersion;
             s_psVersionTable[PSVersionInfo.WSManStackVersionName] = GetWSManStackVersion();
@@ -183,8 +172,6 @@ public static Version PSVersion
             }
         }
 
-        internal static string ProductVersion { get; }
-
         internal static string GitCommitId
         {
             get

From 94b1adc17d1f8c155a1a139910b4f4b24e2ddcb1 Mon Sep 17 00:00:00 2001
From: Ilya <darpa@yandex.ru>
Date: Fri, 18 Jun 2021 20:09:21 +0500
Subject: [PATCH 02/13] Fix CodeFactor issues

---
 .../PSVersionInfoGenerator/PSVersionInfoGenerator.cs          | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/SourceGenerators/PSVersionInfoGenerator/PSVersionInfoGenerator.cs b/src/SourceGenerators/PSVersionInfoGenerator/PSVersionInfoGenerator.cs
index ef7785bc41a..0a01b251146 100644
--- a/src/SourceGenerators/PSVersionInfoGenerator/PSVersionInfoGenerator.cs
+++ b/src/SourceGenerators/PSVersionInfoGenerator/PSVersionInfoGenerator.cs
@@ -18,6 +18,7 @@ public class PSVersionInfoGenerator : ISourceGenerator
         /// Generate output PSVersionInfo.generated.cs file.
         /// This allows to directly get ProductVersion and others without reflection.
         /// </summary>
+        /// <param name="context">Generator execution context.</param>
         public void Execute(GeneratorExecutionContext context)
         {
             var result = CreatePSVersionInfoPartialClass(context);
@@ -30,6 +31,7 @@ public void Execute(GeneratorExecutionContext context)
         /// <summary>
         /// Not used.
         /// </summary>
+        /// <param name="context">Generator initialization context.</param>
         public void Initialize(GeneratorInitializationContext context)
         {
             // No initialization required for this one.
@@ -38,6 +40,8 @@ public void Initialize(GeneratorInitializationContext context)
         /// <summary>
         /// Create a string with partial PSVersionInfo class.
         /// </summary>
+        /// <param name="context">Generator execution context.</param>
+        /// <returns>A string with partial PSVersionInfo class.</returns>
         private static string CreatePSVersionInfoPartialClass(GeneratorExecutionContext context)
         {
             // We must put "<auto-generated" on first line so that Roslyng analizers skip the file.

From 3f49bb7ec1afed1ca9fa44dab97768ba4afb2675 Mon Sep 17 00:00:00 2001
From: Ilya <darpa@yandex.ru>
Date: Fri, 18 Jun 2021 20:14:10 +0500
Subject: [PATCH 03/13] Remove starting 'v' from _rawGitCommitId

---
 .../PSVersionInfoGenerator/PSVersionInfoGenerator.cs     | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/SourceGenerators/PSVersionInfoGenerator/PSVersionInfoGenerator.cs b/src/SourceGenerators/PSVersionInfoGenerator/PSVersionInfoGenerator.cs
index 0a01b251146..8473a9e4582 100644
--- a/src/SourceGenerators/PSVersionInfoGenerator/PSVersionInfoGenerator.cs
+++ b/src/SourceGenerators/PSVersionInfoGenerator/PSVersionInfoGenerator.cs
@@ -70,10 +70,15 @@ public static partial class PSVersionInfo
 }}";
 
             context.AnalyzerConfigOptions.GlobalOptions.TryGetValue("build_property.ProductVersion", out var productVersion);
-            context.AnalyzerConfigOptions.GlobalOptions.TryGetValue("build_property.PowerShellVersion", out var powerShellVersion);
+            context.AnalyzerConfigOptions.GlobalOptions.TryGetValue("build_property.PowerShellVersion", out var rawGitCommitId);
             context.AnalyzerConfigOptions.GlobalOptions.TryGetValue("build_property.PSCoreBuildVersion", out var mainVersion);
 
-            return string.Format(CultureInfo.InvariantCulture, SourceTemplate, productVersion, powerShellVersion, mainVersion);
+            if (rawGitCommitId.StartsWith("v"))
+            {
+                rawGitCommitId = rawGitCommitId.Substring(1);
+            }
+
+            return string.Format(CultureInfo.InvariantCulture, SourceTemplate, productVersion, rawGitCommitId, mainVersion);
         }
     }
 }

From 18dd3241cd391658a81df5eb5ed3c0f9a991b2f6 Mon Sep 17 00:00:00 2001
From: Ilya <darpa@yandex.ru>
Date: Fri, 18 Jun 2021 20:27:24 +0500
Subject: [PATCH 04/13] Fix spelling

---
 .spelling | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.spelling b/.spelling
index 35c76464e8d..ffd4b8f7e5e 100644
--- a/.spelling
+++ b/.spelling
@@ -758,6 +758,7 @@ pssessionconfiguration
 pssnapinloadunload
 pssnapins
 psversion
+PSVersionInfoGenerator
 psversiontable
 PSWindowsPowerShellCompatibility
 PublishReadyToRun

From 01503398332a703f6158b27a21beded9d753c856 Mon Sep 17 00:00:00 2001
From: Ilya <darpa@yandex.ru>
Date: Fri, 18 Jun 2021 22:55:12 +0500
Subject: [PATCH 05/13] Fix typo

---
 .../PSVersionInfoGenerator/PSVersionInfoGenerator.cs            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/SourceGenerators/PSVersionInfoGenerator/PSVersionInfoGenerator.cs b/src/SourceGenerators/PSVersionInfoGenerator/PSVersionInfoGenerator.cs
index 8473a9e4582..aa589e694fa 100644
--- a/src/SourceGenerators/PSVersionInfoGenerator/PSVersionInfoGenerator.cs
+++ b/src/SourceGenerators/PSVersionInfoGenerator/PSVersionInfoGenerator.cs
@@ -24,7 +24,7 @@ public void Execute(GeneratorExecutionContext context)
             var result = CreatePSVersionInfoPartialClass(context);
 
             // We must use specific file name suffix (*.g.cs,*.g, *.i.cs, *.generated.cs, *.designer.cs)
-            // so that Roslyng analizers skip the file.
+            // so that Roslyn analyzers skip the file.
             context.AddSource("PSVersionInfo.generated.cs", result);
         }
 

From c08c0f1bb6a274ce71571a53023d5be5ee9af1d1 Mon Sep 17 00:00:00 2001
From: Ilya <darpa@yandex.ru>
Date: Sat, 19 Jun 2021 23:57:34 +0500
Subject: [PATCH 06/13] Fix comment

---
 src/System.Management.Automation/engine/PSVersionInfo.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/System.Management.Automation/engine/PSVersionInfo.cs b/src/System.Management.Automation/engine/PSVersionInfo.cs
index fb2177babae..548f05f06ce 100644
--- a/src/System.Management.Automation/engine/PSVersionInfo.cs
+++ b/src/System.Management.Automation/engine/PSVersionInfo.cs
@@ -42,7 +42,7 @@ public static partial class PSVersionInfo
         private static readonly PSVersionHashTable s_psVersionTable;
 
         /*
-            // The property and fields are generated by PSVersionInfoGenerator source generator.
+            The following property and fields are generated by PSVersionInfoGenerator source generator.
             internal static string ProductVersion { get; } = "...";
             private static readonly string _rawGitCommitId = "...";
             private static readonly string _mainVersion = "...";

From c6b34bb5197abc8074b6be408e182306fda299ba Mon Sep 17 00:00:00 2001
From: Ilya <darpa@yandex.ru>
Date: Fri, 25 Jun 2021 14:07:14 +0500
Subject: [PATCH 07/13] Use ReleaseTag property

---
 PowerShell.Common.props                                   | 1 +
 .../PSVersionInfoGenerator/PSVersionInfoGenerator.cs      | 8 +++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/PowerShell.Common.props b/PowerShell.Common.props
index 27684a3580c..0a78f26b68c 100644
--- a/PowerShell.Common.props
+++ b/PowerShell.Common.props
@@ -109,6 +109,7 @@
       <CompilerVisibleProperty Include="ProductVersion" />
       <CompilerVisibleProperty Include="PowerShellVersion" />
       <CompilerVisibleProperty Include="PSCoreBuildVersion" />
+      <CompilerVisibleProperty Include="ReleaseTag" />
     </ItemGroup>                                          
 
     <!-- Output For Debugging
diff --git a/src/SourceGenerators/PSVersionInfoGenerator/PSVersionInfoGenerator.cs b/src/SourceGenerators/PSVersionInfoGenerator/PSVersionInfoGenerator.cs
index aa589e694fa..17590f95fb9 100644
--- a/src/SourceGenerators/PSVersionInfoGenerator/PSVersionInfoGenerator.cs
+++ b/src/SourceGenerators/PSVersionInfoGenerator/PSVersionInfoGenerator.cs
@@ -72,13 +72,15 @@ public static partial class PSVersionInfo
             context.AnalyzerConfigOptions.GlobalOptions.TryGetValue("build_property.ProductVersion", out var productVersion);
             context.AnalyzerConfigOptions.GlobalOptions.TryGetValue("build_property.PowerShellVersion", out var rawGitCommitId);
             context.AnalyzerConfigOptions.GlobalOptions.TryGetValue("build_property.PSCoreBuildVersion", out var mainVersion);
+            context.AnalyzerConfigOptions.GlobalOptions.TryGetValue("build_property.ReleaseTag", out var releaseTag);
 
-            if (rawGitCommitId.StartsWith("v"))
+            string gitCommitId = string.IsNullOrEmpty(releaseTag) ? rawGitCommitId : releaseTag;
+            if (gitCommitId.StartsWith("v"))
             {
-                rawGitCommitId = rawGitCommitId.Substring(1);
+                gitCommitId = gitCommitId.Substring(1);
             }
 
-            return string.Format(CultureInfo.InvariantCulture, SourceTemplate, productVersion, rawGitCommitId, mainVersion);
+            return string.Format(CultureInfo.InvariantCulture, SourceTemplate, productVersion, gitCommitId, mainVersion);
         }
     }
 }

From cf51855950374bada49325f2aa34439e5c963252 Mon Sep 17 00:00:00 2001
From: Ilya <darpa@yandex.ru>
Date: Wed, 5 Jan 2022 22:16:15 +0500
Subject: [PATCH 08/13] Add s_psV72Version

---
 src/System.Management.Automation/engine/PSVersionInfo.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/System.Management.Automation/engine/PSVersionInfo.cs b/src/System.Management.Automation/engine/PSVersionInfo.cs
index 548f05f06ce..0705beb56b8 100644
--- a/src/System.Management.Automation/engine/PSVersionInfo.cs
+++ b/src/System.Management.Automation/engine/PSVersionInfo.cs
@@ -100,7 +100,7 @@ static PSVersionInfo()
             s_psVersionTable[PSVersionInfo.PSVersionName] = s_psSemVersion;
             s_psVersionTable[PSVersionInfo.PSEditionName] = PSEditionValue;
             s_psVersionTable[PSGitCommitIdName] = _rawGitCommitId;
-            s_psVersionTable[PSCompatibleVersionsName] = new Version[] { s_psV1Version, s_psV2Version, s_psV3Version, s_psV4Version, s_psV5Version, s_psV51Version, s_psV6Version, s_psV61Version, s_psV62Version, s_psV7Version, s_psV71Version, s_psVersion };
+            s_psVersionTable[PSCompatibleVersionsName] = new Version[] { s_psV1Version, s_psV2Version, s_psV3Version, s_psV4Version, s_psV5Version, s_psV51Version, s_psV6Version, s_psV61Version, s_psV62Version, s_psV7Version, s_psV71Version, s_psV72Version, s_psVersion };
             s_psVersionTable[PSVersionInfo.SerializationVersionName] = new Version(InternalSerializer.DefaultVersion);
             s_psVersionTable[PSVersionInfo.PSRemotingProtocolVersionName] = RemotingConstants.ProtocolVersion;
             s_psVersionTable[PSVersionInfo.WSManStackVersionName] = GetWSManStackVersion();

From f09bd4d9bc4300e9794bc4bed98e2928a0fad7cb Mon Sep 17 00:00:00 2001
From: Dongbo Wang <dongbow@microsoft.com>
Date: Wed, 5 Oct 2022 17:05:00 -0700
Subject: [PATCH 09/13] Merge part of #18210 to the source generator and also
 refactor it

---
 .spelling                                     |   1 -
 PowerShell.Common.props                       |  22 ---
 .../PSVersionInfoGenerator.cs                 |  86 ------------
 .../PSVersionInfoGenerator.csproj             |  17 ---
 .../PSVersionInfoGenerator/README.md          |   1 -
 .../PSVersionInfoGenerator.cs                 | 131 ++++++++++++++++++
 .../PSVersionInfoGenerator.csproj             |  21 +++
 .../System.Management.Automation.csproj       |  40 +++---
 .../engine/PSVersionInfo.cs                   |  37 ++---
 9 files changed, 187 insertions(+), 169 deletions(-)
 delete mode 100644 src/SourceGenerators/PSVersionInfoGenerator/PSVersionInfoGenerator.cs
 delete mode 100644 src/SourceGenerators/PSVersionInfoGenerator/PSVersionInfoGenerator.csproj
 delete mode 100644 src/SourceGenerators/PSVersionInfoGenerator/README.md
 create mode 100644 src/System.Management.Automation/SourceGenerators/PSVersionInfoGenerator/PSVersionInfoGenerator.cs
 create mode 100644 src/System.Management.Automation/SourceGenerators/PSVersionInfoGenerator/PSVersionInfoGenerator.csproj

diff --git a/.spelling b/.spelling
index ffd4b8f7e5e..35c76464e8d 100644
--- a/.spelling
+++ b/.spelling
@@ -758,7 +758,6 @@ pssessionconfiguration
 pssnapinloadunload
 pssnapins
 psversion
-PSVersionInfoGenerator
 psversiontable
 PSWindowsPowerShellCompatibility
 PublishReadyToRun
diff --git a/PowerShell.Common.props b/PowerShell.Common.props
index 0a78f26b68c..53ba4d1a57a 100644
--- a/PowerShell.Common.props
+++ b/PowerShell.Common.props
@@ -73,16 +73,6 @@
       <PSCoreFormattedVersion Condition = "'$(ReleaseTag)' != '' or '$(PSCoreAdditionalCommits)' == '0'">$(PSCoreBuildVersion) SHA: $(PSCoreCommitSHA)</PSCoreFormattedVersion>
       <PSCoreFormattedVersion Condition = "'$(PSCoreFormattedVersion)' == ''">$(PSCoreBuildVersion) Commits: $(PSCoreAdditionalCommits) SHA: $(PSCoreCommitSHA)</PSCoreFormattedVersion>
 
-      <!-- Extract the major, minor and patch version numbers, as well as the preview label.
-           They are currently not used anywhere, so we comment them out for now.
-        <RegexSymVer>^((\d+).(\d+).(\d+))(?:-(.+))?</RegexSymVer>
-        <PSCorePrefixVersion>$([System.Text.RegularExpressions.Regex]::Match($(PSCoreBuildVersion), $(RegexSymVer)).Groups[1].Value)</PSCorePrefixVersion>
-        <PSCoreMajorVersion>$([System.Text.RegularExpressions.Regex]::Match($(PSCoreBuildVersion), $(RegexSymVer)).Groups[2].Value)</PSCoreMajorVersion>
-        <PSCoreMinorVersion>$([System.Text.RegularExpressions.Regex]::Match($(PSCoreBuildVersion), $(RegexSymVer)).Groups[3].Value)</PSCoreMinorVersion>
-        <PSCorePatchVersion>$([System.Text.RegularExpressions.Regex]::Match($(PSCoreBuildVersion), $(RegexSymVer)).Groups[4].Value)</PSCorePatchVersion>
-        <PSCoreLabelVersion>$([System.Text.RegularExpressions.Regex]::Match($(PSCoreBuildVersion), $(RegexSymVer)).Groups[5].Value)</PSCoreLabelVersion>
-      -->
-
       <!--
             Here we define explicitly 'Version' to set 'FileVersion' and 'AssemblyVersion' by 'GetAssemblyVersion' target in 'Microsoft.NET.GenerateAssemblyInfo.targets'.
             Here we define explicitly 'InformationalVersion' because by default it is defined as 'Version' by 'GetAssemblyVersion' target in 'Microsoft.NET.GenerateAssemblyInfo.targets'.
@@ -104,14 +94,6 @@
 
     </PropertyGroup>
 
-    <ItemGroup>
-      <!-- These properties are used by Source Code Generators. -->
-      <CompilerVisibleProperty Include="ProductVersion" />
-      <CompilerVisibleProperty Include="PowerShellVersion" />
-      <CompilerVisibleProperty Include="PSCoreBuildVersion" />
-      <CompilerVisibleProperty Include="ReleaseTag" />
-    </ItemGroup>                                          
-
     <!-- Output For Debugging
       <WriteLinesToFile File="targetfile1.txt"
         Lines="ReleaseTag=$(ReleaseTag);
@@ -122,10 +104,6 @@
                ReleaseTagSemVersionPart = $(ReleaseTagSemVersionPart);
                PSCoreAdditionalCommits = $(PSCoreAdditionalCommits);
                PSCoreCommitSHA = $(PSCoreCommitSHA);
-               PSCoreMajorVersion = $(PSCoreMajorVersion);
-               PSCoreMinorVersion = $(PSCoreMinorVersion);
-               PSCorePatchVersion = $(PSCorePatchVersion);
-               PSCoreLabelVersion = $(PSCoreLabelVersion);
                RegexGitVersion = $(RegexGitVersion);
                PSCoreFormattedVersion = $(PSCoreFormattedVersion);
                ProductVersion = $(ProductVersion);
diff --git a/src/SourceGenerators/PSVersionInfoGenerator/PSVersionInfoGenerator.cs b/src/SourceGenerators/PSVersionInfoGenerator/PSVersionInfoGenerator.cs
deleted file mode 100644
index 17590f95fb9..00000000000
--- a/src/SourceGenerators/PSVersionInfoGenerator/PSVersionInfoGenerator.cs
+++ /dev/null
@@ -1,86 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-using System;
-using System.Globalization;
-
-using Microsoft.CodeAnalysis;
-
-namespace System.Management.Automation.Internal.Generators
-{
-    /// <summary>
-    /// Source Code Generator to create partial PSVersionInfo class.
-    /// </summary>
-    [Generator]
-    public class PSVersionInfoGenerator : ISourceGenerator
-    {
-        /// <summary>
-        /// Generate output PSVersionInfo.generated.cs file.
-        /// This allows to directly get ProductVersion and others without reflection.
-        /// </summary>
-        /// <param name="context">Generator execution context.</param>
-        public void Execute(GeneratorExecutionContext context)
-        {
-            var result = CreatePSVersionInfoPartialClass(context);
-
-            // We must use specific file name suffix (*.g.cs,*.g, *.i.cs, *.generated.cs, *.designer.cs)
-            // so that Roslyn analyzers skip the file.
-            context.AddSource("PSVersionInfo.generated.cs", result);
-        }
-
-        /// <summary>
-        /// Not used.
-        /// </summary>
-        /// <param name="context">Generator initialization context.</param>
-        public void Initialize(GeneratorInitializationContext context)
-        {
-            // No initialization required for this one.
-        }
-
-        /// <summary>
-        /// Create a string with partial PSVersionInfo class.
-        /// </summary>
-        /// <param name="context">Generator execution context.</param>
-        /// <returns>A string with partial PSVersionInfo class.</returns>
-        private static string CreatePSVersionInfoPartialClass(GeneratorExecutionContext context)
-        {
-            // We must put "<auto-generated" on first line so that Roslyng analizers skip the file.
-            const string SourceTemplate = @"
-// <auto-generated>
-// This file is auto-generated by PSVersionInfoGenerator.
-// </auto-generated>
-
-    namespace System.Management.Automation
-{{
-    public static partial class PSVersionInfo
-    {{
-        // Defined in PowerShell.Common.props as ProductVersion
-        // '6.0.0-beta.7 Commits: 29 SHA: 52c6b...'
-        internal static string ProductVersion {{ get; }} = ""{0}"";
-
-        // Defined in PowerShell.Common.props as
-        // git describe --abbrev=60 --long
-        // 'v6.0.0-beta.7-29-g52c6b...'
-        private static readonly string _rawGitCommitId = ""{1}"";
-
-        // Defined in PowerShell.Common.props as PSCoreBuildVersion
-        // '6.0.0-beta.7'
-        private static readonly string _mainVersion = ""{2}"";
-    }}
-}}";
-
-            context.AnalyzerConfigOptions.GlobalOptions.TryGetValue("build_property.ProductVersion", out var productVersion);
-            context.AnalyzerConfigOptions.GlobalOptions.TryGetValue("build_property.PowerShellVersion", out var rawGitCommitId);
-            context.AnalyzerConfigOptions.GlobalOptions.TryGetValue("build_property.PSCoreBuildVersion", out var mainVersion);
-            context.AnalyzerConfigOptions.GlobalOptions.TryGetValue("build_property.ReleaseTag", out var releaseTag);
-
-            string gitCommitId = string.IsNullOrEmpty(releaseTag) ? rawGitCommitId : releaseTag;
-            if (gitCommitId.StartsWith("v"))
-            {
-                gitCommitId = gitCommitId.Substring(1);
-            }
-
-            return string.Format(CultureInfo.InvariantCulture, SourceTemplate, productVersion, gitCommitId, mainVersion);
-        }
-    }
-}
diff --git a/src/SourceGenerators/PSVersionInfoGenerator/PSVersionInfoGenerator.csproj b/src/SourceGenerators/PSVersionInfoGenerator/PSVersionInfoGenerator.csproj
deleted file mode 100644
index 83a515c7559..00000000000
--- a/src/SourceGenerators/PSVersionInfoGenerator/PSVersionInfoGenerator.csproj
+++ /dev/null
@@ -1,17 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
-
-  <PropertyGroup>
-    <Description>Generates properties and fields with constants for partial PSVersionInfo class</Description>
-    <AssemblyName>PSVersionInfoGenerator</AssemblyName>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <LangVersion>9.0</LangVersion>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.10.0" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.2" PrivateAssets="all" />
-  </ItemGroup>
-</Project>
diff --git a/src/SourceGenerators/PSVersionInfoGenerator/README.md b/src/SourceGenerators/PSVersionInfoGenerator/README.md
deleted file mode 100644
index b36964f7880..00000000000
--- a/src/SourceGenerators/PSVersionInfoGenerator/README.md
+++ /dev/null
@@ -1 +0,0 @@
-# PSVersionInfoGenerator
diff --git a/src/System.Management.Automation/SourceGenerators/PSVersionInfoGenerator/PSVersionInfoGenerator.cs b/src/System.Management.Automation/SourceGenerators/PSVersionInfoGenerator/PSVersionInfoGenerator.cs
new file mode 100644
index 00000000000..4674b74fd39
--- /dev/null
+++ b/src/System.Management.Automation/SourceGenerators/PSVersionInfoGenerator/PSVersionInfoGenerator.cs
@@ -0,0 +1,131 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+using System;
+using System.Globalization;
+using Microsoft.CodeAnalysis;
+
+namespace SMA
+{
+    /// <summary>
+    /// Source Code Generator to create partial PSVersionInfo class.
+    /// </summary>
+    [Generator]
+    public class PSVersionInfoGenerator : ISourceGenerator
+    {
+        /// <summary>
+        /// Generate output PSVersionInfo.g.cs file.
+        /// This allows to directly get ProductVersion and others without reflection.
+        /// </summary>
+        /// <param name="context">Generator execution context.</param>
+        public void Execute(GeneratorExecutionContext context)
+        {
+            var result = CreatePSVersionInfoPartialClass(context);
+
+            // We must use specific file name suffix (*.g.cs,*.g, *.i.cs, *.generated.cs, *.designer.cs)
+            // so that Roslyn analyzers skip the file.
+            context.AddSource("PSVersionInfo.g.cs", result);
+        }
+
+        /// <summary>
+        /// Not used.
+        /// </summary>
+        /// <param name="context">Generator initialization context.</param>
+        public void Initialize(GeneratorInitializationContext context)
+        {
+            // No initialization required for this one.
+        }
+
+        /// <summary>
+        /// Generate source code for the partial PSVersionInfo class.
+        /// </summary>
+        /// <param name="context">Generator execution context.</param>
+        /// <returns>A string with partial PSVersionInfo class.</returns>
+        private static string CreatePSVersionInfoPartialClass(GeneratorExecutionContext context)
+        {
+            // We must put "<auto-generated" on first line so that Roslyng analyzers skip the file.
+            const string SourceTemplate = @"
+// <auto-generated>
+// This file is auto-generated by PSVersionInfoGenerator.
+// </auto-generated>
+
+namespace System.Management.Automation
+{{
+    public static partial class PSVersionInfo
+    {{
+        // Defined in 'PowerShell.Common.props' as 'ProductVersion'
+        // Example:
+        //  - when built from a commit:              ProductVersion = '7.3.0-preview.8 Commits: 29 SHA: 52c6b...'
+        //  - when built from a preview release tag: ProductVersion = '7.3.0-preview.8 SHA: f1ec9...'
+        //  - when built from a stable release tag:  ProductVersion = '7.3.0 SHA: f1ec9...'
+        internal const string ProductVersion = ""{0}"";
+
+        // The git commit id that the build is based off.
+        // Defined in 'PowerShell.Common.props' as 'PowerShellVersion' or 'ReleaseTag',
+        // depending on whether the '-ReleaseTag' is specified when building.
+        // Example:
+        //  - when built from a commit:              GitCommitId = '7.3.0-preview.8-29-g52c6b...'
+        //  - when built from a preview release tag: GitCommitId = '7.3.0-preview.8'
+        //  - when built from a stable release tag:  GitCommitId = '7.3.0'
+        internal const string GitCommitId = ""{1}"";
+
+        // The PowerShell version components.
+        // The version string is defined in 'PowerShell.Common.props' as 'PSCoreBuildVersion',
+        // but we break it into components to save the overhead of parsing at runtime.
+        // Example:
+        //  - '7.3.0-preview.8' for preview release or private build
+        //  - '7.3.0' for stable release
+        private const int Version_Major = {2};
+        private const int Version_Minor = {3};
+        private const int Version_Patch = {4};
+        private const string Version_Label = ""{5}"";
+    }}
+}}";
+
+            context.AnalyzerConfigOptions.GlobalOptions.TryGetValue("build_property.ProductVersion", out var productVersion);
+            context.AnalyzerConfigOptions.GlobalOptions.TryGetValue("build_property.PSCoreBuildVersion", out var mainVersion);
+            context.AnalyzerConfigOptions.GlobalOptions.TryGetValue("build_property.PowerShellVersion", out var gitDescribe);
+            context.AnalyzerConfigOptions.GlobalOptions.TryGetValue("build_property.ReleaseTag", out var releaseTag);
+
+            string gitCommitId = string.IsNullOrEmpty(releaseTag) ? gitDescribe : releaseTag;
+            if (gitCommitId.StartsWith("v"))
+            {
+                gitCommitId = gitCommitId.Substring(1);
+            }
+
+            var result = FastParsePSVersion(mainVersion);
+
+            return string.Format(
+                CultureInfo.InvariantCulture,
+                SourceTemplate,
+                productVersion,
+                gitCommitId,
+                result.major,
+                result.minor,
+                result.patch,
+                result.preReleaseLabel);
+        }
+
+        private static (int major, int minor, int patch, string preReleaseLabel) FastParsePSVersion(string mainVersion)
+        {
+            // We only handle the pre-defined PSVersion format here, e.g. 7.x.x or 7.x.x-preview.x
+            int dashIndex = mainVersion.IndexOf('-');
+            bool hasLabel = dashIndex != -1;
+            string preReleaseLabel = hasLabel ? mainVersion.Substring(dashIndex + 1) : string.Empty;
+
+            if (hasLabel)
+            {
+                mainVersion = mainVersion.Substring(0, dashIndex);
+            }
+
+            int majorEnd = mainVersion.IndexOf('.');
+            int minorEnd = mainVersion.LastIndexOf('.');
+
+            int major = int.Parse(mainVersion.Substring(0, majorEnd), NumberStyles.Integer, CultureInfo.InvariantCulture);
+            int minor = int.Parse(mainVersion.Substring(majorEnd + 1, minorEnd - majorEnd - 1), NumberStyles.Integer, CultureInfo.InvariantCulture);
+            int patch = int.Parse(mainVersion.Substring(minorEnd + 1), NumberStyles.Integer, CultureInfo.InvariantCulture);
+
+            return (major, minor, patch, preReleaseLabel);
+        }
+    }
+}
diff --git a/src/System.Management.Automation/SourceGenerators/PSVersionInfoGenerator/PSVersionInfoGenerator.csproj b/src/System.Management.Automation/SourceGenerators/PSVersionInfoGenerator/PSVersionInfoGenerator.csproj
new file mode 100644
index 00000000000..48cebe0c298
--- /dev/null
+++ b/src/System.Management.Automation/SourceGenerators/PSVersionInfoGenerator/PSVersionInfoGenerator.csproj
@@ -0,0 +1,21 @@
+<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
+  <PropertyGroup>
+    <Description>Generate code for SMA using source generator</Description>
+    <AssemblyName>SMA.Generator</AssemblyName>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <!-- source generator project needs to target 'netstandard2.0' -->
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <LangVersion>9.0</LangVersion>
+    <SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.3.1" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.3">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+</Project>
diff --git a/src/System.Management.Automation/System.Management.Automation.csproj b/src/System.Management.Automation/System.Management.Automation.csproj
index d4699b47d78..6020ebc3389 100644
--- a/src/System.Management.Automation/System.Management.Automation.csproj
+++ b/src/System.Management.Automation/System.Management.Automation.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
+<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
   <Import Project="..\..\PowerShell.Common.props" />
   <PropertyGroup>
     <Description>PowerShell's System.Management.Automation project</Description>
@@ -6,15 +6,29 @@
     <AssemblyName>System.Management.Automation</AssemblyName>
   </PropertyGroup>
 
-  <ItemGroup Condition=" '$(IsWindows)' == 'true' ">
-    <ProjectReference Include="..\Microsoft.PowerShell.CoreCLR.Eventing\Microsoft.PowerShell.CoreCLR.Eventing.csproj" />
-  </ItemGroup>
+  <PropertyGroup>
+    <!-- we persist source generator files under 'gen' folder so that they are visible to IDEs -->
+    <EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
+    <CompilerGeneratedFilesOutputPath>gen\SourceGenerated</CompilerGeneratedFilesOutputPath>
+  </PropertyGroup>
 
   <ItemGroup>
-   <ProjectReference Include="..\SourceGenerators\PSVersionInfoGenerator\PSVersionInfoGenerator.csproj"
+    <!-- these properties are declared in 'PowerShell.Common.props' and used by source generator -->
+    <CompilerVisibleProperty Include="ProductVersion" />
+    <CompilerVisibleProperty Include="PSCoreBuildVersion" />
+    <CompilerVisibleProperty Include="PowerShellVersion" />
+    <CompilerVisibleProperty Include="ReleaseTag" />
+
+    <ProjectReference Include="SourceGenerators\PSVersionInfoGenerator\PSVersionInfoGenerator.csproj"
                       OutputItemType="Analyzer"
                       ReferenceOutputAssembly="false" />
+  </ItemGroup>
 
+  <ItemGroup Condition=" '$(IsWindows)' == 'true' ">
+    <ProjectReference Include="..\Microsoft.PowerShell.CoreCLR.Eventing\Microsoft.PowerShell.CoreCLR.Eventing.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
     <!-- the following package(s) are from https://github.com/JamesNK/Newtonsoft.Json -->
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <!-- the Application Insights package -->
@@ -37,24 +51,14 @@
     <PackageReference Include="Microsoft.Security.Extensions" Version="1.2.0" />
   </ItemGroup>
 
-  <PropertyGroup>
-    <!--
-        Source Code Generators use following lines to write the generated files to disk.
-        We change the output path from obj/ to gen/ so that Visual Studio Code IntelliSense can find these files.
-    -->
-    <EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
-    <CompilerGeneratedFilesOutputPath>gen\SourceGeneratedFiles</CompilerGeneratedFilesOutputPath> 
-  </PropertyGroup>
-
   <PropertyGroup>
     <DefineConstants>$(DefineConstants);CORECLR</DefineConstants>
   </PropertyGroup>
 
   <ItemGroup>
-    <!--
-        These files are included in the compilation by Source Code Generators
-        so remove them here to avoid "already contains" errors.
-    -->
+    <!-- exclude code of source generators from compilation and IDEs (e.g. vscode and visual studio) -->
+    <Compile Remove="SourceGenerators\**\*.cs" />
+    <!-- exclude the generated source files because compiler already includes the in-memory source generator output -->
     <Compile Remove="$(CompilerGeneratedFilesOutputPath)\**\*.cs" />
 
     <Compile Remove="cimSupport\cmdletization\xml\cmdlets-over-objects.objectModel.autogen.cs" />
diff --git a/src/System.Management.Automation/engine/PSVersionInfo.cs b/src/System.Management.Automation/engine/PSVersionInfo.cs
index 0705beb56b8..daaa728daea 100644
--- a/src/System.Management.Automation/engine/PSVersionInfo.cs
+++ b/src/System.Management.Automation/engine/PSVersionInfo.cs
@@ -42,10 +42,15 @@ public static partial class PSVersionInfo
         private static readonly PSVersionHashTable s_psVersionTable;
 
         /*
-            The following property and fields are generated by PSVersionInfoGenerator source generator.
-            internal static string ProductVersion { get; } = "...";
-            private static readonly string _rawGitCommitId = "...";
-            private static readonly string _mainVersion = "...";
+            The following constants are generated by the source generator 'PSVersionInfoGenerator':
+
+                internal const string ProductVersion;
+                internal const string GitCommitId;
+
+                private const int Version_Major
+                private const int Version_Minor;
+                private const int Version_Patch;
+                private const string Version_Label;
         */
 
         /// <summary>
@@ -84,22 +89,14 @@ static PSVersionInfo()
         {
             s_psVersionTable = new PSVersionHashTable(StringComparer.OrdinalIgnoreCase);
 
-            // 'GitCommitId' and 'PSVersion' can be one of the following format examples:
-            //    when powershell is built from a commit:
-            //      productVersion = '6.0.0-beta.7 Commits: 29 SHA: 52c6b...' convert to GitCommitId = 'v6.0.0-beta.7-29-g52c6b...'
-            //                                                                           PSVersion   = '6.0.0-beta.7'
-            //    when powershell is built from a release tag:
-            //      productVersion = '6.0.0-beta.7 SHA: f1ec9...'             convert to GitCommitId = 'v6.0.0-beta.7'
-            //                                                                           PSVersion   = '6.0.0-beta.7'
-            //    when powershell is built from a release tag for RTM:
-            //      productVersion = '6.0.0 SHA: f1ec9...'                    convert to GitCommitId = 'v6.0.0'
-            //                                                                           PSVersion   = '6.0.0'
-            s_psSemVersion = new SemanticVersion(_mainVersion);
+            s_psSemVersion = Version_Label == string.Empty
+                ? new SemanticVersion(Version_Major, Version_Minor, Version_Patch)
+                : new SemanticVersion(Version_Major, Version_Minor, Version_Patch, Version_Label, buildLabel: null);
             s_psVersion = (Version)s_psSemVersion;
 
             s_psVersionTable[PSVersionInfo.PSVersionName] = s_psSemVersion;
             s_psVersionTable[PSVersionInfo.PSEditionName] = PSEditionValue;
-            s_psVersionTable[PSGitCommitIdName] = _rawGitCommitId;
+            s_psVersionTable[PSGitCommitIdName] = GitCommitId;
             s_psVersionTable[PSCompatibleVersionsName] = new Version[] { s_psV1Version, s_psV2Version, s_psV3Version, s_psV4Version, s_psV5Version, s_psV51Version, s_psV6Version, s_psV61Version, s_psV62Version, s_psV7Version, s_psV71Version, s_psV72Version, s_psVersion };
             s_psVersionTable[PSVersionInfo.SerializationVersionName] = new Version(InternalSerializer.DefaultVersion);
             s_psVersionTable[PSVersionInfo.PSRemotingProtocolVersionName] = RemotingConstants.ProtocolVersion;
@@ -172,14 +169,6 @@ public static Version PSVersion
             }
         }
 
-        internal static string GitCommitId
-        {
-            get
-            {
-                return (string)s_psVersionTable[PSGitCommitIdName];
-            }
-        }
-
         internal static Version[] PSCompatibleVersions
         {
             get

From 7a89b2efd4551757b4c1eecc400ad346b3166634 Mon Sep 17 00:00:00 2001
From: Ilya <darpa@yandex.ru>
Date: Thu, 6 Oct 2022 10:49:42 +0500
Subject: [PATCH 10/13] Turn off EmitCompilerGeneratedFiles

- Turn off EmitCompilerGeneratedFiles
- Remove first blank line in generated code
---
 .../PSVersionInfoGenerator/PSVersionInfoGenerator.cs      | 3 +--
 .../System.Management.Automation.csproj                   | 8 --------
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/System.Management.Automation/SourceGenerators/PSVersionInfoGenerator/PSVersionInfoGenerator.cs b/src/System.Management.Automation/SourceGenerators/PSVersionInfoGenerator/PSVersionInfoGenerator.cs
index 4674b74fd39..bbda7eee0dc 100644
--- a/src/System.Management.Automation/SourceGenerators/PSVersionInfoGenerator/PSVersionInfoGenerator.cs
+++ b/src/System.Management.Automation/SourceGenerators/PSVersionInfoGenerator/PSVersionInfoGenerator.cs
@@ -44,8 +44,7 @@ public void Initialize(GeneratorInitializationContext context)
         private static string CreatePSVersionInfoPartialClass(GeneratorExecutionContext context)
         {
             // We must put "<auto-generated" on first line so that Roslyng analyzers skip the file.
-            const string SourceTemplate = @"
-// <auto-generated>
+            const string SourceTemplate = @"// <auto-generated>
 // This file is auto-generated by PSVersionInfoGenerator.
 // </auto-generated>
 
diff --git a/src/System.Management.Automation/System.Management.Automation.csproj b/src/System.Management.Automation/System.Management.Automation.csproj
index 6020ebc3389..27cd25ab629 100644
--- a/src/System.Management.Automation/System.Management.Automation.csproj
+++ b/src/System.Management.Automation/System.Management.Automation.csproj
@@ -6,12 +6,6 @@
     <AssemblyName>System.Management.Automation</AssemblyName>
   </PropertyGroup>
 
-  <PropertyGroup>
-    <!-- we persist source generator files under 'gen' folder so that they are visible to IDEs -->
-    <EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
-    <CompilerGeneratedFilesOutputPath>gen\SourceGenerated</CompilerGeneratedFilesOutputPath>
-  </PropertyGroup>
-
   <ItemGroup>
     <!-- these properties are declared in 'PowerShell.Common.props' and used by source generator -->
     <CompilerVisibleProperty Include="ProductVersion" />
@@ -58,8 +52,6 @@
   <ItemGroup>
     <!-- exclude code of source generators from compilation and IDEs (e.g. vscode and visual studio) -->
     <Compile Remove="SourceGenerators\**\*.cs" />
-    <!-- exclude the generated source files because compiler already includes the in-memory source generator output -->
-    <Compile Remove="$(CompilerGeneratedFilesOutputPath)\**\*.cs" />
 
     <Compile Remove="cimSupport\cmdletization\xml\cmdlets-over-objects.objectModel.autogen.cs" />
     <Compile Remove="cimSupport\cmdletization\xml\cmdlets-over-objects.xmlSerializer.autogen.cs" />

From 44a795ecc3a4f60c9506e8452efe22e97037a5fa Mon Sep 17 00:00:00 2001
From: Dongbo Wang <dongbow@microsoft.com>
Date: Thu, 6 Oct 2022 10:08:26 -0700
Subject: [PATCH 11/13] Rename the function to be 'ParsePSVersion'

---
 .../PSVersionInfoGenerator/PSVersionInfoGenerator.cs          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/System.Management.Automation/SourceGenerators/PSVersionInfoGenerator/PSVersionInfoGenerator.cs b/src/System.Management.Automation/SourceGenerators/PSVersionInfoGenerator/PSVersionInfoGenerator.cs
index bbda7eee0dc..6f5b47cca01 100644
--- a/src/System.Management.Automation/SourceGenerators/PSVersionInfoGenerator/PSVersionInfoGenerator.cs
+++ b/src/System.Management.Automation/SourceGenerators/PSVersionInfoGenerator/PSVersionInfoGenerator.cs
@@ -92,7 +92,7 @@ public static partial class PSVersionInfo
                 gitCommitId = gitCommitId.Substring(1);
             }
 
-            var result = FastParsePSVersion(mainVersion);
+            var result = ParsePSVersion(mainVersion);
 
             return string.Format(
                 CultureInfo.InvariantCulture,
@@ -105,7 +105,7 @@ public static partial class PSVersionInfo
                 result.preReleaseLabel);
         }
 
-        private static (int major, int minor, int patch, string preReleaseLabel) FastParsePSVersion(string mainVersion)
+        private static (int major, int minor, int patch, string preReleaseLabel) ParsePSVersion(string mainVersion)
         {
             // We only handle the pre-defined PSVersion format here, e.g. 7.x.x or 7.x.x-preview.x
             int dashIndex = mainVersion.IndexOf('-');

From 77ad8909c7068441ed6a96f6ff89b3b2580f011c Mon Sep 17 00:00:00 2001
From: Dongbo Wang <dongbow@microsoft.com>
Date: Thu, 6 Oct 2022 12:13:46 -0700
Subject: [PATCH 12/13] Make generated files always visible to VSCode and
 Visual Studio and not affect re-building

---
 PowerShell.Common.props                                     | 3 +++
 .../System.Management.Automation.csproj                     | 6 ++++++
 2 files changed, 9 insertions(+)

diff --git a/PowerShell.Common.props b/PowerShell.Common.props
index 53ba4d1a57a..2d5e078f269 100644
--- a/PowerShell.Common.props
+++ b/PowerShell.Common.props
@@ -94,6 +94,9 @@
 
     </PropertyGroup>
 
+    <!-- Remove existing generated files by source generators because new source code will soon be generated when the build starts -->
+    <RemoveDir Directories="gen\SourceGenerated" Condition="Exists('gen\SourceGenerated')" />
+
     <!-- Output For Debugging
       <WriteLinesToFile File="targetfile1.txt"
         Lines="ReleaseTag=$(ReleaseTag);
diff --git a/src/System.Management.Automation/System.Management.Automation.csproj b/src/System.Management.Automation/System.Management.Automation.csproj
index 27cd25ab629..2f80b0cb76b 100644
--- a/src/System.Management.Automation/System.Management.Automation.csproj
+++ b/src/System.Management.Automation/System.Management.Automation.csproj
@@ -6,6 +6,12 @@
     <AssemblyName>System.Management.Automation</AssemblyName>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <!-- we persist source generator files under 'gen' folder so that they are visible to IDEs -->
+    <EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
+    <CompilerGeneratedFilesOutputPath>gen\SourceGenerated</CompilerGeneratedFilesOutputPath>
+  </PropertyGroup>
+
   <ItemGroup>
     <!-- these properties are declared in 'PowerShell.Common.props' and used by source generator -->
     <CompilerVisibleProperty Include="ProductVersion" />

From 1e26d0c7ccd13915e0192b0e4d2d4a8621ed9300 Mon Sep 17 00:00:00 2001
From: Dongbo Wang <dongbow@microsoft.com>
Date: Fri, 7 Oct 2022 14:04:14 -0700
Subject: [PATCH 13/13] Address comments

---
 PowerShell.Common.props                            | 14 ++++++++++++++
 .../PSVersionInfoGenerator.csproj                  |  7 ++-----
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/PowerShell.Common.props b/PowerShell.Common.props
index 38745597007..8f784ede515 100644
--- a/PowerShell.Common.props
+++ b/PowerShell.Common.props
@@ -73,6 +73,16 @@
       <PSCoreFormattedVersion Condition = "'$(ReleaseTag)' != '' or '$(PSCoreAdditionalCommits)' == '0'">$(PSCoreBuildVersion) SHA: $(PSCoreCommitSHA)</PSCoreFormattedVersion>
       <PSCoreFormattedVersion Condition = "'$(PSCoreFormattedVersion)' == ''">$(PSCoreBuildVersion) Commits: $(PSCoreAdditionalCommits) SHA: $(PSCoreCommitSHA)</PSCoreFormattedVersion>
 
+      <!-- Extract the major, minor and patch version numbers, as well as the preview label.
+           They are currently not used anywhere, so we comment them out for now.
+        <RegexSymVer>^((\d+).(\d+).(\d+))(?:-(.+))?</RegexSymVer>
+        <PSCorePrefixVersion>$([System.Text.RegularExpressions.Regex]::Match($(PSCoreBuildVersion), $(RegexSymVer)).Groups[1].Value)</PSCorePrefixVersion>
+        <PSCoreMajorVersion>$([System.Text.RegularExpressions.Regex]::Match($(PSCoreBuildVersion), $(RegexSymVer)).Groups[2].Value)</PSCoreMajorVersion>
+        <PSCoreMinorVersion>$([System.Text.RegularExpressions.Regex]::Match($(PSCoreBuildVersion), $(RegexSymVer)).Groups[3].Value)</PSCoreMinorVersion>
+        <PSCorePatchVersion>$([System.Text.RegularExpressions.Regex]::Match($(PSCoreBuildVersion), $(RegexSymVer)).Groups[4].Value)</PSCorePatchVersion>
+        <PSCoreLabelVersion>$([System.Text.RegularExpressions.Regex]::Match($(PSCoreBuildVersion), $(RegexSymVer)).Groups[5].Value)</PSCoreLabelVersion>
+      -->
+
       <!--
             Here we define explicitly 'Version' to set 'FileVersion' and 'AssemblyVersion' by 'GetAssemblyVersion' target in 'Microsoft.NET.GenerateAssemblyInfo.targets'.
             Here we define explicitly 'InformationalVersion' because by default it is defined as 'Version' by 'GetAssemblyVersion' target in 'Microsoft.NET.GenerateAssemblyInfo.targets'.
@@ -107,6 +117,10 @@
                ReleaseTagSemVersionPart = $(ReleaseTagSemVersionPart);
                PSCoreAdditionalCommits = $(PSCoreAdditionalCommits);
                PSCoreCommitSHA = $(PSCoreCommitSHA);
+               PSCoreMajorVersion = $(PSCoreMajorVersion);
+               PSCoreMinorVersion = $(PSCoreMinorVersion);
+               PSCorePatchVersion = $(PSCorePatchVersion);
+               PSCoreLabelVersion = $(PSCoreLabelVersion);
                RegexGitVersion = $(RegexGitVersion);
                PSCoreFormattedVersion = $(PSCoreFormattedVersion);
                ProductVersion = $(ProductVersion);
diff --git a/src/System.Management.Automation/SourceGenerators/PSVersionInfoGenerator/PSVersionInfoGenerator.csproj b/src/System.Management.Automation/SourceGenerators/PSVersionInfoGenerator/PSVersionInfoGenerator.csproj
index 48cebe0c298..5b9c4cffffe 100644
--- a/src/System.Management.Automation/SourceGenerators/PSVersionInfoGenerator/PSVersionInfoGenerator.csproj
+++ b/src/System.Management.Automation/SourceGenerators/PSVersionInfoGenerator/PSVersionInfoGenerator.csproj
@@ -7,15 +7,12 @@
   <PropertyGroup>
     <!-- source generator project needs to target 'netstandard2.0' -->
     <TargetFramework>netstandard2.0</TargetFramework>
-    <LangVersion>9.0</LangVersion>
+    <LangVersion>10.0</LangVersion>
     <SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.3.1" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.3">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
+    <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.3" PrivateAssets="all" />
   </ItemGroup>
 </Project>