Skip to content

fix stable pkg proj versioning support #58474

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

Merged
Anipik merged 1 commit into from
Sep 1, 2021
Merged

fix stable pkg proj versioning support #58474

Show file tree
Hide file tree
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
9 changes: 7 additions & 2 deletions src/coreclr/.nuget/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,13 @@
<SkipIndexCheck>true</SkipIndexCheck>

<!-- Central place to set the versions of all nuget packages produced in the repo -->
<PackageVersion Condition="'$(PackageVersion)' == ''">6.0.0</PackageVersion>
<StableVersion Condition="'$(StabilizePackageVersion)' == 'true' and '$(StableVersion)' == ''">$(PackageVersion)</StableVersion>
<PackageVersion Condition="'$(PackageVersion)' == ''">$(ProductVersion)</PackageVersion>
<StableVersion Condition="'$(StabilizePackageVersion)' == 'true' and '$(StableVersion)' == '' and '$(PreReleaseVersionLabel)' != 'servicing'">$(PackageVersion)</StableVersion>
<StableVersion Condition="($(MSBuildProjectName.Contains('Private')) or $(MSBuildProjectName.Contains('Experimental')) or $(MSBuildProjectName.Contains('Transport'))) and '$(MSBuildProjectExtension)' == '.pkgproj'"></StableVersion>
</PropertyGroup>

<PropertyGroup Condition="'$(PreReleaseVersionLabel)' == 'servicing'">
<IsShipping>false</IsShipping>
</PropertyGroup>
Comment on lines +26 to 28
Copy link
Member

@ViktorHofer ViktorHofer Sep 1, 2021

Choose a reason for hiding this comment

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

Does that mean that none of these packages ship during servicing?

Copy link
Contributor Author

@Anipik Anipik Sep 1, 2021

Choose a reason for hiding this comment

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

they will get shipped internally

Copy link
Member

@ViktorHofer ViktorHofer Sep 1, 2021 •
edited
Loading

Choose a reason for hiding this comment

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

Why do we change the definition of what's shipping publicly vs internally based on if the repo is in servicing mode?

Copy link
Member

@mmitche mmitche Sep 1, 2021

Choose a reason for hiding this comment

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

What packages are these specifically? IsShipping generally controls whether something goes to NuGet. Are they supposed to go to NuGet in non-servicing?

Copy link
Contributor Author

@Anipik Anipik Sep 1, 2021

Choose a reason for hiding this comment

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

Why do we change the definition of what's shipping publicly vs internally based on if the repo is in servicing mode?

basically following the same convention guidelines from the coreclr team as we did for 5.0.0

What packages are these specifically? IsShipping generally controls whether something goes to NuGet. Are they supposed to go to NuGet in non-servicing?

yes they are not supposed to go to nuget in non-servicing

Copy link
Member

@mmitche mmitche Sep 1, 2021

Choose a reason for hiding this comment

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

But they do go in rtm? What package set is this specifically?

Copy link
Contributor Author

@Anipik Anipik Sep 1, 2021

Choose a reason for hiding this comment

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

yes they go to nuget in rtm, these https://github.com/dotnet/runtime/tree/main/src/coreclr/.nuget

Microsoft.ILVerification
Microsoft.NETCore.ILAsm
Microsoft.NETCore.ILDAsm
Microsoft.NETCore.TestHost
dotnet-ilverify


<ItemGroup>
Expand Down
3 changes: 2 additions & 1 deletion src/mono/nuget/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,9 @@
<SkipIndexCheck>true</SkipIndexCheck>

<!-- Central place to set the versions of all nuget packages produced in the repo -->
<PackageVersion Condition="'$(ProductVersion)' == ''">6.0.0</PackageVersion>
<PackageVersion Condition="'$(PackageVersion)' == ''">$(ProductVersion)</PackageVersion>
<StableVersion Condition="'$(StabilizePackageVersion)' == 'true' and '$(StableVersion)' == ''">$(PackageVersion)</StableVersion>
<StableVersion Condition="($(MSBuildProjectName.Contains('Private')) or $(MSBuildProjectName.Contains('Transport'))) and '$(MSBuildProjectExtension)' == '.pkgproj'"></StableVersion>
</PropertyGroup>

<ItemGroup>
Expand Down