From 9ac06e4e31742b22ecc034b42f15a890091ec5cd Mon Sep 17 00:00:00 2001
From: Jonathan Allen <grauenwolf@gmail.com>
Date: Tue, 10 May 2022 09:29:39 -0700
Subject: [PATCH] Cleanup NuGet package code. Hide dependency on source
 generator

---
 .../Tortuga.Chain.Access.csproj               | 35 ++++---------------
 ...Tortuga.Chain.CompiledMaterializers.csproj | 26 --------------
 .../Tortuga.Chain.Core.Odbc.csproj            | 26 --------------
 .../Tortuga.Chain.Core.OleDb.csproj           | 26 --------------
 .../Tortuga.Chain.Core.csproj                 | 28 +--------------
 .../Tortuga.Chain.MySql.csproj                | 33 +++--------------
 .../Tortuga.Chain.PostgreSql.csproj           | 33 +++--------------
 .../Tortuga.Chain.SQLite.csproj               | 35 ++++---------------
 .../Tortuga.Chain.SqlServer.MDS.csproj        | 34 +++---------------
 .../Tortuga.Chain.SqlServer.OleDb.csproj      | 33 +++--------------
 .../Tortuga.Chain.SqlServer.csproj            | 35 ++++---------------
 11 files changed, 39 insertions(+), 305 deletions(-)

diff --git a/Tortuga.Chain/Tortuga.Chain.Access/Tortuga.Chain.Access.csproj b/Tortuga.Chain/Tortuga.Chain.Access/Tortuga.Chain.Access.csproj
index 8bcedfc2c..8ecdf6b9b 100644
--- a/Tortuga.Chain/Tortuga.Chain.Access/Tortuga.Chain.Access.csproj
+++ b/Tortuga.Chain/Tortuga.Chain.Access/Tortuga.Chain.Access.csproj
@@ -10,9 +10,7 @@
 		<ProductName>Tortuga Chain</ProductName>
 		<Deterministic>true</Deterministic>
 
-		<AssemblyVersion>4.0.0</AssemblyVersion>
-		<Version>4.0.0</Version>
-		<FileVersion>4.0.0.0</FileVersion>
+		<Version>4.0.2</Version>
 
 		<PackageLicenseExpression>MIT</PackageLicenseExpression>
 
@@ -80,9 +78,12 @@
 
 	<!-- Code Generator -->
 	<ItemGroup>
-		<PackageReference Include="Tortuga.Shipwright" Version="0.6.0" />
+		<PackageReference Include="Tortuga.Shipwright" Version="0.9.0" >
+			<PrivateAssets>all</PrivateAssets>
+		</PackageReference>
+		<PackageReference Include="Tortuga.Shipwright.Shared" Version="0.9.0" />
 	</ItemGroup>
-	
+
 	<PropertyGroup>
 		<EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
 		<CompilerGeneratedFilesOutputPath>Generated</CompilerGeneratedFilesOutputPath>
@@ -95,31 +96,7 @@
 		<Compile Remove="$(CompilerGeneratedFilesOutputPath)/*/**/*.cs" />
 	</ItemGroup>
 
-	<!-- NuGet Packaging Boilerplate-->
 	<PropertyGroup Condition="'$(Configuration)'=='Release'">
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-		<GenerateNuspecDependsOn>$(GenerateNuspecDependsOn);ReadPackageVersionFromOutputAssembly</GenerateNuspecDependsOn>
 	</PropertyGroup>
-
-	<Target Name="ReadPackageVersionFromOutputAssembly" DependsOnTargets="Build" Condition="'$(IsCrossTargetingBuild)' == 'true'">
-
-		<PropertyGroup>
-			<FirstTargetFramework>$([System.String]::Copy($(TargetFrameworks)).Split(';').GetValue(0))</FirstTargetFramework>
-		</PropertyGroup>
-		<MSBuild Projects="$(MSBuildProjectFullPath)" Targets="ReadPackageVersionFromOutputAssemblySingleTfm" Properties="TargetFramework=$(FirstTargetFramework)">
-			<Output TaskParameter="TargetOutputs" ItemName="PackAssembly" />
-		</MSBuild>
-		<PropertyGroup>
-			<PackageVersion>%(PackAssembly.Version)</PackageVersion>
-		</PropertyGroup>
-	</Target>
-
-	<Target Name="ReadPackageVersionFromOutputAssemblySingleTfm" Returns="@(PackAssembly)" Condition="'$(IsCrossTargetingBuild)' != 'true'">
-		<GetAssemblyIdentity AssemblyFiles="$(TargetPath)">
-			<Output TaskParameter="Assemblies" ItemName="PackAssembly" />
-		</GetAssemblyIdentity>
-		<PropertyGroup>
-			<PackageVersion>%(PackAssembly.Version)</PackageVersion>
-		</PropertyGroup>
-	</Target>
 </Project>
diff --git a/Tortuga.Chain/Tortuga.Chain.CompiledMaterializers/Tortuga.Chain.CompiledMaterializers.csproj b/Tortuga.Chain/Tortuga.Chain.CompiledMaterializers/Tortuga.Chain.CompiledMaterializers.csproj
index 1c2790158..277d90492 100644
--- a/Tortuga.Chain/Tortuga.Chain.CompiledMaterializers/Tortuga.Chain.CompiledMaterializers.csproj
+++ b/Tortuga.Chain/Tortuga.Chain.CompiledMaterializers/Tortuga.Chain.CompiledMaterializers.csproj
@@ -10,9 +10,7 @@
 		<ProductName>Tortuga Chain</ProductName>
 		<Deterministic>true</Deterministic>
 
-		<AssemblyVersion>4.0.0</AssemblyVersion>
 		<Version>4.0.0</Version>
-		<FileVersion>4.0.0.0</FileVersion>
 
 		<PackageLicenseExpression>MIT</PackageLicenseExpression>
 
@@ -54,31 +52,7 @@
 		<Compile Include="..\Shared\GlobalUsing.cs" Link="GlobalUsing.cs" />
 	</ItemGroup>
 
-	<!-- NuGet Packaging Boilerplate-->
 	<PropertyGroup Condition="'$(Configuration)'=='Release'">
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-		<GenerateNuspecDependsOn>$(GenerateNuspecDependsOn);ReadPackageVersionFromOutputAssembly</GenerateNuspecDependsOn>
 	</PropertyGroup>
-
-	<Target Name="ReadPackageVersionFromOutputAssembly" DependsOnTargets="Build" Condition="'$(IsCrossTargetingBuild)' == 'true'">
-
-		<PropertyGroup>
-			<FirstTargetFramework>$([System.String]::Copy($(TargetFrameworks)).Split(';').GetValue(0))</FirstTargetFramework>
-		</PropertyGroup>
-		<MSBuild Projects="$(MSBuildProjectFullPath)" Targets="ReadPackageVersionFromOutputAssemblySingleTfm" Properties="TargetFramework=$(FirstTargetFramework)">
-			<Output TaskParameter="TargetOutputs" ItemName="PackAssembly" />
-		</MSBuild>
-		<PropertyGroup>
-			<PackageVersion>%(PackAssembly.Version)</PackageVersion>
-		</PropertyGroup>
-	</Target>
-
-	<Target Name="ReadPackageVersionFromOutputAssemblySingleTfm" Returns="@(PackAssembly)" Condition="'$(IsCrossTargetingBuild)' != 'true'">
-		<GetAssemblyIdentity AssemblyFiles="$(TargetPath)">
-			<Output TaskParameter="Assemblies" ItemName="PackAssembly" />
-		</GetAssemblyIdentity>
-		<PropertyGroup>
-			<PackageVersion>%(PackAssembly.Version)</PackageVersion>
-		</PropertyGroup>
-	</Target>
 </Project>
diff --git a/Tortuga.Chain/Tortuga.Chain.Core.Odbc/Tortuga.Chain.Core.Odbc.csproj b/Tortuga.Chain/Tortuga.Chain.Core.Odbc/Tortuga.Chain.Core.Odbc.csproj
index c9d49b2d8..1ebdba2e5 100644
--- a/Tortuga.Chain/Tortuga.Chain.Core.Odbc/Tortuga.Chain.Core.Odbc.csproj
+++ b/Tortuga.Chain/Tortuga.Chain.Core.Odbc/Tortuga.Chain.Core.Odbc.csproj
@@ -11,9 +11,7 @@
 		<ProductName>Tortuga Chain</ProductName>
 		<Deterministic>true</Deterministic>
 
-		<AssemblyVersion>4.0.0</AssemblyVersion>
 		<Version>4.0.0</Version>
-		<FileVersion>4.0.0.0</FileVersion>
 
 		<PackageLicenseExpression>MIT</PackageLicenseExpression>
 
@@ -57,31 +55,7 @@
 		<PackageReference Include="Tortuga.Chain.Core" Version="4.0.0" />
 	</ItemGroup>
 
-	<!-- NuGet Packaging Boilerplate-->
 	<PropertyGroup Condition="'$(Configuration)'=='Release'">
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-		<GenerateNuspecDependsOn>$(GenerateNuspecDependsOn);ReadPackageVersionFromOutputAssembly</GenerateNuspecDependsOn>
 	</PropertyGroup>
-
-	<Target Name="ReadPackageVersionFromOutputAssembly" DependsOnTargets="Build" Condition="'$(IsCrossTargetingBuild)' == 'true'">
-
-		<PropertyGroup>
-			<FirstTargetFramework>$([System.String]::Copy($(TargetFrameworks)).Split(';').GetValue(0))</FirstTargetFramework>
-		</PropertyGroup>
-		<MSBuild Projects="$(MSBuildProjectFullPath)" Targets="ReadPackageVersionFromOutputAssemblySingleTfm" Properties="TargetFramework=$(FirstTargetFramework)">
-			<Output TaskParameter="TargetOutputs" ItemName="PackAssembly" />
-		</MSBuild>
-		<PropertyGroup>
-			<PackageVersion>%(PackAssembly.Version)</PackageVersion>
-		</PropertyGroup>
-	</Target>
-
-	<Target Name="ReadPackageVersionFromOutputAssemblySingleTfm" Returns="@(PackAssembly)" Condition="'$(IsCrossTargetingBuild)' != 'true'">
-		<GetAssemblyIdentity AssemblyFiles="$(TargetPath)">
-			<Output TaskParameter="Assemblies" ItemName="PackAssembly" />
-		</GetAssemblyIdentity>
-		<PropertyGroup>
-			<PackageVersion>%(PackAssembly.Version)</PackageVersion>
-		</PropertyGroup>
-	</Target>
 </Project>
diff --git a/Tortuga.Chain/Tortuga.Chain.Core.OleDb/Tortuga.Chain.Core.OleDb.csproj b/Tortuga.Chain/Tortuga.Chain.Core.OleDb/Tortuga.Chain.Core.OleDb.csproj
index aaebdf26a..54d724739 100644
--- a/Tortuga.Chain/Tortuga.Chain.Core.OleDb/Tortuga.Chain.Core.OleDb.csproj
+++ b/Tortuga.Chain/Tortuga.Chain.Core.OleDb/Tortuga.Chain.Core.OleDb.csproj
@@ -11,9 +11,7 @@
 		<ProductName>Tortuga Chain</ProductName>
 		<Deterministic>true</Deterministic>
 
-		<AssemblyVersion>4.0.0</AssemblyVersion>
 		<Version>4.0.0</Version>
-		<FileVersion>4.0.0.0</FileVersion>
 
 		<PackageLicenseExpression>MIT</PackageLicenseExpression>
 
@@ -55,31 +53,7 @@
 		<Compile Include="..\Shared\GlobalUsing.cs" Link="GlobalUsing.cs" />
 	</ItemGroup>
 
-	<!-- NuGet Packaging Boilerplate-->
 	<PropertyGroup Condition="'$(Configuration)'=='Release'">
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-		<GenerateNuspecDependsOn>$(GenerateNuspecDependsOn);ReadPackageVersionFromOutputAssembly</GenerateNuspecDependsOn>
 	</PropertyGroup>
-
-	<Target Name="ReadPackageVersionFromOutputAssembly" DependsOnTargets="Build" Condition="'$(IsCrossTargetingBuild)' == 'true'">
-
-		<PropertyGroup>
-			<FirstTargetFramework>$([System.String]::Copy($(TargetFrameworks)).Split(';').GetValue(0))</FirstTargetFramework>
-		</PropertyGroup>
-		<MSBuild Projects="$(MSBuildProjectFullPath)" Targets="ReadPackageVersionFromOutputAssemblySingleTfm" Properties="TargetFramework=$(FirstTargetFramework)">
-			<Output TaskParameter="TargetOutputs" ItemName="PackAssembly" />
-		</MSBuild>
-		<PropertyGroup>
-			<PackageVersion>%(PackAssembly.Version)</PackageVersion>
-		</PropertyGroup>
-	</Target>
-
-	<Target Name="ReadPackageVersionFromOutputAssemblySingleTfm" Returns="@(PackAssembly)" Condition="'$(IsCrossTargetingBuild)' != 'true'">
-		<GetAssemblyIdentity AssemblyFiles="$(TargetPath)">
-			<Output TaskParameter="Assemblies" ItemName="PackAssembly" />
-		</GetAssemblyIdentity>
-		<PropertyGroup>
-			<PackageVersion>%(PackAssembly.Version)</PackageVersion>
-		</PropertyGroup>
-	</Target>
 </Project>
diff --git a/Tortuga.Chain/Tortuga.Chain.Core/Tortuga.Chain.Core.csproj b/Tortuga.Chain/Tortuga.Chain.Core/Tortuga.Chain.Core.csproj
index 7f11e5788..5517b63ff 100644
--- a/Tortuga.Chain/Tortuga.Chain.Core/Tortuga.Chain.Core.csproj
+++ b/Tortuga.Chain/Tortuga.Chain.Core/Tortuga.Chain.Core.csproj
@@ -10,9 +10,7 @@
 		<ProductName>Tortuga Chain</ProductName>
 		<Deterministic>true</Deterministic>
 
-		<AssemblyVersion>4.0.0</AssemblyVersion>
 		<Version>4.0.0</Version>
-		<FileVersion>4.0.0.0</FileVersion>
 
 		<PackageLicenseExpression>MIT</PackageLicenseExpression>
 
@@ -46,32 +44,8 @@
 		<PackageReference Include="Tortuga.Anchor" Version="4.0.0" />
 	</ItemGroup>
 
-	
-	<!-- NuGet Packaging Boilerplate-->
+
 	<PropertyGroup Condition="'$(Configuration)'=='Release'">
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-		<GenerateNuspecDependsOn>$(GenerateNuspecDependsOn);ReadPackageVersionFromOutputAssembly</GenerateNuspecDependsOn>
 	</PropertyGroup>
-
-	<Target Name="ReadPackageVersionFromOutputAssembly" DependsOnTargets="Build" Condition="'$(IsCrossTargetingBuild)' == 'true'">
-
-		<PropertyGroup>
-			<FirstTargetFramework>$([System.String]::Copy($(TargetFrameworks)).Split(';').GetValue(0))</FirstTargetFramework>
-		</PropertyGroup>
-		<MSBuild Projects="$(MSBuildProjectFullPath)" Targets="ReadPackageVersionFromOutputAssemblySingleTfm" Properties="TargetFramework=$(FirstTargetFramework)">
-			<Output TaskParameter="TargetOutputs" ItemName="PackAssembly" />
-		</MSBuild>
-		<PropertyGroup>
-			<PackageVersion>%(PackAssembly.Version)</PackageVersion>
-		</PropertyGroup>
-	</Target>
-
-	<Target Name="ReadPackageVersionFromOutputAssemblySingleTfm" Returns="@(PackAssembly)" Condition="'$(IsCrossTargetingBuild)' != 'true'">
-		<GetAssemblyIdentity AssemblyFiles="$(TargetPath)">
-			<Output TaskParameter="Assemblies" ItemName="PackAssembly" />
-		</GetAssemblyIdentity>
-		<PropertyGroup>
-			<PackageVersion>%(PackAssembly.Version)</PackageVersion>
-		</PropertyGroup>
-	</Target>
 </Project>
diff --git a/Tortuga.Chain/Tortuga.Chain.MySql/Tortuga.Chain.MySql.csproj b/Tortuga.Chain/Tortuga.Chain.MySql/Tortuga.Chain.MySql.csproj
index 3fc98f652..6e6d1abaf 100644
--- a/Tortuga.Chain/Tortuga.Chain.MySql/Tortuga.Chain.MySql.csproj
+++ b/Tortuga.Chain/Tortuga.Chain.MySql/Tortuga.Chain.MySql.csproj
@@ -10,9 +10,7 @@
 		<ProductName>Tortuga Chain</ProductName>
 		<Deterministic>true</Deterministic>
 
-		<AssemblyVersion>4.0.0</AssemblyVersion>
-		<Version>4.0.0</Version>
-		<FileVersion>4.0.0.0</FileVersion>
+		<Version>4.0.2</Version>
 
 		<PackageLicenseExpression>MIT</PackageLicenseExpression>
 
@@ -72,7 +70,10 @@
 	
 	<!-- Code Generator -->
 	<ItemGroup>
-		<PackageReference Include="Tortuga.Shipwright" Version="0.6.0" />
+		<PackageReference Include="Tortuga.Shipwright" Version="0.9.0" >
+			<PrivateAssets>all</PrivateAssets>
+		</PackageReference>
+		<PackageReference Include="Tortuga.Shipwright.Shared" Version="0.9.0" />
 	</ItemGroup>
 
 	<PropertyGroup>
@@ -87,31 +88,7 @@
 		<Compile Remove="$(CompilerGeneratedFilesOutputPath)/*/**/*.cs" />
 	</ItemGroup>
 
-	<!-- NuGet Packaging Boilerplate-->
 	<PropertyGroup Condition="'$(Configuration)'=='Release'">
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-		<GenerateNuspecDependsOn>$(GenerateNuspecDependsOn);ReadPackageVersionFromOutputAssembly</GenerateNuspecDependsOn>
 	</PropertyGroup>
-
-	<Target Name="ReadPackageVersionFromOutputAssembly" DependsOnTargets="Build" Condition="'$(IsCrossTargetingBuild)' == 'true'">
-
-		<PropertyGroup>
-			<FirstTargetFramework>$([System.String]::Copy($(TargetFrameworks)).Split(';').GetValue(0))</FirstTargetFramework>
-		</PropertyGroup>
-		<MSBuild Projects="$(MSBuildProjectFullPath)" Targets="ReadPackageVersionFromOutputAssemblySingleTfm" Properties="TargetFramework=$(FirstTargetFramework)">
-			<Output TaskParameter="TargetOutputs" ItemName="PackAssembly" />
-		</MSBuild>
-		<PropertyGroup>
-			<PackageVersion>%(PackAssembly.Version)</PackageVersion>
-		</PropertyGroup>
-	</Target>
-
-	<Target Name="ReadPackageVersionFromOutputAssemblySingleTfm" Returns="@(PackAssembly)" Condition="'$(IsCrossTargetingBuild)' != 'true'">
-		<GetAssemblyIdentity AssemblyFiles="$(TargetPath)">
-			<Output TaskParameter="Assemblies" ItemName="PackAssembly" />
-		</GetAssemblyIdentity>
-		<PropertyGroup>
-			<PackageVersion>%(PackAssembly.Version)</PackageVersion>
-		</PropertyGroup>
-	</Target>
 </Project>
diff --git a/Tortuga.Chain/Tortuga.Chain.PostgreSql/Tortuga.Chain.PostgreSql.csproj b/Tortuga.Chain/Tortuga.Chain.PostgreSql/Tortuga.Chain.PostgreSql.csproj
index 81275db53..cb7a55700 100644
--- a/Tortuga.Chain/Tortuga.Chain.PostgreSql/Tortuga.Chain.PostgreSql.csproj
+++ b/Tortuga.Chain/Tortuga.Chain.PostgreSql/Tortuga.Chain.PostgreSql.csproj
@@ -10,9 +10,7 @@
 		<ProductName>Tortuga Chain</ProductName>
 		<Deterministic>true</Deterministic>
 
-		<AssemblyVersion>4.0.0</AssemblyVersion>
-		<Version>4.0.0</Version>
-		<FileVersion>4.0.0.0</FileVersion>
+		<Version>4.0.2</Version>
 
 		<PackageLicenseExpression>MIT</PackageLicenseExpression>
 
@@ -71,7 +69,10 @@
 
 	<!-- Code Generator -->
 	<ItemGroup>
-		<PackageReference Include="Tortuga.Shipwright" Version="0.6.0" />
+		<PackageReference Include="Tortuga.Shipwright" Version="0.9.0" >
+			<PrivateAssets>all</PrivateAssets>
+		</PackageReference>
+		<PackageReference Include="Tortuga.Shipwright.Shared" Version="0.9.0" />
 	</ItemGroup>
 
 	<PropertyGroup>
@@ -87,31 +88,7 @@
 	</ItemGroup>
 
 
-	<!-- NuGet Packaging Boilerplate-->
 	<PropertyGroup Condition="'$(Configuration)'=='Release'">
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-		<GenerateNuspecDependsOn>$(GenerateNuspecDependsOn);ReadPackageVersionFromOutputAssembly</GenerateNuspecDependsOn>
 	</PropertyGroup>
-
-	<Target Name="ReadPackageVersionFromOutputAssembly" DependsOnTargets="Build" Condition="'$(IsCrossTargetingBuild)' == 'true'">
-
-		<PropertyGroup>
-			<FirstTargetFramework>$([System.String]::Copy($(TargetFrameworks)).Split(';').GetValue(0))</FirstTargetFramework>
-		</PropertyGroup>
-		<MSBuild Projects="$(MSBuildProjectFullPath)" Targets="ReadPackageVersionFromOutputAssemblySingleTfm" Properties="TargetFramework=$(FirstTargetFramework)">
-			<Output TaskParameter="TargetOutputs" ItemName="PackAssembly" />
-		</MSBuild>
-		<PropertyGroup>
-			<PackageVersion>%(PackAssembly.Version)</PackageVersion>
-		</PropertyGroup>
-	</Target>
-
-	<Target Name="ReadPackageVersionFromOutputAssemblySingleTfm" Returns="@(PackAssembly)" Condition="'$(IsCrossTargetingBuild)' != 'true'">
-		<GetAssemblyIdentity AssemblyFiles="$(TargetPath)">
-			<Output TaskParameter="Assemblies" ItemName="PackAssembly" />
-		</GetAssemblyIdentity>
-		<PropertyGroup>
-			<PackageVersion>%(PackAssembly.Version)</PackageVersion>
-		</PropertyGroup>
-	</Target>
 </Project>
diff --git a/Tortuga.Chain/Tortuga.Chain.SQLite/Tortuga.Chain.SQLite.csproj b/Tortuga.Chain/Tortuga.Chain.SQLite/Tortuga.Chain.SQLite.csproj
index fa9a476fd..8ef7a0cfd 100644
--- a/Tortuga.Chain/Tortuga.Chain.SQLite/Tortuga.Chain.SQLite.csproj
+++ b/Tortuga.Chain/Tortuga.Chain.SQLite/Tortuga.Chain.SQLite.csproj
@@ -11,9 +11,7 @@
 		<ProductName>Tortuga Chain</ProductName>
 		<Deterministic>true</Deterministic>
 
-		<AssemblyVersion>4.0.0</AssemblyVersion>
-		<Version>4.0.0</Version>
-		<FileVersion>4.0.0.0</FileVersion>
+		<Version>4.0.2</Version>
 
 		<PackageLicenseExpression>MIT</PackageLicenseExpression>
 
@@ -82,7 +80,10 @@
 
 	<!-- Code Generator -->
 	<ItemGroup>
-		<PackageReference Include="Tortuga.Shipwright" Version="0.6.0" />
+		<PackageReference Include="Tortuga.Shipwright" Version="0.9.0" >
+			<PrivateAssets>all</PrivateAssets>
+		</PackageReference>
+		<PackageReference Include="Tortuga.Shipwright.Shared" Version="0.9.0" />
 	</ItemGroup>
 
 	<PropertyGroup>
@@ -96,32 +97,8 @@
   some other tool. -->
 		<Compile Remove="$(CompilerGeneratedFilesOutputPath)/*/**/*.cs" />
 	</ItemGroup>
-	
-	<!-- NuGet Packaging Boilerplate-->
+
 	<PropertyGroup Condition="'$(Configuration)'=='Release'">
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-		<GenerateNuspecDependsOn>$(GenerateNuspecDependsOn);ReadPackageVersionFromOutputAssembly</GenerateNuspecDependsOn>
 	</PropertyGroup>
-
-	<Target Name="ReadPackageVersionFromOutputAssembly" DependsOnTargets="Build" Condition="'$(IsCrossTargetingBuild)' == 'true'">
-
-		<PropertyGroup>
-			<FirstTargetFramework>$([System.String]::Copy($(TargetFrameworks)).Split(';').GetValue(0))</FirstTargetFramework>
-		</PropertyGroup>
-		<MSBuild Projects="$(MSBuildProjectFullPath)" Targets="ReadPackageVersionFromOutputAssemblySingleTfm" Properties="TargetFramework=$(FirstTargetFramework)">
-			<Output TaskParameter="TargetOutputs" ItemName="PackAssembly" />
-		</MSBuild>
-		<PropertyGroup>
-			<PackageVersion>%(PackAssembly.Version)</PackageVersion>
-		</PropertyGroup>
-	</Target>
-
-	<Target Name="ReadPackageVersionFromOutputAssemblySingleTfm" Returns="@(PackAssembly)" Condition="'$(IsCrossTargetingBuild)' != 'true'">
-		<GetAssemblyIdentity AssemblyFiles="$(TargetPath)">
-			<Output TaskParameter="Assemblies" ItemName="PackAssembly" />
-		</GetAssemblyIdentity>
-		<PropertyGroup>
-			<PackageVersion>%(PackAssembly.Version)</PackageVersion>
-		</PropertyGroup>
-	</Target>
 </Project>
diff --git a/Tortuga.Chain/Tortuga.Chain.SqlServer.MDS/Tortuga.Chain.SqlServer.MDS.csproj b/Tortuga.Chain/Tortuga.Chain.SqlServer.MDS/Tortuga.Chain.SqlServer.MDS.csproj
index ee4c10231..372794622 100644
--- a/Tortuga.Chain/Tortuga.Chain.SqlServer.MDS/Tortuga.Chain.SqlServer.MDS.csproj
+++ b/Tortuga.Chain/Tortuga.Chain.SqlServer.MDS/Tortuga.Chain.SqlServer.MDS.csproj
@@ -10,9 +10,7 @@
 		<ProductName>Tortuga Chain</ProductName>
 		<Deterministic>true</Deterministic>
 
-		<AssemblyVersion>4.0.0</AssemblyVersion>
-		<Version>4.0.0</Version>
-		<FileVersion>4.0.0.0</FileVersion>
+		<Version>4.0.2</Version>
 
 		<PackageLicenseExpression>MIT</PackageLicenseExpression>
 
@@ -81,7 +79,10 @@
 
 	<!-- Code Generator -->
 	<ItemGroup>
-		<PackageReference Include="Tortuga.Shipwright" Version="0.6.0" />
+		<PackageReference Include="Tortuga.Shipwright" Version="0.9.0" >
+			<PrivateAssets>all</PrivateAssets>
+		</PackageReference>
+		<PackageReference Include="Tortuga.Shipwright.Shared" Version="0.9.0" />
 	</ItemGroup>
 
 	<PropertyGroup>
@@ -96,32 +97,7 @@
 		<Compile Remove="$(CompilerGeneratedFilesOutputPath)/*/**/*.cs" />
 	</ItemGroup>
 
-	
-	<!-- NuGet Packaging Boilerplate-->
 	<PropertyGroup Condition="'$(Configuration)'=='Release'">
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-		<GenerateNuspecDependsOn>$(GenerateNuspecDependsOn);ReadPackageVersionFromOutputAssembly</GenerateNuspecDependsOn>
 	</PropertyGroup>
-
-	<Target Name="ReadPackageVersionFromOutputAssembly" DependsOnTargets="Build" Condition="'$(IsCrossTargetingBuild)' == 'true'">
-
-		<PropertyGroup>
-			<FirstTargetFramework>$([System.String]::Copy($(TargetFrameworks)).Split(';').GetValue(0))</FirstTargetFramework>
-		</PropertyGroup>
-		<MSBuild Projects="$(MSBuildProjectFullPath)" Targets="ReadPackageVersionFromOutputAssemblySingleTfm" Properties="TargetFramework=$(FirstTargetFramework)">
-			<Output TaskParameter="TargetOutputs" ItemName="PackAssembly" />
-		</MSBuild>
-		<PropertyGroup>
-			<PackageVersion>%(PackAssembly.Version)</PackageVersion>
-		</PropertyGroup>
-	</Target>
-
-	<Target Name="ReadPackageVersionFromOutputAssemblySingleTfm" Returns="@(PackAssembly)" Condition="'$(IsCrossTargetingBuild)' != 'true'">
-		<GetAssemblyIdentity AssemblyFiles="$(TargetPath)">
-			<Output TaskParameter="Assemblies" ItemName="PackAssembly" />
-		</GetAssemblyIdentity>
-		<PropertyGroup>
-			<PackageVersion>%(PackAssembly.Version)</PackageVersion>
-		</PropertyGroup>
-	</Target>
 </Project>
diff --git a/Tortuga.Chain/Tortuga.Chain.SqlServer.OleDb/Tortuga.Chain.SqlServer.OleDb.csproj b/Tortuga.Chain/Tortuga.Chain.SqlServer.OleDb/Tortuga.Chain.SqlServer.OleDb.csproj
index 65078d662..2c4a35c76 100644
--- a/Tortuga.Chain/Tortuga.Chain.SqlServer.OleDb/Tortuga.Chain.SqlServer.OleDb.csproj
+++ b/Tortuga.Chain/Tortuga.Chain.SqlServer.OleDb/Tortuga.Chain.SqlServer.OleDb.csproj
@@ -10,9 +10,7 @@
 		<ProductName>Tortuga Chain</ProductName>
 		<Deterministic>true</Deterministic>
 
-		<AssemblyVersion>4.0.0</AssemblyVersion>
-		<Version>4.0.0</Version>
-		<FileVersion>4.0.0.0</FileVersion>
+		<Version>4.0.2</Version>
 
 		<PackageLicenseExpression>MIT</PackageLicenseExpression>
 
@@ -74,7 +72,10 @@
 
 	<!-- Code Generator -->
 	<ItemGroup>
-		<PackageReference Include="Tortuga.Shipwright" Version="0.6.0" />
+		<PackageReference Include="Tortuga.Shipwright" Version="0.9.0" >
+			<PrivateAssets>all</PrivateAssets>
+		</PackageReference>
+		<PackageReference Include="Tortuga.Shipwright.Shared" Version="0.9.0" />
 	</ItemGroup>
 
 	<PropertyGroup>
@@ -90,31 +91,7 @@
 	</ItemGroup>
 
 
-	<!-- NuGet Packaging Boilerplate-->
 	<PropertyGroup Condition="'$(Configuration)'=='Release'">
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-		<GenerateNuspecDependsOn>$(GenerateNuspecDependsOn);ReadPackageVersionFromOutputAssembly</GenerateNuspecDependsOn>
 	</PropertyGroup>
-
-	<Target Name="ReadPackageVersionFromOutputAssembly" DependsOnTargets="Build" Condition="'$(IsCrossTargetingBuild)' == 'true'">
-
-		<PropertyGroup>
-			<FirstTargetFramework>$([System.String]::Copy($(TargetFrameworks)).Split(';').GetValue(0))</FirstTargetFramework>
-		</PropertyGroup>
-		<MSBuild Projects="$(MSBuildProjectFullPath)" Targets="ReadPackageVersionFromOutputAssemblySingleTfm" Properties="TargetFramework=$(FirstTargetFramework)">
-			<Output TaskParameter="TargetOutputs" ItemName="PackAssembly" />
-		</MSBuild>
-		<PropertyGroup>
-			<PackageVersion>%(PackAssembly.Version)</PackageVersion>
-		</PropertyGroup>
-	</Target>
-
-	<Target Name="ReadPackageVersionFromOutputAssemblySingleTfm" Returns="@(PackAssembly)" Condition="'$(IsCrossTargetingBuild)' != 'true'">
-		<GetAssemblyIdentity AssemblyFiles="$(TargetPath)">
-			<Output TaskParameter="Assemblies" ItemName="PackAssembly" />
-		</GetAssemblyIdentity>
-		<PropertyGroup>
-			<PackageVersion>%(PackAssembly.Version)</PackageVersion>
-		</PropertyGroup>
-	</Target>
 </Project>
diff --git a/Tortuga.Chain/Tortuga.Chain.SqlServer/Tortuga.Chain.SqlServer.csproj b/Tortuga.Chain/Tortuga.Chain.SqlServer/Tortuga.Chain.SqlServer.csproj
index 1c97beb82..92dded9e2 100644
--- a/Tortuga.Chain/Tortuga.Chain.SqlServer/Tortuga.Chain.SqlServer.csproj
+++ b/Tortuga.Chain/Tortuga.Chain.SqlServer/Tortuga.Chain.SqlServer.csproj
@@ -10,9 +10,7 @@
 		<ProductName>Tortuga Chain</ProductName>
 		<Deterministic>true</Deterministic>
 
-		<AssemblyVersion>4.0.0</AssemblyVersion>
-		<Version>4.0.0</Version>
-		<FileVersion>4.0.0.0</FileVersion>
+		<Version>4.0.2</Version>
 
 		<PackageLicenseExpression>MIT</PackageLicenseExpression>
 
@@ -71,7 +69,10 @@
 
 	<!-- Code Generator -->
 	<ItemGroup>
-		<PackageReference Include="Tortuga.Shipwright" Version="0.6.0" />
+		<PackageReference Include="Tortuga.Shipwright" Version="0.9.0" >
+			<PrivateAssets>all</PrivateAssets>
+		</PackageReference>
+		<PackageReference Include="Tortuga.Shipwright.Shared" Version="0.9.0" />
 	</ItemGroup>
 
 	<PropertyGroup>
@@ -86,32 +87,8 @@
 		<Compile Remove="$(CompilerGeneratedFilesOutputPath)/*/**/*.cs" />
 	</ItemGroup>
 
-	
-	<!-- NuGet Packaging Boilerplate-->
+
 	<PropertyGroup Condition="'$(Configuration)'=='Release'">
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-		<GenerateNuspecDependsOn>$(GenerateNuspecDependsOn);ReadPackageVersionFromOutputAssembly</GenerateNuspecDependsOn>
 	</PropertyGroup>
-
-	<Target Name="ReadPackageVersionFromOutputAssembly" DependsOnTargets="Build" Condition="'$(IsCrossTargetingBuild)' == 'true'">
-
-		<PropertyGroup>
-			<FirstTargetFramework>$([System.String]::Copy($(TargetFrameworks)).Split(';').GetValue(0))</FirstTargetFramework>
-		</PropertyGroup>
-		<MSBuild Projects="$(MSBuildProjectFullPath)" Targets="ReadPackageVersionFromOutputAssemblySingleTfm" Properties="TargetFramework=$(FirstTargetFramework)">
-			<Output TaskParameter="TargetOutputs" ItemName="PackAssembly" />
-		</MSBuild>
-		<PropertyGroup>
-			<PackageVersion>%(PackAssembly.Version)</PackageVersion>
-		</PropertyGroup>
-	</Target>
-
-	<Target Name="ReadPackageVersionFromOutputAssemblySingleTfm" Returns="@(PackAssembly)" Condition="'$(IsCrossTargetingBuild)' != 'true'">
-		<GetAssemblyIdentity AssemblyFiles="$(TargetPath)">
-			<Output TaskParameter="Assemblies" ItemName="PackAssembly" />
-		</GetAssemblyIdentity>
-		<PropertyGroup>
-			<PackageVersion>%(PackAssembly.Version)</PackageVersion>
-		</PropertyGroup>
-	</Target>
 </Project>