diff --git a/build/OSharpNS.nuspec b/build/OSharpNS.nuspec index 99b97f680..a3a3bf04c 100644 --- a/build/OSharpNS.nuspec +++ b/build/OSharpNS.nuspec @@ -2,8 +2,8 @@ OSharpNS - 3.1.1 - OSharpFramework(.NETCoreApp3.0) + 3.1.2-preview2.27 + OSharpFramework(.NETCoreApp3.1) 柳柳软件(66soft.net) 柳柳软件(66soft.net) false @@ -11,24 +11,15 @@ https://github.com/i66soft/osharp https://en.gravatar.com/userimage/140788132/0ff3b1e68fa0154337b1528c4276e276.png?size=80 OSharp Framework with .NETCoreApp3.0,此Package包含了OSharpNS的所有常用组件 - Copyright @ 66SOFT 2014-2019 + Copyright @ 66SOFT 2014-2020 osharp osharpns - - - - - - - - - - - - - - + + + + + diff --git a/build/build-pack.bat b/build/build-pack.bat index 7e66d45ee..e69adb51a 100644 --- a/build/build-pack.bat +++ b/build/build-pack.bat @@ -1,5 +1,5 @@ del /f /s /q nupkgs\*.* -rd /s /q nupkgs + dotnet build ../osharp.sln -c Release 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 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 + start "" nupkgs exit \ No newline at end of file diff --git a/build/nuget.exe b/build/nuget.exe new file mode 100644 index 000000000..f74bfff7f Binary files /dev/null and b/build/nuget.exe differ diff --git a/samples/web/Liuliu.Demo.Web/Liuliu.Demo.Web.csproj b/samples/web/Liuliu.Demo.Web/Liuliu.Demo.Web.csproj index 46ac580a9..9d510fc94 100644 --- a/samples/web/Liuliu.Demo.Web/Liuliu.Demo.Web.csproj +++ b/samples/web/Liuliu.Demo.Web/Liuliu.Demo.Web.csproj @@ -33,7 +33,7 @@ - + diff --git a/src/OSharp.AspNetCore/OSharp.AspNetCore.csproj b/src/OSharp.AspNetCore/OSharp.AspNetCore.csproj index 666c01ad1..d3f79d315 100644 --- a/src/OSharp.AspNetCore/OSharp.AspNetCore.csproj +++ b/src/OSharp.AspNetCore/OSharp.AspNetCore.csproj @@ -18,9 +18,9 @@ - - - + + + diff --git a/src/OSharp/Authorization/FunctionRequirement.cs b/src/OSharp.Authorization.Functions/FunctionRequirement.cs similarity index 100% rename from src/OSharp/Authorization/FunctionRequirement.cs rename to src/OSharp.Authorization.Functions/FunctionRequirement.cs diff --git a/src/OSharp.Authorization.Functions/OSharp.Authorization.Functions.csproj b/src/OSharp.Authorization.Functions/OSharp.Authorization.Functions.csproj index 02b87702a..038e6df2a 100644 --- a/src/OSharp.Authorization.Functions/OSharp.Authorization.Functions.csproj +++ b/src/OSharp.Authorization.Functions/OSharp.Authorization.Functions.csproj @@ -12,7 +12,7 @@ - + diff --git a/src/OSharp.AutoMapper/OSharp.AutoMapper.csproj b/src/OSharp.AutoMapper/OSharp.AutoMapper.csproj index a5a5d4741..67e95f3df 100644 --- a/src/OSharp.AutoMapper/OSharp.AutoMapper.csproj +++ b/src/OSharp.AutoMapper/OSharp.AutoMapper.csproj @@ -18,7 +18,7 @@ - + diff --git a/src/OSharp.EntityFrameworkCore.PostgreSql/OSharp.EntityFrameworkCore.PostgreSql.csproj b/src/OSharp.EntityFrameworkCore.PostgreSql/OSharp.EntityFrameworkCore.PostgreSql.csproj index db2383a47..5b9e8be0b 100644 --- a/src/OSharp.EntityFrameworkCore.PostgreSql/OSharp.EntityFrameworkCore.PostgreSql.csproj +++ b/src/OSharp.EntityFrameworkCore.PostgreSql/OSharp.EntityFrameworkCore.PostgreSql.csproj @@ -17,7 +17,7 @@ - + diff --git a/src/OSharp.EntityFrameworkCore.SqlServer/OSharp.EntityFrameworkCore.SqlServer.csproj b/src/OSharp.EntityFrameworkCore.SqlServer/OSharp.EntityFrameworkCore.SqlServer.csproj index 102348269..aa6960f6a 100644 --- a/src/OSharp.EntityFrameworkCore.SqlServer/OSharp.EntityFrameworkCore.SqlServer.csproj +++ b/src/OSharp.EntityFrameworkCore.SqlServer/OSharp.EntityFrameworkCore.SqlServer.csproj @@ -17,7 +17,7 @@ - + diff --git a/src/OSharp.EntityFrameworkCore.Sqlite/OSharp.EntityFrameworkCore.Sqlite.csproj b/src/OSharp.EntityFrameworkCore.Sqlite/OSharp.EntityFrameworkCore.Sqlite.csproj index 713828e01..ca728e387 100644 --- a/src/OSharp.EntityFrameworkCore.Sqlite/OSharp.EntityFrameworkCore.Sqlite.csproj +++ b/src/OSharp.EntityFrameworkCore.Sqlite/OSharp.EntityFrameworkCore.Sqlite.csproj @@ -17,7 +17,7 @@ - + diff --git a/src/OSharp.EntityFrameworkCore/OSharp.EntityFrameworkCore.csproj b/src/OSharp.EntityFrameworkCore/OSharp.EntityFrameworkCore.csproj index 7cfdfd0cb..07e686cad 100644 --- a/src/OSharp.EntityFrameworkCore/OSharp.EntityFrameworkCore.csproj +++ b/src/OSharp.EntityFrameworkCore/OSharp.EntityFrameworkCore.csproj @@ -18,10 +18,13 @@ - - - - + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + diff --git a/src/OSharp.Identity/OSharp.Identity.csproj b/src/OSharp.Identity/OSharp.Identity.csproj index 0521fc929..c45c58fcf 100644 --- a/src/OSharp.Identity/OSharp.Identity.csproj +++ b/src/OSharp.Identity/OSharp.Identity.csproj @@ -18,8 +18,8 @@ - - + + diff --git a/src/OSharp.Redis/OSharp.Redis.csproj b/src/OSharp.Redis/OSharp.Redis.csproj index a1f0a5b6f..8b14d9daf 100644 --- a/src/OSharp.Redis/OSharp.Redis.csproj +++ b/src/OSharp.Redis/OSharp.Redis.csproj @@ -16,7 +16,7 @@ - + diff --git a/src/OSharp.Wpf/OSharp.Wpf.csproj b/src/OSharp.Wpf/OSharp.Wpf.csproj index c03686a9e..a3dd19fc8 100644 --- a/src/OSharp.Wpf/OSharp.Wpf.csproj +++ b/src/OSharp.Wpf/OSharp.Wpf.csproj @@ -16,10 +16,10 @@ - - + + - + diff --git a/src/OSharp/OSharp.csproj b/src/OSharp/OSharp.csproj index 65aac8bc7..0fdf46910 100644 --- a/src/OSharp/OSharp.csproj +++ b/src/OSharp/OSharp.csproj @@ -24,7 +24,6 @@ - @@ -34,15 +33,15 @@ - - - - - - - - - + + + + + + + + + diff --git a/tests/Liuliu.Demo.Core.Tests/Liuliu.Demo.Core.Tests.csproj b/tests/Liuliu.Demo.Core.Tests/Liuliu.Demo.Core.Tests.csproj index 425b75596..08a337a79 100644 --- a/tests/Liuliu.Demo.Core.Tests/Liuliu.Demo.Core.Tests.csproj +++ b/tests/Liuliu.Demo.Core.Tests/Liuliu.Demo.Core.Tests.csproj @@ -7,10 +7,10 @@ - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/tests/OSharp.AspNetCore.Tests/OSharp.AspNetCore.Tests.csproj b/tests/OSharp.AspNetCore.Tests/OSharp.AspNetCore.Tests.csproj index c205712bf..c1aab0f5f 100644 --- a/tests/OSharp.AspNetCore.Tests/OSharp.AspNetCore.Tests.csproj +++ b/tests/OSharp.AspNetCore.Tests/OSharp.AspNetCore.Tests.csproj @@ -7,11 +7,11 @@ - - - + + + - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/tests/OSharp.Tests/OSharp.Tests.csproj b/tests/OSharp.Tests/OSharp.Tests.csproj index 49a147045..51742fbfd 100644 --- a/tests/OSharp.Tests/OSharp.Tests.csproj +++ b/tests/OSharp.Tests/OSharp.Tests.csproj @@ -6,10 +6,10 @@ - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/tests/OSharp.UnitTest.Infrastructure/OSharp.UnitTest.Infrastructure.csproj b/tests/OSharp.UnitTest.Infrastructure/OSharp.UnitTest.Infrastructure.csproj index 03b77778f..ae4e81a8e 100644 --- a/tests/OSharp.UnitTest.Infrastructure/OSharp.UnitTest.Infrastructure.csproj +++ b/tests/OSharp.UnitTest.Infrastructure/OSharp.UnitTest.Infrastructure.csproj @@ -6,10 +6,10 @@ - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive @@ -17,7 +17,7 @@ - +