Clean nuget dependencies and versioning

Update dependencies
Add init scripts
Set branches for gitmodules

.gitmodules

@@ -6,3 +6,15 @@
 	path = dependencies/Connected.Framework
 	url = https://git.tompit.com/Connected/Connected.Framework.git
 	branch = develop
+[submodule "dependencies/Connected"]
+	path = dependencies/Connected
+	url = https://git.tompit.com/Connected/Connected.git
+	branch = develop
+[submodule "dependencies/Connected.Common"]
+	path = dependencies/Connected.Common
+	url = https://git.tompit.com/Connected/Connected.Common.git
+	branch = develop
+[submodule "dependencies/Connected.UI"]
+	path = dependencies/Connected.UI
+	url = https://git.tompit.com/Connected/Connected.UI.git
+	branch = develop

Connected.Common.Types.sln

@@ -21,6 +21,22 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Dependencies", "Dependencie
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Components", "dependencies\Connected.Components\src\Connected.Components\Connected.Components.csproj", "{17EBBBC2-B4AF-4CE4-8F76-73C6E088B3E1}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Data", "dependencies\Connected.Framework\src\Connected.Data\Connected.Data.csproj", "{3D20C199-5CF0-45CA-B99F-AB1A4D9DB233}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Services", "dependencies\Connected.Framework\src\Connected.Services\Connected.Services.csproj", "{A3D978D2-21E1-4C45-A6BF-91302DFA65DE}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Runtime", "dependencies\Connected.Framework\src\Connected.Runtime\Connected.Runtime.csproj", "{9145B08A-8BC9-407E-9773-2086A1FD6958}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Client", "dependencies\Connected\src\Connected.Client\Connected.Client.csproj", "{ABF3C8B0-8884-4E12-8960-57FDB5CC16C1}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Middleware", "dependencies\Connected.Framework\src\Connected.Middleware\Connected.Middleware.csproj", "{DDB3DE44-6D5C-447E-861A-5B7F53E84E3C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected", "dependencies\Connected\src\Connected\Connected.csproj", "{F4A4F947-5CE5-4DED-B884-B78E8DB3FD9B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Common.Model", "dependencies\Connected.Common\src\Connected.Common.Model\Connected.Common.Model.csproj", "{21195444-52F3-450D-A78E-6F0AF914B907}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.UI", "dependencies\Connected.UI\src\Connected.UI\Connected.UI.csproj", "{6125BA47-11C5-4F2C-9AE1-C61069CD95E2}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -55,6 +71,38 @@ Global
 		{17EBBBC2-B4AF-4CE4-8F76-73C6E088B3E1}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{17EBBBC2-B4AF-4CE4-8F76-73C6E088B3E1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{17EBBBC2-B4AF-4CE4-8F76-73C6E088B3E1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3D20C199-5CF0-45CA-B99F-AB1A4D9DB233}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3D20C199-5CF0-45CA-B99F-AB1A4D9DB233}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3D20C199-5CF0-45CA-B99F-AB1A4D9DB233}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3D20C199-5CF0-45CA-B99F-AB1A4D9DB233}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A3D978D2-21E1-4C45-A6BF-91302DFA65DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A3D978D2-21E1-4C45-A6BF-91302DFA65DE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A3D978D2-21E1-4C45-A6BF-91302DFA65DE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A3D978D2-21E1-4C45-A6BF-91302DFA65DE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9145B08A-8BC9-407E-9773-2086A1FD6958}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9145B08A-8BC9-407E-9773-2086A1FD6958}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9145B08A-8BC9-407E-9773-2086A1FD6958}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9145B08A-8BC9-407E-9773-2086A1FD6958}.Release|Any CPU.Build.0 = Release|Any CPU
+		{ABF3C8B0-8884-4E12-8960-57FDB5CC16C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{ABF3C8B0-8884-4E12-8960-57FDB5CC16C1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{ABF3C8B0-8884-4E12-8960-57FDB5CC16C1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{ABF3C8B0-8884-4E12-8960-57FDB5CC16C1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DDB3DE44-6D5C-447E-861A-5B7F53E84E3C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DDB3DE44-6D5C-447E-861A-5B7F53E84E3C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DDB3DE44-6D5C-447E-861A-5B7F53E84E3C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DDB3DE44-6D5C-447E-861A-5B7F53E84E3C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F4A4F947-5CE5-4DED-B884-B78E8DB3FD9B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F4A4F947-5CE5-4DED-B884-B78E8DB3FD9B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F4A4F947-5CE5-4DED-B884-B78E8DB3FD9B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F4A4F947-5CE5-4DED-B884-B78E8DB3FD9B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{21195444-52F3-450D-A78E-6F0AF914B907}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{21195444-52F3-450D-A78E-6F0AF914B907}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{21195444-52F3-450D-A78E-6F0AF914B907}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{21195444-52F3-450D-A78E-6F0AF914B907}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6125BA47-11C5-4F2C-9AE1-C61069CD95E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6125BA47-11C5-4F2C-9AE1-C61069CD95E2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6125BA47-11C5-4F2C-9AE1-C61069CD95E2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6125BA47-11C5-4F2C-9AE1-C61069CD95E2}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -62,6 +110,14 @@ Global
 	GlobalSection(NestedProjects) = preSolution
 		{B1C41076-5120-47DA-AEE7-D90E0EB7C038} = {D1988217-0AF1-4A13-94AA-FF55337383D0}
 		{17EBBBC2-B4AF-4CE4-8F76-73C6E088B3E1} = {D27CBC04-496C-4112-A2AF-786715AFEDE5}
+		{3D20C199-5CF0-45CA-B99F-AB1A4D9DB233} = {D27CBC04-496C-4112-A2AF-786715AFEDE5}
+		{A3D978D2-21E1-4C45-A6BF-91302DFA65DE} = {D27CBC04-496C-4112-A2AF-786715AFEDE5}
+		{9145B08A-8BC9-407E-9773-2086A1FD6958} = {D27CBC04-496C-4112-A2AF-786715AFEDE5}
+		{ABF3C8B0-8884-4E12-8960-57FDB5CC16C1} = {D27CBC04-496C-4112-A2AF-786715AFEDE5}
+		{DDB3DE44-6D5C-447E-861A-5B7F53E84E3C} = {D27CBC04-496C-4112-A2AF-786715AFEDE5}
+		{F4A4F947-5CE5-4DED-B884-B78E8DB3FD9B} = {D27CBC04-496C-4112-A2AF-786715AFEDE5}
+		{21195444-52F3-450D-A78E-6F0AF914B907} = {D27CBC04-496C-4112-A2AF-786715AFEDE5}
+		{6125BA47-11C5-4F2C-9AE1-C61069CD95E2} = {D27CBC04-496C-4112-A2AF-786715AFEDE5}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {4C661325-1729-4560-89F9-E2B51B111B72}

Connected.Framework

@@ -1 +0,0 @@
-Subproject commit f80b6bfac9c1ae1e9009949e1ec322b3ce973d08

build/init.bat

@@ -9,7 +9,7 @@ echo "Submodules up to date"
 
 FOR /F "delims=" %%a IN ('DIR "../dependencies" /A:d /B') DO (
     echo Handling %%a
-    cd "../dependencies/%%a/build"
+    cd ../dependencies/%%a/build
     echo %cd%
     IF EXIST init.bat  (
         echo "found init.bat"

dependencies/Connected

@@ -0,0 +1 @@
+Subproject commit dd40532a0ff03237407de9635c7211c5e1af5807

dependencies/Connected.Common

@@ -0,0 +1 @@
+Subproject commit 174ef6636713482fd0d17b95fb7b0e9bf275da7c

dependencies/Connected.Components

@@ -1 +1 @@
-Subproject commit acd9963b41706535efe5c643ea2e9e742fbe6a99
+Subproject commit a9e0968740c970e01fbef1d434f5802511ac138f

dependencies/Connected.UI

@@ -0,0 +1 @@
+Subproject commit c5ff77a648ffd937ded7cefff59371f880a465d6

src/Connected.Common.Types.Client/Connected.Common.Types.Client.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
 		<TargetFramework>net7.0</TargetFramework>
@@ -18,15 +18,6 @@
 		<PackageOutputPath>$(OutputPath)</PackageOutputPath>
 	</PropertyGroup>
 
-	<ItemGroup>
-		<PackageReference Include="Connected.Client" Version="1.0.*-*"/>
-		<PackageReference Include="Connected.Common.Types.Model" Version="1.0.*-*"/>
-		<PackageReference Include="Nerdbank.GitVersioning"
-									Version="3.5.119"
-									PrivateAssets="all"
-									Condition="!Exists('packages.config')" />
-	</ItemGroup>
-
 	<ItemGroup>
 		<None Include="..\..\LICENSE">
 			<Pack>True</Pack>
@@ -38,8 +29,8 @@
 		</None>
 	</ItemGroup>
 
-	<Target Name="CopyPackages" AfterTargets="Pack">
-		<Copy SourceFiles="$(OutputPath)..\$(PackageId).$(PackageVersion).nupkg" DestinationFolder="$([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET'))" />
-		<Copy SourceFiles="$(OutputPath)..\$(PackageId).$(PackageVersion).snupkg" DestinationFolder="$([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET'))" />
-	</Target>
+	<ItemGroup>
+	  <ProjectReference Include="..\..\dependencies\Connected\src\Connected.Client\Connected.Client.csproj" />
+	  <ProjectReference Include="..\Connected.Common.Types.Model\Connected.Common.Types.Model.csproj" />
+	</ItemGroup>
 </Project>

src/Connected.Common.Types.Client/version.json

@@ -1,14 +0,0 @@
-{
-  "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/main/src/NerdBank.GitVersioning/version.schema.json",
-  "version": "1.0-prerelease",
-  "semVer1NumericIdentifierPadding": 4,
-  "nugetPackageVersion": {
-    "semVer": 2, // optional. Set to either 1 or 2 to control how the NuGet package version string is generated. Default is 1.
-    "precision": "build" // optional. Use when you want to use a more or less precise package version than the default major.minor.build.
-  },
-  "cloudBuild": {
-    "buildNumber": {
-      "enabled": true
-    }
-  }
-}

src/Connected.Common.Types.Middleware/Connected.Common.Types.Middleware.csproj

@@ -18,15 +18,6 @@
 		<PackageOutputPath>$(OutputPath)</PackageOutputPath>
 	</PropertyGroup>
 
-	<ItemGroup>
-		<PackageReference Include="Connected.Middleware" Version="1.0.*-*" />
-		<PackageReference Include="Connected.Common.Types.Model" Version="1.0.*-*" />
-		<PackageReference Include="Nerdbank.GitVersioning"
-									Version="3.5.119"
-									PrivateAssets="all"
-									Condition="!Exists('packages.config')" />
-	</ItemGroup>
-
 	<ItemGroup>
 		<None Include="..\..\LICENSE">
 			<Pack>True</Pack>
@@ -38,8 +29,8 @@
 		</None>
 	</ItemGroup>
 
-	<Target Name="CopyPackages" AfterTargets="Pack">
-		<Copy SourceFiles="$(OutputPath)..\$(PackageId).$(PackageVersion).nupkg" DestinationFolder="$([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET'))" />
-		<Copy SourceFiles="$(OutputPath)..\$(PackageId).$(PackageVersion).snupkg" DestinationFolder="$([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET'))" />
-	</Target>
+	<ItemGroup>
+	  <ProjectReference Include="..\..\dependencies\Connected.Framework\src\Connected.Middleware\Connected.Middleware.csproj" />
+	  <ProjectReference Include="..\Connected.Common.Types.Model\Connected.Common.Types.Model.csproj" />
+	</ItemGroup>
 </Project>

src/Connected.Common.Types.Middleware/version.json

@@ -1,14 +0,0 @@
-{
-  "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/main/src/NerdBank.GitVersioning/version.schema.json",
-  "version": "1.0-prerelease",
-  "semVer1NumericIdentifierPadding": 4,
-  "nugetPackageVersion": {
-    "semVer": 2, // optional. Set to either 1 or 2 to control how the NuGet package version string is generated. Default is 1.
-    "precision": "build" // optional. Use when you want to use a more or less precise package version than the default major.minor.build.
-  },
-  "cloudBuild": {
-    "buildNumber": {
-      "enabled": true
-    }
-  }
-}

src/Connected.Common.Types.Model/Connected.Common.Types.Model.csproj

@@ -18,15 +18,6 @@
 		<PackageOutputPath>$(OutputPath)</PackageOutputPath>
 	</PropertyGroup>
 
-	<ItemGroup>
-		<PackageReference Include="Connected.Common.Model" Version="1.0.*-*" />
-		<PackageReference Include="Connected" Version="1.0.*-*" />
-		<PackageReference Include="Nerdbank.GitVersioning"
-									Version="3.5.119"
-									PrivateAssets="all"
-									Condition="!Exists('packages.config')" />
-	</ItemGroup>
-
 	<ItemGroup>
 		<None Include="..\..\LICENSE">
 			<Pack>True</Pack>
@@ -38,8 +29,8 @@
 		</None>
 	</ItemGroup>
 
-	<Target Name="CopyPackages" AfterTargets="Pack">
-		<Copy SourceFiles="$(OutputPath)..\$(PackageId).$(PackageVersion).nupkg" DestinationFolder="$([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET'))" />
-		<Copy SourceFiles="$(OutputPath)..\$(PackageId).$(PackageVersion).snupkg" DestinationFolder="$([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET'))" />
-	</Target>
+	<ItemGroup>
+	  <ProjectReference Include="..\..\dependencies\Connected.Common\src\Connected.Common.Model\Connected.Common.Model.csproj" />
+	  <ProjectReference Include="..\..\dependencies\Connected\src\Connected\Connected.csproj" />
+	</ItemGroup>
 </Project>

src/Connected.Common.Types.Model/version.json

@@ -1,14 +0,0 @@
-{
-  "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/main/src/NerdBank.GitVersioning/version.schema.json",
-  "version": "1.0-prerelease",
-  "semVer1NumericIdentifierPadding": 4,
-  "nugetPackageVersion": {
-    "semVer": 2, // optional. Set to either 1 or 2 to control how the NuGet package version string is generated. Default is 1.
-    "precision": "build" // optional. Use when you want to use a more or less precise package version than the default major.minor.build.
-  },
-  "cloudBuild": {
-    "buildNumber": {
-      "enabled": true
-    }
-  }
-}

src/Connected.Common.Types.UI/Connected.Common.Types.UI.csproj

@@ -25,10 +25,6 @@
 		<None Remove="wwwroot\**" />
 	</ItemGroup>
 
-	<ItemGroup>
-	  <Content Remove="version.json" />
-	</ItemGroup>
-
 
 	<ItemGroup>
 		<SupportedPlatform Include="browser" />
@@ -36,11 +32,6 @@
 
 	<ItemGroup>
 		<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="7.0.*-*" />
-		<PackageReference Include="Connected.Client" Version="1.0.*-*" />
-		<PackageReference Include="Connected.UI" Version="1.0.*-*" />
-		<PackageReference Include="Connected" Version="1.0.*-*" />
-		<PackageReference Include="Connected.Common.Types.Client" Version="1.0.*-*" />
-		<PackageReference Include="Nerdbank.GitVersioning" Version="3.5.119" PrivateAssets="all" Condition="!Exists('packages.config')" />
 	</ItemGroup>
 
 	<ItemGroup>
@@ -52,15 +43,13 @@
 			<Pack>True</Pack>
 			<PackagePath>\</PackagePath>
 		</None>
-		<None Include="version.json" />
 	</ItemGroup>
 
 	<ItemGroup>
 	  <ProjectReference Include="..\..\dependencies\Connected.Components\src\Connected.Components\Connected.Components.csproj" />
+	  <ProjectReference Include="..\..\dependencies\Connected.UI\src\Connected.UI\Connected.UI.csproj" />
+	  <ProjectReference Include="..\..\dependencies\Connected\src\Connected.Client\Connected.Client.csproj" />
+	  <ProjectReference Include="..\..\dependencies\Connected\src\Connected\Connected.csproj" />
+	  <ProjectReference Include="..\Connected.Common.Types.Client\Connected.Common.Types.Client.csproj" />
 	</ItemGroup>
-
-	<Target Name="CopyPackages" AfterTargets="Pack">
-		<Copy SourceFiles="$(OutputPath)..\$(PackageId).$(PackageVersion).nupkg" DestinationFolder="$([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET'))" />
-		<Copy SourceFiles="$(OutputPath)..\$(PackageId).$(PackageVersion).snupkg" DestinationFolder="$([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET'))" />
-	</Target>
 </Project>

src/Connected.Common.Types.UI/TaxRates/Components/TaxRateAdd.razor

@@ -4,11 +4,11 @@
 
 <div>
 	<div>
-		<InputText id="name" @bind-Value="DataSource.Name" />
+		<TextInput id="name" @bind-Value="@DataSource.Name" />
 	</div>
 	
 	<div>
-		<InputNumber id="rate" @bind-Value="DataSource.Rate" />
+		<NumberInput id="rate" @bind-Value="DataSource.Rate" />
 	</div>
 
 	<Button @onclick="OnInsert">Submit</Button>

src/Connected.Common.Types.UI/TaxRates/Components/TaxRateEdit.razor

@@ -5,21 +5,13 @@
 
 <h3>TaxRateEditForm</h3>
 
-<EditForm Model="@DataSource" OnValidSubmit="@OnUpdate">
-	<DataAnnotationsValidator />
-	<ValidationSummary />
+<div>
+   <TextInput id="name" @bind-Value="@DataSource.Name" />
+</div>
 
-	<div>
-		<label for="name">Name</label>
-		<InputText id="name" @bind-Value="DataSource.Name" />
-	</div>
+<div>
+   <NumberInput id="rate" @bind-Value="DataSource.Rate" />
+</div>
 
-	<div>
-		<label for="rate">Rate</label>
-		<InputNumber id="rate" @bind-Value="DataSource.Rate" />
-	</div>
-
-	<button type="submit">Submit</button>
-	<button @onclick="OnCancel">Cancel</button>
-
-</EditForm>
+<Button @onclick="OnUpdate">Submit</Button>
+<Button @onclick="OnCancel">Cancel</Button>

src/Connected.Common.Types.UI/version.json

@@ -1,14 +0,0 @@
-{
-  "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/main/src/NerdBank.GitVersioning/version.schema.json",
-  "version": "1.0-prerelease",
-  "semVer1NumericIdentifierPadding": 4,
-  "nugetPackageVersion": {
-    "semVer": 2, // optional. Set to either 1 or 2 to control how the NuGet package version string is generated. Default is 1.
-    "precision": "build" // optional. Use when you want to use a more or less precise package version than the default major.minor.build.
-  },
-  "cloudBuild": {
-    "buildNumber": {
-      "enabled": true
-    }
-  }
-}

src/Connected.Common.Types/Connected.Common.Types.csproj

@@ -5,7 +5,7 @@
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
 		<RootNamespace>$(MSBuildProjectName.Replace(" ", "_"))</RootNamespace>
-		<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
+		<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
 		<Title>$(AssemblyName)</Title>
 		<Authors>Tom PIT ltd</Authors>
 		<Copyright>2022 Tom PIT ltd</Copyright>
@@ -18,18 +18,6 @@
 		<PackageOutputPath>$(OutputPath)</PackageOutputPath>
 	</PropertyGroup>
 
-	<ItemGroup>
-		<PackageReference Include="Connected.Data" Version="1.0.*-*" />
-		<PackageReference Include="Connected.Runtime" Version="1.0.*-*" />
-		<PackageReference Include="Connected.Services" Version="1.0.*-*" />
-		<PackageReference Include="Connected.Common.Types.Middleware" Version="1.0.*-*" />
-		<PackageReference Include="Connected.Common.Types.Model" Version="1.0.*-*" />
-		<PackageReference Include="Nerdbank.GitVersioning"
-									Version="3.5.119"
-									PrivateAssets="all"
-									Condition="!Exists('packages.config')" />
-	</ItemGroup>
-
 	<ItemGroup>
 		<None Include="..\..\LICENSE">
 			<Pack>True</Pack>
@@ -41,8 +29,11 @@
 		</None>
 	</ItemGroup>
 
-	<Target Name="CopyPackages" AfterTargets="Pack">
-		<Copy SourceFiles="$(OutputPath)..\$(PackageId).$(PackageVersion).nupkg" DestinationFolder="$([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET'))" />
-		<Copy SourceFiles="$(OutputPath)..\$(PackageId).$(PackageVersion).snupkg" DestinationFolder="$([System.Environment]::GetEnvironmentVariable('LOCAL_NUGET'))" />
-	</Target>
+	<ItemGroup>
+	  <ProjectReference Include="..\..\dependencies\Connected.Framework\src\Connected.Data\Connected.Data.csproj" />
+	  <ProjectReference Include="..\..\dependencies\Connected.Framework\src\Connected.Runtime\Connected.Runtime.csproj" />
+	  <ProjectReference Include="..\..\dependencies\Connected.Framework\src\Connected.Services\Connected.Services.csproj" />
+	  <ProjectReference Include="..\Connected.Common.Types.Middleware\Connected.Common.Types.Middleware.csproj" />
+	  <ProjectReference Include="..\Connected.Common.Types.Model\Connected.Common.Types.Model.csproj" />
+	</ItemGroup>
 </Project>

src/Connected.Common.Types/version.json

@@ -1,14 +0,0 @@
-{
-  "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/main/src/NerdBank.GitVersioning/version.schema.json",
-  "version": "1.0-prerelease",
-  "semVer1NumericIdentifierPadding": 4,
-  "nugetPackageVersion": {
-    "semVer": 2, // optional. Set to either 1 or 2 to control how the NuGet package version string is generated. Default is 1.
-    "precision": "build" // optional. Use when you want to use a more or less precise package version than the default major.minor.build.
-  },
-  "cloudBuild": {
-    "buildNumber": {
-      "enabled": true
-    }
-  }
-}

tests/Connected.Common.Types.Tests/TaxRates/Ops/InsertTests.cs

@@ -192,7 +192,7 @@ public class InsertTests
 
 			var eventServiceFake = instanceFaker.GetMock<IEventService>()!;
 
-			_ = eventServiceFake.Setup(e => e.Enqueue(It.IsAny<ITaxRateService?>(), ServiceEvents.Inserted, It.IsAny<int>()));
+			_ = eventServiceFake.Setup(e => e.Enqueue(It.IsAny<Insert>(), It.IsAny<ITaxRateService?>(), ServiceEvents.Inserted, It.IsAny<int>()));
 			/* 
 			 * Test
 			 */
@@ -201,7 +201,7 @@ public class InsertTests
 			/* 
 			 * Assert
 			 */
-			eventServiceFake.Verify(e => e.Enqueue(It.IsAny<ITaxRateService?>(), ServiceEvents.Inserted, It.IsAny<int>()), Times.Exactly(1));
+			eventServiceFake.Verify(e => e.Enqueue(It.IsAny<Insert>(), It.IsAny<ITaxRateService?>(), ServiceEvents.Inserted, It.IsAny<int>()), Times.Exactly(1));
 		}
 
 		[TestMethod("Insert commit refreshes cache exactly once")]
@@ -218,7 +218,7 @@ public class InsertTests
 
 			var eventServiceFake = instanceFaker.GetMock<IEventService>()!;
 
-			_ = eventServiceFake.Setup(e => e.Enqueue(It.IsAny<ITaxRateService?>(), ServiceEvents.Inserted, It.IsAny<int>()));
+			_ = eventServiceFake.Setup(e => e.Enqueue(It.IsAny<Insert>(), It.IsAny<ITaxRateService?>(), ServiceEvents.Inserted, It.IsAny<int>()));
 			/* 
 			 * Test
 			 */
@@ -254,7 +254,7 @@ public class InsertTests
 
 			_ = eventServiceFake
 				.InSequence(sequence)
-				.Setup(e => e.Enqueue(It.IsAny<ITaxRateService?>(), ServiceEvents.Inserted, It.IsAny<int>()));
+				.Setup(e => e.Enqueue(It.IsAny<Insert>(), It.IsAny<ITaxRateService?>(), ServiceEvents.Inserted, It.IsAny<int>()));
 			/* 
 			 * Test
 			 */
@@ -264,7 +264,7 @@ public class InsertTests
 			 * Assert
 			 */
 			taxRateCacheFake.Verify(e => e.Refresh(It.IsAny<int>()), Times.Exactly(1));
-			eventServiceFake.Verify(e => e.Enqueue(It.IsAny<ITaxRateService?>(), ServiceEvents.Inserted, It.IsAny<int>()));
+			eventServiceFake.Verify(e => e.Enqueue(It.IsAny<Insert>(), It.IsAny<ITaxRateService?>(), ServiceEvents.Inserted, It.IsAny<int>()));
 		}
 	}
 }

tests/Connected.Common.Types.Tests/TaxRates/Ops/QueryTests.cs

@@ -1,4 +1,5 @@
 using System.Collections.Immutable;
+using Connected.Common.Types.TaxRates;
 using Connected.Entities;
 using Connected.ServiceModel;
 using static Connected.Common.Types.TaxRates.TaxRateOps;

tests/Connected.Common.Types.Tests/TaxRates/Ops/UpdateTests.cs

@@ -219,7 +219,7 @@ public class UpdateTests
 
 			var eventServiceFake = instanceFaker.GetMock<IEventService>()!;
 
-			_ = eventServiceFake.Setup(e => e.Enqueue(It.IsAny<ITaxRateService?>(), ServiceEvents.Updated, It.IsAny<int>()));
+			_ = eventServiceFake.Setup(e => e.Enqueue(It.IsAny<Update>(), It.IsAny<ITaxRateService?>(), ServiceEvents.Updated, It.IsAny<int>()));
 
 			/*
 			 * Argument values are irrelevant for the test
@@ -234,7 +234,7 @@ public class UpdateTests
 			/* 
 			 * Assert
 			 */
-			eventServiceFake.Verify(e => e.Enqueue(It.IsAny<ITaxRateService?>(), ServiceEvents.Updated, It.IsAny<int>()), Times.Exactly(1));
+			eventServiceFake.Verify(e => e.Enqueue(It.IsAny<Update>(), It.IsAny<ITaxRateService?>(), ServiceEvents.Updated, It.IsAny<int>()), Times.Exactly(1));
 		}
 
 		[TestMethod("Update commit refreshes cache exactly once")]
@@ -251,7 +251,7 @@ public class UpdateTests
 
 			var eventServiceFake = instanceFaker.GetMock<IEventService>()!;
 
-			_ = eventServiceFake.Setup(e => e.Enqueue(It.IsAny<ITaxRateService?>(), ServiceEvents.Updated, It.IsAny<int>()));
+			_ = eventServiceFake.Setup(e => e.Enqueue(It.IsAny<Update>(), It.IsAny<ITaxRateService?>(), ServiceEvents.Updated, It.IsAny<int>()));
 
 			/*
 			 * Argument values are irrelevant for the test
@@ -293,7 +293,7 @@ public class UpdateTests
 
 			_ = eventServiceFake
 				.InSequence(sequence)
-				.Setup(e => e.Enqueue(It.IsAny<ITaxRateService?>(), ServiceEvents.Updated, It.IsAny<int>()));
+				.Setup(e => e.Enqueue(It.IsAny<Update>(), It.IsAny<ITaxRateService?>(), ServiceEvents.Updated, It.IsAny<int>()));
 
 			/*
 			 * Argument values are irrelevant for the test