Fix load order of ProjectStaging and restrict package version validation to only official builds

Directory.Build.props

@@ -105,6 +105,19 @@
   <!-- Enable the Evaluation report builds on all CI builds -->
   <PropertyGroup>
     <EnableEvaluationReportBuild Condition="'$(ContinuousIntegrationBuild)'=='true'">true</EnableEvaluationReportBuild>
+
+    <!--
+      ProjectStaging.props depends on the $(Stage) property, which is defined in the project file.
+      It also controls $(SuppressFinalPackageVersion) which controls how versions are defined in  Arcade's Version.BeforeCommonTargets.targets.
+
+      Normally, we'd import custom props in Directory.Build.props but it is imported before the project.
+      We can't move the props into ProjectStaging.targets as it is imported after Version.BeforeCommonTargets.targets
+      is imported, which is too late. This allows us to import the props at the right time.
+      -->
+    <BeforeMicrosoftNETSdkTargets>
+      $(BeforeMicrosoftNETSdkTargets);
+      $(MSBuildThisFileDirectory)\eng\MSBuild\ProjectStaging.props
+    </BeforeMicrosoftNETSdkTargets>
   </PropertyGroup>
 
   <!-- Common properties -->

azure-pipelines.yml

@@ -10,6 +10,7 @@ trigger:
       - dev
       - release/*
       - internal/release/*
+      - validation/*
   paths:
     include:
       - '*'
@@ -74,7 +75,7 @@ variables:
   - name: Build.Arcade.VSIXOutputPath
     value: $(Build.Arcade.ArtifactsPath)VSIX
 
-  - ${{ if or(startswith(variables['Build.SourceBranch'], 'refs/heads/release/'), startswith(variables['Build.SourceBranch'], 'refs/heads/internal/release/'), eq(variables['Build.Reason'], 'Manual')) }}:
+  - ${{ if or(startswith(variables['Build.SourceBranch'], 'refs/heads/release/'), startswith(variables['Build.SourceBranch'], 'refs/heads/internal/release/'), startswith(variables['Build.SourceBranch'], 'refs/heads/validation/'), eq(variables['Build.Reason'], 'Manual')) }}:
     - name: PostBuildSign
       value: false
   - ${{ else }}:

eng/MSBuild/ProjectStaging.props

@@ -0,0 +1,28 @@
+<Project>
+
+  <PropertyGroup>
+    <!-- Amend the description based on stage -->
+    <Description Condition="'$(Stage)' == 'dev'">Experimental package. $(Description)</Description>
+    <Description Condition="'$(Stage)' == 'obsolete'">Obsolete Package. $(Description)</Description>
+
+    <!--
+        In 8.0, we shipped Microsoft.AspNetCore.Testing package as stable even when it was in the dev stage, so we
+        keep it as stable for compatiblity.
+      -->
+    <_IsStable Condition="('$(Stage)' != 'dev' and '$(Stage)' != 'preview') Or '$(MSBuildProjectName)' == 'Microsoft.AspNetCore.Testing'">true</_IsStable>
+
+    <!--
+        When DotNetFinalVersionKind is set to 'release' (only for the release branches),
+        the build will produce stable outputs for 'Shipping' packages.
+      -->
+    <DotNetFinalVersionKind Condition=" '$(StabilizePackageVersion)' == 'true' And '$(DotNetFinalVersionKind)' == '' And '$(_IsStable)' == 'true' ">release</DotNetFinalVersionKind>
+
+    <!-- Preview packages: do not use stable branding and do not warn about lack of [Experimental] -->
+    <NoWarn Condition="'$(Stage)' == 'dev' or '$(Stage)' == 'preview'">$(NoWarn);LA0003</NoWarn>
+    <!--
+        Makes it such that the package version won't be stabilized even when the rest of the repo is going stable.
+        https://github.com/dotnet/arcade/blob/main/Documentation/CorePackages/Versioning.md#package-version
+      -->
+    <SuppressFinalPackageVersion Condition=" '$(_IsStable)' != 'true' ">true</SuppressFinalPackageVersion>
+  </PropertyGroup>
+</Project>

eng/MSBuild/ProjectStaging.targets

@@ -1,11 +1,5 @@
 <Project>
 
-  <PropertyGroup>
-    <!-- Preview packages: do not use stable branding and do not warn about lack of [Experimental] -->
-    <SuppressFinalPackageVersion Condition="'$(Stage)' == 'preview'">true</SuppressFinalPackageVersion>
-    <NoWarn Condition="'$(Stage)' == 'preview'">$(NoWarn);LA0003</NoWarn>
-  </PropertyGroup>
-
   <!-- Produce errors if we don't have all the right properties defined -->
   <Target Name="_CheckPropsExist" Condition="'$(IsPackable)' == 'true' and '$(Stage)' != '' and $(Stage) != 'transport'" BeforeTargets="Build">
     <Error Condition="'$(Stage)' != 'dev' AND '$(Stage)' != 'normal' AND '$(Stage)' != 'obsolete' AND '$(Stage)' != 'preview'" Text="Stage property must be dev|normal|obsolete|preview" />
@@ -22,10 +16,17 @@
     <Error Condition="'$(MinMutationScore)' != 'n/a' AND ('$(MinMutationScore)' &lt; 50)" Text="MinMutationScore property must be >= 50 for normal stage." />
   </Target>
 
-  <!-- Amend the description based on stage -->
-  <PropertyGroup>
-    <Description Condition="'$(Stage)' == 'dev'">Experimental package. $(Description)</Description>
-    <Description Condition="'$(Stage)' == 'obsolete'">Obsolete Package. $(Description)</Description>
-  </PropertyGroup>
+  <!--
+   Produce errors if we don't have all the right property values for non-production stages.
+
+   Note, that Arcade resets $(_PreReleaseLabel) to "ci" for non-official builds, which breaks the validation.
+   See Arcade SDK/Version.BeforeCommonTargets.targets for more details.
+    -->
+  <Target Name="_ValidateVersion" AfterTargets="GenerateNuspec" Condition=" '$(OfficialBuild)' == 'true' and '$(_IsStable)' != 'true' ">
+    <PropertyGroup>
+      <_ExpectedVersionSuffix>$(_PreReleaseLabel)$(_BuildNumberLabels)</_ExpectedVersionSuffix>
+    </PropertyGroup>
 
+    <Error Condition=" '$(VersionSuffix)' != '$(_ExpectedVersionSuffix)' " Text="Unexpected package version suffix. Expected suffix for '$(Stage)' stage: '$(_ExpectedVersionSuffix)', received: '$(VersionSuffix)'." />
+  </Target>
 </Project>

eng/Versions.props

@@ -9,9 +9,9 @@
     <ApiCompatBaselineVersion>9.3.0</ApiCompatBaselineVersion>
     <AssemblyVersion>$(MajorVersion).$(MinorVersion).0.0</AssemblyVersion>
     <!--
-        When DotNetFinalVersionKind is set to 'release', this branch will produce stable outputs for 'Shipping' packages
+        When StabilizePackageVersion is set to 'true', this branch will produce stable outputs for 'Shipping' packages
     -->
-    <DotNetFinalVersionKind />
+    <StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
     <!-- Enabling this rule will cause build failures on undocumented public APIs. -->
     <SkipArcadeNoWarnCS1591>true</SkipArcadeNoWarnCS1591>
   </PropertyGroup>

src/Generators/Microsoft.Gen.MetricsReports/Microsoft.Gen.MetricsReports.csproj

@@ -12,6 +12,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
+    <Stage>dev</Stage>
     <MinCodeCoverage>67</MinCodeCoverage>
     <MinMutationScore>85</MinMutationScore>
   </PropertyGroup>

src/Libraries/Microsoft.AspNetCore.Testing/Microsoft.AspNetCore.Testing.csproj

@@ -12,6 +12,8 @@
   </PropertyGroup>
 
   <PropertyGroup>
+    <Stage>dev</Stage>
+    <StageDevDiagnosticId>EXTEXP0014</StageDevDiagnosticId>
     <MinCodeCoverage>100</MinCodeCoverage>
     <MinMutationScore>100</MinMutationScore>
   </PropertyGroup>

src/Libraries/Microsoft.Extensions.AI.Abstractions/Microsoft.Extensions.AI.Abstractions.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <RootNamespace>Microsoft.Extensions.AI</RootNamespace>
@@ -8,7 +8,6 @@
 
   <PropertyGroup>
     <Stage>preview</Stage>
-    <SuppressFinalPackageVersion>true</SuppressFinalPackageVersion>
     <EnablePackageValidation>false</EnablePackageValidation>
     <MinCodeCoverage>82</MinCodeCoverage>
     <MinMutationScore>0</MinMutationScore>

src/Libraries/Microsoft.Extensions.AI.AzureAIInference/Microsoft.Extensions.AI.AzureAIInference.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <RootNamespace>Microsoft.Extensions.AI</RootNamespace>
@@ -8,7 +8,6 @@
 
   <PropertyGroup>
     <Stage>preview</Stage>
-    <SuppressFinalPackageVersion>true</SuppressFinalPackageVersion>
     <EnablePackageValidation>false</EnablePackageValidation>
     <MinCodeCoverage>86</MinCodeCoverage>
     <MinMutationScore>0</MinMutationScore>

src/Libraries/Microsoft.Extensions.AI.Evaluation.Console/Microsoft.Extensions.AI.Evaluation.Console.csproj

@@ -16,7 +16,6 @@
   <PropertyGroup>
     <Workstream>AIEval</Workstream>
     <Stage>preview</Stage>
-    <SuppressFinalPackageVersion>true</SuppressFinalPackageVersion>
     <ForceLatestDotnetVersions>true</ForceLatestDotnetVersions>
     <EnablePackageValidation>false</EnablePackageValidation>
     <MinCodeCoverage>8</MinCodeCoverage>

src/Libraries/Microsoft.Extensions.AI.Evaluation.Quality/Microsoft.Extensions.AI.Evaluation.Quality.csproj

@@ -9,7 +9,6 @@
   <PropertyGroup>
     <Workstream>AIEval</Workstream>
     <Stage>preview</Stage>
-    <SuppressFinalPackageVersion>true</SuppressFinalPackageVersion>
     <ForceLatestDotnetVersions>true</ForceLatestDotnetVersions>
     <EnablePackageValidation>false</EnablePackageValidation>
     <!-- The evaluators in this assembly need AI and the tests that cover them are not being run in CI at the moment. -->

src/Libraries/Microsoft.Extensions.AI.Evaluation.Reporting.Azure/Microsoft.Extensions.AI.Evaluation.Reporting.Azure.csproj

@@ -11,7 +11,6 @@
   <PropertyGroup>
     <Workstream>AIEval</Workstream>
     <Stage>preview</Stage>
-    <SuppressFinalPackageVersion>true</SuppressFinalPackageVersion>
     <ForceLatestDotnetVersions>true</ForceLatestDotnetVersions>
     <EnablePackageValidation>false</EnablePackageValidation>
     <MinCodeCoverage>88</MinCodeCoverage>

src/Libraries/Microsoft.Extensions.AI.Evaluation.Reporting/CSharp/Microsoft.Extensions.AI.Evaluation.Reporting.csproj

@@ -18,7 +18,6 @@
   <PropertyGroup>
     <Workstream>AIEval</Workstream>
     <Stage>preview</Stage>
-    <SuppressFinalPackageVersion>true</SuppressFinalPackageVersion>
     <ForceLatestDotnetVersions>true</ForceLatestDotnetVersions>
     <EnablePackageValidation>false</EnablePackageValidation>
     <MinCodeCoverage>66</MinCodeCoverage>

src/Libraries/Microsoft.Extensions.AI.Evaluation/Microsoft.Extensions.AI.Evaluation.csproj

@@ -9,7 +9,6 @@
   <PropertyGroup>
     <Workstream>AIEval</Workstream>
     <Stage>preview</Stage>
-    <SuppressFinalPackageVersion>true</SuppressFinalPackageVersion>
     <ForceLatestDotnetVersions>true</ForceLatestDotnetVersions>
     <EnablePackageValidation>false</EnablePackageValidation>
     <MinCodeCoverage>56</MinCodeCoverage>

src/Libraries/Microsoft.Extensions.AI.Ollama/Microsoft.Extensions.AI.Ollama.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <RootNamespace>Microsoft.Extensions.AI</RootNamespace>
@@ -8,7 +8,6 @@
 
   <PropertyGroup>
     <Stage>preview</Stage>
-    <SuppressFinalPackageVersion>true</SuppressFinalPackageVersion>
     <EnablePackageValidation>false</EnablePackageValidation>
     <MinCodeCoverage>78</MinCodeCoverage>
     <MinMutationScore>0</MinMutationScore>

src/Libraries/Microsoft.Extensions.AI.OpenAI/Microsoft.Extensions.AI.OpenAI.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <RootNamespace>Microsoft.Extensions.AI</RootNamespace>
@@ -8,7 +8,6 @@
 
   <PropertyGroup>
     <Stage>preview</Stage>
-    <SuppressFinalPackageVersion>true</SuppressFinalPackageVersion>
     <EnablePackageValidation>false</EnablePackageValidation>
     <MinCodeCoverage>49</MinCodeCoverage>
     <MinMutationScore>0</MinMutationScore>

src/Libraries/Microsoft.Extensions.AI/Microsoft.Extensions.AI.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <RootNamespace>Microsoft.Extensions.AI</RootNamespace>
@@ -10,7 +10,6 @@
 
   <PropertyGroup>
     <Stage>preview</Stage>
-    <SuppressFinalPackageVersion>true</SuppressFinalPackageVersion>
     <EnablePackageValidation>false</EnablePackageValidation>
     <MinCodeCoverage>89</MinCodeCoverage>
     <MinMutationScore>0</MinMutationScore>

src/Libraries/Microsoft.Extensions.Diagnostics.Probes/Microsoft.Extensions.Diagnostics.Probes.csproj

@@ -13,6 +13,8 @@
   </PropertyGroup>
 
   <PropertyGroup>
+    <Stage>dev</Stage>
+    <StageDevDiagnosticId>EXTEXP0015</StageDevDiagnosticId>
     <MinCodeCoverage>76</MinCodeCoverage>
     <MinMutationScore>75</MinMutationScore>
   </PropertyGroup>

src/Libraries/Microsoft.Extensions.Hosting.Testing/Microsoft.Extensions.Hosting.Testing.csproj

@@ -13,6 +13,8 @@
   </PropertyGroup>
 
   <PropertyGroup>
+    <Stage>dev</Stage>
+    <StageDevDiagnosticId>EXTEXP0016</StageDevDiagnosticId>
     <MinCodeCoverage>100</MinCodeCoverage>
     <MinMutationScore>90</MinMutationScore>
   </PropertyGroup>

src/Libraries/Microsoft.Extensions.Options.Contextual/Microsoft.Extensions.Options.Contextual.csproj

@@ -11,6 +11,8 @@
   </PropertyGroup>
 
   <PropertyGroup>
+    <Stage>dev</Stage>
+    <StageDevDiagnosticId>EXTEXP0017</StageDevDiagnosticId>
     <MinCodeCoverage>100</MinCodeCoverage>
     <MinMutationScore>80</MinMutationScore>
   </PropertyGroup>

src/Packages/Microsoft.Internal.Extensions.DotNetApiDocs.Transport/Microsoft.Internal.Extensions.DotNetApiDocs.Transport.proj

@@ -6,7 +6,6 @@
     <TargetFrameworks />
 
     <Stage>transport</Stage>
-    <SuppressFinalPackageVersion>true</SuppressFinalPackageVersion>
     <IsShipping>false</IsShipping>
 
     <PackageDescription>Internal transport package to provide dotnet-api-docs with the reference assemblies and compiler generated documentation files from dotnet/extensions.</PackageDescription>

src/ProjectTemplates/Microsoft.Extensions.AI.Templates/Microsoft.Extensions.AI.Templates.csproj

@@ -7,7 +7,6 @@
     <PackageTags>dotnet-new;templates;ai</PackageTags>
 
     <Stage>preview</Stage>
-    <SuppressFinalPackageVersion>true</SuppressFinalPackageVersion>
     <Workstream>AI</Workstream>
     <MinCodeCoverage>0</MinCodeCoverage>
     <MinMutationScore>0</MinMutationScore>