Skip to content

Commit 3babc09

Browse files
Update branding to 10.0 (#57340)
* Update branding to 10.0 * Update Microsoft.AspNetCore.Grpc.Microbenchmarks.csproj * Update TemplatePackageInstaller.cs * Fix ApiExplorer_LogsInvokedDescriptionProvidersOnStartup --------- Co-authored-by: Mackinnon Buck <[email protected]>
1 parent 42af9fe commit 3babc09

File tree

5 files changed

+21
-8
lines changed

5 files changed

+21
-8
lines changed

.github/policies/resourceManagement.yml

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -501,19 +501,30 @@ configuration:
501501
branch: main
502502
then:
503503
- addMilestone:
504-
milestone: 9.0-rc1
504+
milestone: 10.0-preview1
505505
description: '[Milestone Assignments] Assign Milestone to PRs merged to the `main` branch'
506506
- if:
507507
- payloadType: Pull_Request
508508
- isAction:
509509
action: Closed
510510
- targetsBranch:
511-
branch: release/9.0-preview7
511+
branch: release/9.0-rc1
512+
then:
513+
- removeMilestone
514+
- addMilestone:
515+
milestone: 9.0-rc1
516+
description: '[Milestone Assignments] Assign Milestone to PRs merged to release/9.0-rc1 branch'
517+
- if:
518+
- payloadType: Pull_Request
519+
- isAction:
520+
action: Closed
521+
- targetsBranch:
522+
branch: release/9.0
512523
then:
513524
- removeMilestone
514525
- addMilestone:
515-
milestone: 9.0-preview7
516-
description: '[Milestone Assignments] Assign Milestone to PRs merged to release/9.0-preview7 branch'
526+
milestone: 9.0-rc2
527+
description: '[Milestone Assignments] Assign Milestone to PRs merged to release/9.0 branch'
517528
- if:
518529
- payloadType: Issues
519530
- isAction:

eng/Versions.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
-->
77
<Project>
88
<PropertyGroup Label="Version settings">
9-
<AspNetCoreMajorVersion>9</AspNetCoreMajorVersion>
9+
<AspNetCoreMajorVersion>10</AspNetCoreMajorVersion>
1010
<AspNetCoreMinorVersion>0</AspNetCoreMinorVersion>
1111
<AspNetCorePatchVersion>0</AspNetCorePatchVersion>
1212
<PreReleaseVersionIteration>1</PreReleaseVersionIteration>
@@ -18,8 +18,8 @@
1818
-->
1919
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
2020
<DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>
21-
<PreReleaseVersionLabel>rc</PreReleaseVersionLabel>
22-
<PreReleaseBrandingLabel>Release Candidate $(PreReleaseVersionIteration)</PreReleaseBrandingLabel>
21+
<PreReleaseVersionLabel>alpha</PreReleaseVersionLabel>
22+
<PreReleaseBrandingLabel>Alpha $(PreReleaseVersionIteration)</PreReleaseBrandingLabel>
2323
<IncludePreReleaseLabelInPackageVersion>true</IncludePreReleaseLabelInPackageVersion>
2424
<IncludePreReleaseLabelInPackageVersion Condition=" '$(DotNetFinalVersionKind)' == 'release' ">false</IncludePreReleaseLabelInPackageVersion>
2525
<AspNetCoreMajorMinorVersion>$(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion)</AspNetCoreMajorMinorVersion>

src/Grpc/JsonTranscoding/perf/Microsoft.AspNetCore.Grpc.Microbenchmarks/Microsoft.AspNetCore.Grpc.Microbenchmarks.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
77
<TieredCompilation>false</TieredCompilation>
88
<DefineConstants>$(DefineConstants);IS_BENCHMARKS</DefineConstants>
9+
<SkipMicrobenchmarksValidation>true</SkipMicrobenchmarksValidation>
910
</PropertyGroup>
1011

1112
<ItemGroup>

src/Mvc/test/Mvc.FunctionalTests/ApiExplorerTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1561,7 +1561,7 @@ public async Task ApiExplorer_LogsInvokedDescriptionProvidersOnStartup()
15611561
// Assert
15621562
Assert.Contains(TestSink.Writes, w => w.EventId.Name?.Equals("ApiDescriptionProviderExecuting", StringComparison.Ordinal) == true);
15631563
Assert.Contains(TestSink.Writes, w => w.LoggerName.Equals("Microsoft.AspNetCore.Mvc.ApiExplorer.ApiDescriptionGroupCollectionProvider", StringComparison.Ordinal));
1564-
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));
1564+
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));
15651565
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));
15661566
}
15671567

src/ProjectTemplates/Shared/TemplatePackageInstaller.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ internal static class TemplatePackageInstaller
3636
"Microsoft.DotNet.Web.ProjectTemplates.7.0",
3737
"Microsoft.DotNet.Web.ProjectTemplates.8.0",
3838
"Microsoft.DotNet.Web.ProjectTemplates.9.0",
39+
"Microsoft.DotNet.Web.ProjectTemplates.10.0",
3940
"Microsoft.AspNetCore.Blazor.Templates",
4041
};
4142

0 commit comments

Comments
 (0)