From 627a93d66c0e5824bb74eb1686ff3853139f4811 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Wed, 14 Aug 2024 17:02:21 -0700 Subject: [PATCH 1/4] Update branding to 10.0 --- .github/policies/resourceManagement.yml | 19 +++++++++++++++---- eng/Versions.props | 6 +++--- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/.github/policies/resourceManagement.yml b/.github/policies/resourceManagement.yml index df75c3a5f09d..5ac82f57224f 100644 --- 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 index 9792948c4476..b94028273f3d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -6,7 +6,7 @@ --> - 9 + 10 0 0 1 @@ -18,8 +18,8 @@ --> false release - rc - Release Candidate $(PreReleaseVersionIteration) + alpha + Alpha $(PreReleaseVersionIteration) true false $(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion) From a6b73abd969f9261842f1bb3c33dd0a5cef5600f Mon Sep 17 00:00:00 2001 From: William Godbe Date: Wed, 14 Aug 2024 17:28:08 -0700 Subject: [PATCH 2/4] Update Microsoft.AspNetCore.Grpc.Microbenchmarks.csproj --- .../Microsoft.AspNetCore.Grpc.Microbenchmarks.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Grpc/JsonTranscoding/perf/Microsoft.AspNetCore.Grpc.Microbenchmarks/Microsoft.AspNetCore.Grpc.Microbenchmarks.csproj b/src/Grpc/JsonTranscoding/perf/Microsoft.AspNetCore.Grpc.Microbenchmarks/Microsoft.AspNetCore.Grpc.Microbenchmarks.csproj index 4c8e02e25b8f..322fea55238a 100644 --- a/src/Grpc/JsonTranscoding/perf/Microsoft.AspNetCore.Grpc.Microbenchmarks/Microsoft.AspNetCore.Grpc.Microbenchmarks.csproj +++ b/src/Grpc/JsonTranscoding/perf/Microsoft.AspNetCore.Grpc.Microbenchmarks/Microsoft.AspNetCore.Grpc.Microbenchmarks.csproj @@ -6,6 +6,7 @@ true false $(DefineConstants);IS_BENCHMARKS + true From 40e8dcc741222b3603140ff051b55adb7e2f04d7 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Wed, 14 Aug 2024 18:08:13 -0700 Subject: [PATCH 3/4] Update TemplatePackageInstaller.cs --- src/ProjectTemplates/Shared/TemplatePackageInstaller.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/ProjectTemplates/Shared/TemplatePackageInstaller.cs b/src/ProjectTemplates/Shared/TemplatePackageInstaller.cs index a0cb1f6e904c..08555fb5e696 100644 --- 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", }; From 18f8b0548779ee71af27b938f484da3dff3a163f Mon Sep 17 00:00:00 2001 From: Mackinnon Buck Date: Thu, 15 Aug 2024 10:57:27 -0700 Subject: [PATCH 4/4] Fix ApiExplorer_LogsInvokedDescriptionProvidersOnStartup --- src/Mvc/test/Mvc.FunctionalTests/ApiExplorerTest.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Mvc/test/Mvc.FunctionalTests/ApiExplorerTest.cs b/src/Mvc/test/Mvc.FunctionalTests/ApiExplorerTest.cs index 71d1ab1cc1ee..2ffebf5af979 100644 --- 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)); }