Skip to content

Commit 864a57f

Browse files
gmf520gmf520
committed
🔨 (entity) 将Microsoft.EntityFrameworkCore.Tools的引用从OSharp.EntityFrameworkCore转换到hosting项目
1 parent 79fed62 commit 864a57f

File tree

7 files changed

+12
-58
lines changed

7 files changed

+12
-58
lines changed

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

File renamed without changes.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ dotnet pack ../src/OSharp.Redis/OSharp.Redis.csproj -c Release --output nupkgs
2020
dotnet pack ../src/OSharp.Swagger/OSharp.Swagger.csproj -c Release --output nupkgs
2121
dotnet pack ../src/OSharp.Wpf/OSharp.Wpf.csproj -c Release --output nupkgs
2222

23-
nuget.exe pack ./osharpns.nuspec -OutputDirectory nupkgs
23+
nuget pack ./osharpns.nuspec -OutputDirectory nupkgs
2424

2525
start "" nupkgs
2626
exit

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,16 @@ set version=:
55
set /p version=
66
nuget delete OSharpNS.Core %version% -src https://www.nuget.org -NonInteractive
77
nuget delete OSharpNS.AspNetCore %version% -src https://www.nuget.org -NonInteractive
8+
nuget delete OSharpNS.Authorization.Datas %version% -src https://www.nuget.org -NonInteractive
9+
nuget delete OSharpNS.Authorization.Functions %version% -src https://www.nuget.org -NonInteractive
810
nuget delete OSharpNS.AutoMapper %version% -src https://www.nuget.org -NonInteractive
911
nuget delete OSharpNS.EntityFrameworkCore %version% -src https://www.nuget.org -NonInteractive
1012
nuget delete OSharpNS.EntityFrameworkCore.SqlServer %version% -src https://www.nuget.org -NonInteractive
1113
nuget delete OSharpNS.EntityFrameworkCore.MySql %version% -src https://www.nuget.org -NonInteractive
1214
nuget delete OSharpNS.EntityFrameworkCore.Sqlite %version% -src https://www.nuget.org -NonInteractive
1315
nuget delete OSharpNS.EntityFrameworkCore.PostgreSql %version% -src https://www.nuget.org -NonInteractive
1416
nuget delete OSharpNS.EntityFrameworkCore.Oracle %version% -src https://www.nuget.org -NonInteractive
15-
nuget delete OSharpNS.Permissions %version% -src https://www.nuget.org -NonInteractive
17+
nuget delete OSharpNS.Identity %version% -src https://www.nuget.org -NonInteractive
1618
nuget delete OSharpNS.Log4Net %version% -src https://www.nuget.org -NonInteractive
1719
nuget delete OSharpNS.Redis %version% -src https://www.nuget.org -NonInteractive
1820
nuget delete OSharpNS.Hangfire %version% -src https://www.nuget.org -NonInteractive

‎osharp.sln‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OSharp.Swagger", "src\OShar
3535
EndProject
3636
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{0E0B758C-85E0-456E-BE7D-A68E4A2B3D6C}"
3737
ProjectSection(SolutionItems) = preProject
38-
build\build-pack.bat = build\build-pack.bat
38+
build\nuget-build.bat = build\nuget-build.bat
39+
build\nuget-delete.bat = build\nuget-delete.bat
3940
build\OSharpNS.nuspec = build\OSharpNS.nuspec
4041
build\public.props = build\public.props
4142
README.md = README.md

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,10 @@
3434

3535
<ItemGroup>
3636
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="3.1.2" />
37+
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.1.2">
38+
<PrivateAssets>all</PrivateAssets>
39+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
40+
</PackageReference>
3741
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="3.1.1" />
3842
</ItemGroup>
3943

@@ -53,4 +57,6 @@
5357
<ProjectReference Include="..\Liuliu.Demo.EntityConfiguration\Liuliu.Demo.EntityConfiguration.csproj" />
5458
</ItemGroup>
5559

60+
<ProjectExtensions><VisualStudio><UserProperties appsettings_1development_1json__JsonSchema="http://json.schemastore.org/appsettings" /></VisualStudio></ProjectExtensions>
61+
5662
</Project>

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

Lines changed: 0 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -8,56 +8,5 @@
88
"OSharp": "Debug",
99
"Liuliu": "Debug"
1010
}
11-
},
12-
"OSharp": {
13-
"DbContexts": {
14-
//"SqlServer": {
15-
// "DbContextTypeName": "OSharp.Entity.DefaultDbContext,OSharp.EntityFrameworkCore",
16-
// "ConnectionString": "Server=.;Database=OSharp.Site;User Id=sa;Password=Abc123456!;MultipleActiveResultSets=true",
17-
// "DatabaseType": "SqlServer",
18-
// "LazyLoadingProxiesEnabled": true,
19-
// "AuditEntityEnabled": true,
20-
// "AutoMigrationEnabled": false
21-
//}
22-
},
23-
"OAuth2": {
24-
25-
},
26-
"Jwt": {
27-
"Issuer": "osharp identity",
28-
"Audience": "osharp angular demo",
29-
"Secret": "{8619F7C3-B53C-4B85-99F0-983D351ECD82}",
30-
"ExpireDays": 7.0
31-
},
32-
"MailSender": {
33-
"Host": "smtp.66soft.net",
34-
"DisplayName": "柳柳软件服务",
35-
"UserName": "service@66soft.net",
36-
"Password": "gmf31529019"
37-
},
38-
"Redis": {
39-
"Configuration": "localhost",
40-
"InstanceName": "OSharpDemo",
41-
"Enabled": false
42-
},
43-
"Swagger": {
44-
"Title": "OSharp API",
45-
"Version": 1,
46-
"Url": "/swagger/v1/swagger.json",
47-
"MiniProfiler": true,
48-
"Enabled": false
49-
},
50-
"Hangfire": {
51-
"WorkerCount": 20,
52-
"StorageConnectionString": "Server=.;Database=OSharp.Site.hangfire-dev;User Id=sa;Password=Abc123456!;MultipleActiveResultSets=true",
53-
"DashboardUrl": "/hangfire",
54-
"Roles": "",
55-
"Enabled": false
56-
},
57-
"Exceptionless": {
58-
"ApiKey": "",
59-
"ServerUrl": null,
60-
"Enabled": false
61-
}
6211
}
6312
}

‎src/OSharp.EntityFrameworkCore/OSharp.EntityFrameworkCore.csproj‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,6 @@
2020
<PackageReference Include="Dapper" Version="2.0.30" />
2121
<PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="3.1.2" />
2222
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="3.1.2" />
23-
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.1.2">
24-
<PrivateAssets>all</PrivateAssets>
25-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
26-
</PackageReference>
2723
<PackageReference Include="Z.EntityFramework.Plus.EFCore" Version="3.0.40" />
2824
</ItemGroup>
2925

0 commit comments

Comments
 (0)