From d058a4f3a1d7b96d6b914f4106aff82b20564c00 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Thu, 19 Jun 2025 19:05:36 -0700
Subject: [PATCH] Unify package versioning

---
 eng/Versions.props                                | 15 ---------------
 .../Directory.Build.props                         | 10 ----------
 ...stem.CommandLine.ApiCompatibility.Tests.csproj |  1 +
 .../Directory.Build.props                         | 10 ----------
 .../System.CommandLine.Generator.Tests.csproj     |  1 +
 .../Directory.Build.props                         |  9 ---------
 .../dotnet-suggest.csproj                         |  1 +
 .../Directory.Build.props                         | 10 ----------
 .../System.CommandLine.Tests.csproj               |  1 +
 src/System.CommandLine/Directory.Build.props      |  9 ---------
 10 files changed, 4 insertions(+), 63 deletions(-)
 delete mode 100644 src/System.CommandLine.ApiCompatibility.Tests/Directory.Build.props
 delete mode 100644 src/System.CommandLine.Generator.Tests/Directory.Build.props
 delete mode 100644 src/System.CommandLine.Generator/Directory.Build.props
 delete mode 100644 src/System.CommandLine.Tests/Directory.Build.props
 delete mode 100644 src/System.CommandLine/Directory.Build.props

diff --git a/eng/Versions.props b/eng/Versions.props
index 96957b208a..9fe618b0f2 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -1,23 +1,8 @@
 <Project>
   <!-- Repo Version Information -->
   <PropertyGroup>
-    <!-- Default version number to global tool. -->
-    <VersionPrefix>0.1.0</VersionPrefix>
-    <AutoGenerateAssemblyVersion>true</AutoGenerateAssemblyVersion>
-    <PreReleaseVersionLabel>
-    </PreReleaseVersionLabel>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(UseGlobalToolVersion)' == 'true'">
-    <AutoGenerateAssemblyVersion>false</AutoGenerateAssemblyVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(UseBetaVersion)' == 'true'">
     <VersionPrefix>2.0.0</VersionPrefix>
     <PreReleaseVersionLabel>beta6</PreReleaseVersionLabel>
     <AutoGenerateAssemblyVersion>false</AutoGenerateAssemblyVersion>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(UseAlphaVersion)' == 'true'">
-    <VersionPrefix>0.4.0</VersionPrefix>
-    <PreReleaseVersionLabel>alpha</PreReleaseVersionLabel>
-    <AutoGenerateAssemblyVersion>false</AutoGenerateAssemblyVersion>
-  </PropertyGroup>
 </Project>
diff --git a/src/System.CommandLine.ApiCompatibility.Tests/Directory.Build.props b/src/System.CommandLine.ApiCompatibility.Tests/Directory.Build.props
deleted file mode 100644
index 431713f682..0000000000
--- a/src/System.CommandLine.ApiCompatibility.Tests/Directory.Build.props
+++ /dev/null
@@ -1,10 +0,0 @@
-<Project>
-
-  <PropertyGroup>
-    <UseBetaVersion>true</UseBetaVersion>
-    <NoWarn>IDE1006</NoWarn>
-  </PropertyGroup>
-
-  <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
-
-</Project>
diff --git a/src/System.CommandLine.ApiCompatibility.Tests/System.CommandLine.ApiCompatibility.Tests.csproj b/src/System.CommandLine.ApiCompatibility.Tests/System.CommandLine.ApiCompatibility.Tests.csproj
index b69badcf7c..ed32b27e85 100644
--- a/src/System.CommandLine.ApiCompatibility.Tests/System.CommandLine.ApiCompatibility.Tests.csproj
+++ b/src/System.CommandLine.ApiCompatibility.Tests/System.CommandLine.ApiCompatibility.Tests.csproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFramework>$(TargetFrameworkForNETSDK)</TargetFramework>
     <IsPackable>false</IsPackable>
+    <NoWarn>$(NoWarn);IDE1006</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/System.CommandLine.Generator.Tests/Directory.Build.props b/src/System.CommandLine.Generator.Tests/Directory.Build.props
deleted file mode 100644
index 431713f682..0000000000
--- a/src/System.CommandLine.Generator.Tests/Directory.Build.props
+++ /dev/null
@@ -1,10 +0,0 @@
-<Project>
-
-  <PropertyGroup>
-    <UseBetaVersion>true</UseBetaVersion>
-    <NoWarn>IDE1006</NoWarn>
-  </PropertyGroup>
-
-  <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
-
-</Project>
diff --git a/src/System.CommandLine.Generator.Tests/System.CommandLine.Generator.Tests.csproj b/src/System.CommandLine.Generator.Tests/System.CommandLine.Generator.Tests.csproj
index 2d5bf5eaae..1c0f2f3598 100644
--- a/src/System.CommandLine.Generator.Tests/System.CommandLine.Generator.Tests.csproj
+++ b/src/System.CommandLine.Generator.Tests/System.CommandLine.Generator.Tests.csproj
@@ -6,6 +6,7 @@
     <ExcludeFromSourceBuild>true</ExcludeFromSourceBuild>
     <ExcludeFromSourceOnlyBuild>true</ExcludeFromSourceOnlyBuild>
     <Nullable>enable</Nullable>
+    <NoWarn>$(NoWarn);IDE1006</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/System.CommandLine.Generator/Directory.Build.props b/src/System.CommandLine.Generator/Directory.Build.props
deleted file mode 100644
index 47aea44a94..0000000000
--- a/src/System.CommandLine.Generator/Directory.Build.props
+++ /dev/null
@@ -1,9 +0,0 @@
-<Project>
-
-  <PropertyGroup>
-    <UseBetaVersion>true</UseBetaVersion>
-  </PropertyGroup>
-
-  <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
-
-</Project>
diff --git a/src/System.CommandLine.Suggest/dotnet-suggest.csproj b/src/System.CommandLine.Suggest/dotnet-suggest.csproj
index 8cd0d4c715..371b0becd0 100644
--- a/src/System.CommandLine.Suggest/dotnet-suggest.csproj
+++ b/src/System.CommandLine.Suggest/dotnet-suggest.csproj
@@ -13,6 +13,7 @@
     <DotnetSuggestBuildNumber>.1</DotnetSuggestBuildNumber>
     <DotnetSuggestBuildNumber Condition="'$(VersionSuffixDateStamp)' != ''">.$(VersionSuffixDateStamp).$(VersionSuffixBuildOfTheDay)</DotnetSuggestBuildNumber>
     <VersionPrefix>1.1$(DotnetSuggestBuildNumber)</VersionPrefix>
+    <PreReleaseVersionLabel />
     <!-- Don't stabilize the version when building from the VMR as the package doesn't ship from there. -->
     <VersionSuffix Condition="'$(DotNetBuild)' != 'true'" />
   </PropertyGroup>
diff --git a/src/System.CommandLine.Tests/Directory.Build.props b/src/System.CommandLine.Tests/Directory.Build.props
deleted file mode 100644
index 431713f682..0000000000
--- a/src/System.CommandLine.Tests/Directory.Build.props
+++ /dev/null
@@ -1,10 +0,0 @@
-<Project>
-
-  <PropertyGroup>
-    <UseBetaVersion>true</UseBetaVersion>
-    <NoWarn>IDE1006</NoWarn>
-  </PropertyGroup>
-
-  <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
-
-</Project>
diff --git a/src/System.CommandLine.Tests/System.CommandLine.Tests.csproj b/src/System.CommandLine.Tests/System.CommandLine.Tests.csproj
index db582f0b23..9aaa6f4b20 100644
--- a/src/System.CommandLine.Tests/System.CommandLine.Tests.csproj
+++ b/src/System.CommandLine.Tests/System.CommandLine.Tests.csproj
@@ -5,6 +5,7 @@
     <GenerateProgramFile>false</GenerateProgramFile>
     <DefaultExcludesInProjectFolder>$(DefaultExcludesInProjectFolder);TestApps\**</DefaultExcludesInProjectFolder>
     <NoWarn>$(NoWarn);CS8632</NoWarn> <!-- Suppress nullable warning for files included as links -->
+    <NoWarn>$(NoWarn);IDE1006</NoWarn>
   </PropertyGroup>
   
   <ItemGroup>   
diff --git a/src/System.CommandLine/Directory.Build.props b/src/System.CommandLine/Directory.Build.props
deleted file mode 100644
index 47aea44a94..0000000000
--- a/src/System.CommandLine/Directory.Build.props
+++ /dev/null
@@ -1,9 +0,0 @@
-<Project>
-
-  <PropertyGroup>
-    <UseBetaVersion>true</UseBetaVersion>
-  </PropertyGroup>
-
-  <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
-
-</Project>