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

[release/5.0] Fix AssemblyInformationalAttribute version in coreclr corelib #45876

Merged
merged 1 commit into from
Dec 11, 2020
Merged

[release/5.0] Fix AssemblyInformationalAttribute version in coreclr corelib #45876

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
8 changes: 0 additions & 8 deletions src/coreclr/dir.common.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,6 @@
<PackagesBinDir>$(BinDir).nuget\</PackagesBinDir>
</PropertyGroup>

<PropertyGroup>
<!-- Set the boolean below to true to generate packages with stabilized versions -->
<IsShipping>false</IsShipping>
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
<StableVersion Condition="'$(StabilizePackageVersion)' == 'true' and '$(StableVersion)' == ''">$(PackageVersion)</StableVersion>
<StableVersion Condition="($(MSBuildProjectName.Contains('Private')) or $(MSBuildProjectName.Contains('Transport'))) and '$(MSBuildProjectExtension)' == '.pkgproj'"></StableVersion>
</PropertyGroup>

<!-- Set up common target properties that we use to conditionally include sources -->
<PropertyGroup>
<TargetsFreeBSD Condition="'$(TargetOS)' == 'FreeBSD'">true</TargetsFreeBSD>
Expand Down
8 changes: 8 additions & 0 deletions src/coreclr/src/.nuget/packaging.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,14 @@
<VersionTxtFile Condition="'$(VersionTxtFile)' == ''">$(ArtifactsObjDir)version.txt</VersionTxtFile>
</PropertyGroup>

<PropertyGroup>
<!-- Set the boolean below to true to generate packages with stabilized versions -->
<IsShipping>false</IsShipping>
Copy link
Member

Choose a reason for hiding this comment

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

In libraries this property is set to true for anything except tests. Why is this different in coreclr? Based on the official docs, IsShipping determines if an asset is...

if it is intended to be delivered to customers via an official channel

Why do we set this to false for coreclr packages then, which are shipping to customers?

Copy link
Member Author

Choose a reason for hiding this comment

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

Because we're marking them as non shipping for servicing releases since we don't want to ship them (publish to nuget). The difference with libraries, is that the libraries packages are selectively built, this are always built. I'm just moving this from one place to another to keep the fix simple.

Copy link
Member

Choose a reason for hiding this comment

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

That makes sense, thanks for clarifying. Do you know if we have an issue regarding building and publishing packages across the repo the same way?

Copy link
Member Author

Choose a reason for hiding this comment

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

I don't think so... @Anipik do you know?

Copy link
Contributor

Choose a reason for hiding this comment

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

no we donot

Copy link
Member

Choose a reason for hiding this comment

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

@Anipik Do you think it would be worth improving the current situation where packaging and publishing properties differ? If yes, could old file one?

<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
<StableVersion Condition="'$(StabilizePackageVersion)' == 'true' and '$(StableVersion)' == ''">$(PackageVersion)</StableVersion>
<StableVersion Condition="$(MSBuildProjectName.Contains('Private')) or $(MSBuildProjectName.Contains('Transport'))" />
</PropertyGroup>

<ItemGroup Condition="'$(MSBuildProjectExtension)' == '.pkgproj'">
<!-- Add required legal files to packages -->
<File Condition="Exists('$(PackageLicenseFile)')"
Expand Down