Merge pull request #108 from aspnetboilerplate/pr/6385

Upgrade Abp packages to v7.1.0
aspnetboilerplate · Feb 14, 2022 · ad38a8d · ad38a8d
2 parents 4e47c5a + f73bb88
commit ad38a8d
Show file tree

Hide file tree

Showing 16 changed files with 119 additions and 149 deletions.
diff --git a/...bpCompanyName.AbpProjectName.Application/AbpCompanyName.AbpProjectName.Application.csproj b/...bpCompanyName.AbpProjectName.Application/AbpCompanyName.AbpProjectName.Application.csproj
@@ -36,13 +36,11 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Abp, Version=7.0.0.0, Culture=neutral, PublicKeyToken=null">
-      <HintPath>..\packages\Abp.7.0.0\lib\netstandard2.0\Abp.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Abp, Version=7.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Abp.7.1.0\lib\netstandard2.0\Abp.dll</HintPath>
     </Reference>
-    <Reference Include="Abp.AutoMapper, Version=7.0.0.0, Culture=neutral, PublicKeyToken=null">
-      <HintPath>..\packages\Abp.AutoMapper.7.0.0\lib\netstandard2.0\Abp.AutoMapper.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Abp.AutoMapper, Version=7.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Abp.AutoMapper.7.1.0\lib\netstandard2.0\Abp.AutoMapper.dll</HintPath>
     </Reference>
     <Reference Include="AutoMapper, Version=10.0.0.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
       <HintPath>..\packages\AutoMapper.10.1.1\lib\net461\AutoMapper.dll</HintPath>

diff --git a/src/AbpCompanyName.AbpProjectName.Application/packages.config b/src/AbpCompanyName.AbpProjectName.Application/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Abp" version="7.0.0" targetFramework="net461" />
-  <package id="Abp.AutoMapper" version="7.0.0" targetFramework="net461" />
+  <package id="Abp" version="7.1.0" targetFramework="net461" />
+  <package id="Abp.AutoMapper" version="7.1.0" targetFramework="net461" />
   <package id="AutoMapper" version="10.1.1" targetFramework="net461" />
   <package id="AutoMapper.Collection" version="7.0.1" targetFramework="net461" />
   <package id="Castle.Core" version="4.4.1" targetFramework="net461" />
@@ -13,13 +13,13 @@
   <package id="JetBrains.Annotations" version="2021.3.0" targetFramework="net461" />
   <package id="Microsoft.Bcl" version="1.1.10" targetFramework="net452" />
   <package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net452" />
-  <package id="Microsoft.Extensions.Caching.Memory" version="6.0.0" targetFramework="net461" />
-  <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="6.0.0" targetFramework="net461" />
-  <package id="Microsoft.Extensions.Options" version="6.0.0" targetFramework="net461" />
   <package id="Microsoft.Bcl.AsyncInterfaces" version="6.0.0" targetFramework="net461" />
   <package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net452" />
   <package id="Microsoft.Extensions.Caching.Abstractions" version="6.0.0" targetFramework="net461" />
+  <package id="Microsoft.Extensions.Caching.Memory" version="6.0.0" targetFramework="net461" />
+  <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="6.0.0" targetFramework="net461" />
   <package id="Microsoft.Extensions.Logging.Abstractions" version="6.0.0" targetFramework="net461" />
+  <package id="Microsoft.Extensions.Options" version="6.0.0" targetFramework="net461" />
   <package id="Microsoft.Extensions.Primitives" version="6.0.0" targetFramework="net461" />
   <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net461" />
   <package id="Nito.AsyncEx" version="5.1.2" targetFramework="net461" />

diff --git a/src/AbpCompanyName.AbpProjectName.Core/AbpCompanyName.AbpProjectName.Core.csproj b/src/AbpCompanyName.AbpProjectName.Core/AbpCompanyName.AbpProjectName.Core.csproj
@@ -36,9 +36,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Abp, Version=7.0.0.0, Culture=neutral, PublicKeyToken=null">
-      <HintPath>..\packages\Abp.7.0.0\lib\netstandard2.0\Abp.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Abp, Version=7.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Abp.7.1.0\lib\netstandard2.0\Abp.dll</HintPath>
     </Reference>
     <Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
       <HintPath>..\packages\Castle.Core.4.4.1\lib\net45\Castle.Core.dll</HintPath>

diff --git a/src/AbpCompanyName.AbpProjectName.Core/packages.config b/src/AbpCompanyName.AbpProjectName.Core/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Abp" version="7.0.0" targetFramework="net461" />
+  <package id="Abp" version="7.1.0" targetFramework="net461" />
   <package id="Castle.Core" version="4.4.1" targetFramework="net461" />
   <package id="Castle.Core.AsyncInterceptor" version="2.0.21-alpha" targetFramework="net461" />
   <package id="Castle.LoggingFacility" version="5.1.1" targetFramework="net461" />
@@ -10,13 +10,13 @@
   <package id="JetBrains.Annotations" version="2021.3.0" targetFramework="net461" />
   <package id="Microsoft.Bcl" version="1.1.10" targetFramework="net452" />
   <package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net452" />
-  <package id="Microsoft.Extensions.Caching.Memory" version="6.0.0" targetFramework="net461" />
-  <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="6.0.0" targetFramework="net461" />
-  <package id="Microsoft.Extensions.Options" version="6.0.0" targetFramework="net461" />
   <package id="Microsoft.Bcl.AsyncInterfaces" version="6.0.0" targetFramework="net461" />
   <package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net452" />
   <package id="Microsoft.Extensions.Caching.Abstractions" version="6.0.0" targetFramework="net461" />
+  <package id="Microsoft.Extensions.Caching.Memory" version="6.0.0" targetFramework="net461" />
+  <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="6.0.0" targetFramework="net461" />
   <package id="Microsoft.Extensions.Logging.Abstractions" version="6.0.0" targetFramework="net461" />
+  <package id="Microsoft.Extensions.Options" version="6.0.0" targetFramework="net461" />
   <package id="Microsoft.Extensions.Primitives" version="6.0.0" targetFramework="net461" />
   <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net461" />
   <package id="Nito.AsyncEx" version="5.1.2" targetFramework="net461" />

diff --git a/...yName.AbpProjectName.EntityFramework/AbpCompanyName.AbpProjectName.EntityFramework.csproj b/...yName.AbpProjectName.EntityFramework/AbpCompanyName.AbpProjectName.EntityFramework.csproj
@@ -37,17 +37,14 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Abp, Version=7.0.0.0, Culture=neutral, PublicKeyToken=null">
-      <HintPath>..\packages\Abp.7.0.0\lib\netstandard2.0\Abp.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Abp, Version=7.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Abp.7.1.0\lib\netstandard2.0\Abp.dll</HintPath>
     </Reference>
-    <Reference Include="Abp.EntityFramework, Version=7.0.0.0, Culture=neutral, PublicKeyToken=null">
-      <HintPath>..\packages\Abp.EntityFramework.7.0.0\lib\net461\Abp.EntityFramework.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Abp.EntityFramework, Version=7.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Abp.EntityFramework.7.1.0\lib\net461\Abp.EntityFramework.dll</HintPath>
     </Reference>
-    <Reference Include="Abp.EntityFramework.Common, Version=7.0.0.0, Culture=neutral, PublicKeyToken=null">
-      <HintPath>..\packages\Abp.EntityFramework.Common.7.0.0\lib\netstandard2.0\Abp.EntityFramework.Common.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Abp.EntityFramework.Common, Version=7.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Abp.EntityFramework.Common.7.1.0\lib\netstandard2.0\Abp.EntityFramework.Common.dll</HintPath>
     </Reference>
     <Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
       <HintPath>..\packages\Castle.Core.4.4.1\lib\net45\Castle.Core.dll</HintPath>

diff --git a/src/AbpCompanyName.AbpProjectName.EntityFramework/packages.config b/src/AbpCompanyName.AbpProjectName.EntityFramework/packages.config
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Abp" version="7.0.0" targetFramework="net461" />
-  <package id="Abp.EntityFramework" version="7.0.0" targetFramework="net461" />
-  <package id="Abp.EntityFramework.Common" version="7.0.0" targetFramework="net461" />
+  <package id="Abp" version="7.1.0" targetFramework="net461" />
+  <package id="Abp.EntityFramework" version="7.1.0" targetFramework="net461" />
+  <package id="Abp.EntityFramework.Common" version="7.1.0" targetFramework="net461" />
   <package id="Castle.Core" version="4.4.1" targetFramework="net461" />
   <package id="Castle.Core.AsyncInterceptor" version="2.0.21-alpha" targetFramework="net461" />
   <package id="Castle.LoggingFacility" version="5.1.1" targetFramework="net461" />
@@ -14,13 +14,13 @@
   <package id="JetBrains.Annotations" version="2021.3.0" targetFramework="net461" />
   <package id="Microsoft.Bcl" version="1.1.10" targetFramework="net452" />
   <package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net452" />
-  <package id="Microsoft.Extensions.Caching.Memory" version="6.0.0" targetFramework="net461" />
-  <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="6.0.0" targetFramework="net461" />
-  <package id="Microsoft.Extensions.Options" version="6.0.0" targetFramework="net461" />
   <package id="Microsoft.Bcl.AsyncInterfaces" version="6.0.0" targetFramework="net461" />
   <package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net452" />
   <package id="Microsoft.Extensions.Caching.Abstractions" version="6.0.0" targetFramework="net461" />
+  <package id="Microsoft.Extensions.Caching.Memory" version="6.0.0" targetFramework="net461" />
+  <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="6.0.0" targetFramework="net461" />
   <package id="Microsoft.Extensions.Logging.Abstractions" version="6.0.0" targetFramework="net461" />
+  <package id="Microsoft.Extensions.Options" version="6.0.0" targetFramework="net461" />
   <package id="Microsoft.Extensions.Primitives" version="6.0.0" targetFramework="net461" />
   <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net461" />
   <package id="Nito.AsyncEx" version="5.1.2" targetFramework="net461" />

diff --git a/src/AbpCompanyName.AbpProjectName.NHibernate/AbpCompanyName.AbpProjectName.NHibernate.csproj b/src/AbpCompanyName.AbpProjectName.NHibernate/AbpCompanyName.AbpProjectName.NHibernate.csproj
@@ -36,17 +36,14 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Abp, Version=7.0.0.0, Culture=neutral, PublicKeyToken=null">
-      <HintPath>..\packages\Abp.7.0.0\lib\netstandard2.0\Abp.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Abp, Version=7.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Abp.7.1.0\lib\netstandard2.0\Abp.dll</HintPath>
     </Reference>
-    <Reference Include="Abp.FluentMigrator, Version=7.0.0.0, Culture=neutral, PublicKeyToken=null">
-      <HintPath>..\packages\Abp.FluentMigrator.7.0.0\lib\net461\Abp.FluentMigrator.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Abp.FluentMigrator, Version=7.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Abp.FluentMigrator.7.1.0\lib\net461\Abp.FluentMigrator.dll</HintPath>
     </Reference>
-    <Reference Include="Abp.NHibernate, Version=7.0.0.0, Culture=neutral, PublicKeyToken=null">
-      <HintPath>..\packages\Abp.NHibernate.7.0.0\lib\netstandard2.0\Abp.NHibernate.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Abp.NHibernate, Version=7.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Abp.NHibernate.7.1.0\lib\netstandard2.0\Abp.NHibernate.dll</HintPath>
     </Reference>
     <Reference Include="Antlr3.Runtime, Version=3.5.0.2, Culture=neutral, PublicKeyToken=eb42632606e9261f, processorArchitecture=MSIL">
       <HintPath>..\packages\Antlr3.Runtime.3.5.1\lib\net40-client\Antlr3.Runtime.dll</HintPath>

diff --git a/src/AbpCompanyName.AbpProjectName.NHibernate/packages.config b/src/AbpCompanyName.AbpProjectName.NHibernate/packages.config
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Abp" version="7.0.0" targetFramework="net461" />
-  <package id="Abp.FluentMigrator" version="7.0.0" targetFramework="net461" />
-  <package id="Abp.NHibernate" version="7.0.0" targetFramework="net461" />
+  <package id="Abp" version="7.1.0" targetFramework="net461" />
+  <package id="Abp.FluentMigrator" version="7.1.0" targetFramework="net461" />
+  <package id="Abp.NHibernate" version="7.1.0" targetFramework="net461" />
   <package id="Antlr3.Runtime" version="3.5.1" targetFramework="net461" />
   <package id="Azure.Core" version="1.21.0" targetFramework="net461" />
   <package id="Azure.Identity" version="1.5.0" targetFramework="net461" />
@@ -78,8 +78,8 @@
   <package id="System.Configuration.ConfigurationManager" version="6.0.0" targetFramework="net461" />
   <package id="System.Data.Common" version="4.3.0" targetFramework="net461" />
   <package id="System.Diagnostics.DiagnosticSource" version="6.0.0" targetFramework="net461" />
-  <package id="System.IO" version="4.3.0" targetFramework="net461" />
   <package id="System.IdentityModel.Tokens.Jwt" version="6.15.0" targetFramework="net461" />
+  <package id="System.IO" version="4.3.0" targetFramework="net461" />
   <package id="System.Linq.Dynamic.Core" version="1.2.14" targetFramework="net461" />
   <package id="System.Linq.Queryable" version="4.3.0" targetFramework="net461" />
   <package id="System.Memory" version="4.5.4" targetFramework="net461" />

diff --git a/src/AbpCompanyName.AbpProjectName.WebApi/AbpCompanyName.AbpProjectName.WebApi.csproj b/src/AbpCompanyName.AbpProjectName.WebApi/AbpCompanyName.AbpProjectName.WebApi.csproj
@@ -36,25 +36,20 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Abp, Version=7.0.0.0, Culture=neutral, PublicKeyToken=null">
-      <HintPath>..\packages\Abp.7.0.0\lib\netstandard2.0\Abp.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Abp, Version=7.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Abp.7.1.0\lib\netstandard2.0\Abp.dll</HintPath>
     </Reference>
-    <Reference Include="Abp.AutoMapper, Version=7.0.0.0, Culture=neutral, PublicKeyToken=null">
-      <HintPath>..\packages\Abp.AutoMapper.7.0.0\lib\netstandard2.0\Abp.AutoMapper.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Abp.AutoMapper, Version=7.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Abp.AutoMapper.7.1.0\lib\netstandard2.0\Abp.AutoMapper.dll</HintPath>
     </Reference>
-    <Reference Include="Abp.Web, Version=7.0.0.0, Culture=neutral, PublicKeyToken=null">
-      <HintPath>..\packages\Abp.Web.7.0.0\lib\net461\Abp.Web.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Abp.Web, Version=7.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Abp.Web.7.1.0\lib\net461\Abp.Web.dll</HintPath>
     </Reference>
-    <Reference Include="Abp.Web.Api, Version=7.0.0.0, Culture=neutral, PublicKeyToken=null">
-      <HintPath>..\packages\Abp.Web.Api.7.0.0\lib\net461\Abp.Web.Api.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Abp.Web.Api, Version=7.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Abp.Web.Api.7.1.0\lib\net461\Abp.Web.Api.dll</HintPath>
     </Reference>
-    <Reference Include="Abp.Web.Common, Version=7.0.0.0, Culture=neutral, PublicKeyToken=null">
-      <HintPath>..\packages\Abp.Web.Common.7.0.0\lib\netstandard2.0\Abp.Web.Common.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Abp.Web.Common, Version=7.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Abp.Web.Common.7.1.0\lib\netstandard2.0\Abp.Web.Common.dll</HintPath>
     </Reference>
     <Reference Include="AutoMapper, Version=10.0.0.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
       <HintPath>..\packages\AutoMapper.10.1.1\lib\net461\AutoMapper.dll</HintPath>

diff --git a/src/AbpCompanyName.AbpProjectName.WebApi/packages.config b/src/AbpCompanyName.AbpProjectName.WebApi/packages.config
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Abp" version="7.0.0" targetFramework="net461" />
-  <package id="Abp.AutoMapper" version="7.0.0" targetFramework="net461" />
-  <package id="Abp.Web" version="7.0.0" targetFramework="net461" />
-  <package id="Abp.Web.Api" version="7.0.0" targetFramework="net461" />
-  <package id="Abp.Web.Common" version="7.0.0" targetFramework="net461" />
+  <package id="Abp" version="7.1.0" targetFramework="net461" />
+  <package id="Abp.AutoMapper" version="7.1.0" targetFramework="net461" />
+  <package id="Abp.Web" version="7.1.0" targetFramework="net461" />
+  <package id="Abp.Web.Api" version="7.1.0" targetFramework="net461" />
+  <package id="Abp.Web.Common" version="7.1.0" targetFramework="net461" />
   <package id="AutoMapper" version="10.1.1" targetFramework="net461" />
   <package id="AutoMapper.Collection" version="7.0.1" targetFramework="net461" />
   <package id="Castle.Core" version="4.4.1" targetFramework="net461" />
@@ -21,13 +21,13 @@
   <package id="Microsoft.AspNet.WebApi.WebHost" version="5.2.7" targetFramework="net461" />
   <package id="Microsoft.Bcl" version="1.1.10" targetFramework="net452" />
   <package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net452" />
-  <package id="Microsoft.Extensions.Caching.Memory" version="6.0.0" targetFramework="net461" />
-  <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="6.0.0" targetFramework="net461" />
-  <package id="Microsoft.Extensions.Options" version="6.0.0" targetFramework="net461" />
   <package id="Microsoft.Bcl.AsyncInterfaces" version="6.0.0" targetFramework="net461" />
   <package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net452" />
   <package id="Microsoft.Extensions.Caching.Abstractions" version="6.0.0" targetFramework="net461" />
+  <package id="Microsoft.Extensions.Caching.Memory" version="6.0.0" targetFramework="net461" />
+  <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="6.0.0" targetFramework="net461" />
   <package id="Microsoft.Extensions.Logging.Abstractions" version="6.0.0" targetFramework="net461" />
+  <package id="Microsoft.Extensions.Options" version="6.0.0" targetFramework="net461" />
   <package id="Microsoft.Extensions.Primitives" version="6.0.0" targetFramework="net461" />
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net461" />
   <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net461" />

diff --git a/src/AbpCompanyName.AbpProjectName.WebMpa/Abp/Framework/scripts/abp.d.ts b/src/AbpCompanyName.AbpProjectName.WebMpa/Abp/Framework/scripts/abp.d.ts
@@ -318,8 +318,7 @@
 
         function error(message: string, title?: string, options?: any): any;
 
-        function confirm(message: string, title?: string, callback?: (result: boolean) => void, options?: any): any;
-
+        function confirm(message: string, title?: string, callback?: (result: boolean, info?: any) => void, options?: any): any;
     }
 
     namespace ui {