diff --git a/.gitignore b/.gitignore
index dabfa1d..9644368 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ obj
 
 /packages/
 .vs/
+*.nupkg
diff --git a/Directory.Build.targets b/Directory.Build.targets
new file mode 100644
index 0000000..553c24f
--- /dev/null
+++ b/Directory.Build.targets
@@ -0,0 +1,22 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <PackageReference Include="GitInfo" Version="2.1.2" PrivateAssets="all" />
+  </ItemGroup>
+  <PropertyGroup>
+    <GitThisAssembly>false</GitThisAssembly>
+    <GitDefaultBranch>main</GitDefaultBranch>
+  </PropertyGroup>
+
+  <Target Name="SetVersion" BeforeTargets="GetAssemblyVersion;GetPackageVersion;GenerateNuspec" DependsOnTargets="GitVersion">
+    <PropertyGroup>
+      <Version>$(GitSemVerMajor).$(GitSemVerMinor).$(GitSemVerPatch)</Version>
+      <PackageVersion>$(Version)$(PackageVersionSuffix)</PackageVersion>
+      <InformationalVersion>$(Version); git-rev-head:$(GitCommit); git-branch:$(GitBranch)</InformationalVersion>
+    </PropertyGroup>
+  </Target>
+
+  <Import
+      Project="$([System.IO.Path]::GetDirectoryName($(MSBuildThisFileDirectory))).override.targets"
+      Condition=" Exists('$([System.IO.Path]::GetDirectoryName($(MSBuildThisFileDirectory))).override.targets') "
+  />
+</Project>
diff --git a/GitInfo.txt b/GitInfo.txt
new file mode 100644
index 0000000..d3827e7
--- /dev/null
+++ b/GitInfo.txt
@@ -0,0 +1 @@
+1.0
diff --git a/Xamarin.MacDev/Properties/AssemblyInfo.cs b/Xamarin.MacDev/Properties/AssemblyInfo.cs
index 9dcf5f4..5124d5a 100644
--- a/Xamarin.MacDev/Properties/AssemblyInfo.cs
+++ b/Xamarin.MacDev/Properties/AssemblyInfo.cs
@@ -28,7 +28,7 @@
 
 // Information about this assembly is defined by the following attributes. 
 // Change them to the values specific to your project.
-[assembly: AssemblyTitle ("Xamarin.MacDev")]
+[assembly: AssemblyTitle ("Xamarin.Apple.Tools.MaciOS")]
 [assembly: AssemblyDescription ("")]
 [assembly: AssemblyConfiguration ("")]
 [assembly: AssemblyCompany ("Xamarin Inc.")]
diff --git a/Xamarin.MacDev/Xamarin.MacDev.csproj b/Xamarin.MacDev/Xamarin.MacDev.csproj
index cc10fbd..57c0ef5 100644
--- a/Xamarin.MacDev/Xamarin.MacDev.csproj
+++ b/Xamarin.MacDev/Xamarin.MacDev.csproj
@@ -11,7 +11,9 @@
 
   <!-- NuGet Package Properties -->
   <PropertyGroup>
-    <Title>Xamarin.MacDev</Title>
+    <PackageId>Xamarin.Apple.Tools.MaciOS</PackageId>
+    <AssemblyName>Xamarin.Apple.Tools.MaciOS</AssemblyName>
+    <Title>Xamarin.Apple.Tools.MaciOS</Title>
     <Authors>Microsoft</Authors>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageProjectUrl>https://github.com/dotnet/macios-devtools</PackageProjectUrl>