From bc15604c3b18cb0e11881e1d1656a34e93f99b5c Mon Sep 17 00:00:00 2001
From: Andrew Arnott <andrewarnott@live.com>
Date: Thu, 7 Oct 2021 17:41:11 -0600
Subject: [PATCH 1/2] Add property that can disable the private MSBuild task
 invocation

This allows Nerdbank.GitVersioning to (once again) work under quickbuild.
---
 .../BuildIntegrationTests.cs                  | 22 +++++++
 .../NerdBank.GitVersioning.Tests.csproj       |  2 +-
 .../Nerdbank.GitVersioning.nuspec             |  6 +-
 .../build/InProjectVersionComputation.targets | 20 ++++++
 .../build/MSBuildTargetCaching.targets        | 60 ++++++++++++++++++
 .../Nerdbank.GitVersioning.Common.targets     |  1 +
 ...Nerdbank.GitVersioning.Inner.Empty.targets |  9 +++
 .../Nerdbank.GitVersioning.Inner.targets      | 12 ++--
 .../build/Nerdbank.GitVersioning.props        | 15 +++++
 .../build/Nerdbank.GitVersioning.targets      | 63 ++-----------------
 .../Nerdbank.GitVersioning.props              |  4 ++
 11 files changed, 147 insertions(+), 67 deletions(-)
 create mode 100644 src/Nerdbank.GitVersioning.Tasks/build/InProjectVersionComputation.targets
 create mode 100644 src/Nerdbank.GitVersioning.Tasks/build/MSBuildTargetCaching.targets
 create mode 100644 src/Nerdbank.GitVersioning.Tasks/build/Nerdbank.GitVersioning.Inner.Empty.targets
 create mode 100644 src/Nerdbank.GitVersioning.Tasks/build/Nerdbank.GitVersioning.props
 create mode 100644 src/Nerdbank.GitVersioning.Tasks/buildCrossTargeting/Nerdbank.GitVersioning.props

diff --git a/src/NerdBank.GitVersioning.Tests/BuildIntegrationTests.cs b/src/NerdBank.GitVersioning.Tests/BuildIntegrationTests.cs
index 3b4e00ea..57727e10 100644
--- a/src/NerdBank.GitVersioning.Tests/BuildIntegrationTests.cs
+++ b/src/NerdBank.GitVersioning.Tests/BuildIntegrationTests.cs
@@ -39,6 +39,25 @@ protected override void ApplyGlobalProperties(IDictionary<string, string> global
         => globalProperties["NBGV_GitEngine"] = "Managed";
 }
 
+[Trait("Engine", "Managed")]
+[Collection("Build")] // msbuild sets current directory in the process, so we can't have it be concurrent with other build tests.
+public class BuildIntegrationInProjectManagedTests : BuildIntegrationTests
+{
+    public BuildIntegrationInProjectManagedTests(ITestOutputHelper logger)
+        : base(logger)
+    {
+    }
+
+    protected override GitContext CreateGitContext(string path, string committish = null)
+        => GitContext.Create(path, committish, writable: false);
+
+    protected override void ApplyGlobalProperties(IDictionary<string, string> globalProperties)
+    {
+        globalProperties["NBGV_GitEngine"] = "Managed";
+        globalProperties["NBGV_CacheMode"] = "None";
+    }
+}
+
 [Trait("Engine", "LibGit2")]
 [Collection("Build")] // msbuild sets current directory in the process, so we can't have it be concurrent with other build tests.
 public class BuildIntegrationLibGit2Tests : BuildIntegrationTests
@@ -57,6 +76,7 @@ protected override void ApplyGlobalProperties(IDictionary<string, string> global
 
 public abstract class BuildIntegrationTests : RepoTestBase, IClassFixture<MSBuildFixture>
 {
+    private const string GitVersioningPropsFileName = "NerdBank.GitVersioning.props";
     private const string GitVersioningTargetsFileName = "NerdBank.GitVersioning.targets";
     private const string UnitTestCloudBuildPrefix = "UnitTest: ";
     private static readonly string[] ToxicEnvironmentVariablePrefixes = new string[]
@@ -1175,6 +1195,7 @@ private ProjectRootElement CreateNativeProjectRootElement(string projectDirector
         {
             var pre = ProjectRootElement.Create(reader, this.projectCollection);
             pre.FullPath = Path.Combine(projectDirectory, projectName);
+            pre.InsertAfterChild(pre.CreateImportElement(Path.Combine(this.RepoPath, GitVersioningPropsFileName)), null);
             pre.AddImport(Path.Combine(this.RepoPath, GitVersioningTargetsFileName));
             return pre;
         }
@@ -1186,6 +1207,7 @@ private ProjectRootElement CreateProjectRootElement(string projectDirectory, str
         {
             var pre = ProjectRootElement.Create(reader, this.projectCollection);
             pre.FullPath = Path.Combine(projectDirectory, projectName);
+            pre.InsertAfterChild(pre.CreateImportElement(Path.Combine(this.RepoPath, GitVersioningPropsFileName)), null);
             pre.AddImport(Path.Combine(this.RepoPath, GitVersioningTargetsFileName));
             return pre;
         }
diff --git a/src/NerdBank.GitVersioning.Tests/NerdBank.GitVersioning.Tests.csproj b/src/NerdBank.GitVersioning.Tests/NerdBank.GitVersioning.Tests.csproj
index 9e4bd7ef..e82aaab4 100644
--- a/src/NerdBank.GitVersioning.Tests/NerdBank.GitVersioning.Tests.csproj
+++ b/src/NerdBank.GitVersioning.Tests/NerdBank.GitVersioning.Tests.csproj
@@ -12,7 +12,7 @@
     <Compile Include="..\Shared\**\*.cs" LinkBase="Shared" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="..\Nerdbank.GitVersioning.Tasks\build\*.targets">
+    <EmbeddedResource Include="..\Nerdbank.GitVersioning.Tasks\build\*.targets;..\Nerdbank.GitVersioning.Tasks\build\*.props">
       <Visible>false</Visible>
       <Link>Targets\%(FileName)%(Extension)</Link>
     </EmbeddedResource>
diff --git a/src/Nerdbank.GitVersioning.Tasks/Nerdbank.GitVersioning.nuspec b/src/Nerdbank.GitVersioning.Tasks/Nerdbank.GitVersioning.nuspec
index 47223cac..47107c37 100644
--- a/src/Nerdbank.GitVersioning.Tasks/Nerdbank.GitVersioning.nuspec
+++ b/src/Nerdbank.GitVersioning.Tasks/Nerdbank.GitVersioning.nuspec
@@ -48,9 +48,13 @@ IMPORTANT: The 3.x release may produce a different version height than prior maj
     <file src="$BaseOutputPath$netcoreapp3.1\System.Text.Json.dll" target="build\MSBuildCore\System.Text.Json.dll" />
     <file src="$BaseOutputPath$netcoreapp3.1\Validation.dll" target="build\MSBuildCore\Validation.dll" />
 
-    <file src="build\Nerdbank.GitVersioning.targets" target="build\Nerdbank.GitVersioning$LKGSuffix$.targets" />
+    <file src="build\InProjectVersionComputation.targets" target="build\InProjectVersionComputation.targets" />
+    <file src="build\MSBuildTargetCaching.targets" target="build\MSBuildTargetCaching.targets" />
     <file src="build\Nerdbank.GitVersioning.Common.targets" target="build\Nerdbank.GitVersioning.Common.targets" />
     <file src="build\Nerdbank.GitVersioning.Inner.targets" target="build\Nerdbank.GitVersioning.Inner.targets" />
+    <file src="build\Nerdbank.GitVersioning.Inner.Empty.targets" target="build\Nerdbank.GitVersioning.Inner.Empty.targets" />
+    <file src="build\Nerdbank.GitVersioning.props" target="build\Nerdbank.GitVersioning$LKGSuffix$.props" />
+    <file src="build\Nerdbank.GitVersioning.targets" target="build\Nerdbank.GitVersioning$LKGSuffix$.targets" />
     <file src="buildCrossTargeting\Nerdbank.GitVersioning.targets" target="buildCrossTargeting\Nerdbank.GitVersioning$LKGSuffix$.targets" />
     <file src="readme.txt" target="readme.txt" />
   </files>
diff --git a/src/Nerdbank.GitVersioning.Tasks/build/InProjectVersionComputation.targets b/src/Nerdbank.GitVersioning.Tasks/build/InProjectVersionComputation.targets
new file mode 100644
index 00000000..349fff64
--- /dev/null
+++ b/src/Nerdbank.GitVersioning.Tasks/build/InProjectVersionComputation.targets
@@ -0,0 +1,20 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="Nerdbank.GitVersioning.Inner.targets"/>
+
+  <Target Name="SetPropertiesForInvokeGetBuildVersionTask">
+    <!-- Set properties required for InvokeGetBuildVersionTask here, because
+         CallTarget invoked targets do not see properties set by the calling target. -->
+    <PropertyGroup>
+      <BuildMetadata>@(BuildMetadata, ',')</BuildMetadata>
+    </PropertyGroup>
+  </Target>
+
+  <Target Name="InvokeGetBuildVersionTask" DependsOnTargets="SetPropertiesForInvokeGetBuildVersionTask">
+    <CallTarget Targets="GetBuildVersion_Properties">
+      <Output TaskParameter="TargetOutputs" ItemName="NBGV_PropertyItems" />
+    </CallTarget>
+    <CallTarget Targets="GetBuildVersion_CloudBuildVersionVars">
+      <Output TaskParameter="TargetOutputs" ItemName="CloudBuildVersionVars" />
+    </CallTarget>
+  </Target>
+</Project>
diff --git a/src/Nerdbank.GitVersioning.Tasks/build/MSBuildTargetCaching.targets b/src/Nerdbank.GitVersioning.Tasks/build/MSBuildTargetCaching.targets
new file mode 100644
index 00000000..9bf0e1e0
--- /dev/null
+++ b/src/Nerdbank.GitVersioning.Tasks/build/MSBuildTargetCaching.targets
@@ -0,0 +1,60 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <NBGV_InnerGlobalProperties Condition=" '$(GitRepoRoot)' != '' ">$(NBGV_InnerGlobalProperties)GitRepoRoot=$(GitRepoRoot);</NBGV_InnerGlobalProperties>
+    <NBGV_InnerGlobalProperties Condition=" '$(PublicRelease)' != '' ">$(NBGV_InnerGlobalProperties)PublicRelease=$(PublicRelease);</NBGV_InnerGlobalProperties>
+    <NBGV_InnerGlobalProperties Condition=" '$(_NBGV_BuildingRef)' != '' ">$(NBGV_InnerGlobalProperties)_NBGV_BuildingRef=$(_NBGV_BuildingRef);</NBGV_InnerGlobalProperties>
+    <NBGV_InnerGlobalProperties Condition=" '$(ProjectPathRelativeToGitRepoRoot)' != '' ">$(NBGV_InnerGlobalProperties)ProjectPathRelativeToGitRepoRoot=$(ProjectPathRelativeToGitRepoRoot);</NBGV_InnerGlobalProperties>
+    <NBGV_InnerGlobalProperties Condition=" '$(GitVersionBaseDirectory)' != '' ">$(NBGV_InnerGlobalProperties)GitVersionBaseDirectory=$(GitVersionBaseDirectory);</NBGV_InnerGlobalProperties>
+    <NBGV_InnerGlobalProperties Condition=" '$(OverrideBuildNumberOffset)' != '' ">$(NBGV_InnerGlobalProperties)OverrideBuildNumberOffset=$(OverrideBuildNumberOffset);</NBGV_InnerGlobalProperties>
+    <NBGV_InnerGlobalProperties Condition=" '$(NBGV_CacheMode)' != '' ">$(NBGV_InnerGlobalProperties)NBGV_CacheMode=$(NBGV_CacheMode);</NBGV_InnerGlobalProperties>
+  </PropertyGroup>
+
+  <!-- Compile a list of global properties that may vary when a project builds but that would never influence the result of the GetBuildVersion task. -->
+  <ItemGroup>
+    <NBGV_GlobalPropertiesToRemove Include="TargetFramework" />
+    <NBGV_GlobalPropertiesToRemove Include="RuntimeIdentifier" />
+    <NBGV_GlobalPropertiesToRemove Include="Configuration" />
+    <NBGV_GlobalPropertiesToRemove Include="Platform" />
+
+    <_BuildMetadataSnapped Include="@(BuildMetadata)" />
+  </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="$(MSBuildThisFileDirectory)Nerdbank.GitVersioning.Inner.targets">
+      <Targets>GetBuildVersion_Properties;GetBuildVersion_CloudBuildVersionVars</Targets>
+      <Properties>$(NBGV_InnerGlobalProperties)BuildMetadata=@(BuildMetadata, ',');</Properties>
+      <GlobalPropertiesToRemove>@(NBGV_GlobalPropertiesToRemove)</GlobalPropertiesToRemove>
+
+      <!-- Do our very best to prevent Microsoft.Common.CurrentVersion.targets or IDEs from processing this P2P. It's only here for MSBuild's static graph. -->
+      <BuildReference>false</BuildReference>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+      <SkipGetTargetFrameworkProperties>true</SkipGetTargetFrameworkProperties>
+      <Visible>false</Visible>
+      <NBGV_InnerProject>true</NBGV_InnerProject>
+    </ProjectReference>
+  </ItemGroup>
+
+  <Target Name="InvokeGetBuildVersionTask">
+    <Error Text="BuildMetadata items changed after a copy was made. Add all BuildMetadata items before importing this file." Condition=" '@(BuildMetadata)' != '@(_BuildMetadataSnapped)' " />
+
+    <!-- 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)"
+             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)"
+             Targets="GetBuildVersion_CloudBuildVersionVars">
+      <Output TaskParameter="TargetOutputs" ItemName="CloudBuildVersionVars" />
+    </MSBuild>
+  </Target>
+</Project>
diff --git a/src/Nerdbank.GitVersioning.Tasks/build/Nerdbank.GitVersioning.Common.targets b/src/Nerdbank.GitVersioning.Tasks/build/Nerdbank.GitVersioning.Common.targets
index 047e2420..a360732f 100644
--- a/src/Nerdbank.GitVersioning.Tasks/build/Nerdbank.GitVersioning.Common.targets
+++ b/src/Nerdbank.GitVersioning.Tasks/build/Nerdbank.GitVersioning.Common.targets
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
+    <_NBGV_Common_Targets_Imported>true</_NBGV_Common_Targets_Imported>
     <_NBGV_PlatformSuffix Condition=" '$(_NBGV_PlatformSuffix)' == '' and '$(MSBuildRuntimeType)' == 'Core' ">MSBuildCore/</_NBGV_PlatformSuffix>
     <_NBGV_PlatformSuffix Condition=" '$(_NBGV_PlatformSuffix)' == '' ">MSBuildFull/</_NBGV_PlatformSuffix>
     <NerdbankGitVersioningTasksPath Condition=" '$(NerdbankGitVersioningTasksPath)' == '' ">$(MSBuildThisFileDirectory)$(_NBGV_PlatformSuffix)</NerdbankGitVersioningTasksPath>
diff --git a/src/Nerdbank.GitVersioning.Tasks/build/Nerdbank.GitVersioning.Inner.Empty.targets b/src/Nerdbank.GitVersioning.Tasks/build/Nerdbank.GitVersioning.Inner.Empty.targets
new file mode 100644
index 00000000..02f61168
--- /dev/null
+++ b/src/Nerdbank.GitVersioning.Tasks/build/Nerdbank.GitVersioning.Inner.Empty.targets
@@ -0,0 +1,9 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <!-- These targets are called by MSBuild static graph because we declare a ProjectReference item to this file. -->
+  <Target Name="GetTargetFrameworks" />
+  <Target Name="GetNativeManifest" />
+  <Target Name="GetCopyToOutputDirectoryItems" />
+  <Target Name="GetTargetFrameworksWithPlatformForSingleTargetFramework" />
+
+</Project>
\ No newline at end of file
diff --git a/src/Nerdbank.GitVersioning.Tasks/build/Nerdbank.GitVersioning.Inner.targets b/src/Nerdbank.GitVersioning.Tasks/build/Nerdbank.GitVersioning.Inner.targets
index 8075fb21..1cbafadb 100644
--- a/src/Nerdbank.GitVersioning.Tasks/build/Nerdbank.GitVersioning.Inner.targets
+++ b/src/Nerdbank.GitVersioning.Tasks/build/Nerdbank.GitVersioning.Inner.targets
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
-  <Import Project="Nerdbank.GitVersioning.Common.targets"/>
+  <Import Project="Nerdbank.GitVersioning.Common.targets" Condition=" '$(_NBGV_Common_Targets_Imported)' != 'true' "/>
 
   <UsingTask AssemblyFile="$(NerdbankGitVersioningTasksPath)Nerdbank.GitVersioning.Tasks.dll" TaskName="Nerdbank.GitVersioning.Tasks.GetBuildVersion"/>
   
@@ -18,7 +18,7 @@
       BuildingRef="$(_NBGV_BuildingRef)"
       BuildMetadata="$(BuildMetadata.Replace(',',';'))"
       DefaultPublicRelease="$(PublicRelease)"
-      ProjectDirectory="$(ProjectDirectory)"
+      ProjectDirectory="$(GitVersionBaseDirectory)"
       GitRepoRoot="$(GitRepoRoot)"
       ProjectPathRelativeToGitRepoRoot="$(ProjectPathRelativeToGitRepoRoot)"
       OverrideBuildNumberOffset="$(OverrideBuildNumberOffset)"
@@ -42,11 +42,7 @@
     <Message Importance="low" Text="AssemblyInformationalVersion: $(AssemblyInformationalVersion)" />
     <Message Importance="low" Text="NuGetPackageVersion: $(NuGetPackageVersion)" />
   </Target>
-  
-  <!-- These targets are called by MSBuild static graph because we declare a ProjectReference item to this file. -->
-  <Target Name="GetTargetFrameworks" />
-  <Target Name="GetNativeManifest" />
-  <Target Name="GetCopyToOutputDirectoryItems" />
-  <Target Name="GetTargetFrameworksWithPlatformForSingleTargetFramework" />
+
+  <Import Project="Nerdbank.GitVersioning.Inner.Empty.targets" Condition=" '$(NBGV_CacheMode)' == 'MSBuildTargetCaching' " />
 
 </Project>
\ No newline at end of file
diff --git a/src/Nerdbank.GitVersioning.Tasks/build/Nerdbank.GitVersioning.props b/src/Nerdbank.GitVersioning.Tasks/build/Nerdbank.GitVersioning.props
new file mode 100644
index 00000000..5ebd8c16
--- /dev/null
+++ b/src/Nerdbank.GitVersioning.Tasks/build/Nerdbank.GitVersioning.props
@@ -0,0 +1,15 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <!-- Cache modes include:
+         MSBuildTargetCaching
+            This is the default.
+            Versions will be computed by an MSBuild target which can be shared across an entire build session via MSBuild target output caching.
+         None
+            Every project will compute its own version.
+
+         Note that the choice in caching should have no bearing on the result of the versions computed - only on build perf and which systems it can work with.
+    -->
+    <NBGV_CacheMode Condition=" '$(NBGV_CacheMode)' == '' and '$(QBuild)' == '1' ">None</NBGV_CacheMode>
+    <NBGV_CacheMode Condition=" '$(NBGV_CacheMode)' == '' ">MSBuildTargetCaching</NBGV_CacheMode>
+  </PropertyGroup>
+</Project>
diff --git a/src/Nerdbank.GitVersioning.Tasks/build/Nerdbank.GitVersioning.targets b/src/Nerdbank.GitVersioning.Tasks/build/Nerdbank.GitVersioning.targets
index 33a2910f..abc90c9e 100644
--- a/src/Nerdbank.GitVersioning.Tasks/build/Nerdbank.GitVersioning.targets
+++ b/src/Nerdbank.GitVersioning.Tasks/build/Nerdbank.GitVersioning.targets
@@ -25,7 +25,7 @@
     <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
   </PropertyGroup>
 
-  <Import Project="Nerdbank.GitVersioning.Common.targets"/>
+  <Import Project="Nerdbank.GitVersioning.Common.targets" />
 
   <UsingTask AssemblyFile="$(NerdbankGitVersioningTasksPath)Nerdbank.GitVersioning.Tasks.dll" TaskName="Nerdbank.GitVersioning.Tasks.AssemblyVersionInfo"/>
   <UsingTask AssemblyFile="$(NerdbankGitVersioningTasksPath)Nerdbank.GitVersioning.Tasks.dll" TaskName="Nerdbank.GitVersioning.Tasks.NativeVersionInfo"/>
@@ -37,7 +37,7 @@
     <PropertyGroup>
       <!-- $(TargetExt) isn't set at evaluation time for us when built in wpftmp.csproj with manual imports -->
       <!-- Suppress assembly version info generation if not obviously compiling an assembly. -->
-      <GenerateAssemblyVersionInfo Condition=" '$(GenerateAssemblyVersionInfo)' == '' and '$(TargetExt)' != '.dll' and '$(TargetExt)' != '.exe'">false</GenerateAssemblyVersionInfo>
+      <GenerateAssemblyVersionInfo Condition=" '$(GenerateAssemblyVersionInfo)' == '' and '$(TargetExt)' != '.dll' and '$(TargetExt)' != '.exe' ">false</GenerateAssemblyVersionInfo>
 
       <!-- Workaround the property stomping that msbuild does (see https://github.com/microsoft/msbuild/pull/4922) with manual imports. -->
       <PrepareForBuildDependsOn>
@@ -64,54 +64,9 @@
     <_NBGV_BuildingRef Condition=" '$(_NBGV_BuildingRef)' == '' ">$(_NBGV_BuildingBranch)</_NBGV_BuildingRef>
 
     <GitVersionBaseDirectory Condition=" '$(GitVersionBaseDirectory)' == '' ">$(MSBuildProjectDirectory)</GitVersionBaseDirectory>
-    <NBGV_InnerGlobalProperties Condition=" '$(GitRepoRoot)' != '' ">$(NBGV_InnerGlobalProperties)GitRepoRoot=$(GitRepoRoot);</NBGV_InnerGlobalProperties>
-    <NBGV_InnerGlobalProperties Condition=" '$(PublicRelease)' != '' ">$(NBGV_InnerGlobalProperties)PublicRelease=$(PublicRelease);</NBGV_InnerGlobalProperties>
-    <NBGV_InnerGlobalProperties Condition=" '$(_NBGV_BuildingRef)' != '' ">$(NBGV_InnerGlobalProperties)_NBGV_BuildingRef=$(_NBGV_BuildingRef);</NBGV_InnerGlobalProperties>
-    <NBGV_InnerGlobalProperties Condition=" '$(ProjectPathRelativeToGitRepoRoot)' != '' ">$(NBGV_InnerGlobalProperties)ProjectPathRelativeToGitRepoRoot=$(ProjectPathRelativeToGitRepoRoot);</NBGV_InnerGlobalProperties>
-    <NBGV_InnerGlobalProperties Condition=" '$(GitVersionBaseDirectory)' != '' ">$(NBGV_InnerGlobalProperties)ProjectDirectory=$(GitVersionBaseDirectory);</NBGV_InnerGlobalProperties>
-    <NBGV_InnerGlobalProperties Condition=" '$(OverrideBuildNumberOffset)' != '' ">$(NBGV_InnerGlobalProperties)OverrideBuildNumberOffset=$(OverrideBuildNumberOffset);</NBGV_InnerGlobalProperties>
-    <NBGV_CoreTargets>$(MSBuildThisFileDirectory)Nerdbank.GitVersioning.Inner.targets</NBGV_CoreTargets>
   </PropertyGroup>
 
-  <!-- Compile a list of global properties that may vary when a project builds but that would never influence the result of the GetBuildVersion task. -->
-  <ItemGroup>
-    <NBGV_GlobalPropertiesToRemove Include="TargetFramework" />
-    <NBGV_GlobalPropertiesToRemove Include="RuntimeIdentifier" />
-    <NBGV_GlobalPropertiesToRemove Include="Configuration" />
-    <NBGV_GlobalPropertiesToRemove Include="Platform" />
-  
-    <_BuildMetadataSnapped Include="@(BuildMetadata)" />
-  </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_CoreTargets)">
-      <Targets>GetBuildVersion_Properties;GetBuildVersion_CloudBuildVersionVars</Targets>
-      <Properties>$(NBGV_InnerGlobalProperties)BuildMetadata=@(BuildMetadata, ',');</Properties>
-      <GlobalPropertiesToRemove>@(NBGV_GlobalPropertiesToRemove)</GlobalPropertiesToRemove>
-
-      <!-- Do our very best to prevent Microsoft.Common.CurrentVersion.targets or IDEs from processing this P2P. It's only here for MSBuild's static graph. -->
-      <BuildReference>false</BuildReference>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-      <SkipGetTargetFrameworkProperties>true</SkipGetTargetFrameworkProperties>
-      <Visible>false</Visible>
-      <NBGV_InnerProject>true</NBGV_InnerProject>
-    </ProjectReference>
-  </ItemGroup>
-
-  <Target Name="GetBuildVersion" Returns="$(BuildVersion)">
-    <Error Text="BuildMetadata items changed after a copy was made. Add all BuildMetadata items before importing this file." Condition=" '@(BuildMetadata)' != '@(_BuildMetadataSnapped)' " />
-    
-    <!-- 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)"
-             Targets="GetBuildVersion_Properties">
-      <Output TaskParameter="TargetOutputs" ItemName="NBGV_PropertyItems" />
-    </MSBuild>
-
+  <Target Name="GetBuildVersion" Returns="$(BuildVersion)" DependsOnTargets="InvokeGetBuildVersionTask">
     <!-- Convert each task item into a bona fide MSBuild property. -->
     <CreateProperty
       Value="%(NBGV_PropertyItems.Value)"
@@ -123,17 +78,11 @@
     <PropertyGroup>
       <CloudBuildNumber Condition=" '$(CloudBuildNumber)' == '' and %(NBGV_PropertyItems.Identity) == 'CloudBuildNumber' ">%(Value)</CloudBuildNumber>
     </PropertyGroup>
-
-    <!-- Also get other items. -->
-    <MSBuild Projects="@(ProjectReference)"
-             Condition=" '%(ProjectReference.NBGV_InnerProject)' == 'true' "
-             Properties="%(ProjectReference.Properties)"
-             RemoveProperties="%(ProjectReference.GlobalPropertiesToRemove)"
-             Targets="GetBuildVersion_CloudBuildVersionVars">
-      <Output TaskParameter="TargetOutputs" ItemName="CloudBuildVersionVars" />
-    </MSBuild>
   </Target>
 
+  <Import Project="InProjectVersionComputation.targets" Condition=" '$(NBGV_CacheMode)' != 'MSBuildTargetCaching' "/>
+  <Import Project="MSBuildTargetCaching.targets" Condition=" '$(NBGV_CacheMode)' == 'MSBuildTargetCaching' "/>
+
   <Target Name="SetCloudBuildVersionVars"
         DependsOnTargets="GetBuildVersion"
         AfterTargets="GetBuildVersion"
diff --git a/src/Nerdbank.GitVersioning.Tasks/buildCrossTargeting/Nerdbank.GitVersioning.props b/src/Nerdbank.GitVersioning.Tasks/buildCrossTargeting/Nerdbank.GitVersioning.props
new file mode 100644
index 00000000..6eb00eea
--- /dev/null
+++ b/src/Nerdbank.GitVersioning.Tasks/buildCrossTargeting/Nerdbank.GitVersioning.props
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\build\$(MSBuildThisFileName)$(MSBuildThisFileExtension)" />
+</Project>

From f0e05d18c0cce260fb2a92b2e415d5fe67f70047 Mon Sep 17 00:00:00 2001
From: Andrew Arnott <andrewarnott@live.com>
Date: Fri, 8 Oct 2021 06:49:43 -0600
Subject: [PATCH 2/2] Allow sharing version computation with a user-owned
 project

Quickbuild requires that every P2P be to a git-controlled project. This makes it incompatible with NB.GV's running the MSBuild task to one of its own .targets files.
To workaround this, a quickbuild user will have to define their own project that does nothing but compute the version using NB.GV, and then set `NBGV_CachingProjectReference` to the full path to this custom project.

Note that no actual *caching* occurs at this stage when under quickbuild because quickbuild uses a new top-level msbuild call for every project. We'll need to combine this with caching version info to a file on disk for this to be a perf improvement in quickbuild.
---
 doc/quickbuild.md                             | 55 +++++++++++++++++++
 .../NerdBank.GitVersioning.Tests.csproj       |  2 +-
 .../Nerdbank.GitVersioning.nuspec             |  2 +-
 .../build/MSBuildTargetCaching.targets        | 17 ++++--
 .../Nerdbank.GitVersioning.Inner.targets      |  2 -
 .../build/Nerdbank.GitVersioning.props        |  5 ++
 .../build/Nerdbank.GitVersioning.targets      |  1 +
 ...r.Empty.targets => PrivateP2PCaching.proj} |  5 +-
 8 files changed, 80 insertions(+), 9 deletions(-)
 create mode 100644 doc/quickbuild.md
 rename src/Nerdbank.GitVersioning.Tasks/build/{Nerdbank.GitVersioning.Inner.Empty.targets => PrivateP2PCaching.proj} (63%)

diff --git a/doc/quickbuild.md b/doc/quickbuild.md
new file mode 100644
index 00000000..0fc733b5
--- /dev/null
+++ b/doc/quickbuild.md
@@ -0,0 +1,55 @@
+# Microsoft's (internal) quickbuild
+
+Nerdbank.GitVersioning supports the Microsoft-internal quickbuild/cloudbuild tool.
+
+It works out of the box, but each project will recompute the version, which may accumulate to a significant increase in overall build time.
+
+🚧 A future version of Nerdbank.GitVersioning will cache version information as a file so that the following instructions will be effective. 🚧
+
+To calculate the version just once for an entire build, a few manual steps are required.
+
+1. Create this project in your repo. The suggested location is `VersionGeneration/VersionGeneration.msbuildproj`.
+
+    ```xml
+    <Project Sdk="Microsoft.Build.NoTargets">
+      <PropertyGroup>
+        <TargetFramework>net5.0</TargetFramework>
+        <IsPackable>false</IsPackable>
+        <SkipCopyBuildProduct>true</SkipCopyBuildProduct>
+        <NBGV_CacheMode>VersionGenerationTarget</NBGV_CacheMode>
+      </PropertyGroup>
+    </Project>
+    ```
+
+    The `TargetFramework` property value is not important as no assemblies are built by this project,
+    but a value is nonetheless required for NuGet to be willing to consume the Nerdbank.GitVersioning package reference
+    (which is referenced in Directory.Build.props as described later).
+
+1. Add the SDK version to your repo-root level `global.json` file, if it is not already present.
+    The [latest available version from nuget.org](https://www.nuget.org/packages/microsoft.build.notargets) is recommended.
+
+    ```json
+    {
+      "msbuild-sdks": {
+        "Microsoft.Build.NoTargets": "3.1.0"
+      }
+    }
+    ```
+
+1. Modify your repo-root level `Directory.Build.props` file to contain these elements:
+
+    ```xml
+    <PropertyGroup>
+      <!-- This entire repo has just one version.json file, so compute the version   once and share with all projects in a large build. -->
+      <GitVersionBaseDirectory>$(MSBuildThisFileDirectory)</GitVersionBaseDirectory>
+    </PropertyGroup>
+
+    <PropertyGroup Condition=" '$(QBuild)' == '1' ">
+      <NBGV_CacheMode>MSBuildTargetCaching</NBGV_CacheMode>
+      <NBGV_CachingProjectReference>$(MSBuildThisFileDirectory)VersionGeneration\VersionGeneration.msbuildproj</NBGV_CachingProjectReference>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <PackageReference Include="Nerdbank.GitVersioning" Version="3.5.*" PrivateAssets="all" />
+    </ItemGroup>
+    ```
diff --git a/src/NerdBank.GitVersioning.Tests/NerdBank.GitVersioning.Tests.csproj b/src/NerdBank.GitVersioning.Tests/NerdBank.GitVersioning.Tests.csproj
index e82aaab4..1e9f8e11 100644
--- a/src/NerdBank.GitVersioning.Tests/NerdBank.GitVersioning.Tests.csproj
+++ b/src/NerdBank.GitVersioning.Tests/NerdBank.GitVersioning.Tests.csproj
@@ -12,7 +12,7 @@
     <Compile Include="..\Shared\**\*.cs" LinkBase="Shared" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="..\Nerdbank.GitVersioning.Tasks\build\*.targets;..\Nerdbank.GitVersioning.Tasks\build\*.props">
+    <EmbeddedResource Include="..\Nerdbank.GitVersioning.Tasks\build\*.targets;..\Nerdbank.GitVersioning.Tasks\build\*.props;..\Nerdbank.GitVersioning.Tasks\build\*.proj">
       <Visible>false</Visible>
       <Link>Targets\%(FileName)%(Extension)</Link>
     </EmbeddedResource>
diff --git a/src/Nerdbank.GitVersioning.Tasks/Nerdbank.GitVersioning.nuspec b/src/Nerdbank.GitVersioning.Tasks/Nerdbank.GitVersioning.nuspec
index 47107c37..668b210e 100644
--- a/src/Nerdbank.GitVersioning.Tasks/Nerdbank.GitVersioning.nuspec
+++ b/src/Nerdbank.GitVersioning.Tasks/Nerdbank.GitVersioning.nuspec
@@ -52,9 +52,9 @@ IMPORTANT: The 3.x release may produce a different version height than prior maj
     <file src="build\MSBuildTargetCaching.targets" target="build\MSBuildTargetCaching.targets" />
     <file src="build\Nerdbank.GitVersioning.Common.targets" target="build\Nerdbank.GitVersioning.Common.targets" />
     <file src="build\Nerdbank.GitVersioning.Inner.targets" target="build\Nerdbank.GitVersioning.Inner.targets" />
-    <file src="build\Nerdbank.GitVersioning.Inner.Empty.targets" target="build\Nerdbank.GitVersioning.Inner.Empty.targets" />
     <file src="build\Nerdbank.GitVersioning.props" target="build\Nerdbank.GitVersioning$LKGSuffix$.props" />
     <file src="build\Nerdbank.GitVersioning.targets" target="build\Nerdbank.GitVersioning$LKGSuffix$.targets" />
+    <file src="build\PrivateP2PCaching.proj" target="build\PrivateP2PCaching.proj" />
     <file src="buildCrossTargeting\Nerdbank.GitVersioning.targets" target="buildCrossTargeting\Nerdbank.GitVersioning$LKGSuffix$.targets" />
     <file src="readme.txt" target="readme.txt" />
   </files>
diff --git a/src/Nerdbank.GitVersioning.Tasks/build/MSBuildTargetCaching.targets b/src/Nerdbank.GitVersioning.Tasks/build/MSBuildTargetCaching.targets
index 9bf0e1e0..7e2b97ca 100644
--- a/src/Nerdbank.GitVersioning.Tasks/build/MSBuildTargetCaching.targets
+++ b/src/Nerdbank.GitVersioning.Tasks/build/MSBuildTargetCaching.targets
@@ -6,22 +6,30 @@
     <NBGV_InnerGlobalProperties Condition=" '$(ProjectPathRelativeToGitRepoRoot)' != '' ">$(NBGV_InnerGlobalProperties)ProjectPathRelativeToGitRepoRoot=$(ProjectPathRelativeToGitRepoRoot);</NBGV_InnerGlobalProperties>
     <NBGV_InnerGlobalProperties Condition=" '$(GitVersionBaseDirectory)' != '' ">$(NBGV_InnerGlobalProperties)GitVersionBaseDirectory=$(GitVersionBaseDirectory);</NBGV_InnerGlobalProperties>
     <NBGV_InnerGlobalProperties Condition=" '$(OverrideBuildNumberOffset)' != '' ">$(NBGV_InnerGlobalProperties)OverrideBuildNumberOffset=$(OverrideBuildNumberOffset);</NBGV_InnerGlobalProperties>
-    <NBGV_InnerGlobalProperties Condition=" '$(NBGV_CacheMode)' != '' ">$(NBGV_InnerGlobalProperties)NBGV_CacheMode=$(NBGV_CacheMode);</NBGV_InnerGlobalProperties>
   </PropertyGroup>
 
   <!-- Compile a list of global properties that may vary when a project builds but that would never influence the result of the GetBuildVersion task. -->
   <ItemGroup>
     <NBGV_GlobalPropertiesToRemove Include="TargetFramework" />
     <NBGV_GlobalPropertiesToRemove Include="RuntimeIdentifier" />
-    <NBGV_GlobalPropertiesToRemove Include="Configuration" />
-    <NBGV_GlobalPropertiesToRemove Include="Platform" />
 
     <_BuildMetadataSnapped Include="@(BuildMetadata)" />
   </ItemGroup>
 
+  <!-- We generally prefer to clear config|platform properties because they do not impact the version.
+       But quickbuild doesn't like a p2p that removes these, so set them to defensible constant values in that situation. -->
+  <PropertyGroup Condition=" '$(QBuild)' == '1' ">
+    <NBGV_InnerGlobalProperties>$(NBGV_InnerGlobalProperties)Configuration=Release;</NBGV_InnerGlobalProperties>
+    <NBGV_InnerGlobalProperties>$(NBGV_InnerGlobalProperties)Platform=AnyCPU;</NBGV_InnerGlobalProperties>
+  </PropertyGroup>
+  <ItemGroup Condition=" '$(QBuild)' != '1' ">
+    <NBGV_GlobalPropertiesToRemove Include="Configuration" />
+    <NBGV_GlobalPropertiesToRemove Include="Platform" />
+  </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="$(MSBuildThisFileDirectory)Nerdbank.GitVersioning.Inner.targets">
+    <ProjectReference Include="$(NBGV_CachingProjectReference)">
       <Targets>GetBuildVersion_Properties;GetBuildVersion_CloudBuildVersionVars</Targets>
       <Properties>$(NBGV_InnerGlobalProperties)BuildMetadata=@(BuildMetadata, ',');</Properties>
       <GlobalPropertiesToRemove>@(NBGV_GlobalPropertiesToRemove)</GlobalPropertiesToRemove>
@@ -32,6 +40,7 @@
       <SkipGetTargetFrameworkProperties>true</SkipGetTargetFrameworkProperties>
       <Visible>false</Visible>
       <NBGV_InnerProject>true</NBGV_InnerProject>
+      <PrivateAssets>all</PrivateAssets>
     </ProjectReference>
   </ItemGroup>
 
diff --git a/src/Nerdbank.GitVersioning.Tasks/build/Nerdbank.GitVersioning.Inner.targets b/src/Nerdbank.GitVersioning.Tasks/build/Nerdbank.GitVersioning.Inner.targets
index 1cbafadb..ac037a13 100644
--- a/src/Nerdbank.GitVersioning.Tasks/build/Nerdbank.GitVersioning.Inner.targets
+++ b/src/Nerdbank.GitVersioning.Tasks/build/Nerdbank.GitVersioning.Inner.targets
@@ -43,6 +43,4 @@
     <Message Importance="low" Text="NuGetPackageVersion: $(NuGetPackageVersion)" />
   </Target>
 
-  <Import Project="Nerdbank.GitVersioning.Inner.Empty.targets" Condition=" '$(NBGV_CacheMode)' == 'MSBuildTargetCaching' " />
-
 </Project>
\ No newline at end of file
diff --git a/src/Nerdbank.GitVersioning.Tasks/build/Nerdbank.GitVersioning.props b/src/Nerdbank.GitVersioning.Tasks/build/Nerdbank.GitVersioning.props
index 5ebd8c16..0c994a77 100644
--- a/src/Nerdbank.GitVersioning.Tasks/build/Nerdbank.GitVersioning.props
+++ b/src/Nerdbank.GitVersioning.Tasks/build/Nerdbank.GitVersioning.props
@@ -11,5 +11,10 @@
     -->
     <NBGV_CacheMode Condition=" '$(NBGV_CacheMode)' == '' and '$(QBuild)' == '1' ">None</NBGV_CacheMode>
     <NBGV_CacheMode Condition=" '$(NBGV_CacheMode)' == '' ">MSBuildTargetCaching</NBGV_CacheMode>
+
+    <!-- This property may be overridden in environments where all P2P references must be a project actually defined within the git repo directory.
+         Learn more at :/doc/quickbuild.md.
+         -->
+    <NBGV_CachingProjectReference Condition=" '$(NBGV_CachingProjectReference)' == '' ">$(MSBuildThisFileDirectory)PrivateP2PCaching.proj</NBGV_CachingProjectReference>
   </PropertyGroup>
 </Project>
diff --git a/src/Nerdbank.GitVersioning.Tasks/build/Nerdbank.GitVersioning.targets b/src/Nerdbank.GitVersioning.Tasks/build/Nerdbank.GitVersioning.targets
index abc90c9e..232ee06b 100644
--- a/src/Nerdbank.GitVersioning.Tasks/build/Nerdbank.GitVersioning.targets
+++ b/src/Nerdbank.GitVersioning.Tasks/build/Nerdbank.GitVersioning.targets
@@ -38,6 +38,7 @@
       <!-- $(TargetExt) isn't set at evaluation time for us when built in wpftmp.csproj with manual imports -->
       <!-- Suppress assembly version info generation if not obviously compiling an assembly. -->
       <GenerateAssemblyVersionInfo Condition=" '$(GenerateAssemblyVersionInfo)' == '' and '$(TargetExt)' != '.dll' and '$(TargetExt)' != '.exe' ">false</GenerateAssemblyVersionInfo>
+      <GenerateAssemblyVersionInfo Condition=" '$(GenerateAssemblyVersionInfo)' == '' and '$(NBGV_CacheMode)' == 'VersionGenerationTarget' ">false</GenerateAssemblyVersionInfo>
 
       <!-- Workaround the property stomping that msbuild does (see https://github.com/microsoft/msbuild/pull/4922) with manual imports. -->
       <PrepareForBuildDependsOn>
diff --git a/src/Nerdbank.GitVersioning.Tasks/build/Nerdbank.GitVersioning.Inner.Empty.targets b/src/Nerdbank.GitVersioning.Tasks/build/PrivateP2PCaching.proj
similarity index 63%
rename from src/Nerdbank.GitVersioning.Tasks/build/Nerdbank.GitVersioning.Inner.Empty.targets
rename to src/Nerdbank.GitVersioning.Tasks/build/PrivateP2PCaching.proj
index 02f61168..0245b1ae 100644
--- a/src/Nerdbank.GitVersioning.Tasks/build/Nerdbank.GitVersioning.Inner.Empty.targets
+++ b/src/Nerdbank.GitVersioning.Tasks/build/PrivateP2PCaching.proj
@@ -1,4 +1,7 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <Import Project="Nerdbank.GitVersioning.Inner.targets" />
 
   <!-- These targets are called by MSBuild static graph because we declare a ProjectReference item to this file. -->
   <Target Name="GetTargetFrameworks" />