From 419cebea562cff6824dab4ad965b970a83fbf754 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matija=20Ko=C5=BEelj?= <matija.kozelj@tompit.net>
Date: Fri, 17 Feb 2023 14:38:34 +0100
Subject: [PATCH] Sort out dependencies

---
 Framework.ServiceModel.sln                    | 25 +++++++++++++++++++
 .../Connected.ServiceModel.csproj             | 18 +++++--------
 src/Connected.ServiceModel/version.json       | 14 -----------
 3 files changed, 31 insertions(+), 26 deletions(-)
 delete mode 100644 src/Connected.ServiceModel/version.json

diff --git a/Framework.ServiceModel.sln b/Framework.ServiceModel.sln
index 768e9e5..5149200 100644
--- a/Framework.ServiceModel.sln
+++ b/Framework.ServiceModel.sln
@@ -5,6 +5,14 @@ VisualStudioVersion = 17.4.33027.239
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.ServiceModel", "src\Connected.ServiceModel\Connected.ServiceModel.csproj", "{EEAAA364-FCF2-4975-8321-A475778D684C}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Dependencies", "Dependencies", "{921C93ED-C848-4465-AE42-CE64D266719F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected", "dependencies\Connected\src\Connected\Connected.csproj", "{7EA2F351-8146-4265-B5D5-E399910DDF5B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Entities", "dependencies\Connected.Framework\src\Connected.Entities\Connected.Entities.csproj", "{D418A843-2153-45BC-9F16-2A24EAD060C8}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Connected.Runtime", "dependencies\Connected.Framework\src\Connected.Runtime\Connected.Runtime.csproj", "{8CC5AEDC-68EC-423D-8F1C-ABD7A4F3CBBF}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -15,10 +23,27 @@ Global
 		{EEAAA364-FCF2-4975-8321-A475778D684C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{EEAAA364-FCF2-4975-8321-A475778D684C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EEAAA364-FCF2-4975-8321-A475778D684C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7EA2F351-8146-4265-B5D5-E399910DDF5B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7EA2F351-8146-4265-B5D5-E399910DDF5B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7EA2F351-8146-4265-B5D5-E399910DDF5B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7EA2F351-8146-4265-B5D5-E399910DDF5B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D418A843-2153-45BC-9F16-2A24EAD060C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D418A843-2153-45BC-9F16-2A24EAD060C8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D418A843-2153-45BC-9F16-2A24EAD060C8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D418A843-2153-45BC-9F16-2A24EAD060C8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8CC5AEDC-68EC-423D-8F1C-ABD7A4F3CBBF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8CC5AEDC-68EC-423D-8F1C-ABD7A4F3CBBF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8CC5AEDC-68EC-423D-8F1C-ABD7A4F3CBBF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8CC5AEDC-68EC-423D-8F1C-ABD7A4F3CBBF}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{7EA2F351-8146-4265-B5D5-E399910DDF5B} = {921C93ED-C848-4465-AE42-CE64D266719F}
+		{D418A843-2153-45BC-9F16-2A24EAD060C8} = {921C93ED-C848-4465-AE42-CE64D266719F}
+		{8CC5AEDC-68EC-423D-8F1C-ABD7A4F3CBBF} = {921C93ED-C848-4465-AE42-CE64D266719F}
+	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {1EC384B4-F27F-4F71-8BDC-16F7BA8689E9}
 	EndGlobalSection
diff --git a/src/Connected.ServiceModel/Connected.ServiceModel.csproj b/src/Connected.ServiceModel/Connected.ServiceModel.csproj
index cc68bbe..d01e8e6 100644
--- a/src/Connected.ServiceModel/Connected.ServiceModel.csproj
+++ b/src/Connected.ServiceModel/Connected.ServiceModel.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
 		<TargetFramework>net7.0</TargetFramework>
@@ -18,14 +18,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Connected" Version="1.0.*-*"/>
-		<PackageReference Include="Connected.Runtime" Version="1.0.*-*"/>
-		<PackageReference Include="Connected.Entities" Version="1.0.*-*"/>
 		<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.*-*" />
-		<PackageReference Include="Nerdbank.GitVersioning"
-								Version="3.5.119"
-								PrivateAssets="all"
-								Condition="!Exists('packages.config')" />
 	</ItemGroup>
 
 	<ItemGroup>
@@ -39,8 +32,9 @@
 		</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.Entities\Connected.Entities.csproj" />
+	  <ProjectReference Include="..\..\dependencies\Connected.Framework\src\Connected.Runtime\Connected.Runtime.csproj" />
+	  <ProjectReference Include="..\..\dependencies\Connected\src\Connected\Connected.csproj" />
+	</ItemGroup>
 </Project>
diff --git a/src/Connected.ServiceModel/version.json b/src/Connected.ServiceModel/version.json
deleted file mode 100644
index 2a1593f..0000000
--- a/src/Connected.ServiceModel/version.json
+++ /dev/null
@@ -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
-    }
-  }
-}
\ No newline at end of file