2.2.0-preview

Vitorm.ClickHouse.sln

@@ -19,7 +19,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Vitorm.ClickHouse", "src\Vi
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Vitorm.ClickHouse.MsTest", "test\Vitorm.ClickHouse.MsTest\Vitorm.ClickHouse.MsTest.csproj", "{AE10FAE6-53E3-41C0-85A4-B2A6FC4C8436}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Vitorm.Data.MsTest", "test\Vitorm.Data.MsTest\Vitorm.Data.MsTest.csproj", "{1BFC2623-7A50-431A-9BE7-DE8B16E70F58}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Vitorm.ClickHouse.Data.MsTest", "test\Vitorm.ClickHouse.Data.MsTest\Vitorm.ClickHouse.Data.MsTest.csproj", "{B6145CF9-1103-461D-922C-F9A3F331B81C}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -35,10 +35,10 @@ Global
 		{AE10FAE6-53E3-41C0-85A4-B2A6FC4C8436}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{AE10FAE6-53E3-41C0-85A4-B2A6FC4C8436}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{AE10FAE6-53E3-41C0-85A4-B2A6FC4C8436}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1BFC2623-7A50-431A-9BE7-DE8B16E70F58}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1BFC2623-7A50-431A-9BE7-DE8B16E70F58}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1BFC2623-7A50-431A-9BE7-DE8B16E70F58}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1BFC2623-7A50-431A-9BE7-DE8B16E70F58}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B6145CF9-1103-461D-922C-F9A3F331B81C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B6145CF9-1103-461D-922C-F9A3F331B81C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B6145CF9-1103-461D-922C-F9A3F331B81C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B6145CF9-1103-461D-922C-F9A3F331B81C}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -46,7 +46,7 @@ Global
 	GlobalSection(NestedProjects) = preSolution
 		{853695CA-E3BF-492A-A20C-88122925AFC8} = {05176905-A2A5-4015-9F04-2904506C902F}
 		{AE10FAE6-53E3-41C0-85A4-B2A6FC4C8436} = {7904FE51-04FF-4477-8E3A-CC340389EE32}
-		{1BFC2623-7A50-431A-9BE7-DE8B16E70F58} = {7904FE51-04FF-4477-8E3A-CC340389EE32}
+		{B6145CF9-1103-461D-922C-F9A3F331B81C} = {7904FE51-04FF-4477-8E3A-CC340389EE32}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {C7DA16E3-9949-49FA-B0B4-F830636DE60F}

src/Versions.props

@@ -1,6 +1,6 @@
 <Project>
     <PropertyGroup>
-        <Version>2.2.0-develop</Version>
-        <Vitorm_Version>[2.2.0, 2.3.0)</Vitorm_Version>
+        <Version>2.2.0-preview</Version>
+        <Vitorm_Version>[2.2.0-preview, 2.3.0)</Vitorm_Version>
     </PropertyGroup>
 </Project>

src/Vitorm.ClickHouse/Vitorm.ClickHouse.csproj

@@ -32,8 +32,19 @@
 
     <ItemGroup>
         <PackageReference Include="ClickHouse.Client" Version="7.7.3" />
+    
+
+    </ItemGroup>
+
+
+    <ItemGroup>
         <PackageReference Include="Vitorm" Version="$(Vitorm_Version)"  />
     </ItemGroup>
 
 
+    <!--<ItemGroup>
+      <ProjectReference Include="..\..\..\Vitorm\src\Vitorm\Vitorm.csproj" />
+    </ItemGroup>-->
+
+
 </Project>

test/Vitorm.Data.MsTest/CommonTest/ClickHouse_Test.cs → test/Vitorm.ClickHouse.Data.MsTest/CommonTest/Common_Test.cs

@@ -1,20 +1,19 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-using User = Vitorm.MsTest.ClickHouse.User;
 
-namespace Vitorm.MsTest.ClickHouse
+namespace Vitorm.MsTest
 {
-    public class User : Vitorm.MsTest.UserBase
+    public class User : Vitorm.MsTest.CommonTest.UserBase
     {
     }
 }
 
 
-namespace Vitorm.MsTest
+namespace Vitorm.MsTest.CommonTest
 {
 
     [TestClass]
-    public partial class ClickHouse_Test : UserTest<User>
+    public partial class Common_Test : UserTest<User>
     {
         [TestMethod]
         public void Test()

test/Vitorm.Data.MsTest/UserBase.cs → test/Vitorm.ClickHouse.Data.MsTest/CommonTest/UserTest.Entity.cs

@@ -1,5 +1,5 @@
 
-namespace Vitorm.MsTest
+namespace Vitorm.MsTest.CommonTest
 {
 
     [System.ComponentModel.DataAnnotations.Schema.Table("User")]

test/Vitorm.Data.MsTest/CommonTest/UserTest.cs → test/Vitorm.ClickHouse.Data.MsTest/CommonTest/UserTest.cs

@@ -1,9 +1,9 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 
-namespace Vitorm.MsTest
+namespace Vitorm.MsTest.CommonTest
 {
-    public abstract partial class UserTest<User> where User : Vitorm.MsTest.UserBase, new()
+    public abstract partial class UserTest<User> where User : UserBase, new()
     {
         public virtual void WaitForUpdate() { }
         public abstract User NewUser(int id, bool forAdd = false);

test/Vitorm.Data.MsTest/CommonTest/UserTestAsync.cs → test/Vitorm.ClickHouse.Data.MsTest/CommonTest/UserTestAsync.cs

@@ -2,9 +2,9 @@
 
 using Vit.Linq;
 
-namespace Vitorm.MsTest
+namespace Vitorm.MsTest.CommonTest
 {
-    public abstract partial class UserTest<User> where User : Vitorm.MsTest.UserBase, new()
+    public abstract partial class UserTest<User>
     {
 
         public async Task Test_GetAsync()

test/Vitorm.Data.MsTest/Vitorm.Data.MsTest.csproj → test/Vitorm.ClickHouse.Data.MsTest/Vitorm.ClickHouse.Data.MsTest.csproj

@@ -1,4 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
+    <Import Project="..\..\src\Versions.props" />
 
     <PropertyGroup>
         <test>MSTest</test>
@@ -19,7 +20,7 @@
         <PackageReference Include="MSTest.TestFramework" Version="3.5.2" />
 
         <PackageReference Include="Vit.Core" Version="2.2.0" />
-        <PackageReference Include="Vitorm.Data" Version="[2.1.0, 2.2.0)" />
+        <PackageReference Include="Vitorm.Data" Version="$(Vitorm_Version)"  />
     </ItemGroup>
 
     <ItemGroup>

test/Vitorm.Data.MsTest/appsettings.json → test/Vitorm.ClickHouse.Data.MsTest/appsettings.json

@@ -3,7 +3,7 @@
     "Data": [
       {
         "provider": "ClickHouse",
-        "namespace": "Vitorm.MsTest.ClickHouse",
+        "namespace": "Vitorm.MsTest",
         "connectionString": "Host=localhost;Port=8123;Database=db_orm;User=default;Password=;Compress=True;CheckCompressedHash=False;Compressor=lz4;"
       }
     ]