Update branding to 10.0 (dotnet#57340)

* Update branding to 10.0 * Update Microsoft.AspNetCore.Grpc.Microbenchmarks.csproj * Update TemplatePackageInstaller.cs * Fix ApiExplorer_LogsInvokedDescriptionProvidersOnStartup --------- Co-authored-by: Mackinnon Buck <mackinnon.buck@gmail.com>
ladeak · Aug 16, 2024 · 3babc09 · 3babc09
1 parent 42af9fe
commit 3babc09
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 8 deletions.
diff --git a/.github/policies/resourceManagement.yml b/.github/policies/resourceManagement.yml
@@ -501,19 +501,30 @@ configuration:
           branch: main
       then:
       - addMilestone:
-          milestone: 9.0-rc1
+          milestone: 10.0-preview1
       description: '[Milestone Assignments] Assign Milestone to PRs merged to the `main` branch'
     - if:
       - payloadType: Pull_Request
       - isAction:
           action: Closed
       - targetsBranch:
-          branch: release/9.0-preview7
+          branch: release/9.0-rc1
+      then:
+      - removeMilestone
+      - addMilestone:
+          milestone: 9.0-rc1
+      description: '[Milestone Assignments] Assign Milestone to PRs merged to release/9.0-rc1 branch'
+    - if:
+      - payloadType: Pull_Request
+      - isAction:
+          action: Closed
+      - targetsBranch:
+          branch: release/9.0
       then:
       - removeMilestone
       - addMilestone:
-          milestone: 9.0-preview7
-      description: '[Milestone Assignments] Assign Milestone to PRs merged to release/9.0-preview7 branch'
+          milestone: 9.0-rc2
+      description: '[Milestone Assignments] Assign Milestone to PRs merged to release/9.0 branch'
     - if:
       - payloadType: Issues
       - isAction:

diff --git a/eng/Versions.props b/eng/Versions.props
@@ -6,7 +6,7 @@
 -->
 <Project>
   <PropertyGroup Label="Version settings">
-    <AspNetCoreMajorVersion>9</AspNetCoreMajorVersion>
+    <AspNetCoreMajorVersion>10</AspNetCoreMajorVersion>
     <AspNetCoreMinorVersion>0</AspNetCoreMinorVersion>
     <AspNetCorePatchVersion>0</AspNetCorePatchVersion>
     <PreReleaseVersionIteration>1</PreReleaseVersionIteration>
@@ -18,8 +18,8 @@
     -->
     <StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
     <DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>
-    <PreReleaseVersionLabel>rc</PreReleaseVersionLabel>
-    <PreReleaseBrandingLabel>Release Candidate $(PreReleaseVersionIteration)</PreReleaseBrandingLabel>
+    <PreReleaseVersionLabel>alpha</PreReleaseVersionLabel>
+    <PreReleaseBrandingLabel>Alpha $(PreReleaseVersionIteration)</PreReleaseBrandingLabel>
     <IncludePreReleaseLabelInPackageVersion>true</IncludePreReleaseLabelInPackageVersion>
     <IncludePreReleaseLabelInPackageVersion Condition=" '$(DotNetFinalVersionKind)' == 'release' ">false</IncludePreReleaseLabelInPackageVersion>
     <AspNetCoreMajorMinorVersion>$(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion)</AspNetCoreMajorMinorVersion>

diff --git a/...icrosoft.AspNetCore.Grpc.Microbenchmarks/Microsoft.AspNetCore.Grpc.Microbenchmarks.csproj b/...icrosoft.AspNetCore.Grpc.Microbenchmarks/Microsoft.AspNetCore.Grpc.Microbenchmarks.csproj
@@ -6,6 +6,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <TieredCompilation>false</TieredCompilation>
     <DefineConstants>$(DefineConstants);IS_BENCHMARKS</DefineConstants>
+    <SkipMicrobenchmarksValidation>true</SkipMicrobenchmarksValidation>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Mvc/test/Mvc.FunctionalTests/ApiExplorerTest.cs b/src/Mvc/test/Mvc.FunctionalTests/ApiExplorerTest.cs
@@ -1561,7 +1561,7 @@ public async Task ApiExplorer_LogsInvokedDescriptionProvidersOnStartup()
         // Assert
         Assert.Contains(TestSink.Writes, w => w.EventId.Name?.Equals("ApiDescriptionProviderExecuting", StringComparison.Ordinal) == true);
         Assert.Contains(TestSink.Writes, w => w.LoggerName.Equals("Microsoft.AspNetCore.Mvc.ApiExplorer.ApiDescriptionGroupCollectionProvider", StringComparison.Ordinal));
-        Assert.Contains(TestSink.Writes, w => w.Message.Equals("Executing API description provider 'DefaultApiDescriptionProvider' from assembly Microsoft.AspNetCore.Mvc.ApiExplorer v9.0.0.0.", StringComparison.Ordinal));
+        Assert.Contains(TestSink.Writes, w => w.Message.Equals("Executing API description provider 'DefaultApiDescriptionProvider' from assembly Microsoft.AspNetCore.Mvc.ApiExplorer v10.0.0.0.", StringComparison.Ordinal));
         Assert.Contains(TestSink.Writes, w => w.Message.Equals("Executing API description provider 'JsonPatchOperationsArrayProvider' from assembly Microsoft.AspNetCore.Mvc.NewtonsoftJson v42.42.42.42.", StringComparison.Ordinal));
     }
 

diff --git a/src/ProjectTemplates/Shared/TemplatePackageInstaller.cs b/src/ProjectTemplates/Shared/TemplatePackageInstaller.cs
@@ -36,6 +36,7 @@ internal static class TemplatePackageInstaller
             "Microsoft.DotNet.Web.ProjectTemplates.7.0",
             "Microsoft.DotNet.Web.ProjectTemplates.8.0",
             "Microsoft.DotNet.Web.ProjectTemplates.9.0",
+            "Microsoft.DotNet.Web.ProjectTemplates.10.0",
             "Microsoft.AspNetCore.Blazor.Templates",
         };