From 5fe3e523c2e2804f0f7f3e938713154d652f7714 Mon Sep 17 00:00:00 2001 From: YinChang Date: Thu, 11 Jul 2024 14:34:00 +0800 Subject: [PATCH] Upgrade to ABP 8.2.0 --- Directory.Build.props | 4 ++-- common.props | 2 +- .../EasyAbp.BookingService.Orleans.Blazor.Host.csproj | 4 ++-- .../BookingServiceOrleansBlazorHostModule.cs | 4 ++-- .../BookingServiceOrleansHttpApiHostModule.cs | 6 +++--- .../BookingServiceOrleansIdentityServerModule.cs | 6 +++--- .../BookingServiceOrleansWebUnifiedModule.cs | 6 +++--- .../EasyAbp.BookingService.Orleans.Web.csproj | 2 +- .../EasyAbp.BookingService.Blazor.Host.csproj | 4 ++-- .../BookingServiceBlazorHostModule.cs | 4 ++-- .../BookingServiceHttpApiHostModule.cs | 6 +++--- .../BookingServiceIdentityServerModule.cs | 6 +++--- .../BookingServiceWebUnifiedModule.cs | 6 +++--- .../EasyAbp.BookingService.Web.csproj | 2 +- .../EasyAbp.BookingService.Common.Domain.Shared.csproj | 2 +- .../EasyAbp.BookingService.Common.Web.csproj | 2 +- 16 files changed, 33 insertions(+), 33 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 5eef158..85749ce 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,8 +1,8 @@ - 8.1.0 - 2.16.0 + 8.2.0 + 2.17.0 3.7.1 diff --git a/common.props b/common.props index fe974a0..9432162 100644 --- a/common.props +++ b/common.props @@ -1,7 +1,7 @@ latest - 0.10.0 + 0.11.0 $(NoWarn);CS1591 module true diff --git a/modules/BookingService.Orleans/host/EasyAbp.BookingService.Orleans.Blazor.Host/EasyAbp.BookingService.Orleans.Blazor.Host.csproj b/modules/BookingService.Orleans/host/EasyAbp.BookingService.Orleans.Blazor.Host/EasyAbp.BookingService.Orleans.Blazor.Host.csproj index 55007a0..5743172 100644 --- a/modules/BookingService.Orleans/host/EasyAbp.BookingService.Orleans.Blazor.Host/EasyAbp.BookingService.Orleans.Blazor.Host.csproj +++ b/modules/BookingService.Orleans/host/EasyAbp.BookingService.Orleans.Blazor.Host/EasyAbp.BookingService.Orleans.Blazor.Host.csproj @@ -11,8 +11,8 @@ - - + + diff --git a/modules/BookingService.Orleans/host/EasyAbp.BookingService.Orleans.Blazor.Server.Host/BookingServiceOrleansBlazorHostModule.cs b/modules/BookingService.Orleans/host/EasyAbp.BookingService.Orleans.Blazor.Server.Host/BookingServiceOrleansBlazorHostModule.cs index f414762..dc370b7 100644 --- a/modules/BookingService.Orleans/host/EasyAbp.BookingService.Orleans.Blazor.Server.Host/BookingServiceOrleansBlazorHostModule.cs +++ b/modules/BookingService.Orleans/host/EasyAbp.BookingService.Orleans.Blazor.Server.Host/BookingServiceOrleansBlazorHostModule.cs @@ -168,8 +168,8 @@ public override void ConfigureServices(ServiceConfigurationContext context) options.Languages.Add(new LanguageInfo("en-GB", "en-GB", "English (UK)")); options.Languages.Add(new LanguageInfo("fi", "fi", "Finnish")); options.Languages.Add(new LanguageInfo("fr", "fr", "Français")); - options.Languages.Add(new LanguageInfo("hi", "hi", "Hindi", "in")); - options.Languages.Add(new LanguageInfo("it", "it", "Italian", "it")); + options.Languages.Add(new LanguageInfo("hi", "hi", "Hindi")); + options.Languages.Add(new LanguageInfo("it", "it", "Italian")); options.Languages.Add(new LanguageInfo("hu", "hu", "Magyar")); options.Languages.Add(new LanguageInfo("pt-BR", "pt-BR", "Português (Brasil)")); options.Languages.Add(new LanguageInfo("ro-RO", "ro-RO", "Română")); diff --git a/modules/BookingService.Orleans/host/EasyAbp.BookingService.Orleans.HttpApi.Host/BookingServiceOrleansHttpApiHostModule.cs b/modules/BookingService.Orleans/host/EasyAbp.BookingService.Orleans.HttpApi.Host/BookingServiceOrleansHttpApiHostModule.cs index 53f4232..15ef3d1 100644 --- a/modules/BookingService.Orleans/host/EasyAbp.BookingService.Orleans.HttpApi.Host/BookingServiceOrleansHttpApiHostModule.cs +++ b/modules/BookingService.Orleans/host/EasyAbp.BookingService.Orleans.HttpApi.Host/BookingServiceOrleansHttpApiHostModule.cs @@ -101,9 +101,9 @@ public override void ConfigureServices(ServiceConfigurationContext context) options.Languages.Add(new LanguageInfo("en-GB", "en-GB", "English (UK)")); options.Languages.Add(new LanguageInfo("fi", "fi", "Finnish")); options.Languages.Add(new LanguageInfo("fr", "fr", "Français")); - options.Languages.Add(new LanguageInfo("hi", "hi", "Hindi", "in")); - options.Languages.Add(new LanguageInfo("is", "is", "Icelandic", "is")); - options.Languages.Add(new LanguageInfo("it", "it", "Italiano", "it")); + options.Languages.Add(new LanguageInfo("hi", "hi", "Hindi")); + options.Languages.Add(new LanguageInfo("is", "is", "Icelandic")); + options.Languages.Add(new LanguageInfo("it", "it", "Italiano")); options.Languages.Add(new LanguageInfo("hu", "hu", "Magyar")); options.Languages.Add(new LanguageInfo("pt-BR", "pt-BR", "Português")); options.Languages.Add(new LanguageInfo("ro-RO", "ro-RO", "Română")); diff --git a/modules/BookingService.Orleans/host/EasyAbp.BookingService.Orleans.IdentityServer/BookingServiceOrleansIdentityServerModule.cs b/modules/BookingService.Orleans/host/EasyAbp.BookingService.Orleans.IdentityServer/BookingServiceOrleansIdentityServerModule.cs index ecbf44c..9c1dc8f 100644 --- a/modules/BookingService.Orleans/host/EasyAbp.BookingService.Orleans.IdentityServer/BookingServiceOrleansIdentityServerModule.cs +++ b/modules/BookingService.Orleans/host/EasyAbp.BookingService.Orleans.IdentityServer/BookingServiceOrleansIdentityServerModule.cs @@ -112,9 +112,9 @@ public override void ConfigureServices(ServiceConfigurationContext context) options.Languages.Add(new LanguageInfo("en-GB", "en-GB", "English (UK)")); options.Languages.Add(new LanguageInfo("fi", "fi", "Finnish")); options.Languages.Add(new LanguageInfo("fr", "fr", "Français")); - options.Languages.Add(new LanguageInfo("hi", "hi", "Hindi", "in")); - options.Languages.Add(new LanguageInfo("is", "is", "Icelandic", "is")); - options.Languages.Add(new LanguageInfo("it", "it", "Italiano", "it")); + options.Languages.Add(new LanguageInfo("hi", "hi", "Hindi")); + options.Languages.Add(new LanguageInfo("is", "is", "Icelandic")); + options.Languages.Add(new LanguageInfo("it", "it", "Italiano")); options.Languages.Add(new LanguageInfo("hu", "hu", "Magyar")); options.Languages.Add(new LanguageInfo("pt-BR", "pt-BR", "Português")); options.Languages.Add(new LanguageInfo("ro-RO", "ro-RO", "Română")); diff --git a/modules/BookingService.Orleans/host/EasyAbp.BookingService.Orleans.Web.Unified/BookingServiceOrleansWebUnifiedModule.cs b/modules/BookingService.Orleans/host/EasyAbp.BookingService.Orleans.Web.Unified/BookingServiceOrleansWebUnifiedModule.cs index fdb0938..b5f3a09 100644 --- a/modules/BookingService.Orleans/host/EasyAbp.BookingService.Orleans.Web.Unified/BookingServiceOrleansWebUnifiedModule.cs +++ b/modules/BookingService.Orleans/host/EasyAbp.BookingService.Orleans.Web.Unified/BookingServiceOrleansWebUnifiedModule.cs @@ -121,9 +121,9 @@ public override void ConfigureServices(ServiceConfigurationContext context) options.Languages.Add(new LanguageInfo("en-GB", "en-GB", "English (UK)")); options.Languages.Add(new LanguageInfo("fi", "fi", "Finnish")); options.Languages.Add(new LanguageInfo("fr", "fr", "Français")); - options.Languages.Add(new LanguageInfo("hi", "hi", "Hindi", "in")); - options.Languages.Add(new LanguageInfo("is", "is", "Icelandic", "is")); - options.Languages.Add(new LanguageInfo("it", "it", "Italiano", "it")); + options.Languages.Add(new LanguageInfo("hi", "hi", "Hindi")); + options.Languages.Add(new LanguageInfo("is", "is", "Icelandic")); + options.Languages.Add(new LanguageInfo("it", "it", "Italiano")); options.Languages.Add(new LanguageInfo("hu", "hu", "Magyar")); options.Languages.Add(new LanguageInfo("pt-BR", "pt-BR", "Português (Brasil)")); options.Languages.Add(new LanguageInfo("ro-RO", "ro-RO", "Română")); diff --git a/modules/BookingService.Orleans/src/EasyAbp.BookingService.Orleans.Web/EasyAbp.BookingService.Orleans.Web.csproj b/modules/BookingService.Orleans/src/EasyAbp.BookingService.Orleans.Web/EasyAbp.BookingService.Orleans.Web.csproj index 13f5aec..5ec44dc 100644 --- a/modules/BookingService.Orleans/src/EasyAbp.BookingService.Orleans.Web/EasyAbp.BookingService.Orleans.Web.csproj +++ b/modules/BookingService.Orleans/src/EasyAbp.BookingService.Orleans.Web/EasyAbp.BookingService.Orleans.Web.csproj @@ -22,7 +22,7 @@ - + diff --git a/modules/BookingService/host/EasyAbp.BookingService.Blazor.Host/EasyAbp.BookingService.Blazor.Host.csproj b/modules/BookingService/host/EasyAbp.BookingService.Blazor.Host/EasyAbp.BookingService.Blazor.Host.csproj index c82ef9e..6d08c72 100644 --- a/modules/BookingService/host/EasyAbp.BookingService.Blazor.Host/EasyAbp.BookingService.Blazor.Host.csproj +++ b/modules/BookingService/host/EasyAbp.BookingService.Blazor.Host/EasyAbp.BookingService.Blazor.Host.csproj @@ -10,8 +10,8 @@ - - + + diff --git a/modules/BookingService/host/EasyAbp.BookingService.Blazor.Server.Host/BookingServiceBlazorHostModule.cs b/modules/BookingService/host/EasyAbp.BookingService.Blazor.Server.Host/BookingServiceBlazorHostModule.cs index e8da92e..771de50 100644 --- a/modules/BookingService/host/EasyAbp.BookingService.Blazor.Server.Host/BookingServiceBlazorHostModule.cs +++ b/modules/BookingService/host/EasyAbp.BookingService.Blazor.Server.Host/BookingServiceBlazorHostModule.cs @@ -168,8 +168,8 @@ public override void ConfigureServices(ServiceConfigurationContext context) options.Languages.Add(new LanguageInfo("en-GB", "en-GB", "English (UK)")); options.Languages.Add(new LanguageInfo("fi", "fi", "Finnish")); options.Languages.Add(new LanguageInfo("fr", "fr", "Français")); - options.Languages.Add(new LanguageInfo("hi", "hi", "Hindi", "in")); - options.Languages.Add(new LanguageInfo("it", "it", "Italian", "it")); + options.Languages.Add(new LanguageInfo("hi", "hi", "Hindi")); + options.Languages.Add(new LanguageInfo("it", "it", "Italian")); options.Languages.Add(new LanguageInfo("hu", "hu", "Magyar")); options.Languages.Add(new LanguageInfo("pt-BR", "pt-BR", "Português (Brasil)")); options.Languages.Add(new LanguageInfo("ro-RO", "ro-RO", "Română")); diff --git a/modules/BookingService/host/EasyAbp.BookingService.HttpApi.Host/BookingServiceHttpApiHostModule.cs b/modules/BookingService/host/EasyAbp.BookingService.HttpApi.Host/BookingServiceHttpApiHostModule.cs index 3d07365..ac4b197 100644 --- a/modules/BookingService/host/EasyAbp.BookingService.HttpApi.Host/BookingServiceHttpApiHostModule.cs +++ b/modules/BookingService/host/EasyAbp.BookingService.HttpApi.Host/BookingServiceHttpApiHostModule.cs @@ -101,9 +101,9 @@ public override void ConfigureServices(ServiceConfigurationContext context) options.Languages.Add(new LanguageInfo("en-GB", "en-GB", "English (UK)")); options.Languages.Add(new LanguageInfo("fi", "fi", "Finnish")); options.Languages.Add(new LanguageInfo("fr", "fr", "Français")); - options.Languages.Add(new LanguageInfo("hi", "hi", "Hindi", "in")); - options.Languages.Add(new LanguageInfo("is", "is", "Icelandic", "is")); - options.Languages.Add(new LanguageInfo("it", "it", "Italiano", "it")); + options.Languages.Add(new LanguageInfo("hi", "hi", "Hindi")); + options.Languages.Add(new LanguageInfo("is", "is", "Icelandic")); + options.Languages.Add(new LanguageInfo("it", "it", "Italiano")); options.Languages.Add(new LanguageInfo("hu", "hu", "Magyar")); options.Languages.Add(new LanguageInfo("pt-BR", "pt-BR", "Português")); options.Languages.Add(new LanguageInfo("ro-RO", "ro-RO", "Română")); diff --git a/modules/BookingService/host/EasyAbp.BookingService.IdentityServer/BookingServiceIdentityServerModule.cs b/modules/BookingService/host/EasyAbp.BookingService.IdentityServer/BookingServiceIdentityServerModule.cs index 242b1aa..8d2cd9c 100644 --- a/modules/BookingService/host/EasyAbp.BookingService.IdentityServer/BookingServiceIdentityServerModule.cs +++ b/modules/BookingService/host/EasyAbp.BookingService.IdentityServer/BookingServiceIdentityServerModule.cs @@ -113,9 +113,9 @@ public override void ConfigureServices(ServiceConfigurationContext context) options.Languages.Add(new LanguageInfo("en-GB", "en-GB", "English (UK)")); options.Languages.Add(new LanguageInfo("fi", "fi", "Finnish")); options.Languages.Add(new LanguageInfo("fr", "fr", "Français")); - options.Languages.Add(new LanguageInfo("hi", "hi", "Hindi", "in")); - options.Languages.Add(new LanguageInfo("is", "is", "Icelandic", "is")); - options.Languages.Add(new LanguageInfo("it", "it", "Italiano", "it")); + options.Languages.Add(new LanguageInfo("hi", "hi", "Hindi")); + options.Languages.Add(new LanguageInfo("is", "is", "Icelandic")); + options.Languages.Add(new LanguageInfo("it", "it", "Italiano")); options.Languages.Add(new LanguageInfo("hu", "hu", "Magyar")); options.Languages.Add(new LanguageInfo("pt-BR", "pt-BR", "Português")); options.Languages.Add(new LanguageInfo("ro-RO", "ro-RO", "Română")); diff --git a/modules/BookingService/host/EasyAbp.BookingService.Web.Unified/BookingServiceWebUnifiedModule.cs b/modules/BookingService/host/EasyAbp.BookingService.Web.Unified/BookingServiceWebUnifiedModule.cs index cffdc19..2301eeb 100644 --- a/modules/BookingService/host/EasyAbp.BookingService.Web.Unified/BookingServiceWebUnifiedModule.cs +++ b/modules/BookingService/host/EasyAbp.BookingService.Web.Unified/BookingServiceWebUnifiedModule.cs @@ -121,9 +121,9 @@ public override void ConfigureServices(ServiceConfigurationContext context) options.Languages.Add(new LanguageInfo("en-GB", "en-GB", "English (UK)")); options.Languages.Add(new LanguageInfo("fi", "fi", "Finnish")); options.Languages.Add(new LanguageInfo("fr", "fr", "Français")); - options.Languages.Add(new LanguageInfo("hi", "hi", "Hindi", "in")); - options.Languages.Add(new LanguageInfo("is", "is", "Icelandic", "is")); - options.Languages.Add(new LanguageInfo("it", "it", "Italiano", "it")); + options.Languages.Add(new LanguageInfo("hi", "hi", "Hindi")); + options.Languages.Add(new LanguageInfo("is", "is", "Icelandic")); + options.Languages.Add(new LanguageInfo("it", "it", "Italiano")); options.Languages.Add(new LanguageInfo("hu", "hu", "Magyar")); options.Languages.Add(new LanguageInfo("pt-BR", "pt-BR", "Português (Brasil)")); options.Languages.Add(new LanguageInfo("ro-RO", "ro-RO", "Română")); diff --git a/modules/BookingService/src/EasyAbp.BookingService.Web/EasyAbp.BookingService.Web.csproj b/modules/BookingService/src/EasyAbp.BookingService.Web/EasyAbp.BookingService.Web.csproj index d06d887..2421b69 100644 --- a/modules/BookingService/src/EasyAbp.BookingService.Web/EasyAbp.BookingService.Web.csproj +++ b/modules/BookingService/src/EasyAbp.BookingService.Web/EasyAbp.BookingService.Web.csproj @@ -22,7 +22,7 @@ - + diff --git a/modules/Common/src/EasyAbp.BookingService.Common.Domain.Shared/EasyAbp.BookingService.Common.Domain.Shared.csproj b/modules/Common/src/EasyAbp.BookingService.Common.Domain.Shared/EasyAbp.BookingService.Common.Domain.Shared.csproj index 90e2f65..4e35c4c 100644 --- a/modules/Common/src/EasyAbp.BookingService.Common.Domain.Shared/EasyAbp.BookingService.Common.Domain.Shared.csproj +++ b/modules/Common/src/EasyAbp.BookingService.Common.Domain.Shared/EasyAbp.BookingService.Common.Domain.Shared.csproj @@ -14,7 +14,7 @@ - + diff --git a/modules/Common/src/EasyAbp.BookingService.Common.Web/EasyAbp.BookingService.Common.Web.csproj b/modules/Common/src/EasyAbp.BookingService.Common.Web/EasyAbp.BookingService.Common.Web.csproj index 3ffe0b8..d4ca104 100644 --- a/modules/Common/src/EasyAbp.BookingService.Common.Web/EasyAbp.BookingService.Common.Web.csproj +++ b/modules/Common/src/EasyAbp.BookingService.Common.Web/EasyAbp.BookingService.Common.Web.csproj @@ -21,7 +21,7 @@ - +