Upgrade to ABP 7.4.0 & GraphQL 7.6.1

EasyAbp · Oct 19, 2023 · ec8a626 · ec8a626
1 parent b05569e
commit ec8a626
Show file tree

Hide file tree

Showing 12 changed files with 26 additions and 26 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,9 +1,9 @@
 <Project>
   <PropertyGroup>
 
-    <AbpVersion>7.3.0</AbpVersion>
-    <GraphQLDotnetVersion>7.5.0</GraphQLDotnetVersion>
-    <GraphQLDotnetServerUiVersion>7.5.0</GraphQLDotnetServerUiVersion>
+    <AbpVersion>7.4.0</AbpVersion>
+    <GraphQLDotnetVersion>7.6.1</GraphQLDotnetVersion>
+    <GraphQLDotnetServerUiVersion>7.6.0</GraphQLDotnetServerUiVersion>
 
   </PropertyGroup>
 </Project>
diff --git a/common.props b/common.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <LangVersion>latest</LangVersion>
-    <Version>1.4.0</Version>
+    <Version>1.5.0</Version>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <AbpProjectType>module</AbpProjectType>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>

diff --git a/host/EasyAbp.Abp.GraphQL.HttpApi.Host/EasyAbp.Abp.GraphQL.HttpApi.Host.csproj b/host/EasyAbp.Abp.GraphQL.HttpApi.Host/EasyAbp.Abp.GraphQL.HttpApi.Host.csproj
@@ -10,12 +10,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Serilog.AspNetCore" Version="5.0.0" />
+    <PackageReference Include="Serilog.AspNetCore" Version="7.0.0" />
     <PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
-    <PackageReference Include="IdentityModel" Version="6.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="7.0.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.0" />
+    <PackageReference Include="IdentityModel" Version="6.2.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.10" />
+    <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="7.0.10" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.10" />
     <PackageReference Include="Volo.Abp.Autofac" Version="$(AbpVersion)" />
     <PackageReference Include="Volo.Abp.Caching.StackExchangeRedis" Version="$(AbpVersion)" />
     <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy" Version="$(AbpVersion)" />

diff --git a/host/EasyAbp.Abp.GraphQL.HttpApi.Host/package.json b/host/EasyAbp.Abp.GraphQL.HttpApi.Host/package.json
@@ -3,6 +3,6 @@
   "name": "my-app",
   "private": true,
   "dependencies": {
-    "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~2.3.0"
+    "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~2.4.1"
   }
 }
diff --git a/host/EasyAbp.Abp.GraphQL.HttpApi.Host/yarn.lock b/host/EasyAbp.Abp.GraphQL.HttpApi.Host/yarn.lock
@@ -2,10 +2,10 @@
 # yarn lockfile v1
 
 
-"@abp/aspnetcore.mvc.ui.theme.leptonxlite@~2.3.0":
-  version "2.3.0"
-  resolved "https://registry.npmmirror.com/@abp/aspnetcore.mvc.ui.theme.leptonxlite/-/aspnetcore.mvc.ui.theme.leptonxlite-2.3.0.tgz#7e05ce2a897de0f0bb016e0ae4a9adfd0260e7be"
-  integrity sha512-d7p8Pv6g8aocjBIBKHMF8fFDeVzWqkriz6uKy3oowCKSe5tqzq3j35Um7kEu7DapPf9MyBPq8+z9VsGbxJCjww==
+"@abp/aspnetcore.mvc.ui.theme.leptonxlite@~2.4.1":
+  version "2.4.1"
+  resolved "https://registry.npmmirror.com/@abp/aspnetcore.mvc.ui.theme.leptonxlite/-/aspnetcore.mvc.ui.theme.leptonxlite-2.4.1.tgz#414d28d6347aecc7a0246ada8dfa2f447781613c"
+  integrity sha512-qbWEVchynWGGvGbXP/M6KGJHy0ip3DlIIvkBpaCld6n1aisizJ9lz8yatMb/BKVwejPqOROtOOCYRJiz4oI0WA==
   dependencies:
     "@abp/aspnetcore.mvc.ui.theme.shared" "~7.2.1"
 

diff --git a/host/EasyAbp.Abp.GraphQL.IdentityServer/EasyAbp.Abp.GraphQL.IdentityServer.csproj b/host/EasyAbp.Abp.GraphQL.IdentityServer/EasyAbp.Abp.GraphQL.IdentityServer.csproj
@@ -10,10 +10,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Serilog.AspNetCore" Version="5.0.0" />
+    <PackageReference Include="Serilog.AspNetCore" Version="7.0.0" />
     <PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
-    <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="7.0.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.0">
+    <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="7.0.10" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.10">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>

diff --git a/host/EasyAbp.Abp.GraphQL.IdentityServer/package.json b/host/EasyAbp.Abp.GraphQL.IdentityServer/package.json
@@ -3,6 +3,6 @@
   "name": "my-app-identityserver",
   "private": true,
   "dependencies": {
-    "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~2.3.0"
+    "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~2.4.1"
   }
 }
diff --git a/host/EasyAbp.Abp.GraphQL.IdentityServer/yarn.lock b/host/EasyAbp.Abp.GraphQL.IdentityServer/yarn.lock
@@ -2,10 +2,10 @@
 # yarn lockfile v1
 
 
-"@abp/aspnetcore.mvc.ui.theme.leptonxlite@~2.3.0":
-  version "2.3.0"
-  resolved "https://registry.npmmirror.com/@abp/aspnetcore.mvc.ui.theme.leptonxlite/-/aspnetcore.mvc.ui.theme.leptonxlite-2.3.0.tgz#7e05ce2a897de0f0bb016e0ae4a9adfd0260e7be"
-  integrity sha512-d7p8Pv6g8aocjBIBKHMF8fFDeVzWqkriz6uKy3oowCKSe5tqzq3j35Um7kEu7DapPf9MyBPq8+z9VsGbxJCjww==
+"@abp/aspnetcore.mvc.ui.theme.leptonxlite@~2.4.1":
+  version "2.4.1"
+  resolved "https://registry.npmmirror.com/@abp/aspnetcore.mvc.ui.theme.leptonxlite/-/aspnetcore.mvc.ui.theme.leptonxlite-2.4.1.tgz#414d28d6347aecc7a0246ada8dfa2f447781613c"
+  integrity sha512-qbWEVchynWGGvGbXP/M6KGJHy0ip3DlIIvkBpaCld6n1aisizJ9lz8yatMb/BKVwejPqOROtOOCYRJiz4oI0WA==
   dependencies:
     "@abp/aspnetcore.mvc.ui.theme.shared" "~7.2.1"
 

diff --git a/...asyAbp.Abp.GraphQL.Application.Contracts/EasyAbp.Abp.GraphQL.Application.Contracts.csproj b/...asyAbp.Abp.GraphQL.Application.Contracts/EasyAbp.Abp.GraphQL.Application.Contracts.csproj
@@ -3,7 +3,7 @@
   <Import Project="..\..\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFrameworks>netstandard2.0;netstandard2.1;net7.0</TargetFrameworks>
     <RootNamespace />
   </PropertyGroup>
 

diff --git a/src/EasyAbp.Abp.GraphQL.HttpApi.Client/EasyAbp.Abp.GraphQL.HttpApi.Client.csproj b/src/EasyAbp.Abp.GraphQL.HttpApi.Client/EasyAbp.Abp.GraphQL.HttpApi.Client.csproj
@@ -3,7 +3,7 @@
   <Import Project="..\..\common.props" />
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFrameworks>netstandard2.0;netstandard2.1;net7.0</TargetFrameworks>
     <RootNamespace />
   </PropertyGroup>
 

diff --git a/src/EasyAbp.Abp.GraphQL.Provider.Shared/EasyAbp.Abp.GraphQL.Provider.Shared.csproj b/src/EasyAbp.Abp.GraphQL.Provider.Shared/EasyAbp.Abp.GraphQL.Provider.Shared.csproj
@@ -3,7 +3,7 @@
     <Import Project="..\..\common.props" />
 
     <PropertyGroup>
-        <TargetFramework>netstandard2.0</TargetFramework>
+        <TargetFrameworks>netstandard2.0;netstandard2.1;net7.0</TargetFrameworks>
         <RootNamespace />
     </PropertyGroup>
 

diff --git a/test/EasyAbp.Abp.GraphQL.TestBase/EasyAbp.Abp.GraphQL.TestBase.csproj b/test/EasyAbp.Abp.GraphQL.TestBase/EasyAbp.Abp.GraphQL.TestBase.csproj
@@ -8,7 +8,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
     <PackageReference Include="NSubstitute" Version="4.3.0" />
-    <PackageReference Include="Shouldly" Version="4.0.3" />
+    <PackageReference Include="Shouldly" Version="4.1.0" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.extensibility.execution" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" />