Skip to content

Commit

Permalink
[release/7.0-rc1] Fix mono package versions during stabilization (#74368
Browse files Browse the repository at this point in the history
)

* 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.

* Update Directory.Build.targets

Co-authored-by: Viktor Hofer <viktor.hofer@microsoft.com>
  • Loading branch information
github-actions[bot] and ViktorHofer authored Aug 23, 2022
1 parent 5ddbb7c commit 40dc057
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
4 changes: 0 additions & 4 deletions src/mono/nuget/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,6 @@

<!-- mono doesn't currently use the index so don't force it to be in sync -->
<SkipIndexCheck>true</SkipIndexCheck>

<!-- Central place to set the versions of all nuget packages produced in the repo -->
<PackageVersion Condition="'$(ProductVersion)' == ''">7.0.0</PackageVersion>
<StableVersion Condition="'$(StabilizePackageVersion)' == 'true' and '$(StableVersion)' == ''">$(PackageVersion)</StableVersion>
</PropertyGroup>

<ItemGroup>
Expand Down
8 changes: 8 additions & 0 deletions src/mono/nuget/Directory.Build.targets
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
<Project>
<UsingTask TaskName="GenerateFileFromTemplate" AssemblyFile="$(WorkloadTasksAssemblyPath)" />
<Import Project="..\Directory.Build.targets" />

<PropertyGroup>
<!-- Central place to set the versions of all mono pkgprojs. -->
<PackageVersion Condition="'$(PackageVersion)' == ''">$(ProductVersion)</PackageVersion>
<StableVersion Condition="'$(StabilizePackageVersion)' == 'true' and '$(StableVersion)' == ''">$(PackageVersion)</StableVersion>
<StableVersion Condition="'$(IsShippingPackage)' != 'true' and '$(MSBuildProjectExtension)' == '.pkgproj'" />
</PropertyGroup>

<Import Project="$(NuGetPackageRoot)\microsoft.dotnet.build.tasks.packaging\$(MicrosoftDotNetBuildTasksPackagingVersion)\build\Microsoft.DotNet.Build.Tasks.Packaging.targets" />
</Project>

0 comments on commit 40dc057

Please sign in to comment.