Skip to content

Commit dc5d2f4

Browse files
RussKieRussKie
authored
Fix load order of ProjectStaging and restrict package version validation to only official builds (#6041)
* Fix load order of ProjectStaging and restrict package version validation to only official builds * Add "validation" branch which mirrors "release" but can be deleted * Revert "Merged PR 48132: Flowing dependencies and getting ready for 9.3 release" This reverts commit 092d941.
1 parent 3194512 commit dc5d2f4

File tree

27 files changed

+71
-88
lines changed

27 files changed

+71
-88
lines changed

‎Directory.Build.props

+13
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,19 @@
105105
<!-- Enable the Evaluation report builds on all CI builds -->
106106
<PropertyGroup>
107107
<EnableEvaluationReportBuild Condition="'$(ContinuousIntegrationBuild)'=='true'">true</EnableEvaluationReportBuild>
108+
109+
<!--
110+
ProjectStaging.props depends on the $(Stage) property, which is defined in the project file.
111+
It also controls $(SuppressFinalPackageVersion) which controls how versions are defined in Arcade's Version.BeforeCommonTargets.targets.
112+
113+
Normally, we'd import custom props in Directory.Build.props but it is imported before the project.
114+
We can't move the props into ProjectStaging.targets as it is imported after Version.BeforeCommonTargets.targets
115+
is imported, which is too late. This allows us to import the props at the right time.
116+
-->
117+
<BeforeMicrosoftNETSdkTargets>
118+
$(BeforeMicrosoftNETSdkTargets);
119+
$(MSBuildThisFileDirectory)\eng\MSBuild\ProjectStaging.props
120+
</BeforeMicrosoftNETSdkTargets>
108121
</PropertyGroup>
109122

110123
<!-- Common properties -->

‎azure-pipelines.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ trigger:
1010
- dev
1111
- release/*
1212
- internal/release/*
13+
- validation/*
1314
paths:
1415
include:
1516
- '*'
@@ -74,7 +75,7 @@ variables:
7475
- name: Build.Arcade.VSIXOutputPath
7576
value: $(Build.Arcade.ArtifactsPath)VSIX
7677

77-
- ${{ if or(startswith(variables['Build.SourceBranch'], 'refs/heads/release/'), startswith(variables['Build.SourceBranch'], 'refs/heads/internal/release/'), eq(variables['Build.Reason'], 'Manual')) }}:
78+
- ${{ 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')) }}:
7879
- name: PostBuildSign
7980
value: false
8081
- ${{ else }}:

‎eng/MSBuild/ProjectStaging.props

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<Project>
2+
3+
<PropertyGroup>
4+
<!-- Amend the description based on stage -->
5+
<Description Condition="'$(Stage)' == 'dev'">Experimental package. $(Description)</Description>
6+
<Description Condition="'$(Stage)' == 'obsolete'">Obsolete Package. $(Description)</Description>
7+
8+
<!--
9+
In 8.0, we shipped Microsoft.AspNetCore.Testing package as stable even when it was in the dev stage, so we
10+
keep it as stable for compatiblity.
11+
-->
12+
<_IsStable Condition="('$(Stage)' != 'dev' and '$(Stage)' != 'preview') Or '$(MSBuildProjectName)' == 'Microsoft.AspNetCore.Testing'">true</_IsStable>
13+
14+
<!--
15+
When DotNetFinalVersionKind is set to 'release' (only for the release branches),
16+
the build will produce stable outputs for 'Shipping' packages.
17+
-->
18+
<DotNetFinalVersionKind Condition=" '$(StabilizePackageVersion)' == 'true' And '$(DotNetFinalVersionKind)' == '' And '$(_IsStable)' == 'true' ">release</DotNetFinalVersionKind>
19+
20+
<!-- Preview packages: do not use stable branding and do not warn about lack of [Experimental] -->
21+
<NoWarn Condition="'$(Stage)' == 'dev' or '$(Stage)' == 'preview'">$(NoWarn);LA0003</NoWarn>
22+
<!--
23+
Makes it such that the package version won't be stabilized even when the rest of the repo is going stable.
24+
https://github.com/dotnet/arcade/blob/main/Documentation/CorePackages/Versioning.md#package-version
25+
-->
26+
<SuppressFinalPackageVersion Condition=" '$(_IsStable)' != 'true' ">true</SuppressFinalPackageVersion>
27+
</PropertyGroup>
28+
</Project>

‎eng/MSBuild/ProjectStaging.targets

+12-11
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
11
<Project>
22

3-
<PropertyGroup>
4-
<!-- Preview packages: do not use stable branding and do not warn about lack of [Experimental] -->
5-
<SuppressFinalPackageVersion Condition="'$(Stage)' == 'preview'">true</SuppressFinalPackageVersion>
6-
<NoWarn Condition="'$(Stage)' == 'preview'">$(NoWarn);LA0003</NoWarn>
7-
</PropertyGroup>
8-
93
<!-- Produce errors if we don't have all the right properties defined -->
104
<Target Name="_CheckPropsExist" Condition="'$(IsPackable)' == 'true' and '$(Stage)' != '' and $(Stage) != 'transport'" BeforeTargets="Build">
115
<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 @@
2216
<Error Condition="'$(MinMutationScore)' != 'n/a' AND ('$(MinMutationScore)' &lt; 50)" Text="MinMutationScore property must be >= 50 for normal stage." />
2317
</Target>
2418

25-
<!-- Amend the description based on stage -->
26-
<PropertyGroup>
27-
<Description Condition="'$(Stage)' == 'dev'">Experimental package. $(Description)</Description>
28-
<Description Condition="'$(Stage)' == 'obsolete'">Obsolete Package. $(Description)</Description>
29-
</PropertyGroup>
19+
<!--
20+
Produce errors if we don't have all the right property values for non-production stages.
21+
22+
Note, that Arcade resets $(_PreReleaseLabel) to "ci" for non-official builds, which breaks the validation.
23+
See Arcade SDK/Version.BeforeCommonTargets.targets for more details.
24+
-->
25+
<Target Name="_ValidateVersion" AfterTargets="GenerateNuspec" Condition=" '$(OfficialBuild)' == 'true' and '$(_IsStable)' != 'true' ">
26+
<PropertyGroup>
27+
<_ExpectedVersionSuffix>$(_PreReleaseLabel)$(_BuildNumberLabels)</_ExpectedVersionSuffix>
28+
</PropertyGroup>
3029

30+
<Error Condition=" '$(VersionSuffix)' != '$(_ExpectedVersionSuffix)' " Text="Unexpected package version suffix. Expected suffix for '$(Stage)' stage: '$(_ExpectedVersionSuffix)', received: '$(VersionSuffix)'." />
31+
</Target>
3132
</Project>

‎eng/Versions.props

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
<ApiCompatBaselineVersion>9.3.0</ApiCompatBaselineVersion>
1010
<AssemblyVersion>$(MajorVersion).$(MinorVersion).0.0</AssemblyVersion>
1111
<!--
12-
When DotNetFinalVersionKind is set to 'release', this branch will produce stable outputs for 'Shipping' packages
12+
When StabilizePackageVersion is set to 'true', this branch will produce stable outputs for 'Shipping' packages
1313
-->
14-
<DotNetFinalVersionKind />
14+
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
1515
<!-- Enabling this rule will cause build failures on undocumented public APIs. -->
1616
<SkipArcadeNoWarnCS1591>true</SkipArcadeNoWarnCS1591>
1717
</PropertyGroup>

‎src/Generators/Microsoft.Gen.MetricsReports/Directory.Build.props

-10
This file was deleted.

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

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
</PropertyGroup>
1313

1414
<PropertyGroup>
15+
<Stage>dev</Stage>
1516
<MinCodeCoverage>67</MinCodeCoverage>
1617
<MinMutationScore>85</MinMutationScore>
1718
</PropertyGroup>

‎src/Libraries/Microsoft.AspNetCore.Testing/Directory.Build.props

-11
This file was deleted.

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

+2
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
</PropertyGroup>
1313

1414
<PropertyGroup>
15+
<Stage>dev</Stage>
16+
<StageDevDiagnosticId>EXTEXP0014</StageDevDiagnosticId>
1517
<MinCodeCoverage>100</MinCodeCoverage>
1618
<MinMutationScore>100</MinMutationScore>
1719
</PropertyGroup>

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<RootNamespace>Microsoft.Extensions.AI</RootNamespace>
@@ -8,7 +8,6 @@
88

99
<PropertyGroup>
1010
<Stage>preview</Stage>
11-
<SuppressFinalPackageVersion>true</SuppressFinalPackageVersion>
1211
<EnablePackageValidation>false</EnablePackageValidation>
1312
<MinCodeCoverage>82</MinCodeCoverage>
1413
<MinMutationScore>0</MinMutationScore>

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<RootNamespace>Microsoft.Extensions.AI</RootNamespace>
@@ -8,7 +8,6 @@
88

99
<PropertyGroup>
1010
<Stage>preview</Stage>
11-
<SuppressFinalPackageVersion>true</SuppressFinalPackageVersion>
1211
<EnablePackageValidation>false</EnablePackageValidation>
1312
<MinCodeCoverage>86</MinCodeCoverage>
1413
<MinMutationScore>0</MinMutationScore>

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

-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
<PropertyGroup>
1717
<Workstream>AIEval</Workstream>
1818
<Stage>preview</Stage>
19-
<SuppressFinalPackageVersion>true</SuppressFinalPackageVersion>
2019
<ForceLatestDotnetVersions>true</ForceLatestDotnetVersions>
2120
<EnablePackageValidation>false</EnablePackageValidation>
2221
<MinCodeCoverage>8</MinCodeCoverage>

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

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
<PropertyGroup>
1010
<Workstream>AIEval</Workstream>
1111
<Stage>preview</Stage>
12-
<SuppressFinalPackageVersion>true</SuppressFinalPackageVersion>
1312
<ForceLatestDotnetVersions>true</ForceLatestDotnetVersions>
1413
<EnablePackageValidation>false</EnablePackageValidation>
1514
<!-- 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

-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
<PropertyGroup>
1212
<Workstream>AIEval</Workstream>
1313
<Stage>preview</Stage>
14-
<SuppressFinalPackageVersion>true</SuppressFinalPackageVersion>
1514
<ForceLatestDotnetVersions>true</ForceLatestDotnetVersions>
1615
<EnablePackageValidation>false</EnablePackageValidation>
1716
<MinCodeCoverage>88</MinCodeCoverage>

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

-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
<PropertyGroup>
1919
<Workstream>AIEval</Workstream>
2020
<Stage>preview</Stage>
21-
<SuppressFinalPackageVersion>true</SuppressFinalPackageVersion>
2221
<ForceLatestDotnetVersions>true</ForceLatestDotnetVersions>
2322
<EnablePackageValidation>false</EnablePackageValidation>
2423
<MinCodeCoverage>66</MinCodeCoverage>

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

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
<PropertyGroup>
1010
<Workstream>AIEval</Workstream>
1111
<Stage>preview</Stage>
12-
<SuppressFinalPackageVersion>true</SuppressFinalPackageVersion>
1312
<ForceLatestDotnetVersions>true</ForceLatestDotnetVersions>
1413
<EnablePackageValidation>false</EnablePackageValidation>
1514
<MinCodeCoverage>56</MinCodeCoverage>

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<RootNamespace>Microsoft.Extensions.AI</RootNamespace>
@@ -8,7 +8,6 @@
88

99
<PropertyGroup>
1010
<Stage>preview</Stage>
11-
<SuppressFinalPackageVersion>true</SuppressFinalPackageVersion>
1211
<EnablePackageValidation>false</EnablePackageValidation>
1312
<MinCodeCoverage>78</MinCodeCoverage>
1413
<MinMutationScore>0</MinMutationScore>

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<RootNamespace>Microsoft.Extensions.AI</RootNamespace>
@@ -8,7 +8,6 @@
88

99
<PropertyGroup>
1010
<Stage>preview</Stage>
11-
<SuppressFinalPackageVersion>true</SuppressFinalPackageVersion>
1211
<EnablePackageValidation>false</EnablePackageValidation>
1312
<MinCodeCoverage>49</MinCodeCoverage>
1413
<MinMutationScore>0</MinMutationScore>

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<RootNamespace>Microsoft.Extensions.AI</RootNamespace>
@@ -10,7 +10,6 @@
1010

1111
<PropertyGroup>
1212
<Stage>preview</Stage>
13-
<SuppressFinalPackageVersion>true</SuppressFinalPackageVersion>
1413
<EnablePackageValidation>false</EnablePackageValidation>
1514
<MinCodeCoverage>89</MinCodeCoverage>
1615
<MinMutationScore>0</MinMutationScore>

‎src/Libraries/Microsoft.Extensions.Diagnostics.Probes/Directory.Build.props

-12
This file was deleted.

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

+2
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
</PropertyGroup>
1414

1515
<PropertyGroup>
16+
<Stage>dev</Stage>
17+
<StageDevDiagnosticId>EXTEXP0015</StageDevDiagnosticId>
1618
<MinCodeCoverage>76</MinCodeCoverage>
1719
<MinMutationScore>75</MinMutationScore>
1820
</PropertyGroup>

‎src/Libraries/Microsoft.Extensions.Hosting.Testing/Directory.Build.props

-12
This file was deleted.

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

+2
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
</PropertyGroup>
1414

1515
<PropertyGroup>
16+
<Stage>dev</Stage>
17+
<StageDevDiagnosticId>EXTEXP0016</StageDevDiagnosticId>
1618
<MinCodeCoverage>100</MinCodeCoverage>
1719
<MinMutationScore>90</MinMutationScore>
1820
</PropertyGroup>

‎src/Libraries/Microsoft.Extensions.Options.Contextual/Directory.Build.props

-12
This file was deleted.

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

+2
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
</PropertyGroup>
1212

1313
<PropertyGroup>
14+
<Stage>dev</Stage>
15+
<StageDevDiagnosticId>EXTEXP0017</StageDevDiagnosticId>
1416
<MinCodeCoverage>100</MinCodeCoverage>
1517
<MinMutationScore>80</MinMutationScore>
1618
</PropertyGroup>

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

-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
<TargetFrameworks />
77

88
<Stage>transport</Stage>
9-
<SuppressFinalPackageVersion>true</SuppressFinalPackageVersion>
109
<IsShipping>false</IsShipping>
1110

1211
<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

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
<PackageTags>dotnet-new;templates;ai</PackageTags>
88

99
<Stage>preview</Stage>
10-
<SuppressFinalPackageVersion>true</SuppressFinalPackageVersion>
1110
<Workstream>AI</Workstream>
1211
<MinCodeCoverage>0</MinCodeCoverage>
1312
<MinMutationScore>0</MinMutationScore>

0 commit comments

Comments
 (0)