sdk: 更新.net sdk到6.0.22，7.0.11，更新第三方类库，版本更新到7.0.11-preview.1001

dotnetcore · Oct 1, 2023 · 1c88f20 · 1c88f20
1 parent 01356d5
commit 1c88f20
Show file tree

Hide file tree

Showing 16 changed files with 42 additions and 42 deletions.
diff --git a/build/version.props b/build/version.props
@@ -1,9 +1,9 @@
 <Project>
   <PropertyGroup>
     <VersionMain>7.0</VersionMain>
-    <VersionPrefix>10</VersionPrefix>
+    <VersionPrefix>11</VersionPrefix>
     <VersionSuffix>-preview.</VersionSuffix>
-    <VersionSuffixVersion>0911</VersionSuffixVersion>
+    <VersionSuffixVersion>1001</VersionSuffixVersion>
     <Version>$(VersionMain).$(VersionPrefix)$(VersionSuffix)$(VersionSuffixVersion)</Version>
     <FileVersion>$(VersionMain).$(VersionPrefix).$(VersionSuffixVersion)</FileVersion>
     <!--<Version>$(VersionMain).$(VersionPrefix)</Version>

diff --git a/samples/web/Liuliu.Demo.Web/Liuliu.Demo.Web.csproj b/samples/web/Liuliu.Demo.Web/Liuliu.Demo.Web.csproj
@@ -17,8 +17,8 @@
     <PackageReference Include="AspectCore.Extensions.Hosting" Version="2.4.0" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)'=='net6'">
-    <PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="[6.0.21, 7.0.0)" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="[6.0.21, 7.0.0)">
+    <PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="[6.0.22, 7.0.0)" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="[6.0.22, 7.0.0)">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/samples/web/Liuliu.Demo.WebApi/Hangfire/HangfireJobRunner.cs b/samples/web/Liuliu.Demo.WebApi/Hangfire/HangfireJobRunner.cs
@@ -35,8 +35,8 @@ public void Start()
             BackgroundJob.Enqueue<UserManager<User>>(m => m.FindByIdAsync("1"));
             string jobId = BackgroundJob.Schedule<UserManager<User>>(m => m.FindByIdAsync("2"), TimeSpan.FromMinutes(2));
             BackgroundJob.ContinueJobWith<TestHangfireJob>(jobId, m => m.GetUserCount());
-            RecurringJob.AddOrUpdate<TestHangfireJob>(m => m.GetUserCount(), Cron.Minutely, TimeZoneInfo.Local);
-            RecurringJob.AddOrUpdate<TestHangfireJob>(m => m.LockUser2(), Cron.Minutely, TimeZoneInfo.Local);
+            RecurringJob.AddOrUpdate<TestHangfireJob>("TestHangfireJob.GetUserCount", m => m.GetUserCount(), Cron.Minutely);
+            RecurringJob.AddOrUpdate<TestHangfireJob>("TestHangfireJob.LockUser2", m => m.LockUser2(), Cron.Minutely);
         }
     }
 

diff --git a/samples/web/Liuliu.Demo.WebApi/Liuliu.Demo.WebApi.csproj b/samples/web/Liuliu.Demo.WebApi/Liuliu.Demo.WebApi.csproj
@@ -24,17 +24,17 @@
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.5" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
-    <PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="6.0.21" />
+    <PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="6.0.22" />
     <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.16" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.21">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.22">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)'=='net7.0'">
-    <PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="7.0.10" />
-    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="7.0.9" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.10">
+    <PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="7.0.11" />
+    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="7.0.10" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.11">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/samples/wpf/OSharp.CodeGenerator/OSharp.CodeGenerator.csproj b/samples/wpf/OSharp.CodeGenerator/OSharp.CodeGenerator.csproj
@@ -18,7 +18,7 @@
     <PackageReference Include="MahApps.Metro" Version="2.4.10" />
     <PackageReference Include="MahApps.Metro.IconPacks" Version="4.11.0" />
     <PackageReference Include="MahApps.Metro.SimpleChildWindow" Version="2.2.1" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.21">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.22">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/src/OSharp.AspNetCore/OSharp.AspNetCore.csproj b/src/OSharp.AspNetCore/OSharp.AspNetCore.csproj
@@ -16,15 +16,15 @@
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
-    <PackageReference Include="Microsoft.AspNetCore.Authorization" Version="[6.0.21, 7.0.0)" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="[6.0.21, 7.0.0)" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="[6.0.21, 7.0.0)" />
+    <PackageReference Include="Microsoft.AspNetCore.Authorization" Version="[6.0.22, 7.0.0)" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="[6.0.22, 7.0.0)" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="[6.0.22, 7.0.0)" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)'=='net7.0'">
-    <PackageReference Include="Microsoft.AspNetCore.Authorization" Version="[7.0.10, 8.0.0)" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="[7.0.10, 8.0.0)" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="[7.0.10, 8.0.0)" />
+    <PackageReference Include="Microsoft.AspNetCore.Authorization" Version="[7.0.11, 8.0.0)" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="[7.0.11, 8.0.0)" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="[7.0.11, 8.0.0)" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\OSharp\OSharp.csproj" />

diff --git a/src/OSharp.AspNetCore/ServiceExtensions.cs b/src/OSharp.AspNetCore/ServiceExtensions.cs
@@ -18,7 +18,7 @@ public static class ServiceExtensions
     #region IServiceCollection
 
     /// <summary>
-    /// 获取<see cref="IHostingEnvironment"/>环境信息
+    /// 获取<see cref="IWebHostEnvironment"/>环境信息
     /// </summary>
     public static IWebHostEnvironment GetWebHostEnvironment(this IServiceCollection services)
     {

diff --git a/src/OSharp.EntityFrameworkCore.PostgreSql/OSharp.EntityFrameworkCore.PostgreSql.csproj b/src/OSharp.EntityFrameworkCore.PostgreSql/OSharp.EntityFrameworkCore.PostgreSql.csproj
@@ -12,10 +12,10 @@
   </PropertyGroup>
 
   <ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
-    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="[6.0.8, 7.0.0)" />
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="[6.0.22, 7.0.0)" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)'=='net7.0'">
-    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="[7.0.4, 8.0.0)" />
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="[7.0.11, 8.0.0)" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/OSharp.EntityFrameworkCore.SqlServer/OSharp.EntityFrameworkCore.SqlServer.csproj b/src/OSharp.EntityFrameworkCore.SqlServer/OSharp.EntityFrameworkCore.SqlServer.csproj
@@ -12,10 +12,10 @@
   </PropertyGroup>
 
   <ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="[6.0.21, 7.0.0)" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="[6.0.22, 7.0.0)" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)'=='net7.0'">
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="[7.0.10, 8.0.0)" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="[7.0.11, 8.0.0)" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/OSharp.EntityFrameworkCore.Sqlite/OSharp.EntityFrameworkCore.Sqlite.csproj b/src/OSharp.EntityFrameworkCore.Sqlite/OSharp.EntityFrameworkCore.Sqlite.csproj
@@ -12,10 +12,10 @@
   </PropertyGroup>
 
   <ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="[6.0.21, 7.0.0)" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="[6.0.22, 7.0.0)" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)'=='net7.0'">
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="[7.0.10, 8.0.0)" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="[7.0.11, 8.0.0)" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/OSharp.EntityFrameworkCore/OSharp.EntityFrameworkCore.csproj b/src/OSharp.EntityFrameworkCore/OSharp.EntityFrameworkCore.csproj
@@ -16,14 +16,14 @@
     <PackageReference Include="Dapper" Version="2.0.151" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="[6.0.21, 7.0.0)" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="[6.0.21, 7.0.0)" />
-    <PackageReference Include="Z.EntityFramework.Plus.EFCore" Version="[6.22.6, 7.0.0)" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="[6.0.22, 7.0.0)" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="[6.0.22, 7.0.0)" />
+    <PackageReference Include="Z.EntityFramework.Plus.EFCore" Version="[6.100.0.2, 7.0.0)" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)'=='net7.0'">
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="[7.0.10, 8.0.0)" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="[7.0.10, 8.0.0)" />
-    <PackageReference Include="Z.EntityFramework.Plus.EFCore" Version="[7.22.6, 8.0.0)" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="[7.0.11, 8.0.0)" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="[7.0.11, 8.0.0)" />
+    <PackageReference Include="Z.EntityFramework.Plus.EFCore" Version="[7.100.0.2, 8.0.0)" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/OSharp.Hangfire/OSharp.Hangfire.csproj b/src/OSharp.Hangfire/OSharp.Hangfire.csproj
@@ -12,7 +12,7 @@
 
   <ItemGroup>
     <PackageReference Include="Hangfire" Version="1.8.5" />
-    <PackageReference Include="Hangfire.MemoryStorage.Core" Version="1.4.0" />
+    <PackageReference Include="Hangfire.MemoryStorage" Version="1.8.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/OSharp.Hosting.Apis/OSharp.Hosting.Apis.csproj b/src/OSharp.Hosting.Apis/OSharp.Hosting.Apis.csproj
@@ -23,7 +23,7 @@
     <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="[6.0.16, 7.0.0)" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)'=='net7.0'">
-    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="[7.0.9, 8.0.0)" />
+    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="[7.0.10, 8.0.0)" />
   </ItemGroup>
 
 </Project>
diff --git a/src/OSharp.Identity/OSharp.Identity.csproj b/src/OSharp.Identity/OSharp.Identity.csproj
@@ -21,12 +21,12 @@
     <PackageReference Include="Authentication.GitHub.Core" Version="1.0.0" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="[6.0.21, 7.0.0)" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="[6.0.21, 7.0.0)" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="[6.0.22, 7.0.0)" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="[6.0.22, 7.0.0)" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)'=='net7.0'">
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="[7.0.10, 8.0.0)" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="[7.0.10, 8.0.0)" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="[7.0.11, 8.0.0)" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="[7.0.11, 8.0.0)" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/OSharp.Redis/OSharp.Redis.csproj b/src/OSharp.Redis/OSharp.Redis.csproj
@@ -11,10 +11,10 @@
   </PropertyGroup>
 
   <ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
-    <PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="[6.0.21, 7.0.0)" />
+    <PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="[6.0.22, 7.0.0)" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)'=='net7.0'">
-    <PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="[7.0.10, 8.0.0)" />
+    <PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="[7.0.11, 8.0.0)" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/OSharp.Wpf/OSharp.Wpf.csproj b/src/OSharp.Wpf/OSharp.Wpf.csproj
@@ -18,14 +18,14 @@
 
   <ItemGroup>
     <PackageReference Include="FluentValidation" Version="11.7.1" />
-    <PackageReference Include="Stylet" Version="1.3.6" />
+    <PackageReference Include="Stylet" Version="1.3.7" />
     <PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)'=='net6.0-windows'">
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="[6.0.21, 7.0.0)" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="[6.0.22, 7.0.0)" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)'=='net7.0-windows'">
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="[7.0.10, 8.0.0)" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="[7.0.11, 8.0.0)" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\OSharp\OSharp.csproj" />