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

+8-17
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

+3-1
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

+1-1
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

+3-3
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

+1-1
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

+1-1
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

+1-1
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

+1-1
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>

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
</PropertyGroup>
1818

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

2323
<ItemGroup>

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

+7-4
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,13 @@
1818

1919
<ItemGroup>
2020
<PackageReference Include="Dapper" Version="2.0.30" />
21-
<PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="3.1.1" />
22-
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="3.1.1" />
23-
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.1.1" />
24-
<PackageReference Include="Z.EntityFramework.Plus.EFCore" Version="3.0.33" />
21+
<PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="3.1.2" />
22+
<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>
27+
<PackageReference Include="Z.EntityFramework.Plus.EFCore" Version="3.0.40" />
2528
</ItemGroup>
2629

2730
<ItemGroup>

‎src/OSharp.Identity/OSharp.Identity.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818

1919
<ItemGroup>
2020
<PackageReference Include="Authentication.GitHub.Core" Version="1.0.0" />
21-
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.1.1" />
22-
<PackageReference Include="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="3.1.0" />
21+
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.1.2" />
22+
<PackageReference Include="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="3.1.2" />
2323
</ItemGroup>
2424

2525
<ItemGroup>

‎src/OSharp.Redis/OSharp.Redis.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
</PropertyGroup>
1717

1818
<ItemGroup Condition="'$(TargetFramework)'=='netstandard2.1'">
19-
<PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="3.1.1" />
19+
<PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="3.1.2" />
2020
</ItemGroup>
2121

2222
<ItemGroup>

‎src/OSharp.Wpf/OSharp.Wpf.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616
</PropertyGroup>
1717

1818
<ItemGroup>
19-
<PackageReference Include="FluentValidation" Version="8.6.0" />
20-
<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="3.1.1" />
19+
<PackageReference Include="FluentValidation" Version="8.6.1" />
20+
<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="3.1.2" />
2121
<PackageReference Include="Microsoft.Win32.Registry" Version="4.7.0" />
22-
<PackageReference Include="Stylet" Version="1.3.0" />
22+
<PackageReference Include="Stylet" Version="1.3.1" />
2323
</ItemGroup>
2424

2525
<ItemGroup>

‎src/OSharp/OSharp.csproj

+9-10
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424

2525
<ItemGroup>
2626
<PackageReference Include="JetBrains.Annotations" Version="2019.1.3" />
27-
<PackageReference Include="Microsoft.AspNetCore.Authorization" Version="3.1.1" />
2827
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
2928
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
3029
<PackageReference Include="System.ComponentModel" Version=" 4.3.0" />
@@ -34,15 +33,15 @@
3433
<PackageReference Include="System.Reflection.Emit.Lightweight" Version="4.7.0" />
3534
<PackageReference Include="System.Security.Cryptography.Algorithms" Version="4.3.1" />
3635
<PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="5.2.7" />
37-
<PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="3.1.1" />
38-
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="3.1.1" />
39-
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="3.1.1" />
40-
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="3.1.1" />
41-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.1" />
42-
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="3.1.1" />
43-
<PackageReference Include="Microsoft.Extensions.Http" Version="3.1.1" />
44-
<PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.1" />
45-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.1" />
36+
<PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="3.1.2" />
37+
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="3.1.2" />
38+
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="3.1.2" />
39+
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="3.1.2" />
40+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.2" />
41+
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="3.1.2" />
42+
<PackageReference Include="Microsoft.Extensions.Http" Version="3.1.2" />
43+
<PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.2" />
44+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.2" />
4645
</ItemGroup>
4746

4847
<ItemGroup>

‎tests/Liuliu.Demo.Core.Tests/Liuliu.Demo.Core.Tests.csproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
11-
<PackageReference Include="MSTest.TestAdapter" Version="2.0.0" />
12-
<PackageReference Include="MSTest.TestFramework" Version="2.0.0" />
13-
<PackageReference Include="coverlet.collector" Version="1.1.0">
10+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
11+
<PackageReference Include="MSTest.TestAdapter" Version="2.1.0" />
12+
<PackageReference Include="MSTest.TestFramework" Version="2.1.0" />
13+
<PackageReference Include="coverlet.collector" Version="1.2.0">
1414
<PrivateAssets>all</PrivateAssets>
1515
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1616
</PackageReference>

‎tests/OSharp.AspNetCore.Tests/OSharp.AspNetCore.Tests.csproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
11-
<PackageReference Include="MSTest.TestAdapter" Version="2.0.0" />
12-
<PackageReference Include="MSTest.TestFramework" Version="2.0.0" />
10+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
11+
<PackageReference Include="MSTest.TestAdapter" Version="2.1.0" />
12+
<PackageReference Include="MSTest.TestFramework" Version="2.1.0" />
1313
<PackageReference Include="Shouldly" Version="3.0.2" />
14-
<PackageReference Include="coverlet.collector" Version="1.1.0">
14+
<PackageReference Include="coverlet.collector" Version="1.2.0">
1515
<PrivateAssets>all</PrivateAssets>
1616
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1717
</PackageReference>

‎tests/OSharp.Tests/OSharp.Tests.csproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
10-
<PackageReference Include="MSTest.TestAdapter" Version="2.0.0" />
11-
<PackageReference Include="MSTest.TestFramework" Version="2.0.0" />
12-
<PackageReference Include="coverlet.collector" Version="1.1.0">
9+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
10+
<PackageReference Include="MSTest.TestAdapter" Version="2.1.0" />
11+
<PackageReference Include="MSTest.TestFramework" Version="2.1.0" />
12+
<PackageReference Include="coverlet.collector" Version="1.2.0">
1313
<PrivateAssets>all</PrivateAssets>
1414
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1515
</PackageReference>

‎tests/OSharp.UnitTest.Infrastructure/OSharp.UnitTest.Infrastructure.csproj

+5-5
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,18 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
10-
<PackageReference Include="MSTest.TestAdapter" Version="2.0.0" />
11-
<PackageReference Include="MSTest.TestFramework" Version="2.0.0" />
12-
<PackageReference Include="coverlet.collector" Version="1.1.0">
9+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
10+
<PackageReference Include="MSTest.TestAdapter" Version="2.1.0" />
11+
<PackageReference Include="MSTest.TestFramework" Version="2.1.0" />
12+
<PackageReference Include="coverlet.collector" Version="1.2.0">
1313
<PrivateAssets>all</PrivateAssets>
1414
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1515
</PackageReference>
1616
<PackageReference Include="xunit" Version="2.4.1" />
1717
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
1818
<PackageReference Include="NSubstitute" Version="4.2.1" />
1919
<PackageReference Include="Shouldly" Version="3.0.2" />
20-
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="3.1.0" />
20+
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="3.1.2" />
2121
</ItemGroup>
2222

2323
<ItemGroup>

0 commit comments

Comments
 (0)