move src dir

Sqler.sln

@@ -3,13 +3,19 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.1.32113.165
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sqler", "Sqler\Sqler.csproj", "{15FA4B65-9F9E-41A9-A41F-BA5E4160D05A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sqler", "src\Sqler\Sqler.csproj", "{15FA4B65-9F9E-41A9-A41F-BA5E4160D05A}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Vit.AutoTemp", "Vit.AutoTemp\Vit.AutoTemp.csproj", "{537F663E-B0EC-4C9B-9E11-AD83317F727C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Vit.AutoTemp", "src\Vit.AutoTemp\Vit.AutoTemp.csproj", "{537F663E-B0EC-4C9B-9E11-AD83317F727C}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "doc", "doc", "{F0F7B3BD-9155-4120-80DB-95388EC15EF0}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{9568E206-5A8A-4C92-AFC5-F3F8227ABE39}"
+	ProjectSection(SolutionItems) = preProject
+		src\Versions.props = src\Versions.props
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "doc", "doc", "{02D7A308-F1D2-489D-84C6-2102C7F24C09}"
 	ProjectSection(SolutionItems) = preProject
 		README.md = README.md
+		doc\ReleaseLog.md = doc\ReleaseLog.md
 	EndProjectSection
 EndProject
 Global
@@ -30,6 +36,10 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{15FA4B65-9F9E-41A9-A41F-BA5E4160D05A} = {9568E206-5A8A-4C92-AFC5-F3F8227ABE39}
+		{537F663E-B0EC-4C9B-9E11-AD83317F727C} = {9568E206-5A8A-4C92-AFC5-F3F8227ABE39}
+	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {C7DA16E3-9949-49FA-B0B4-F830636DE60F}
 	EndGlobalSection

doc/ReleaseLog.md

@@ -0,0 +1,14 @@
+# Sqler ReleaseLog
+
+
+-----------------------
+# 4.1.0
+
+
+
+
+
+-----------------------
+# 3.0.10
+- fix bug: --set not work in console
+- In Sql Server, support import/export Geometry type data

doc/UpgradeLog.md

@@ -1,7 +0,0 @@
-
-# 3.0.10
-修复启动命令行参数--set不生效的bug
-
-
-# 
- Sql Server可导入导出 Geometry类型

Sqler/Module/Sqler/Logical/DataEditor/DataEditorHelp.cs → src/Sqler/Module/Sqler/Logical/DataEditor/DataEditorHelp.cs

@@ -43,8 +43,8 @@ namespace App.Module.Sqler.Logical.DataEditor
                 var moduleLabel = "configBy_SqlerDataEditor";
                 dataSourceConfig[moduleLabel] = true;
 
-                Data.ClearDataSource(provider => provider.dataSourceConfig.ContainsKey(moduleLabel));
-                var success = Data.AddDataSource(dataSourceConfig);
+                Data.ClearDataProviders(provider => provider.dataSourceConfig.ContainsKey(moduleLabel));
+                var success = Data.AddDataProvider(dataSourceConfig);
 
                 if (!success)
                 {

Sqler/Module/Sqler/Logical/SqlVersion/SqlVersionHelp.cs → src/Sqler/Module/Sqler/Logical/SqlVersion/SqlVersionHelp.cs

@@ -44,8 +44,8 @@ namespace App.Module.Sqler.Logical.SqlVersion
                 var moduleLabel = "configBy_SqlerSqlVersion";
                 dataSourceConfig[moduleLabel] = true;
 
-                Data.ClearDataSource(provider => provider.dataSourceConfig.ContainsKey(moduleLabel));
-                var success = Data.AddDataSource(dataSourceConfig);
+                Data.ClearDataProviders(provider => provider.dataSourceConfig.ContainsKey(moduleLabel));
+                var success = Data.AddDataProvider(dataSourceConfig);
             }
             #endregion
 

Sqler/Sqler.csproj → src/Sqler/Sqler.csproj

@@ -1,4 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
+    <Import Project="..\Versions.props" />
 
     <PropertyGroup>
         <publish>Sqler</publish>
@@ -8,28 +9,20 @@
     <PropertyGroup>
         <TargetFramework>net6.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
-        <Version>4.0.1</Version>
-        <Description>https://github.com/Vit-Lib/Sqler</Description>
     </PropertyGroup>
 
-
-    <PropertyGroup>
-        <DocumentationFile>bin\Debug\net6.0\Sqler.xml</DocumentationFile>
-    </PropertyGroup>
-
-
     <ItemGroup>
         <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
         <PackageReference Include="System.Reflection.Emit" Version="4.7.0" />
         <PackageReference Include="Vit.Excel" Version="2.2.18" />
-        <PackageReference Include="Vit.WebHost" Version="6.1.0" />
+        <PackageReference Include="Vit.WebHost" Version="6.1.1" />
         <PackageReference Include="Vit.Db.DbMng" Version="3.0.1" />
-        <PackageReference Include="Sers.Core" Version="2.1.27" />
-        <PackageReference Include="Vitorm.Data" Version="2.1.1" />
-        <PackageReference Include="Vitorm.EntityGenerate" Version="2.1.1" />
-        <PackageReference Include="Vitorm.MySql" Version="2.1.1" />
-        <PackageReference Include="Vitorm.Sqlite" Version="2.1.1" />
-        <PackageReference Include="Vitorm.SqlServer" Version="2.1.1" />
+        <PackageReference Include="Sers.Core" Version="2.1.28" />
+        <PackageReference Include="Vitorm.Data" Version="2.2.0-preview2" />
+        <PackageReference Include="Vitorm.EntityGenerate" Version="2.2.0-preview2" />
+        <PackageReference Include="Vitorm.MySql" Version="2.2.0-preview2" />
+        <PackageReference Include="Vitorm.Sqlite" Version="2.2.0-preview2" />
+        <PackageReference Include="Vitorm.SqlServer" Version="2.2.0-preview2" />
     </ItemGroup>