Dev/develop

.github/workflows/ci.yml

@@ -15,22 +15,18 @@ jobs:
         uses: actions/checkout@v2
         with:
           fetch-depth: 0
-      - name: Setup dotnet6.0
-        uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: 6.0.x
-      - name: Setup dotnet7.0
-        uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: 7.0.x
       - name: Setup dotnet8.0
         uses: actions/setup-dotnet@v1
         with:
           dotnet-version: 8.0.x
       - name: Setup dotnet9.0
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: 9.0.x
+          dotnet-version: 9.0.x          
+      - name: Setup dotnet10.0
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: 10.0.x
       - name: Linux Build
         run: |
           dotnet build ./src/OSharp.Utils/OSharp.Utils.csproj
@@ -60,22 +56,18 @@ jobs:
     runs-on: windows-latest
     steps:
       - uses: actions/checkout@v2
-      - name: Setup dotnet6.0
-        uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: 6.0.x
-      - name: Setup dotnet7.0
-        uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: 7.0.x
       - name: Setup dotnet8.0
         uses: actions/setup-dotnet@v1
         with:
           dotnet-version: 8.0.x
       - name: Setup dotnet9.0
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: 9.0.x
+          dotnet-version: 9.0.x          
+      - name: Setup dotnet10.0
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: 10.0.x
       - name: Windows Build
         run: |
           dotnet build ./src/OSharp.Wpf/OSharp.Wpf.csproj

.github/workflows/nuget.yml

@@ -15,14 +15,6 @@ jobs:
     runs-on: windows-latest
     steps:
       - uses: actions/checkout@v2
-      - name: Setup dotnet6.0
-        uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: 6.0.x
-      - name: Setup dotnet7.0
-        uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: 7.0.x
       - name: Setup dotnet8.0
         uses: actions/setup-dotnet@v1
         with:
@@ -31,6 +23,10 @@ jobs:
         uses: actions/setup-dotnet@v1
         with:
           dotnet-version: 9.0.x
+      - name: Setup dotnet10.0
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: 10.0.x
       - name: Restore
         run: dotnet restore
       - name: Build and Pack

build/OSharpNS.nuspec

@@ -1,37 +1,29 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
+
 <package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
-  <metadata>
-    <id>OSharpNS</id>
-    <version>9.0.0-preview.304</version>
-    <title>OSharpFramework(.NET6.0/.NETCoreApp3.1)</title>
-    <authors>柳柳软件(66soft.net)</authors>
-    <owners>LiuliuSoft nnc</owners>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <license type="expression">Apache-2.0</license>
-    <icon>icon.png</icon>
-    <projectUrl>https://github.com/dotnetcore/osharp</projectUrl>
-    <description>OSharp Framework with .NET，此Package包含了OSharp的所有常用组件</description>
-    <releaseNotes>https://github.com/dotnetcore/osharp/releases</releaseNotes>
-    <copyright>Copyright (c) 2014-2022 LIULIUSOFT. All rights reserved.</copyright>
-    <tags>osharp</tags>
-    <dependencies>
-      <group targetFramework=".NETCoreApp3.1">
-        <dependency id="OSharp.Core" version="9.0.0-preview.304" />
-        <dependency id="OSharp.EntityFrameworkCore" version="9.0.0-preview.304" />
-        <dependency id="OSharp.AutoMapper" version="9.0.0-preview.304" />
-        <dependency id="OSharp.AspNetCore" version="9.0.0-preview.304" />
-        <dependency id="OSharp.Log4Net" version="9.0.0-preview.304" />
-      </group>
-      <group targetFramework="net6.0">
-        <dependency id="OSharp.Core" version="9.0.0-preview.304" />
-        <dependency id="OSharp.EntityFrameworkCore" version="9.0.0-preview.304" />
-        <dependency id="OSharp.AutoMapper" version="9.0.0-preview.304" />
-        <dependency id="OSharp.AspNetCore" version="9.0.0-preview.304" />
-        <dependency id="OSharp.Log4Net" version="9.0.0-preview.304" />
-      </group>
-    </dependencies>
-  </metadata>
-  <files>
-    <file src="icon.png" target="icon.png" />
-  </files>
-</package>
+    <metadata>
+        <id>OSharpNS</id>
+        <version>10.0.0</version>
+        <title>OSharpFramework</title>
+        <authors>柳柳软件(66soft.net)</authors>
+        <owners>LiuliuSoft nnc</owners>
+        <requireLicenseAcceptance>false</requireLicenseAcceptance>
+        <license type="expression">Apache-2.0</license>
+        <icon>icon.png</icon>
+        <projectUrl>https://github.com/dotnetcore/osharp</projectUrl>
+        <description>OSharp Framework with .NET，此Package包含了OSharp的所有常用组件</description>
+        <releaseNotes>https://github.com/dotnetcore/osharp/releases</releaseNotes>
+        <copyright>Copyright (c) 2014-2026 LIULIUSOFT. All rights reserved.</copyright>
+        <tags>osharp</tags>
+        <dependencies>
+            <dependency id="OSharp.Core" version="10.0.0" />
+            <dependency id="OSharp.EntityFrameworkCore" version="10.0.0" />
+            <dependency id="OSharp.AutoMapper" version="10.0.0" />
+            <dependency id="OSharp.AspNetCore" version="10.0.0" />
+            <dependency id="OSharp.Log4Net" version="10.0.0" />
+        </dependencies>
+    </metadata>
+    <files>
+        <file src="icon.png" target="icon.png" />
+    </files>
+</package>

build/nuget-push.ps1

@@ -19,7 +19,7 @@ function GetVersion()
 $server = "https://www.nuget.org"
 $readkey = Read-Host "默认服务器为nuget.org，确认按回车键`n如要切换为nuget.66soft.net，按 1`n如要切换为ncc.myget.org，按 2`n如要切换为osharp.myget.org，按3"
 if ($readkey -eq 1) {
-    $server = "http://nuget.66soft.net/nuget"
+    $server = "https://nuget.66soft.net/nuget"
 }
 elseif ($readkey -eq 2) {
     $server = "https://www.myget.org/F/ncc/api/v2/package"

build/version.props

@@ -1,12 +1,12 @@
 <Project>
   <PropertyGroup>
-    <VersionMain>9.0</VersionMain>
+    <VersionMain>10.0</VersionMain>
     <VersionPrefix>0</VersionPrefix>
     <VersionSuffix>-preview.</VersionSuffix>
-    <VersionSuffixVersion>907</VersionSuffixVersion>
-    <Version>$(VersionMain).$(VersionPrefix)$(VersionSuffix)$(VersionSuffixVersion)</Version>
-    <FileVersion>$(VersionMain).$(VersionPrefix).$(VersionSuffixVersion)</FileVersion>
-    <!--<Version>$(VersionMain).$(VersionPrefix)</Version>
-    <FileVersion>$(VersionMain).$(VersionPrefix)</FileVersion>-->
+    <VersionSuffixVersion>117</VersionSuffixVersion>
+    <!--<Version>$(VersionMain).$(VersionPrefix)$(VersionSuffix)$(VersionSuffixVersion)</Version>
+    <FileVersion>$(VersionMain).$(VersionPrefix).$(VersionSuffixVersion)</FileVersion>-->
+    <Version>$(VersionMain).$(VersionPrefix)</Version>
+    <FileVersion>$(VersionMain).$(VersionPrefix)</FileVersion>
   </PropertyGroup>
 </Project>

global.json

@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "9.0.100",
+    "version": "10.0.100",
     "rollForward": "latestFeature",
     "allowPrerelease": false
   }

samples/web/Liuliu.Demo.Core/Liuliu.Demo.Core.csproj

@@ -4,7 +4,7 @@
   <Import Project="../../../build/version.props" />
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
     <RootNamespace>Liuliu.Demo</RootNamespace>
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
   </PropertyGroup>

samples/web/Liuliu.Demo.EntityConfiguration/Liuliu.Demo.EntityConfiguration.csproj

@@ -4,7 +4,7 @@
   <Import Project="../../../build/version.props" />
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
   </PropertyGroup>
 

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

@@ -16,22 +16,6 @@
   <ItemGroup>
     <PackageReference Include="AspectCore.Extensions.Hosting" Version="2.*" />
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
-    <PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="6.*" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.*">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.*" />
-  </ItemGroup>
-  <ItemGroup Condition="'$(TargetFramework)'=='net7.0'">
-    <PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="7.*" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.*">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="7.*" />
-  </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
     <PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="8.*" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.*">
@@ -48,6 +32,14 @@
     </PackageReference>
     <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="9.*" />
   </ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)'=='net10.0'">
+    <PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="10.*" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="10.*">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="10.*" />
+  </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\..\..\src\OSharp.AspNetCore\OSharp.AspNetCore.csproj" />

src/OSharp.AspNetCore/OSharp.AspNetCore.csproj

@@ -4,7 +4,7 @@
   <Import Project="../../build/version.props" />
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
     <PackageId>OSharp.AspNetCore</PackageId>
     <Summary>OSharp AspNetCore组件</Summary>
     <Description>OSharp AspNetCore组件，提供AspNetCore的服务端功能的封装</Description>
@@ -15,16 +15,6 @@
   <ItemGroup>
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
-    <PackageReference Include="Microsoft.AspNetCore.Authorization" Version="6.*" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.*" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="6.*" />
-  </ItemGroup>
-  <ItemGroup Condition="'$(TargetFramework)'=='net7.0'">
-    <PackageReference Include="Microsoft.AspNetCore.Authorization" Version="7.*" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.*" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="7.*" />
-  </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
     <PackageReference Include="Microsoft.AspNetCore.Authorization" Version="8.*" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.*" />
@@ -35,6 +25,11 @@
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="9.*" />
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="9.*" />
   </ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)'=='net10.0'">
+    <PackageReference Include="Microsoft.AspNetCore.Authorization" Version="10.*" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="10.*" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="10.*" />
+  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\OSharp\OSharp.csproj" />
   </ItemGroup>

src/OSharp.Authorization.Datas/OSharp.Authorization.Datas.csproj

@@ -4,7 +4,7 @@
   <Import Project="../../build/version.props" />
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
     <PackageId>OSharp.Authorization.Datas</PackageId>
     <Summary>OSharp 数据权限组件</Summary>
     <Description>OSharp 数据权限组件，对应用中数据权限进行授权的设计实现</Description>

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

@@ -4,7 +4,7 @@
   <Import Project="../../build/version.props" />
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
     <PackageId>OSharp.Authorization.Functions</PackageId>
     <Summary>OSharp 功能权限组件</Summary>
     <Description>OSharp 功能权限组件，API功能权限授权的设计实现</Description>

src/OSharp.AutoMapper/OSharp.AutoMapper.csproj

@@ -4,7 +4,7 @@
   <Import Project="../../build/version.props" />
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
     <PackageId>OSharp.AutoMapper</PackageId>
     <Summary>OSharp AutoMapper 对象映射组件</Summary>
     <Description>OSharp AutoMapper 对象映射组件，封装基于AutoMapper的对象映射实现</Description>

src/OSharp.EntityFrameworkCore.MySql/OSharp.EntityFrameworkCore.MySql.csproj

@@ -4,28 +4,21 @@
   <Import Project="../../build/version.props" />
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
     <PackageId>OSharp.EntityFrameworkCore.MySql</PackageId>
     <Description>OSharp 数据访问组件，封装EntityFrameworkCore的MySql数据访问功能的实现</Description>
     <Summary>OSharp 数据访问组件MySql</Summary>
     <RootNamespace>OSharp.Entity.MySql</RootNamespace>
   </PropertyGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
-    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="6.*" />
-  </ItemGroup>
-  <ItemGroup Condition="'$(TargetFramework)'=='net7.0'">
-    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="7.*" />
-  </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
     <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="8.*" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)'=='net9.0'">
-    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="9.0.0-preview.3.efcore.9.0.0" />
+    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="9.*" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="9.*" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.*" />
   </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\OSharp.EntityFrameworkCore\OSharp.EntityFrameworkCore.csproj" />
   </ItemGroup>

src/OSharp.EntityFrameworkCore.Oracle/OSharp.EntityFrameworkCore.Oracle.csproj

@@ -4,19 +4,13 @@
   <Import Project="../../build/version.props" />
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
     <PackageId>OSharp.EntityFrameworkCore.Oracle</PackageId>
     <Description>OSharp 数据访问组件，封装EntityFrameworkCore的Oracle数据访问功能的实现</Description>
     <Summary>OSharp 数据访问组件Oracle</Summary>
     <RootNamespace>OSharp.Entity.Oracle</RootNamespace>
   </PropertyGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
-    <PackageReference Include="Oracle.EntityFrameworkCore" Version="6.*" />
-  </ItemGroup>
-  <ItemGroup Condition="'$(TargetFramework)'=='net7.0'">
-    <PackageReference Include="Oracle.EntityFrameworkCore" Version="7.*" />
-  </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
     <PackageReference Include="Oracle.EntityFrameworkCore" Version="8.*" />
   </ItemGroup>
@@ -25,6 +19,11 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="9.*" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.*" />
   </ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)'=='net10.0'">
+    <PackageReference Include="Oracle.EntityFrameworkCore" Version="10.*" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="10.*" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.*" />
+  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\OSharp.EntityFrameworkCore\OSharp.EntityFrameworkCore.csproj" />
   </ItemGroup>

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

@@ -4,25 +4,22 @@
   <Import Project="../../build/version.props" />
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
     <PackageId>OSharp.EntityFrameworkCore.PostgreSql</PackageId>
     <Description>OSharp 数据访问组件，封装EntityFrameworkCore的PostgreSql数据访问功能的实现</Description>
     <Summary>OSharp 数据访问组件PostgreSql</Summary>
     <RootNamespace>OSharp.Entity.PostgreSql</RootNamespace>
   </PropertyGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
-    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.*" />
-  </ItemGroup>
-  <ItemGroup Condition="'$(TargetFramework)'=='net7.0'">
-    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="7.*" />
-  </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
     <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.*" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)'=='net9.0'">
     <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.*" />
   </ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)'=='net10.0'">
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="10.*" />
+  </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\OSharp.EntityFrameworkCore\OSharp.EntityFrameworkCore.csproj" />