From 0224e0fdc7daf8358a464850e5dd845a6f990f8f Mon Sep 17 00:00:00 2001 From: Musa Demir Date: Mon, 26 Jul 2021 11:31:03 +0300 Subject: [PATCH] Upgrade to ABP 6.4.0 --- ...panyName.AbpProjectName.Application.csproj | 20 +-- .../packages.config | 12 +- .../AbpCompanyName.AbpProjectName.Core.csproj | 18 +-- .../packages.config | 10 +- ...Name.AbpProjectName.EntityFramework.csproj | 22 +-- .../packages.config | 14 +- ...mpanyName.AbpProjectName.NHibernate.csproj | 137 +++++++++++------- .../packages.config | 65 +++++---- ...bpCompanyName.AbpProjectName.WebApi.csproj | 30 ++-- .../app.config | 2 +- .../packages.config | 20 +-- ...bpCompanyName.AbpProjectName.WebMpa.csproj | 34 ++--- .../Web.config | 4 +- .../packages.config | 26 ++-- ...nyName.AbpProjectName.WebSpaAngular.csproj | 34 ++--- .../Web.config | 8 +- .../packages.config | 26 ++-- 17 files changed, 260 insertions(+), 222 deletions(-) diff --git a/src/AbpCompanyName.AbpProjectName.Application/AbpCompanyName.AbpProjectName.Application.csproj b/src/AbpCompanyName.AbpProjectName.Application/AbpCompanyName.AbpProjectName.Application.csproj index 9587cb9c..2dede678 100644 --- a/src/AbpCompanyName.AbpProjectName.Application/AbpCompanyName.AbpProjectName.Application.csproj +++ b/src/AbpCompanyName.AbpProjectName.Application/AbpCompanyName.AbpProjectName.Application.csproj @@ -37,10 +37,10 @@ - ..\packages\Abp.6.4.0-rc1\lib\netstandard2.0\Abp.dll + ..\packages\Abp.6.4.0\lib\netstandard2.0\Abp.dll - ..\packages\Abp.AutoMapper.6.4.0-rc1\lib\netstandard2.0\Abp.AutoMapper.dll + ..\packages\Abp.AutoMapper.6.4.0\lib\netstandard2.0\Abp.AutoMapper.dll ..\packages\AutoMapper.10.1.1\lib\net461\AutoMapper.dll @@ -63,8 +63,8 @@ ..\packages\ConfigureAwait.Fody.3.3.1\lib\net452\ConfigureAwait.dll - - ..\packages\JetBrains.Annotations.2020.3.0\lib\net20\JetBrains.Annotations.dll + + ..\packages\JetBrains.Annotations.2021.1.0\lib\net20\JetBrains.Annotations.dll ..\packages\Microsoft.Extensions.Caching.Abstractions.5.0.0\lib\net461\Microsoft.Extensions.Caching.Abstractions.dll @@ -96,8 +96,8 @@ ..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll True - - ..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll + + ..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll ..\packages\Nito.AsyncEx.Context.5.1.0\lib\netstandard2.0\Nito.AsyncEx.Context.dll @@ -146,8 +146,8 @@ - - ..\packages\System.Linq.Dynamic.Core.1.2.8\lib\net46\System.Linq.Dynamic.Core.dll + + ..\packages\System.Linq.Dynamic.Core.1.2.10\lib\net46\System.Linq.Dynamic.Core.dll ..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll @@ -211,8 +211,8 @@ ..\packages\System.Xml.XPath.XmlDocument.4.3.0\lib\net46\System.Xml.XPath.XmlDocument.dll - - ..\packages\TimeZoneConverter.3.4.0\lib\net461\TimeZoneConverter.dll + + ..\packages\TimeZoneConverter.3.5.0\lib\net461\TimeZoneConverter.dll diff --git a/src/AbpCompanyName.AbpProjectName.Application/packages.config b/src/AbpCompanyName.AbpProjectName.Application/packages.config index 5b1d0dc9..41ffba1b 100644 --- a/src/AbpCompanyName.AbpProjectName.Application/packages.config +++ b/src/AbpCompanyName.AbpProjectName.Application/packages.config @@ -1,7 +1,7 @@  - - + + @@ -10,7 +10,7 @@ - + @@ -20,7 +20,7 @@ - + @@ -35,7 +35,7 @@ - + @@ -52,5 +52,5 @@ - + \ No newline at end of file diff --git a/src/AbpCompanyName.AbpProjectName.Core/AbpCompanyName.AbpProjectName.Core.csproj b/src/AbpCompanyName.AbpProjectName.Core/AbpCompanyName.AbpProjectName.Core.csproj index cfe0ec89..49c86d8c 100644 --- a/src/AbpCompanyName.AbpProjectName.Core/AbpCompanyName.AbpProjectName.Core.csproj +++ b/src/AbpCompanyName.AbpProjectName.Core/AbpCompanyName.AbpProjectName.Core.csproj @@ -37,7 +37,7 @@ - ..\packages\Abp.6.4.0-rc1\lib\netstandard2.0\Abp.dll + ..\packages\Abp.6.4.0\lib\netstandard2.0\Abp.dll ..\packages\Castle.Core.4.4.1\lib\net45\Castle.Core.dll @@ -54,8 +54,8 @@ ..\packages\ConfigureAwait.Fody.3.3.1\lib\net452\ConfigureAwait.dll - - ..\packages\JetBrains.Annotations.2020.3.0\lib\net20\JetBrains.Annotations.dll + + ..\packages\JetBrains.Annotations.2021.1.0\lib\net20\JetBrains.Annotations.dll ..\packages\Microsoft.Extensions.Caching.Abstractions.5.0.0\lib\net461\Microsoft.Extensions.Caching.Abstractions.dll @@ -87,8 +87,8 @@ ..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll True - - ..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll + + ..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll ..\packages\Nito.AsyncEx.Context.5.1.0\lib\netstandard2.0\Nito.AsyncEx.Context.dll @@ -137,8 +137,8 @@ - - ..\packages\System.Linq.Dynamic.Core.1.2.8\lib\net46\System.Linq.Dynamic.Core.dll + + ..\packages\System.Linq.Dynamic.Core.1.2.10\lib\net46\System.Linq.Dynamic.Core.dll ..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll @@ -199,8 +199,8 @@ ..\packages\System.Xml.XPath.XmlDocument.4.3.0\lib\net46\System.Xml.XPath.XmlDocument.dll - - ..\packages\TimeZoneConverter.3.4.0\lib\net461\TimeZoneConverter.dll + + ..\packages\TimeZoneConverter.3.5.0\lib\net461\TimeZoneConverter.dll diff --git a/src/AbpCompanyName.AbpProjectName.Core/packages.config b/src/AbpCompanyName.AbpProjectName.Core/packages.config index 57e913fe..64d0375d 100644 --- a/src/AbpCompanyName.AbpProjectName.Core/packages.config +++ b/src/AbpCompanyName.AbpProjectName.Core/packages.config @@ -1,13 +1,13 @@  - + - + @@ -17,7 +17,7 @@ - + @@ -32,7 +32,7 @@ - + @@ -48,5 +48,5 @@ - + \ No newline at end of file diff --git a/src/AbpCompanyName.AbpProjectName.EntityFramework/AbpCompanyName.AbpProjectName.EntityFramework.csproj b/src/AbpCompanyName.AbpProjectName.EntityFramework/AbpCompanyName.AbpProjectName.EntityFramework.csproj index 40875ad3..145c24be 100644 --- a/src/AbpCompanyName.AbpProjectName.EntityFramework/AbpCompanyName.AbpProjectName.EntityFramework.csproj +++ b/src/AbpCompanyName.AbpProjectName.EntityFramework/AbpCompanyName.AbpProjectName.EntityFramework.csproj @@ -38,13 +38,13 @@ - ..\packages\Abp.6.4.0-rc1\lib\netstandard2.0\Abp.dll + ..\packages\Abp.6.4.0\lib\netstandard2.0\Abp.dll - ..\packages\Abp.EntityFramework.6.4.0-rc1\lib\net461\Abp.EntityFramework.dll + ..\packages\Abp.EntityFramework.6.4.0\lib\net461\Abp.EntityFramework.dll - ..\packages\Abp.EntityFramework.Common.6.4.0-rc1\lib\netstandard2.0\Abp.EntityFramework.Common.dll + ..\packages\Abp.EntityFramework.Common.6.4.0\lib\netstandard2.0\Abp.EntityFramework.Common.dll ..\packages\Castle.Core.4.4.1\lib\net45\Castle.Core.dll @@ -70,8 +70,8 @@ ..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll - - ..\packages\JetBrains.Annotations.2020.3.0\lib\net20\JetBrains.Annotations.dll + + ..\packages\JetBrains.Annotations.2021.1.0\lib\net20\JetBrains.Annotations.dll ..\packages\Microsoft.Extensions.Caching.Abstractions.5.0.0\lib\net461\Microsoft.Extensions.Caching.Abstractions.dll @@ -103,8 +103,8 @@ ..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll True - - ..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll + + ..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll ..\packages\Nito.AsyncEx.Context.5.1.0\lib\netstandard2.0\Nito.AsyncEx.Context.dll @@ -153,8 +153,8 @@ - - ..\packages\System.Linq.Dynamic.Core.1.2.8\lib\net46\System.Linq.Dynamic.Core.dll + + ..\packages\System.Linq.Dynamic.Core.1.2.10\lib\net46\System.Linq.Dynamic.Core.dll ..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll @@ -215,8 +215,8 @@ ..\packages\System.Xml.XPath.XmlDocument.4.3.0\lib\net46\System.Xml.XPath.XmlDocument.dll - - ..\packages\TimeZoneConverter.3.4.0\lib\net461\TimeZoneConverter.dll + + ..\packages\TimeZoneConverter.3.5.0\lib\net461\TimeZoneConverter.dll diff --git a/src/AbpCompanyName.AbpProjectName.EntityFramework/packages.config b/src/AbpCompanyName.AbpProjectName.EntityFramework/packages.config index 5b40792f..c5bec284 100644 --- a/src/AbpCompanyName.AbpProjectName.EntityFramework/packages.config +++ b/src/AbpCompanyName.AbpProjectName.EntityFramework/packages.config @@ -1,8 +1,8 @@  - - - + + + @@ -11,7 +11,7 @@ - + @@ -21,7 +21,7 @@ - + @@ -36,7 +36,7 @@ - + @@ -52,5 +52,5 @@ - + \ No newline at end of file diff --git a/src/AbpCompanyName.AbpProjectName.NHibernate/AbpCompanyName.AbpProjectName.NHibernate.csproj b/src/AbpCompanyName.AbpProjectName.NHibernate/AbpCompanyName.AbpProjectName.NHibernate.csproj index 6c04da5c..681fc838 100644 --- a/src/AbpCompanyName.AbpProjectName.NHibernate/AbpCompanyName.AbpProjectName.NHibernate.csproj +++ b/src/AbpCompanyName.AbpProjectName.NHibernate/AbpCompanyName.AbpProjectName.NHibernate.csproj @@ -37,13 +37,13 @@ - ..\packages\Abp.6.4.0-rc1\lib\netstandard2.0\Abp.dll + ..\packages\Abp.6.4.0\lib\netstandard2.0\Abp.dll - ..\packages\Abp.FluentMigrator.6.4.0-rc1\lib\net461\Abp.FluentMigrator.dll + ..\packages\Abp.FluentMigrator.6.4.0\lib\net461\Abp.FluentMigrator.dll - ..\packages\Abp.NHibernate.6.4.0-rc1\lib\netstandard2.0\Abp.NHibernate.dll + ..\packages\Abp.NHibernate.6.4.0\lib\netstandard2.0\Abp.NHibernate.dll ..\packages\Antlr3.Runtime.3.5.1\lib\net40-client\Antlr3.Runtime.dll @@ -63,65 +63,65 @@ ..\packages\ConfigureAwait.Fody.3.3.1\lib\net452\ConfigureAwait.dll - - ..\packages\FluentMigrator.3.2.15\lib\net461\FluentMigrator.dll + + ..\packages\FluentMigrator.3.2.17\lib\net461\FluentMigrator.dll - - ..\packages\FluentMigrator.Abstractions.3.2.15\lib\net461\FluentMigrator.Abstractions.dll + + ..\packages\FluentMigrator.Abstractions.3.2.17\lib\net461\FluentMigrator.Abstractions.dll - - ..\packages\FluentMigrator.Extensions.Oracle.3.2.15\lib\net461\FluentMigrator.Extensions.Oracle.dll + + ..\packages\FluentMigrator.Extensions.Oracle.3.2.17\lib\net461\FluentMigrator.Extensions.Oracle.dll - - ..\packages\FluentMigrator.Extensions.Postgres.3.2.15\lib\net461\FluentMigrator.Extensions.Postgres.dll + + ..\packages\FluentMigrator.Extensions.Postgres.3.2.17\lib\net461\FluentMigrator.Extensions.Postgres.dll - - ..\packages\FluentMigrator.Extensions.SqlAnywhere.3.2.15\lib\net461\FluentMigrator.Extensions.SqlAnywhere.dll + + ..\packages\FluentMigrator.Extensions.SqlAnywhere.3.2.17\lib\net461\FluentMigrator.Extensions.SqlAnywhere.dll - - ..\packages\FluentMigrator.Extensions.SqlServer.3.2.15\lib\net461\FluentMigrator.Extensions.SqlServer.dll + + ..\packages\FluentMigrator.Extensions.SqlServer.3.2.17\lib\net461\FluentMigrator.Extensions.SqlServer.dll - - ..\packages\FluentMigrator.Runner.3.2.15\lib\net461\FluentMigrator.Runner.dll + + ..\packages\FluentMigrator.Runner.3.2.17\lib\net461\FluentMigrator.Runner.dll - - ..\packages\FluentMigrator.Runner.Core.3.2.15\lib\net461\FluentMigrator.Runner.Core.dll + + ..\packages\FluentMigrator.Runner.Core.3.2.17\lib\net461\FluentMigrator.Runner.Core.dll - - ..\packages\FluentMigrator.Runner.Db2.3.2.15\lib\net461\FluentMigrator.Runner.Db2.dll + + ..\packages\FluentMigrator.Runner.Db2.3.2.17\lib\net461\FluentMigrator.Runner.Db2.dll - - ..\packages\FluentMigrator.Runner.Firebird.3.2.15\lib\net461\FluentMigrator.Runner.Firebird.dll + + ..\packages\FluentMigrator.Runner.Firebird.3.2.17\lib\net461\FluentMigrator.Runner.Firebird.dll - - ..\packages\FluentMigrator.Runner.Hana.3.2.15\lib\net461\FluentMigrator.Runner.Hana.dll + + ..\packages\FluentMigrator.Runner.Hana.3.2.17\lib\net461\FluentMigrator.Runner.Hana.dll - - ..\packages\FluentMigrator.Runner.Jet.3.2.15\lib\net461\FluentMigrator.Runner.Jet.dll + + ..\packages\FluentMigrator.Runner.Jet.3.2.17\lib\net461\FluentMigrator.Runner.Jet.dll - - ..\packages\FluentMigrator.Runner.MySql.3.2.15\lib\net461\FluentMigrator.Runner.MySql.dll + + ..\packages\FluentMigrator.Runner.MySql.3.2.17\lib\net461\FluentMigrator.Runner.MySql.dll - - ..\packages\FluentMigrator.Runner.Oracle.3.2.15\lib\net461\FluentMigrator.Runner.Oracle.dll + + ..\packages\FluentMigrator.Runner.Oracle.3.2.17\lib\net461\FluentMigrator.Runner.Oracle.dll - - ..\packages\FluentMigrator.Runner.Postgres.3.2.15\lib\net461\FluentMigrator.Runner.Postgres.dll + + ..\packages\FluentMigrator.Runner.Postgres.3.2.17\lib\net461\FluentMigrator.Runner.Postgres.dll - - ..\packages\FluentMigrator.Runner.Redshift.3.2.15\lib\net461\FluentMigrator.Runner.Redshift.dll + + ..\packages\FluentMigrator.Runner.Redshift.3.2.17\lib\net461\FluentMigrator.Runner.Redshift.dll - - ..\packages\FluentMigrator.Runner.SqlAnywhere.3.2.15\lib\net461\FluentMigrator.Runner.SqlAnywhere.dll + + ..\packages\FluentMigrator.Runner.SqlAnywhere.3.2.17\lib\net461\FluentMigrator.Runner.SqlAnywhere.dll - - ..\packages\FluentMigrator.Runner.SQLite.3.2.15\lib\net461\FluentMigrator.Runner.SQLite.dll + + ..\packages\FluentMigrator.Runner.SQLite.3.2.17\lib\net461\FluentMigrator.Runner.SQLite.dll - - ..\packages\FluentMigrator.Runner.SqlServer.3.2.15\lib\net461\FluentMigrator.Runner.SqlServer.dll + + ..\packages\FluentMigrator.Runner.SqlServer.3.2.17\lib\net461\FluentMigrator.Runner.SqlServer.dll - - ..\packages\FluentMigrator.Runner.SqlServerCe.3.2.15\lib\net461\FluentMigrator.Runner.SqlServerCe.dll + + ..\packages\FluentMigrator.Runner.SqlServerCe.3.2.17\lib\net461\FluentMigrator.Runner.SqlServerCe.dll ..\packages\FluentNHibernate.3.1.0\lib\net461\FluentNHibernate.dll @@ -129,12 +129,15 @@ ..\packages\Iesi.Collections.4.0.4\lib\net461\Iesi.Collections.dll - - ..\packages\JetBrains.Annotations.2020.3.0\lib\net20\JetBrains.Annotations.dll + + ..\packages\JetBrains.Annotations.2021.1.0\lib\net20\JetBrains.Annotations.dll ..\packages\Microsoft.Bcl.AsyncInterfaces.5.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll + + ..\packages\Microsoft.Data.SqlClient.2.1.2\lib\net46\Microsoft.Data.SqlClient.dll + ..\packages\Microsoft.Extensions.Caching.Abstractions.5.0.0\lib\net461\Microsoft.Extensions.Caching.Abstractions.dll @@ -168,6 +171,24 @@ ..\packages\Microsoft.Extensions.Primitives.5.0.0\lib\net461\Microsoft.Extensions.Primitives.dll + + ..\packages\Microsoft.Identity.Client.4.21.1\lib\net461\Microsoft.Identity.Client.dll + + + ..\packages\Microsoft.IdentityModel.JsonWebTokens.6.8.0\lib\net461\Microsoft.IdentityModel.JsonWebTokens.dll + + + ..\packages\Microsoft.IdentityModel.Logging.6.8.0\lib\net461\Microsoft.IdentityModel.Logging.dll + + + ..\packages\Microsoft.IdentityModel.Protocols.6.8.0\lib\net461\Microsoft.IdentityModel.Protocols.dll + + + ..\packages\Microsoft.IdentityModel.Protocols.OpenIdConnect.6.8.0\lib\net461\Microsoft.IdentityModel.Protocols.OpenIdConnect.dll + + + ..\packages\Microsoft.IdentityModel.Tokens.6.8.0\lib\net461\Microsoft.IdentityModel.Tokens.dll + ..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll True @@ -180,11 +201,11 @@ ..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll True - - ..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll + + ..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll - ..\packages\NHibernate.5.3.6\lib\net461\NHibernate.dll + ..\packages\NHibernate.5.3.9\lib\net461\NHibernate.dll ..\packages\Nito.AsyncEx.Context.5.1.0\lib\netstandard2.0\Nito.AsyncEx.Context.dll @@ -241,14 +262,19 @@ ..\packages\System.Diagnostics.DiagnosticSource.5.0.0\lib\net46\System.Diagnostics.DiagnosticSource.dll + + + ..\packages\System.IdentityModel.Tokens.Jwt.6.8.0\lib\net461\System.IdentityModel.Tokens.Jwt.dll + - - ..\packages\System.Linq.Dynamic.Core.1.2.8\lib\net46\System.Linq.Dynamic.Core.dll + + ..\packages\System.Linq.Dynamic.Core.1.2.10\lib\net46\System.Linq.Dynamic.Core.dll ..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll + ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll @@ -295,6 +321,7 @@ ..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll + @@ -311,8 +338,8 @@ ..\packages\System.Xml.XPath.XmlDocument.4.3.0\lib\net46\System.Xml.XPath.XmlDocument.dll - - ..\packages\TimeZoneConverter.3.4.0\lib\net461\TimeZoneConverter.dll + + ..\packages\TimeZoneConverter.3.5.0\lib\net461\TimeZoneConverter.dll @@ -346,11 +373,13 @@ - + + - + +