🔨 (entity) 将Microsoft.EntityFrameworkCore.Tools的引用从OSharp.EntityFrameworkCore转换到hosting项目

Author: gmf520

build/build-docs.bat renamed to build/docs-build.bat

@@ -20,7 +20,7 @@ dotnet pack ../src/OSharp.Redis/OSharp.Redis.csproj -c Release --output nupkgs
 dotnet pack ../src/OSharp.Swagger/OSharp.Swagger.csproj -c Release --output nupkgs
 dotnet pack ../src/OSharp.Wpf/OSharp.Wpf.csproj -c Release --output nupkgs
 
-nuget.exe pack ./osharpns.nuspec -OutputDirectory nupkgs
+nuget pack ./osharpns.nuspec -OutputDirectory nupkgs
 
 start "" nupkgs
 exit

build/build-pack.bat renamed to build/nuget-build.bat

@@ -5,14 +5,16 @@ set version=:
 set /p version=
 nuget delete OSharpNS.Core %version% -src https://www.nuget.org -NonInteractive
 nuget delete OSharpNS.AspNetCore %version% -src https://www.nuget.org -NonInteractive
+nuget delete OSharpNS.Authorization.Datas %version% -src https://www.nuget.org -NonInteractive
+nuget delete OSharpNS.Authorization.Functions %version% -src https://www.nuget.org -NonInteractive
 nuget delete OSharpNS.AutoMapper %version% -src https://www.nuget.org -NonInteractive
 nuget delete OSharpNS.EntityFrameworkCore %version% -src https://www.nuget.org -NonInteractive
 nuget delete OSharpNS.EntityFrameworkCore.SqlServer %version% -src https://www.nuget.org -NonInteractive
 nuget delete OSharpNS.EntityFrameworkCore.MySql %version% -src https://www.nuget.org -NonInteractive
 nuget delete OSharpNS.EntityFrameworkCore.Sqlite %version% -src https://www.nuget.org -NonInteractive
 nuget delete OSharpNS.EntityFrameworkCore.PostgreSql %version% -src https://www.nuget.org -NonInteractive
 nuget delete OSharpNS.EntityFrameworkCore.Oracle %version% -src https://www.nuget.org -NonInteractive
-nuget delete OSharpNS.Permissions %version% -src https://www.nuget.org -NonInteractive
+nuget delete OSharpNS.Identity %version% -src https://www.nuget.org -NonInteractive
 nuget delete OSharpNS.Log4Net %version% -src https://www.nuget.org -NonInteractive
 nuget delete OSharpNS.Redis %version% -src https://www.nuget.org -NonInteractive
 nuget delete OSharpNS.Hangfire %version% -src https://www.nuget.org -NonInteractive

build/del-nuget.bat renamed to build/nuget-delete.bat

@@ -35,7 +35,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OSharp.Swagger", "src\OShar
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{0E0B758C-85E0-456E-BE7D-A68E4A2B3D6C}"
 	ProjectSection(SolutionItems) = preProject
-		build\build-pack.bat = build\build-pack.bat
+		build\nuget-build.bat = build\nuget-build.bat
+		build\nuget-delete.bat = build\nuget-delete.bat
 		build\OSharpNS.nuspec = build\OSharpNS.nuspec
 		build\public.props = build\public.props
 		README.md = README.md

osharp.sln

@@ -34,6 +34,10 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="3.1.2" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.1.2">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="3.1.1" />
   </ItemGroup>
 
@@ -53,4 +57,6 @@
     <ProjectReference Include="..\Liuliu.Demo.EntityConfiguration\Liuliu.Demo.EntityConfiguration.csproj" />
   </ItemGroup>
 
+  <ProjectExtensions><VisualStudio><UserProperties appsettings_1development_1json__JsonSchema="http://json.schemastore.org/appsettings" /></VisualStudio></ProjectExtensions>
+
 </Project>

samples/web/Liuliu.Demo.Web/Liuliu.Demo.Web.csproj

@@ -8,56 +8,5 @@
       "OSharp": "Debug",
       "Liuliu": "Debug"
     }
-  },
-  "OSharp": {
-    "DbContexts": {
-      //"SqlServer": {
-      //  "DbContextTypeName": "OSharp.Entity.DefaultDbContext,OSharp.EntityFrameworkCore",
-      //  "ConnectionString": "Server=.;Database=OSharp.Site;User Id=sa;Password=Abc123456!;MultipleActiveResultSets=true",
-      //  "DatabaseType": "SqlServer",
-      //  "LazyLoadingProxiesEnabled": true,
-      //  "AuditEntityEnabled": true,
-      //  "AutoMigrationEnabled": false
-      //}
-    },
-    "OAuth2": {
-      
-    },
-    "Jwt": {
-      "Issuer": "osharp identity",
-      "Audience": "osharp angular demo",
-      "Secret": "{8619F7C3-B53C-4B85-99F0-983D351ECD82}",
-      "ExpireDays": 7.0 
-    },
-    "MailSender": {
-      "Host": "smtp.66soft.net",
-      "DisplayName": "柳柳软件服务",
-      "UserName": "[email protected]",
-      "Password": "gmf31529019"
-    },
-    "Redis": {
-      "Configuration": "localhost",
-      "InstanceName": "OSharpDemo",
-      "Enabled": false
-    },
-    "Swagger": {
-      "Title": "OSharp API",
-      "Version": 1,
-      "Url": "/swagger/v1/swagger.json",
-      "MiniProfiler": true,
-      "Enabled": false
-    },
-    "Hangfire": {
-      "WorkerCount": 20,
-      "StorageConnectionString": "Server=.;Database=OSharp.Site.hangfire-dev;User Id=sa;Password=Abc123456!;MultipleActiveResultSets=true",
-      "DashboardUrl": "/hangfire",
-      "Roles": "",
-      "Enabled": false
-    },
-    "Exceptionless": {
-      "ApiKey": "",
-      "ServerUrl": null,
-      "Enabled": false
-    }
   }
 }

samples/web/Liuliu.Demo.Web/appsettings.json

@@ -20,10 +20,6 @@
     <PackageReference Include="Dapper" Version="2.0.30" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="3.1.2" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="3.1.2" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.1.2">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
     <PackageReference Include="Z.EntityFramework.Plus.EFCore" Version="3.0.40" />
   </ItemGroup>