From 818b8ab0fd719c73ac0541ef6daa5d2b0ad60e57 Mon Sep 17 00:00:00 2001
From: Dean Ellis <dellis1972@googlemail.com>
Date: Fri, 20 Aug 2021 21:58:28 +0100
Subject: [PATCH 1/2] Try to fix the branch info in gitInfo

---
 Directory.Build.props | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 43483b3d3..6e71d837e 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -90,11 +90,12 @@
     <PackageReference Include="GitInfo" Version="2.1.2" PrivateAssets="all" />
   </ItemGroup>
   <PropertyGroup>
+    <GitNameRevOptions>--refs=&quot;refs/heads/*&quot; --no-undefined --always</GitNameRevOptions>
     <GitDefaultBranch>main</GitDefaultBranch>
     <GitThisAssembly>false</GitThisAssembly>
   </PropertyGroup>
 
-  <Target Name="SetVersion" BeforeTargets="GetAssemblyVersion;GetPackageVersion" DependsOnTargets="GitVersion">
+  <Target Name="SetVersion" BeforeTargets="GetAssemblyVersion;GetPackageVersion" DependsOnTargets="GitVersion" Condition=" '$(BuildingInsideVisualStudio)' != 'true' ">
     <PropertyGroup>
       <Version>$(GitSemVerMajor).$(GitSemVerMinor).$(GitSemVerPatch)</Version>
       <InformationalVersion>$(Version); git-rev-head:$(GitCommit); git-branch:$(GitBranch)</InformationalVersion>

From 8fbc319c4903ab90a554ff2101a06afb3243b3dd Mon Sep 17 00:00:00 2001
From: Dean Ellis <dellis1972@googlemail.com>
Date: Wed, 25 Aug 2021 09:32:38 +0100
Subject: [PATCH 2/2] Try to ensure that the version gets set for the
 Xamarin.Android build of Java.Interop.

---
 Directory.Build.props                            | 3 +--
 src/Java.Interop/Java.Interop-MonoAndroid.csproj | 2 ++
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 6e71d837e..304fd76db 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -87,10 +87,9 @@
 
   <!-- GitInfo Package for Assembly Versioning -->
   <ItemGroup>
-    <PackageReference Include="GitInfo" Version="2.1.2" PrivateAssets="all" />
+    <PackageReference Include="GitInfo" Version="2.1.2" PrivateAssets="all" GeneratePathProperty="true" />
   </ItemGroup>
   <PropertyGroup>
-    <GitNameRevOptions>--refs=&quot;refs/heads/*&quot; --no-undefined --always</GitNameRevOptions>
     <GitDefaultBranch>main</GitDefaultBranch>
     <GitThisAssembly>false</GitThisAssembly>
   </PropertyGroup>
diff --git a/src/Java.Interop/Java.Interop-MonoAndroid.csproj b/src/Java.Interop/Java.Interop-MonoAndroid.csproj
index 9061a960f..e7b8115a8 100644
--- a/src/Java.Interop/Java.Interop-MonoAndroid.csproj
+++ b/src/Java.Interop/Java.Interop-MonoAndroid.csproj
@@ -17,6 +17,7 @@
     <LangVersion>8.0</LangVersion>
     <ProduceReferenceAssembly>true</ProduceReferenceAssembly>
   </PropertyGroup>
+  <Import Project="$(PkgGitInfo)\build\GitInfo.targets" Condition="Exists ('$(PkgGitInfo)\build\GitInfo.targets')" />
   <Import Project="..\..\Directory.Build.props" />
   <PropertyGroup>
     <XAConfigPath>..\..\bin\Build$(Configuration)\XAConfig.props</XAConfigPath>
@@ -85,6 +86,7 @@
   <Import Project="Directory.Build.targets" />
   <PropertyGroup>
     <BuildDependsOn>
+      SetVersion;
       BuildJniEnvironment_g_cs;
       BuildInteropJar;
       $(BuildDependsOn)