Merge branch 'develop' into 'master'

Develop to master

See merge request digital-twin/twinzo/tdevkit!25

Main/Main.csproj

-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <AssemblyVersion>2021.6.22.8</AssemblyVersion>
     <FileVersion>2021.6.22.8</FileVersion>
+    <Version>1.0</Version>
   </PropertyGroup>
 
   <ItemGroup>

SDK/Contracts/Data/ClientContract.cs

@@ -9,5 +9,7 @@ namespace SDK.Models
         public Guid Guid { get; set; }
 
         public string Title { get; set; }
+
+        public string DBName { get; set; }
     }
 }

SDK/SDK.csproj

@@ -5,7 +5,7 @@
     <TargetFramework>net6.0</TargetFramework>
     <AssemblyVersion>2021.6.28.25</AssemblyVersion>
     <FileVersion>2021.6.28.25</FileVersion>
-    <Version>4.7.0</Version>
+    <Version>4.8.0</Version>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
   </PropertyGroup>
 

tDevkit.sln

@@ -7,6 +7,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SDK", "SDK\SDK.csproj", "{A
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Test", "Test\Test\Test.csproj", "{488CE946-CD3E-49E5-A40D-AA2FD5A2744B}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Main", "Main\Main.csproj", "{E30C5B8F-0CA9-4947-8D83-95DC4612F4E1}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -21,6 +23,10 @@ Global
 		{488CE946-CD3E-49E5-A40D-AA2FD5A2744B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{488CE946-CD3E-49E5-A40D-AA2FD5A2744B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{488CE946-CD3E-49E5-A40D-AA2FD5A2744B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E30C5B8F-0CA9-4947-8D83-95DC4612F4E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E30C5B8F-0CA9-4947-8D83-95DC4612F4E1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E30C5B8F-0CA9-4947-8D83-95DC4612F4E1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E30C5B8F-0CA9-4947-8D83-95DC4612F4E1}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE