Skip to content

Commit

Permalink
Fix AssemblyInformationalAttribute version in coreclr corelib (#45876)
Browse files Browse the repository at this point in the history
  • Loading branch information
safern authored Dec 11, 2020
1 parent 5166da4 commit 2a51bcb
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
8 changes: 0 additions & 8 deletions src/coreclr/dir.common.props
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
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>
<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

0 comments on commit 2a51bcb

Please sign in to comment.