diff --git a/Directory.Build.props b/Directory.Build.props
index 43483b3d3..304fd76db 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -87,14 +87,14 @@
 
   <!-- 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>
     <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>
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)