From e54acf10cc421b9b986820ef8df39238cabff970 Mon Sep 17 00:00:00 2001
From: Andrew Arnott <andrewarnott@live.com>
Date: Sat, 22 Oct 2022 08:47:10 -0600
Subject: [PATCH 1/2] Remove inner project from ProjectReference items by
 default

This should avoid the vast majority of the P2P problems introduced by trying to work in `msbuild -graph -isolate`.
---
 .../build/MSBuildTargetCaching.targets        | 25 +++++++++++--------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/Nerdbank.GitVersioning.Tasks/build/MSBuildTargetCaching.targets b/src/Nerdbank.GitVersioning.Tasks/build/MSBuildTargetCaching.targets
index 8f864fc54..3f367900f 100644
--- a/src/Nerdbank.GitVersioning.Tasks/build/MSBuildTargetCaching.targets
+++ b/src/Nerdbank.GitVersioning.Tasks/build/MSBuildTargetCaching.targets
@@ -18,8 +18,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <!-- Declare a P2P so that "msbuild -graph -isolate" doesn't complain when we use the MSBuild task to invoke our inner shared project. -->
-    <ProjectReference Include="$(NBGV_CachingProjectReference)">
+    <NBGV_CachingProjectReference Include="$(NBGV_CachingProjectReference)">
       <Targets>GetBuildVersion_Properties;GetBuildVersion_CloudBuildVersionVars</Targets>
       <Properties>$(NBGV_InnerGlobalProperties)BuildMetadata=@(BuildMetadata, ',');</Properties>
       <SetConfiguration>Configuration=Release</SetConfiguration>
@@ -31,8 +30,14 @@
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <SkipGetTargetFrameworkProperties>true</SkipGetTargetFrameworkProperties>
       <Visible>false</Visible>
-      <NBGV_InnerProject>true</NBGV_InnerProject>
       <PrivateAssets>all</PrivateAssets>
+    </NBGV_CachingProjectReference>
+
+    <!-- Declare a P2P so that "msbuild -graph -isolate" doesn't complain when we use the MSBuild task to invoke our inner shared project.
+         This causes a lot of problems (https://github.com/dotnet/Nerdbank.GitVersioning/issues?q=label%3Amsbuild-p2p+) with projects
+         that expect to understand all their own ProjectReferences though, so only define it when the user is running a graph build. -->
+    <ProjectReference Include="@(NBGV_CachingProjectReference)" Condition="'$(IsGraphBuild)'=='true'">
+      <NBGV_InnerProject>true</NBGV_InnerProject>
     </ProjectReference>
   </ItemGroup>
 
@@ -41,19 +46,17 @@
 
     <!-- Calculate version by invoking another "project" with global properties that will serve as a key
          into an msbuild cache to ensure we only invoke the GetBuildVersion task as many times as will produce a unique value. -->
-    <MSBuild Projects="@(ProjectReference)"
-             Condition=" '%(ProjectReference.NBGV_InnerProject)' == 'true' "
-             Properties="%(ProjectReference.Properties)"
-             RemoveProperties="%(ProjectReference.GlobalPropertiesToRemove)"
+    <MSBuild Projects="@(NBGV_CachingProjectReference)"
+             Properties="%(NBGV_CachingProjectReference.Properties)"
+             RemoveProperties="%(NBGV_CachingProjectReference.GlobalPropertiesToRemove)"
              Targets="GetBuildVersion_Properties">
       <Output TaskParameter="TargetOutputs" ItemName="NBGV_PropertyItems" />
     </MSBuild>
 
     <!-- Also get other items. -->
-    <MSBuild Projects="@(ProjectReference)"
-             Condition=" '%(ProjectReference.NBGV_InnerProject)' == 'true' "
-             Properties="%(ProjectReference.Properties)"
-             RemoveProperties="%(ProjectReference.GlobalPropertiesToRemove)"
+    <MSBuild Projects="@(NBGV_CachingProjectReference)"
+             Properties="%(NBGV_CachingProjectReference.Properties)"
+             RemoveProperties="%(NBGV_CachingProjectReference.GlobalPropertiesToRemove)"
              Targets="GetBuildVersion_CloudBuildVersionVars">
       <Output TaskParameter="TargetOutputs" ItemName="CloudBuildVersionVars" />
     </MSBuild>

From 51cf091064fcc00682a3aa7f89792e52816874ac Mon Sep 17 00:00:00 2001
From: Andrew Arnott <andrewarnott@live.com>
Date: Sat, 22 Oct 2022 09:03:53 -0600
Subject: [PATCH 2/2] Add Microsoft.NETFramework.ReferenceAssemblies to resolve
 net462 targeting framework error

---
 Directory.Build.props | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Directory.Build.props b/Directory.Build.props
index 595cbcf08..46896a515 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -40,6 +40,7 @@
     <LibGit2SharpNativeVersion>2.0.315-alpha.0.9</LibGit2SharpNativeVersion>
   </PropertyGroup>
   <ItemGroup>
+    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" PrivateAssets="all" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="all" />
     <PackageReference Include="Nullable" Version="1.3.1" PrivateAssets="all" />
     <!-- Use the Unstable package ID so that update tools will help us keep it current even though it seems to be ever-unstable lately. -->