Skip to content

Commit b966a10

Browse files
authored
Fix mono package versions during stabilization (#74353)
* Fix mono package versions during stabilization The issues that are being fixed via this PR happened and were fixed during the 7.0 stabilization release exercise.
1 parent 35536d1 commit b966a10

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

src/mono/nuget/Directory.Build.props

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,6 @@
1212

1313
<!-- mono doesn't currently use the index so don't force it to be in sync -->
1414
<SkipIndexCheck>true</SkipIndexCheck>
15-
16-
<!-- Central place to set the versions of all nuget packages produced in the repo -->
17-
<PackageVersion Condition="'$(ProductVersion)' == ''">7.0.0</PackageVersion>
18-
<StableVersion Condition="'$(StabilizePackageVersion)' == 'true' and '$(StableVersion)' == ''">$(PackageVersion)</StableVersion>
1915
</PropertyGroup>
2016

2117
<ItemGroup>
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
<Project>
22
<UsingTask TaskName="GenerateFileFromTemplate" AssemblyFile="$(WorkloadTasksAssemblyPath)" />
33
<Import Project="..\Directory.Build.targets" />
4+
5+
<PropertyGroup>
6+
<!-- Central place to set the versions of all mono pkgprojs. -->
7+
<PackageVersion Condition="'$(PackageVersion)' == ''">$(ProductVersion)</PackageVersion>
8+
<StableVersion Condition="'$(StabilizePackageVersion)' == 'true' and '$(StableVersion)' == ''">$(PackageVersion)</StableVersion>
9+
<StableVersion Condition="'$(IsShippingPackage)' != 'true' and '$(MSBuildProjectExtension)' == '.pkgproj'" />
10+
</PropertyGroup>
11+
412
<Import Project="$(NuGetPackageRoot)\microsoft.dotnet.build.tasks.packaging\$(MicrosoftDotNetBuildTasksPackagingVersion)\build\Microsoft.DotNet.Build.Tasks.Packaging.targets" />
513
</Project>

0 commit comments

Comments
 (0)