Address CR feedback

dotnet · May 14, 2024 · c1ce415 · c1ce415
1 parent db1420d
commit c1ce415
Show file tree

Hide file tree

Showing 7 changed files with 58 additions and 54 deletions.
diff --git a/src/libraries/System.Private.CoreLib/gen/DotnetProductVersionInfoGenerator.cs b/src/libraries/System.Private.CoreLib/gen/DotnetProductVersionInfoGenerator.cs
diff --git a/src/libraries/System.Private.CoreLib/gen/ProductVersionInfoGenerator.cs b/src/libraries/System.Private.CoreLib/gen/ProductVersionInfoGenerator.cs
@@ -0,0 +1,54 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+using System.Reflection;
+using Microsoft.CodeAnalysis;
+
+namespace Generators
+{
+    [Generator]
+    public partial class ProductVersionInfoGenerator : IIncrementalGenerator
+    {
+        public void Initialize(IncrementalGeneratorInitializationContext context)
+        {
+            context.RegisterPostInitializationOutput(ctx =>
+            {
+                string? informationalVersion = typeof(ProductVersionInfoGenerator).Assembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>()?.InformationalVersion;
+
+                // strip semver metadata (git hash) followed by + sign
+                string? productVersion = informationalVersion?.Split('+')?[0];
+
+                if (string.IsNullOrEmpty(productVersion))
+                    throw new InvalidOperationException($"Unable to obtain product version at build-time.");
+
+                // strip semver prerelease label followed by - sign for Environment.Version
+                Version versionObject = Version.Parse(productVersion.Split('-')[0]);
+
+                ctx.AddSource("ProductVersionInfo.g.cs", $@"// <auto-generated/>
+
+namespace System
+{{
+    public static partial class Environment
+    {{
+        /// <summary>
+        /// Gets a version consisting of the major, minor, build, and revision numbers of the common language runtime.
+        /// </summary>
+        public static Version Version => new Version({versionObject.Major}, {versionObject.Minor}, {versionObject.Build});
+    }}
+}}
+
+namespace System.Runtime.InteropServices
+{{
+    public static partial class RuntimeInformation
+    {{
+        /// <summary>
+        /// Gets the name of the .NET installation on which an app is running.
+        /// </summary>
+        public static string FrameworkDescription => "".NET {productVersion}"";
+    }}
+}}");
+            });
+        }
+    }
+}
diff --git a/src/libraries/System.Private.CoreLib/gen/System.Private.CoreLib.Generators.csproj b/src/libraries/System.Private.CoreLib/gen/System.Private.CoreLib.Generators.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="DotnetProductVersionInfoGenerator.cs" />
+    <Compile Include="ProductVersionInfoGenerator.cs" />
     <Compile Include="EventSourceGenerator.cs" />
     <Compile Include="EventSourceGenerator.Emitter.cs" />
     <Compile Include="EventSourceGenerator.Parser.cs" />

diff --git a/src/libraries/System.Private.CoreLib/src/System.Private.CoreLib.Shared.projitems b/src/libraries/System.Private.CoreLib/src/System.Private.CoreLib.Shared.projitems
@@ -2783,7 +2783,4 @@
     <Compile Include="$(MSBuildThisFileDirectory)System\Numerics\IUnaryPlusOperators.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)System\Numerics\IUnsignedNumber.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <AdditionalFiles Include="$(Version).versionstring" />
-  </ItemGroup>
 </Project>
diff --git a/src/libraries/System.Private.CoreLib/src/System/Environment.cs b/src/libraries/System.Private.CoreLib/src/System/Environment.cs
@@ -3,7 +3,6 @@
 
 using System.Collections;
 using System.Diagnostics;
-using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Threading;
 
@@ -201,8 +200,6 @@ public static OperatingSystem OSVersion
             }
         }
 
-        public static Version Version => Version.Parse(ProductVersionWithoutLabel);
-
         public static string StackTrace
         {
             [MethodImpl(MethodImplOptions.NoInlining)] // Prevent inlining from affecting where the stacktrace starts

diff --git a/...libraries/System.Private.CoreLib/src/System/Runtime/InteropServices/RuntimeInformation.cs b/...libraries/System.Private.CoreLib/src/System/Runtime/InteropServices/RuntimeInformation.cs
@@ -7,11 +7,6 @@ public static partial class RuntimeInformation
     {
         private static string? s_runtimeIdentifier;
 
-        /// <summary>
-        /// Gets the name of the .NET installation on which an app is running.
-        /// </summary>
-        public static string FrameworkDescription { get; } = ".NET " + Environment.ProductVersionWithLabel;
-
         /// <summary>
         /// Returns an opaque string that identifies the platform on which an app is running.
         /// </summary>

diff --git a/...s.RuntimeInformation.Tests/System.Runtime.InteropServices.RuntimeInformation.Tests.csproj b/...s.RuntimeInformation.Tests/System.Runtime.InteropServices.RuntimeInformation.Tests.csproj
@@ -4,6 +4,9 @@
     <IncludeRemoteExecutor>true</IncludeRemoteExecutor>
     <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-unix;$(NetCoreAppCurrent)-browser</TargetFrameworks>
   </PropertyGroup>
+  <PropertyGroup>
+    <DefineConstants Condition="'$(StabilizePackageVersion)' == 'true'">$(DefineConstants);STABILIZE_PACKAGE_VERSION</DefineConstants>
+  </PropertyGroup>
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="CheckArchitectureTests.cs" />