Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update branding to 10.0 #57340

Merged
merged 4 commits into from
Aug 16, 2024
Merged

Update branding to 10.0 #57340

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
627a93d
Update branding to 10.0
wtgodbe Aug 15, 2024
a6b73ab
Update Microsoft.AspNetCore.Grpc.Microbenchmarks.csproj
wtgodbe Aug 15, 2024
40e8dcc
Update TemplatePackageInstaller.cs
wtgodbe Aug 15, 2024
18f8b05
Fix ApiExplorer_LogsInvokedDescriptionProvidersOnStartup
MackinnonBuck Aug 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 15 additions & 4 deletions .github/policies/resourceManagement.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
6 changes: 3 additions & 3 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
-->
<Project>
<PropertyGroup Label="Version settings">
<AspNetCoreMajorVersion>9</AspNetCoreMajorVersion>
<AspNetCoreMajorVersion>10</AspNetCoreMajorVersion>
<AspNetCoreMinorVersion>0</AspNetCoreMinorVersion>
<AspNetCorePatchVersion>0</AspNetCorePatchVersion>
<PreReleaseVersionIteration>1</PreReleaseVersionIteration>
Expand All @@ -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>
Expand Down
1 change: 1 addition & 0 deletions ...icrosoft.AspNetCore.Grpc.Microbenchmarks/Microsoft.AspNetCore.Grpc.Microbenchmarks.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<TieredCompilation>false</TieredCompilation>
<DefineConstants>$(DefineConstants);IS_BENCHMARKS</DefineConstants>
<SkipMicrobenchmarksValidation>true</SkipMicrobenchmarksValidation>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is this change for?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The microbenchmark fails to find the just built SharedFx - this happens every time we update the branding/TFM in certain microbenchmarks, we're able to re-enable it once we get an SDK with the new TFM

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok. Maybe add a comment?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#57461

</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Mvc/test/Mvc.FunctionalTests/ApiExplorerTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}

Expand Down
1 change: 1 addition & 0 deletions src/ProjectTemplates/Shared/TemplatePackageInstaller.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
};

Expand Down
Loading