diff --git a/Example/Example.csproj b/Example/Example.csproj
index b12300515..d53cc3e76 100644
--- a/Example/Example.csproj
+++ b/Example/Example.csproj
@@ -5,10 +5,10 @@
     <!-- Version numbers are automatically updated by gitversion when a release is released -->
     <!-- In the source tree the version will always be 1.0 for all projects. -->
     <!-- Do not modify these. -->
-    <AssemblyVersion>1.13.7.0</AssemblyVersion>
-    <FileVersion>1.13.7.0</FileVersion>
-    <Version>1.13.7-pre0060</Version>
-    <InformationalVersion>1.13.7-pre.60+Branch.develop.Sha.9b94dfcbb0adb042177b602e7fca383fb1600b57</InformationalVersion>
+    <AssemblyVersion>1.13.6.0</AssemblyVersion>
+    <FileVersion>1.13.6.0</FileVersion>
+    <Version>1.13.6-pre0002</Version>
+    <InformationalVersion>1.13.6-pre.2+Branch.develop.Sha.90208d6577b9d34bf0c4e9057b4227297bc9118d</InformationalVersion>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\Terminal.Gui\Terminal.Gui.csproj" />
diff --git a/FSharpExample/FSharpExample.fsproj b/FSharpExample/FSharpExample.fsproj
index f76f769ef..0be44075a 100644
--- a/FSharpExample/FSharpExample.fsproj
+++ b/FSharpExample/FSharpExample.fsproj
@@ -2,10 +2,10 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>net6.0</TargetFramework>
-    <AssemblyVersion>1.13.7.0</AssemblyVersion>
-    <FileVersion>1.13.7.0</FileVersion>
-    <InformationalVersion>1.13.7-pre.60+Branch.develop.Sha.9b94dfcbb0adb042177b602e7fca383fb1600b57</InformationalVersion>
-    <Version>1.13.7-pre0060</Version>
+    <AssemblyVersion>1.13.6.0</AssemblyVersion>
+    <FileVersion>1.13.6.0</FileVersion>
+    <InformationalVersion>1.13.6-pre.2+Branch.develop.Sha.90208d6577b9d34bf0c4e9057b4227297bc9118d</InformationalVersion>
+    <Version>1.13.6-pre0002</Version>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Program.fs" />
diff --git a/ReactiveExample/ReactiveExample.csproj b/ReactiveExample/ReactiveExample.csproj
index cd67909e3..67bc3c459 100644
--- a/ReactiveExample/ReactiveExample.csproj
+++ b/ReactiveExample/ReactiveExample.csproj
@@ -5,10 +5,10 @@
     <!-- Version numbers are automatically updated by gitversion when a release is released -->
     <!-- In the source tree the version will always be 2.0 for all projects. -->
     <!-- Do not modify these. -->
-    <AssemblyVersion>1.13.7.0</AssemblyVersion>
-    <FileVersion>1.13.7.0</FileVersion>
-    <Version>1.13.7-pre0060</Version>
-    <InformationalVersion>1.13.7-pre.60+Branch.develop.Sha.9b94dfcbb0adb042177b602e7fca383fb1600b57</InformationalVersion>
+    <AssemblyVersion>1.13.6.0</AssemblyVersion>
+    <FileVersion>1.13.6.0</FileVersion>
+    <Version>1.13.6-pre0002</Version>
+    <InformationalVersion>1.13.6-pre.2+Branch.develop.Sha.90208d6577b9d34bf0c4e9057b4227297bc9118d</InformationalVersion>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="ReactiveUI.Fody" Version="19.4.1" />
diff --git a/Terminal.Gui/Terminal.Gui.csproj b/Terminal.Gui/Terminal.Gui.csproj
index 2c3ddc3c4..72d467a0f 100644
--- a/Terminal.Gui/Terminal.Gui.csproj
+++ b/Terminal.Gui/Terminal.Gui.csproj
@@ -10,10 +10,10 @@
     <!-- Version numbers are automatically updated by gitversion when a release is released -->
     <!-- In the source tree the version will always be 1.0 for all projects. -->
     <!-- Do not modify these. Do NOT commit after manually running `dotnet-gitversion /updateprojectfiles` -->
-    <AssemblyVersion>1.13.7.0</AssemblyVersion>
-    <FileVersion>1.13.7.0</FileVersion>
-    <InformationalVersion>1.13.7-pre.60+Branch.develop.Sha.9b94dfcbb0adb042177b602e7fca383fb1600b57</InformationalVersion>
-    <Version>1.13.7-pre0060</Version>
+    <AssemblyVersion>1.13.6.0</AssemblyVersion>
+    <FileVersion>1.13.6.0</FileVersion>
+    <InformationalVersion>1.13.6-pre.2+Branch.develop.Sha.90208d6577b9d34bf0c4e9057b4227297bc9118d</InformationalVersion>
+    <Version>1.13.6-pre0002</Version>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="NStack.Core" Version="1.0.7" />
@@ -59,8 +59,9 @@
     <AssemblyName>Terminal.Gui</AssemblyName>
     <DocumentationFile>bin\Release\Terminal.Gui.xml</DocumentationFile>
     <GenerateDocumentationFile Condition=" '$(Configuration)' == 'Release' ">true</GenerateDocumentationFile>
-    <!--<GeneratePackageOnBuild Condition=" '$(Configuration)' == 'Release' ">true</GeneratePackageOnBuild>-->
+    <GeneratePackageOnBuild Condition=" '$(Configuration)' == 'Debug' ">true</GeneratePackageOnBuild>
     <PackageId>Terminal.Gui</PackageId>
+    <PackageVersion>$(PackageVersion)</PackageVersion>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageProjectUrl>https://github.com/gui-cs/Terminal.Gui/</PackageProjectUrl>
     <RepositoryUrl>https://github.com/gui-cs/Terminal.Gui.git</RepositoryUrl>
diff --git a/UICatalog/UICatalog.csproj b/UICatalog/UICatalog.csproj
index 4f6505bcb..8feabd825 100644
--- a/UICatalog/UICatalog.csproj
+++ b/UICatalog/UICatalog.csproj
@@ -7,10 +7,10 @@
     <!-- Version numbers are automatically updated by gitversion when a release is released -->
     <!-- In the source tree the version will always be 2.0 for all projects. -->
     <!-- Do not modify these. -->
-    <AssemblyVersion>1.13.7.0</AssemblyVersion>
-    <FileVersion>1.13.7.0</FileVersion>
-    <Version>1.13.7-pre0060</Version>
-    <InformationalVersion>1.13.7-pre.60+Branch.develop.Sha.9b94dfcbb0adb042177b602e7fca383fb1600b57</InformationalVersion>
+    <AssemblyVersion>1.13.6.0</AssemblyVersion>
+    <FileVersion>1.13.6.0</FileVersion>
+    <Version>1.13.6-pre0002</Version>
+    <InformationalVersion>1.13.6-pre.2+Branch.develop.Sha.90208d6577b9d34bf0c4e9057b4227297bc9118d</InformationalVersion>
     <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
diff --git a/UnitTests/UnitTests.csproj b/UnitTests/UnitTests.csproj
index d8360dba5..1cf1cda28 100644
--- a/UnitTests/UnitTests.csproj
+++ b/UnitTests/UnitTests.csproj
@@ -9,10 +9,10 @@
     <!-- Version numbers are automatically updated by gitversion when a release is released -->
     <!-- In the source tree the version will always be 2.0 for all projects. -->
     <!-- Do not modify these. -->
-    <AssemblyVersion>1.13.7.0</AssemblyVersion>
-    <FileVersion>1.13.7.0</FileVersion>
-    <Version>1.13.7-pre0060</Version>
-    <InformationalVersion>1.13.7-pre.60+Branch.develop.Sha.9b94dfcbb0adb042177b602e7fca383fb1600b57</InformationalVersion>
+    <AssemblyVersion>1.13.6.0</AssemblyVersion>
+    <FileVersion>1.13.6.0</FileVersion>
+    <Version>1.13.6-pre0002</Version>
+    <InformationalVersion>1.13.6-pre.2+Branch.develop.Sha.90208d6577b9d34bf0c4e9057b4227297bc9118d</InformationalVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <DefineConstants>TRACE</DefineConstants>