diff --git a/Directory.Build.props b/Directory.Build.props
index 3c8b96e99..2b2343a4d 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -62,6 +62,8 @@
     <UtilityOutputFullPath Condition=" '$(UtilityOutputFullPathCoreApps)' != '' ">$(UtilityOutputFullPathCoreApps)</UtilityOutputFullPath>
     <UtilityOutputFullPath Condition=" '$(UtilityOutputFullPathCoreApps)' == '' ">$(ToolOutputFullPath)</UtilityOutputFullPath>
     <RollForward>Major</RollForward>
+    <JIUtilityVersion>$(JINetToolVersion)</JIUtilityVersion>
+    <JICoreLibVersion>$(JINetCoreLibVersion)</JICoreLibVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(JIBuildingForNetCoreApp)' != 'True' ">
     <IntermediateOutputPath>$(BaseIntermediateOutputPath)\$(Configuration)</IntermediateOutputPath>
@@ -69,6 +71,8 @@
     <ToolOutputFullPath>$(MSBuildThisFileDirectory)bin\$(Configuration)\</ToolOutputFullPath>
     <TestOutputFullPath>$(MSBuildThisFileDirectory)bin\Test$(Configuration)\</TestOutputFullPath>
     <UtilityOutputFullPath Condition=" '$(UtilityOutputFullPath)' == '' ">$(ToolOutputFullPath)</UtilityOutputFullPath>
+    <JIUtilityVersion>$(JIOldToolVersion)</JIUtilityVersion>
+    <JICoreLibVersion>$(JIOldCoreLibVersion)</JICoreLibVersion>
   </PropertyGroup>
   <PropertyGroup>
     <XamarinAndroidToolsDirectory   Condition=" '$(XamarinAndroidToolsDirectory)' == '' ">$(MSBuildThisFileDirectory)external\xamarin-android-tools</XamarinAndroidToolsDirectory>
@@ -119,4 +123,8 @@
     <NoWarn>$(NoWarn);CA1307;CA1309;CA1310</NoWarn>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <Version>$(JIUtilityVersion)</Version>
+  </PropertyGroup>
+
 </Project>
diff --git a/Directory.Build.targets b/Directory.Build.targets
index 5a6438555..ea649d951 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -34,4 +34,6 @@
     <PackageReference Update="XliffTasks"                                   Version="1.0.0-beta.20420.1" />
   </ItemGroup>
 
+  <Import Project="build-tools\scripts\VersionInfo.targets" />
+
 </Project>
diff --git a/GitInfo.txt b/GitInfo.txt
index ceab6e11e..e0ea36fee 100644
--- a/GitInfo.txt
+++ b/GitInfo.txt
@@ -1 +1 @@
-0.1
\ No newline at end of file
+6.0
diff --git a/build-tools/Java.Interop.BootstrapTasks/Java.Interop.BootstrapTasks.csproj b/build-tools/Java.Interop.BootstrapTasks/Java.Interop.BootstrapTasks.csproj
index 82b53b925..2ea9769b5 100644
--- a/build-tools/Java.Interop.BootstrapTasks/Java.Interop.BootstrapTasks.csproj
+++ b/build-tools/Java.Interop.BootstrapTasks/Java.Interop.BootstrapTasks.csproj
@@ -6,7 +6,13 @@
     <OutputPath>$(BuildToolOutputFullPath)</OutputPath>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <GitDefaultBranch>main</GitDefaultBranch>
+    <GitThisAssembly>false</GitThisAssembly>
+  </PropertyGroup>
+
   <ItemGroup>
+    <PackageReference Include="GitInfo" />
     <PackageReference Include="Microsoft.Build.Framework" />
     <PackageReference Include="Microsoft.Build.Utilities.Core" />
     <PackageReference Include="NUnit.ConsoleRunner" GeneratePathProperty="True" />
diff --git a/build-tools/Java.Interop.BootstrapTasks/Java.Interop.BootstrapTasks.targets b/build-tools/Java.Interop.BootstrapTasks/Java.Interop.BootstrapTasks.targets
index 931ea5c70..51cb25fa1 100644
--- a/build-tools/Java.Interop.BootstrapTasks/Java.Interop.BootstrapTasks.targets
+++ b/build-tools/Java.Interop.BootstrapTasks/Java.Interop.BootstrapTasks.targets
@@ -105,4 +105,37 @@
     <Touch Files="$(_OutputPath)PackagePaths.props" />
   </Target>
 
+ <Target Name="_CreateVersionProps"
+      AfterTargets="Build"
+      DependsOnTargets="GitVersion"
+      Inputs="$(MSBuildThisFileFullPath);$(MSBuildThisFileDirectory)Java.Interop.BootstrapTasks.csproj"
+      Outputs="$(_OutputPath)Versions.props">
+    <PropertyGroup>
+      <_NetToolVersion>$(GitBaseVersionMajor).$(GitBaseVersionMinor).$(GitBaseVersionPatch).$(GitCommits)</_NetToolVersion>
+      <_OldToolVersion>0.2.$(GitBaseVersionPatch).$(GitCommits)</_OldToolVersion>
+      <_NetCoreLibVersion>$(GitBaseVersionMajor).$(GitBaseVersionMinor).0.0</_NetCoreLibVersion>
+      <_OldCoreLibVersion>0.1.0.0</_OldCoreLibVersion>
+      <_FileVersion>$(GitBaseVersionMajor).$(GitBaseVersionMinor).$(GitBaseVersionPatch).$(GitCommits)</_FileVersion>
+    </PropertyGroup>
+    <ItemGroup>
+      <_VersionsLine Include="&lt;Project&gt;" />
+      <_VersionsLine Include="  &lt;PropertyGroup&gt;" />
+      <_VersionsLine Include="    &lt;FileVersion&gt;$(_FileVersion)&lt;/FileVersion&gt;" />
+      <_VersionsLine Include="    &lt;JINetToolVersion&gt;$(_NetToolVersion)&lt;/JINetToolVersion&gt;" />
+      <_VersionsLine Include="    &lt;JIOldToolVersion&gt;$(_OldToolVersion)&lt;/JIOldToolVersion&gt;" />
+      <_VersionsLine Include="    &lt;JINetCoreLibVersion&gt;$(_NetCoreLibVersion)&lt;/JINetCoreLibVersion&gt;" />
+      <_VersionsLine Include="    &lt;JIOldCoreLibVersion&gt;$(_OldCoreLibVersion)&lt;/JIOldCoreLibVersion&gt;" />
+      <_VersionsLine Include="    &lt;JIBuildBranch&gt;$(GitBranch)&lt;/JIBuildBranch&gt;" />
+      <_VersionsLine Include="    &lt;JIBuildCommit&gt;$(GitCommit)&lt;/JIBuildCommit&gt;" />
+      <_VersionsLine Include="  &lt;/PropertyGroup&gt;" />
+      <_VersionsLine Include="&lt;/Project&gt;" />
+    </ItemGroup>
+    <WriteLinesToFile
+        File="$(_OutputPath)Version.props"
+        Lines="@(_VersionsLine)"
+        Overwrite="True"
+    />
+    <Touch Files="$(_OutputPath)Version.props" />
+  </Target>
+
 </Project>
diff --git a/build-tools/scripts/Version.props.in b/build-tools/scripts/Version.props.in
deleted file mode 100644
index a414f3475..000000000
--- a/build-tools/scripts/Version.props.in
+++ /dev/null
@@ -1,8 +0,0 @@
-<Project>
-  <PropertyGroup>
-    <Version Condition=" '$(Version)' == '' ">@VERSION@</Version>
-    <InformationalVersion>@VERSION@ git-rev-head:@COMMIT@ git-branch:@BRANCH@</InformationalVersion>
-    <Company>Microsoft Corporation</Company>
-    <Copyright>Microsoft Corporation</Copyright>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/build-tools/scripts/VersionInfo.targets b/build-tools/scripts/VersionInfo.targets
index 5636ef5d3..c86a53c5f 100644
--- a/build-tools/scripts/VersionInfo.targets
+++ b/build-tools/scripts/VersionInfo.targets
@@ -1,29 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project>
 
-  <UsingTask AssemblyFile="$(MSBuildThisFileDirectory)..\..\bin\Build$(Configuration)\Java.Interop.BootstrapTasks.dll"
-      TaskName="Java.Interop.BootstrapTasks.ReplaceFileContents" />
-  <PropertyGroup>
-    <GitDefaultBranch>main</GitDefaultBranch>
-    <GitThisAssembly>false</GitThisAssembly>
-  </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include="GitInfo" PrivateAssets="all" />
-  </ItemGroup>
-
-  <Target Name="GenerateVersionInfo"
-      AfterTargets="Build"
-      DependsOnTargets="GitVersion"
-      Condition="!Exists ('$(MSBuildThisFileDirectory)..\..\bin\Build$(Configuration)\Version.props')">
-    <ItemGroup>
-      <Replacements Include="@VERSION@" Replacement="$(GitSemVerMajor).$(GitSemVerMinor).$(GitSemVerPatch).0"/>
-      <Replacements Include="@COMMIT@" Replacement="$(GitCommit)"/>
-      <Replacements Include="@BRANCH@" Replacement="$(GitBranch)"/>
-    </ItemGroup>
-    <ReplaceFileContents
-        TemplateFile="$(MSBuildThisFileDirectory)Version.props.in"
-        OutputFile="$(MSBuildThisFileDirectory)..\..\bin\Build$(Configuration)\Version.props"
-        Replacements="@(Replacements)"
-    />
+  <Target Name="_SetInformationalVersion"
+      BeforeTargets="GetAssemblyVersion;GetPackageVersion">
+    <PropertyGroup>
+      <InformationalVersion>$(Version) git-rev-head:$(JIBuildCommit) git-branch:$(JIBuildBranch)</InformationalVersion>
+    </PropertyGroup>
   </Target>
+
 </Project>
\ No newline at end of file
diff --git a/src/Java.Base/Java.Base.csproj b/src/Java.Base/Java.Base.csproj
index 5be4deceb..81bd6cc7d 100644
--- a/src/Java.Base/Java.Base.csproj
+++ b/src/Java.Base/Java.Base.csproj
@@ -5,6 +5,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Nullable>enable</Nullable>
     <NoWarn>$(NoWarn);8764</NoWarn>
+    <Version>$(JICoreLibVersion)</Version>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Java.Interop.Dynamic/Java.Interop.Dynamic.csproj b/src/Java.Interop.Dynamic/Java.Interop.Dynamic.csproj
index 051223abd..df7c6b40d 100644
--- a/src/Java.Interop.Dynamic/Java.Interop.Dynamic.csproj
+++ b/src/Java.Interop.Dynamic/Java.Interop.Dynamic.csproj
@@ -7,7 +7,7 @@
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>..\..\product.snk</AssemblyOriginatorKeyFile>
     <AssemblyTitle>Java.Interop.Dynamic</AssemblyTitle>
-    <Version>0.1.0.0</Version>
+    <Version>$(JICoreLibVersion)</Version>
   </PropertyGroup>
   <PropertyGroup>
     <OutputPath>$(ToolOutputFullPath)</OutputPath>
diff --git a/src/Java.Interop.Export/Java.Interop.Export.csproj b/src/Java.Interop.Export/Java.Interop.Export.csproj
index bc3170252..50ded2320 100644
--- a/src/Java.Interop.Export/Java.Interop.Export.csproj
+++ b/src/Java.Interop.Export/Java.Interop.Export.csproj
@@ -7,7 +7,7 @@
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>..\..\product.snk</AssemblyOriginatorKeyFile>
     <AssemblyTitle>Java.Interop.Export</AssemblyTitle>
-    <Version>0.1.0.0</Version>
+    <Version>$(JICoreLibVersion)</Version>
   </PropertyGroup>
   <PropertyGroup>
     <OutputPath>$(ToolOutputFullPath)</OutputPath>
diff --git a/src/Java.Interop.GenericMarshaler/Java.Interop.GenericMarshaler.csproj b/src/Java.Interop.GenericMarshaler/Java.Interop.GenericMarshaler.csproj
index 1b69c773e..4f23b6ca6 100644
--- a/src/Java.Interop.GenericMarshaler/Java.Interop.GenericMarshaler.csproj
+++ b/src/Java.Interop.GenericMarshaler/Java.Interop.GenericMarshaler.csproj
@@ -10,6 +10,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <OutputPath>$(ToolOutputFullPath)</OutputPath>
+    <Version>$(JICoreLibVersion)</Version>
   </PropertyGroup>
   <ItemGroup>
     <None Include="Java.Interop.GenericMarshaler\JniPeerInstanceMethodsExtensions.tt">
diff --git a/src/Java.Interop/Java.Interop.csproj b/src/Java.Interop/Java.Interop.csproj
index 1ee9e3c10..0d666353f 100644
--- a/src/Java.Interop/Java.Interop.csproj
+++ b/src/Java.Interop/Java.Interop.csproj
@@ -30,7 +30,7 @@
     <Nullable>enable</Nullable>
     <ProduceReferenceAssembly>true</ProduceReferenceAssembly>
     <MSBuildWarningsAsMessages>NU1702</MSBuildWarningsAsMessages>
-    <Version>0.1.0.0</Version>
+    <Version>$(JICoreLibVersion)</Version>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DefineConstants>DEBUG;$(DefineConstants)</DefineConstants>
diff --git a/src/Java.Runtime.Environment/Java.Runtime.Environment.csproj b/src/Java.Runtime.Environment/Java.Runtime.Environment.csproj
index 264005096..1ff8f04bf 100644
--- a/src/Java.Runtime.Environment/Java.Runtime.Environment.csproj
+++ b/src/Java.Runtime.Environment/Java.Runtime.Environment.csproj
@@ -12,6 +12,7 @@
 
   <PropertyGroup>
     <OutputPath>$(TestOutputFullPath)</OutputPath>
+    <Version>$(JICoreLibVersion)</Version>
   </PropertyGroup>
 
   <ItemGroup>