Skip to content
This repository has been archived by the owner on Jan 23, 2023. It is now read-only.

update branding to 3.1.2 #8945

Closed
wants to merge 1 commit into from
Closed

update branding to 3.1.2 #8945

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
<PropertyGroup>
<MajorVersion>3</MajorVersion>
<MinorVersion>1</MinorVersion>
<PatchVersion>1</PatchVersion>
<PatchVersion>2</PatchVersion>
<PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
<!-- Enable to remove prerelease label. -->
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">true</StabilizePackageVersion>
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
Copy link
Member

Choose a reason for hiding this comment

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

This may cause pain downstream if merged because dotnet/runtime#639 is not fixed yet. /cc @nguerrera @wtgodbe

I believe the fix is pretty simple, just change <ItemGroup Condition="'$(StabilizePackageVersion)' == 'true'"> to <ItemGroup> below. Since this branch won't enter "master-branch mode" ever again, I believe this is fine. I only should need to find something better in dotnet/runtime.

Could you give it a try in this PR? We should be able to confirm the packages don't get created via the PR validation logs.

Copy link
Author

Choose a reason for hiding this comment

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

i will give this a try

Copy link
Member

Choose a reason for hiding this comment

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

We should not make this false in the PR, btw.

Copy link
Author

Choose a reason for hiding this comment

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

yes this was opened before ur email. I have edited this in all other open prs

<DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>
<!-- Disable SemVer v2 until after 3.0.0. -->
<SemanticVersioningV1 Condition="&#xA; $(MajorVersion) &lt; 3 or&#xA; '$(MajorVersion).$(MinorVersion).$(PatchVersion)' == '3.0.0'">true</SemanticVersioningV1>
Expand Down