From 42395cbc444da821515002b44e3e86c7d750e774 Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Mon, 4 Jan 2021 15:41:39 +0100
Subject: [PATCH 1/2] Add fallback values for GitVersionFileExe and
 GitVersionAssemblyFile

This fixes #2502.
---
 src/GitVersion.MsBuild/msbuild/tools/GitVersion.MsBuild.props | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/GitVersion.MsBuild/msbuild/tools/GitVersion.MsBuild.props b/src/GitVersion.MsBuild/msbuild/tools/GitVersion.MsBuild.props
index e76cb0b48c..67ef37c9be 100644
--- a/src/GitVersion.MsBuild/msbuild/tools/GitVersion.MsBuild.props
+++ b/src/GitVersion.MsBuild/msbuild/tools/GitVersion.MsBuild.props
@@ -32,6 +32,9 @@
     </PropertyGroup>
 
     <PropertyGroup>
+        <GitVersionFileExe Condition="'$(GitVersionFileExe)' == ''">dotnet $(MSBuildThisFileDirectory)netcoreapp3.1/gitversion.dll</GitVersionFileExe>
+        <GitVersionAssemblyFile Condition="'$(GitVersionAssemblyFile)' == ''">$(MSBuildThisFileDirectory)netcoreapp3.1/GitVersion.MsBuild.dll</GitVersionAssemblyFile>
+
         <DisableGitVersionTask Condition=" '$(DisableGitVersionTask)' == '' ">false</DisableGitVersionTask>
 
         <!-- Property that enables WriteVersionInfoToBuildLog -->

From a65af181dd179c049b0db355a93374f1f7f0e94a Mon Sep 17 00:00:00 2001
From: Eberhard Beilharz <eb1@sil.org>
Date: Mon, 4 Jan 2021 15:57:00 +0100
Subject: [PATCH 2/2] Create gitversion.json file in intermediate directory

---
 src/GitVersion.MsBuild/msbuild/tools/GitVersion.MsBuild.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/GitVersion.MsBuild/msbuild/tools/GitVersion.MsBuild.props b/src/GitVersion.MsBuild/msbuild/tools/GitVersion.MsBuild.props
index 67ef37c9be..32c4050c27 100644
--- a/src/GitVersion.MsBuild/msbuild/tools/GitVersion.MsBuild.props
+++ b/src/GitVersion.MsBuild/msbuild/tools/GitVersion.MsBuild.props
@@ -2,7 +2,7 @@
 
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <PropertyGroup>
-        <GitVersionOutputFile>$(MSBuildProjectDirectory)/gitversion.json</GitVersionOutputFile>
+        <GitVersionOutputFile>$(BaseIntermediateOutputPath)/gitversion.json</GitVersionOutputFile>
 
         <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">$(MSBuildProjectDirectory)/../</SolutionDir>
         <GitVersionPath Condition="'$(GitVersionPath)' == '' And '$(GitVersionUseSolutionDir)' == 'true'">$(SolutionDir)</GitVersionPath>