diff --git a/Directory.Build.props b/Directory.Build.props index 2cdce43e08e..0af806af628 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -105,6 +105,19 @@ true + + + + $(BeforeMicrosoftNETSdkTargets); + $(MSBuildThisFileDirectory)\eng\MSBuild\ProjectStaging.props + diff --git a/azure-pipelines.yml b/azure-pipelines.yml index c8479a1cf09..3ec5e3d1cdb 100644 --- a/azure-pipelines.yml +++ b/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 }}: diff --git a/eng/MSBuild/ProjectStaging.props b/eng/MSBuild/ProjectStaging.props new file mode 100644 index 00000000000..95fed0f1e31 --- /dev/null +++ b/eng/MSBuild/ProjectStaging.props @@ -0,0 +1,28 @@ + + + + + Experimental package. $(Description) + Obsolete Package. $(Description) + + + <_IsStable Condition="('$(Stage)' != 'dev' and '$(Stage)' != 'preview') Or '$(MSBuildProjectName)' == 'Microsoft.AspNetCore.Testing'">true + + + release + + + $(NoWarn);LA0003 + + true + + diff --git a/eng/MSBuild/ProjectStaging.targets b/eng/MSBuild/ProjectStaging.targets index e3a89d03542..e43cff1601b 100644 --- a/eng/MSBuild/ProjectStaging.targets +++ b/eng/MSBuild/ProjectStaging.targets @@ -1,11 +1,5 @@ - - - true - $(NoWarn);LA0003 - - @@ -22,10 +16,17 @@ - - - Experimental package. $(Description) - Obsolete Package. $(Description) - + + + + <_ExpectedVersionSuffix>$(_PreReleaseLabel)$(_BuildNumberLabels) + + + diff --git a/eng/Versions.props b/eng/Versions.props index 274c03d0ad6..9a3a56cd5aa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -9,9 +9,9 @@ 9.3.0 $(MajorVersion).$(MinorVersion).0.0 - + false true diff --git a/src/Generators/Microsoft.Gen.MetricsReports/Directory.Build.props b/src/Generators/Microsoft.Gen.MetricsReports/Directory.Build.props deleted file mode 100644 index f739a758633..00000000000 --- a/src/Generators/Microsoft.Gen.MetricsReports/Directory.Build.props +++ /dev/null @@ -1,10 +0,0 @@ - - - - dev - true - - - \ No newline at end of file diff --git a/src/Generators/Microsoft.Gen.MetricsReports/Microsoft.Gen.MetricsReports.csproj b/src/Generators/Microsoft.Gen.MetricsReports/Microsoft.Gen.MetricsReports.csproj index 47ffba75388..ecfe0d4059a 100644 --- a/src/Generators/Microsoft.Gen.MetricsReports/Microsoft.Gen.MetricsReports.csproj +++ b/src/Generators/Microsoft.Gen.MetricsReports/Microsoft.Gen.MetricsReports.csproj @@ -12,6 +12,7 @@ + dev 67 85 diff --git a/src/Libraries/Microsoft.AspNetCore.Testing/Directory.Build.props b/src/Libraries/Microsoft.AspNetCore.Testing/Directory.Build.props deleted file mode 100644 index 4503261437d..00000000000 --- a/src/Libraries/Microsoft.AspNetCore.Testing/Directory.Build.props +++ /dev/null @@ -1,11 +0,0 @@ - - - - dev - EXTEXP0014 - - - - \ No newline at end of file diff --git a/src/Libraries/Microsoft.AspNetCore.Testing/Microsoft.AspNetCore.Testing.csproj b/src/Libraries/Microsoft.AspNetCore.Testing/Microsoft.AspNetCore.Testing.csproj index 01eb8bb974e..d135a3472db 100644 --- a/src/Libraries/Microsoft.AspNetCore.Testing/Microsoft.AspNetCore.Testing.csproj +++ b/src/Libraries/Microsoft.AspNetCore.Testing/Microsoft.AspNetCore.Testing.csproj @@ -12,6 +12,8 @@ + dev + EXTEXP0014 100 100 diff --git a/src/Libraries/Microsoft.Extensions.AI.Abstractions/Microsoft.Extensions.AI.Abstractions.csproj b/src/Libraries/Microsoft.Extensions.AI.Abstractions/Microsoft.Extensions.AI.Abstractions.csproj index 123a9a23334..da24217861e 100644 --- a/src/Libraries/Microsoft.Extensions.AI.Abstractions/Microsoft.Extensions.AI.Abstractions.csproj +++ b/src/Libraries/Microsoft.Extensions.AI.Abstractions/Microsoft.Extensions.AI.Abstractions.csproj @@ -1,4 +1,4 @@ - + Microsoft.Extensions.AI @@ -8,7 +8,6 @@ preview - true false 82 0 diff --git a/src/Libraries/Microsoft.Extensions.AI.AzureAIInference/Microsoft.Extensions.AI.AzureAIInference.csproj b/src/Libraries/Microsoft.Extensions.AI.AzureAIInference/Microsoft.Extensions.AI.AzureAIInference.csproj index 1f14a18d823..5384a7992d7 100644 --- a/src/Libraries/Microsoft.Extensions.AI.AzureAIInference/Microsoft.Extensions.AI.AzureAIInference.csproj +++ b/src/Libraries/Microsoft.Extensions.AI.AzureAIInference/Microsoft.Extensions.AI.AzureAIInference.csproj @@ -1,4 +1,4 @@ - + Microsoft.Extensions.AI @@ -8,7 +8,6 @@ preview - true false 86 0 diff --git a/src/Libraries/Microsoft.Extensions.AI.Evaluation.Console/Microsoft.Extensions.AI.Evaluation.Console.csproj b/src/Libraries/Microsoft.Extensions.AI.Evaluation.Console/Microsoft.Extensions.AI.Evaluation.Console.csproj index 624f1984425..5980faefe72 100644 --- a/src/Libraries/Microsoft.Extensions.AI.Evaluation.Console/Microsoft.Extensions.AI.Evaluation.Console.csproj +++ b/src/Libraries/Microsoft.Extensions.AI.Evaluation.Console/Microsoft.Extensions.AI.Evaluation.Console.csproj @@ -16,7 +16,6 @@ AIEval preview - true true false 8 diff --git a/src/Libraries/Microsoft.Extensions.AI.Evaluation.Quality/Microsoft.Extensions.AI.Evaluation.Quality.csproj b/src/Libraries/Microsoft.Extensions.AI.Evaluation.Quality/Microsoft.Extensions.AI.Evaluation.Quality.csproj index f73422364bc..3d9a48e1a5e 100644 --- a/src/Libraries/Microsoft.Extensions.AI.Evaluation.Quality/Microsoft.Extensions.AI.Evaluation.Quality.csproj +++ b/src/Libraries/Microsoft.Extensions.AI.Evaluation.Quality/Microsoft.Extensions.AI.Evaluation.Quality.csproj @@ -9,7 +9,6 @@ AIEval preview - true true false diff --git a/src/Libraries/Microsoft.Extensions.AI.Evaluation.Reporting.Azure/Microsoft.Extensions.AI.Evaluation.Reporting.Azure.csproj b/src/Libraries/Microsoft.Extensions.AI.Evaluation.Reporting.Azure/Microsoft.Extensions.AI.Evaluation.Reporting.Azure.csproj index b1dbb80dd38..f705add750e 100644 --- a/src/Libraries/Microsoft.Extensions.AI.Evaluation.Reporting.Azure/Microsoft.Extensions.AI.Evaluation.Reporting.Azure.csproj +++ b/src/Libraries/Microsoft.Extensions.AI.Evaluation.Reporting.Azure/Microsoft.Extensions.AI.Evaluation.Reporting.Azure.csproj @@ -11,7 +11,6 @@ AIEval preview - true true false 88 diff --git a/src/Libraries/Microsoft.Extensions.AI.Evaluation.Reporting/CSharp/Microsoft.Extensions.AI.Evaluation.Reporting.csproj b/src/Libraries/Microsoft.Extensions.AI.Evaluation.Reporting/CSharp/Microsoft.Extensions.AI.Evaluation.Reporting.csproj index 1b24a8d5887..878378d633e 100644 --- a/src/Libraries/Microsoft.Extensions.AI.Evaluation.Reporting/CSharp/Microsoft.Extensions.AI.Evaluation.Reporting.csproj +++ b/src/Libraries/Microsoft.Extensions.AI.Evaluation.Reporting/CSharp/Microsoft.Extensions.AI.Evaluation.Reporting.csproj @@ -18,7 +18,6 @@ AIEval preview - true true false 66 diff --git a/src/Libraries/Microsoft.Extensions.AI.Evaluation/Microsoft.Extensions.AI.Evaluation.csproj b/src/Libraries/Microsoft.Extensions.AI.Evaluation/Microsoft.Extensions.AI.Evaluation.csproj index cd65f271c5c..0123cae0f0f 100644 --- a/src/Libraries/Microsoft.Extensions.AI.Evaluation/Microsoft.Extensions.AI.Evaluation.csproj +++ b/src/Libraries/Microsoft.Extensions.AI.Evaluation/Microsoft.Extensions.AI.Evaluation.csproj @@ -9,7 +9,6 @@ AIEval preview - true true false 56 diff --git a/src/Libraries/Microsoft.Extensions.AI.Ollama/Microsoft.Extensions.AI.Ollama.csproj b/src/Libraries/Microsoft.Extensions.AI.Ollama/Microsoft.Extensions.AI.Ollama.csproj index b8e47a28fad..4189a7fb466 100644 --- a/src/Libraries/Microsoft.Extensions.AI.Ollama/Microsoft.Extensions.AI.Ollama.csproj +++ b/src/Libraries/Microsoft.Extensions.AI.Ollama/Microsoft.Extensions.AI.Ollama.csproj @@ -1,4 +1,4 @@ - + Microsoft.Extensions.AI @@ -8,7 +8,6 @@ preview - true false 78 0 diff --git a/src/Libraries/Microsoft.Extensions.AI.OpenAI/Microsoft.Extensions.AI.OpenAI.csproj b/src/Libraries/Microsoft.Extensions.AI.OpenAI/Microsoft.Extensions.AI.OpenAI.csproj index f9e83e3ce88..18bfe009184 100644 --- a/src/Libraries/Microsoft.Extensions.AI.OpenAI/Microsoft.Extensions.AI.OpenAI.csproj +++ b/src/Libraries/Microsoft.Extensions.AI.OpenAI/Microsoft.Extensions.AI.OpenAI.csproj @@ -1,4 +1,4 @@ - + Microsoft.Extensions.AI @@ -8,7 +8,6 @@ preview - true false 49 0 diff --git a/src/Libraries/Microsoft.Extensions.AI/Microsoft.Extensions.AI.csproj b/src/Libraries/Microsoft.Extensions.AI/Microsoft.Extensions.AI.csproj index 72bfb799ae7..10f590639ec 100644 --- a/src/Libraries/Microsoft.Extensions.AI/Microsoft.Extensions.AI.csproj +++ b/src/Libraries/Microsoft.Extensions.AI/Microsoft.Extensions.AI.csproj @@ -1,4 +1,4 @@ - + Microsoft.Extensions.AI @@ -10,7 +10,6 @@ preview - true false 89 0 diff --git a/src/Libraries/Microsoft.Extensions.Diagnostics.Probes/Directory.Build.props b/src/Libraries/Microsoft.Extensions.Diagnostics.Probes/Directory.Build.props deleted file mode 100644 index 0ea108580da..00000000000 --- a/src/Libraries/Microsoft.Extensions.Diagnostics.Probes/Directory.Build.props +++ /dev/null @@ -1,12 +0,0 @@ - - - - true - dev - EXTEXP0015 - - - - \ No newline at end of file diff --git a/src/Libraries/Microsoft.Extensions.Diagnostics.Probes/Microsoft.Extensions.Diagnostics.Probes.csproj b/src/Libraries/Microsoft.Extensions.Diagnostics.Probes/Microsoft.Extensions.Diagnostics.Probes.csproj index 4336188ced0..8eb6ac3b9dc 100644 --- a/src/Libraries/Microsoft.Extensions.Diagnostics.Probes/Microsoft.Extensions.Diagnostics.Probes.csproj +++ b/src/Libraries/Microsoft.Extensions.Diagnostics.Probes/Microsoft.Extensions.Diagnostics.Probes.csproj @@ -13,6 +13,8 @@ + dev + EXTEXP0015 76 75 diff --git a/src/Libraries/Microsoft.Extensions.Hosting.Testing/Directory.Build.props b/src/Libraries/Microsoft.Extensions.Hosting.Testing/Directory.Build.props deleted file mode 100644 index 77a9a53a9e9..00000000000 --- a/src/Libraries/Microsoft.Extensions.Hosting.Testing/Directory.Build.props +++ /dev/null @@ -1,12 +0,0 @@ - - - - true - dev - EXTEXP0016 - - - - \ No newline at end of file diff --git a/src/Libraries/Microsoft.Extensions.Hosting.Testing/Microsoft.Extensions.Hosting.Testing.csproj b/src/Libraries/Microsoft.Extensions.Hosting.Testing/Microsoft.Extensions.Hosting.Testing.csproj index fdc40c84838..63f7651746f 100644 --- a/src/Libraries/Microsoft.Extensions.Hosting.Testing/Microsoft.Extensions.Hosting.Testing.csproj +++ b/src/Libraries/Microsoft.Extensions.Hosting.Testing/Microsoft.Extensions.Hosting.Testing.csproj @@ -13,6 +13,8 @@ + dev + EXTEXP0016 100 90 diff --git a/src/Libraries/Microsoft.Extensions.Options.Contextual/Directory.Build.props b/src/Libraries/Microsoft.Extensions.Options.Contextual/Directory.Build.props deleted file mode 100644 index 59864c9c658..00000000000 --- a/src/Libraries/Microsoft.Extensions.Options.Contextual/Directory.Build.props +++ /dev/null @@ -1,12 +0,0 @@ - - - - true - dev - EXTEXP0017 - - - - \ No newline at end of file diff --git a/src/Libraries/Microsoft.Extensions.Options.Contextual/Microsoft.Extensions.Options.Contextual.csproj b/src/Libraries/Microsoft.Extensions.Options.Contextual/Microsoft.Extensions.Options.Contextual.csproj index d80898ce3ae..e15687a9ee7 100644 --- a/src/Libraries/Microsoft.Extensions.Options.Contextual/Microsoft.Extensions.Options.Contextual.csproj +++ b/src/Libraries/Microsoft.Extensions.Options.Contextual/Microsoft.Extensions.Options.Contextual.csproj @@ -11,6 +11,8 @@ + dev + EXTEXP0017 100 80 diff --git a/src/Packages/Microsoft.Internal.Extensions.DotNetApiDocs.Transport/Microsoft.Internal.Extensions.DotNetApiDocs.Transport.proj b/src/Packages/Microsoft.Internal.Extensions.DotNetApiDocs.Transport/Microsoft.Internal.Extensions.DotNetApiDocs.Transport.proj index b09c6644346..aa1d5b37fbc 100644 --- a/src/Packages/Microsoft.Internal.Extensions.DotNetApiDocs.Transport/Microsoft.Internal.Extensions.DotNetApiDocs.Transport.proj +++ b/src/Packages/Microsoft.Internal.Extensions.DotNetApiDocs.Transport/Microsoft.Internal.Extensions.DotNetApiDocs.Transport.proj @@ -6,7 +6,6 @@ transport - true false Internal transport package to provide dotnet-api-docs with the reference assemblies and compiler generated documentation files from dotnet/extensions. diff --git a/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/Microsoft.Extensions.AI.Templates.csproj b/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/Microsoft.Extensions.AI.Templates.csproj index 34dcf90629b..0f709d15066 100644 --- a/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/Microsoft.Extensions.AI.Templates.csproj +++ b/src/ProjectTemplates/Microsoft.Extensions.AI.Templates/Microsoft.Extensions.AI.Templates.csproj @@ -7,7 +7,6 @@ dotnet-new;templates;ai preview - true AI 0 0