Skip to content

Commit 5e60d73

Browse files
gmf520gmf520
committed
⚓ 将 .netcore sdk 更新至3.1.2，发布nuget版本 3.1.2-preview2.27
1 parent 097f957 commit 5e60d73

File tree

20 files changed

+59
-64
lines changed

20 files changed

+59
-64
lines changed

‎build/OSharpNS.nuspec‎

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,33 +2,24 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
33
<metadata>
44
<id>OSharpNS</id>
5-
<version>3.1.1</version>
6-
<title>OSharpFramework(.NETCoreApp3.0)</title>
5+
<version>3.1.2-preview2.27</version>
6+
<title>OSharpFramework(.NETCoreApp3.1)</title>
77
<authors>柳柳软件(66soft.net)</authors>
88
<owners>柳柳软件(66soft.net)</owners>
99
<requireLicenseAcceptance>false</requireLicenseAcceptance>
1010
<licenseUrl>https://licenses.nuget.org/Apache-2.0</licenseUrl>
1111
<projectUrl>https://github.com/i66soft/osharp</projectUrl>
1212
<iconUrl>https://en.gravatar.com/userimage/140788132/0ff3b1e68fa0154337b1528c4276e276.png?size=80</iconUrl>
1313
<description>OSharp Framework with .NETCoreApp3.0，此Package包含了OSharpNS的所有常用组件</description>
14-
<copyright>Copyright @ 66SOFT 2014-2019</copyright>
14+
<copyright>Copyright @ 66SOFT 2014-2020</copyright>
1515
<tags>osharp osharpns</tags>
1616
<dependencies>
17-
<group targetFramework=".NETCoreApp2.2">
18-
<dependency id="OSharpNS.Core" version="3.1.1" />
19-
<dependency id="OSharpNS.EntityFrameworkCore" version="3.1.1" />
20-
<dependency id="OSharpNS.EntityFrameworkCore.SqlServer" version="3.1.1" />
21-
<dependency id="OSharpNS.AutoMapper" version="3.1.1" />
22-
<dependency id="OSharpNS.AspNetCore" version="3.1.1" />
23-
<dependency id="OSharpNS.Log4Net" version="3.1.1" />
24-
</group>
2517
<group targetFramework=".NETCoreApp3.1">
26-
<dependency id="OSharpNS.Core" version="3.1.1" />
27-
<dependency id="OSharpNS.EntityFrameworkCore" version="3.1.1" />
28-
<dependency id="OSharpNS.EntityFrameworkCore.SqlServer" version="3.1.1" />
29-
<dependency id="OSharpNS.AutoMapper" version="3.1.1" />
30-
<dependency id="OSharpNS.AspNetCore" version="3.1.1" />
31-
<dependency id="OSharpNS.Log4Net" version="3.1.1" />
18+
<dependency id="OSharpNS.Core" version="3.1.2-preview2.27" />
19+
<dependency id="OSharpNS.EntityFrameworkCore" version="3.1.2-preview2.27" />
20+
<dependency id="OSharpNS.AutoMapper" version="3.1.2-preview2.27" />
21+
<dependency id="OSharpNS.AspNetCore" version="3.1.2-preview2.27" />
22+
<dependency id="OSharpNS.Log4Net" version="3.1.2-preview2.27" />
3223
</group>
3324
</dependencies>
3425
</metadata>

‎build/build-pack.bat‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
del /f /s /q nupkgs\*.*
2-
rd /s /q nupkgs
2+
33
dotnet build ../osharp.sln -c Release
44

55
dotnet pack ../src/OSharp/OSharp.csproj -c Release --output nupkgs
@@ -20,5 +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
24+
2325
start "" nupkgs
2426
exit

‎build/nuget.exe‎

5.18 MB
Binary file not shown.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
</ItemGroup>
3434

3535
<ItemGroup>
36-
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="3.1.1" />
36+
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="3.1.2" />
3737
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="3.1.1" />
3838
</ItemGroup>
3939

‎src/OSharp.AspNetCore/OSharp.AspNetCore.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
</PropertyGroup>
1919

2020
<ItemGroup>
21-
<PackageReference Include="Microsoft.AspNetCore.Authorization" Version="3.1.1" />
22-
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.1" />
23-
<PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="3.1.1" />
21+
<PackageReference Include="Microsoft.AspNetCore.Authorization" Version="3.1.2" />
22+
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.2" />
23+
<PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="3.1.2" />
2424
<FrameworkReference Include="Microsoft.AspNetCore.App" />
2525
</ItemGroup>
2626

src/OSharp/Authorization/FunctionRequirement.cs renamed to src/OSharp.Authorization.Functions/FunctionRequirement.cs

File renamed without changes.

‎src/OSharp.Authorization.Functions/OSharp.Authorization.Functions.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
</PropertyGroup>
1313

1414
<ItemGroup>
15-
<PackageReference Include="Microsoft.AspNetCore.Authorization" Version="3.1.1" />
15+
<PackageReference Include="Microsoft.AspNetCore.Authorization" Version="3.1.2" />
1616
</ItemGroup>
1717

1818
<ItemGroup>

‎src/OSharp.AutoMapper/OSharp.AutoMapper.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
<ItemGroup>
2020
<PackageReference Include="AutoMapper" Version="9.0.0" />
21-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.1" />
21+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.2" />
2222
</ItemGroup>
2323

2424
<ItemGroup>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
</PropertyGroup>
1818

1919
<ItemGroup>
20-
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="3.1.1.2" />
20+
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="3.1.2" />
2121
</ItemGroup>
2222

2323
<ItemGroup>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
</PropertyGroup>
1818

1919
<ItemGroup>
20-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.1" />
20+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.2" />
2121
</ItemGroup>
2222

2323
<ItemGroup>

0 commit comments

Comments
 (0)