From a14fcf5598deb018c864389fc24375d890207628 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Mon, 22 Aug 2022 18:05:19 +0200
Subject: [PATCH 1/2] 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.
---
 src/mono/nuget/Directory.Build.props | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/mono/nuget/Directory.Build.props b/src/mono/nuget/Directory.Build.props
index c37b14a0dfd3fa..5b2f04660da82c 100644
--- a/src/mono/nuget/Directory.Build.props
+++ b/src/mono/nuget/Directory.Build.props
@@ -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>

From aa37894ece3f0b8834b0aba8e39a7a80af404d81 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Mon, 22 Aug 2022 18:08:16 +0200
Subject: [PATCH 2/2] Update Directory.Build.targets

---
 src/mono/nuget/Directory.Build.targets | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/mono/nuget/Directory.Build.targets b/src/mono/nuget/Directory.Build.targets
index 32e2e4251e792f..c3af51a7f58b05 100644
--- a/src/mono/nuget/Directory.Build.targets
+++ b/src/mono/nuget/Directory.Build.targets
@@ -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>