From dfe824fc0272eeb1ea5b960e0078fe1e3f25fdb9 Mon Sep 17 00:00:00 2001 From: Argo Date: Wed, 11 Nov 2020 16:06:36 +0800 Subject: [PATCH] =?UTF-8?q?!647=20build(#I24SVG):=20=E5=8D=87=E7=BA=A7?= =?UTF-8?q?=E5=88=B0=20net5.0=20*=20release:=20=E5=8F=91=E5=B8=83=E6=96=B0?= =?UTF-8?q?=E7=89=88=E6=9C=AC=205.0.0-beta01=20*=20refactor:=20=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=20action=20=E7=BC=96=E8=AF=91=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E4=B8=BA=205.0.100=20*=20test:=20=E5=8D=95=E5=85=83=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E6=9B=B4=E6=96=B0=E5=88=B0=20net5.0=20*=20build:=20se?= =?UTF-8?q?rver=20=E6=A8=A1=E5=BC=8F=E6=9B=B4=E6=96=B0=E5=88=B0=20net5.0?= =?UTF-8?q?=20*=20build:=20wasm=20=E6=A8=A1=E5=BC=8F=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E5=88=B0=20net5.0=20*=20refactor:=20=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=A2=9E=E5=8A=A0=20SupportedPlatform=20?= =?UTF-8?q?=E5=B0=8F=E8=8A=82=20*=20build:=20Server=20=E5=B7=A5=E7=A8=8B?= =?UTF-8?q?=E5=8D=87=E7=BA=A7=E5=88=B0=205.0=20*=20build:=20Shared=20?= =?UTF-8?q?=E5=B7=A5=E7=A8=8B=E5=8D=87=E7=BA=A7=E5=88=B0=20net5.0=20*=20bu?= =?UTF-8?q?ild:=20Doc=20=E5=B7=A5=E7=A8=8B=E5=8D=87=E7=BA=A7=E5=88=B0=20ne?= =?UTF-8?q?t5.0=20*=20refactor:=20=E7=A7=BB=E9=99=A4=E8=BF=87=E6=9C=9F?= =?UTF-8?q?=E6=96=B9=E6=B3=95=20*=20build:=20BootstrapBlazor=20=E5=8D=87?= =?UTF-8?q?=E7=BA=A7=E5=88=B0=205.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/pack.yml | 2 +- .github/workflows/publish.yml | 2 +- .../BootstrapBlazor.Docs.csproj | 8 +++++--- .../BootstrapBlazor.Server.csproj | 6 +++++- .../BootstrapBlazor.Shared.csproj | 12 +++++++----- ...BootstrapBlazor.WebAssembly.ClientHost.csproj | 16 +++++++--------- ...BootstrapBlazor.WebAssembly.ServerHost.csproj | 6 +++--- src/BootstrapBlazor/BootstrapBlazor.csproj | 16 +++++++++------- .../Json/Internal/StringLocalizer.cs | 5 ----- test/UnitTest/UnitTest.csproj | 2 +- 10 files changed, 39 insertions(+), 36 deletions(-) diff --git a/.github/workflows/pack.yml b/.github/workflows/pack.yml index 5e45cac23..260440e46 100644 --- a/.github/workflows/pack.yml +++ b/.github/workflows/pack.yml @@ -16,7 +16,7 @@ jobs: - name: Setup .NET Core uses: actions/setup-dotnet@v1 with: - dotnet-version: 3.1.403 + dotnet-version: 5.0.100 - name: Publish to Nuget env: diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index ddaeaf093..32646cd66 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -16,7 +16,7 @@ jobs: - name: Setup .NET Core uses: actions/setup-dotnet@v1 with: - dotnet-version: 3.1.402 + dotnet-version: 5.0.100 - name: Publish wasm run: | diff --git a/src/BootstrapBlazor.Docs/BootstrapBlazor.Docs.csproj b/src/BootstrapBlazor.Docs/BootstrapBlazor.Docs.csproj index b5a17fd31..ae73cd740 100644 --- a/src/BootstrapBlazor.Docs/BootstrapBlazor.Docs.csproj +++ b/src/BootstrapBlazor.Docs/BootstrapBlazor.Docs.csproj @@ -1,9 +1,11 @@ - netstandard2.1 - Library - 3.0 + net5.0 + + + + diff --git a/src/BootstrapBlazor.Server/BootstrapBlazor.Server.csproj b/src/BootstrapBlazor.Server/BootstrapBlazor.Server.csproj index a7db9b53a..0fcf7edab 100644 --- a/src/BootstrapBlazor.Server/BootstrapBlazor.Server.csproj +++ b/src/BootstrapBlazor.Server/BootstrapBlazor.Server.csproj @@ -1,10 +1,14 @@  - netcoreapp3.1 + net5.0 true + + + + diff --git a/src/BootstrapBlazor.Shared/BootstrapBlazor.Shared.csproj b/src/BootstrapBlazor.Shared/BootstrapBlazor.Shared.csproj index c2c0c9a29..f87e65a26 100644 --- a/src/BootstrapBlazor.Shared/BootstrapBlazor.Shared.csproj +++ b/src/BootstrapBlazor.Shared/BootstrapBlazor.Shared.csproj @@ -1,18 +1,20 @@  - netstandard2.1 - Library - 3.0 + net5.0 true - 3.1.0 + 5.0.0 + + + + - + diff --git a/src/BootstrapBlazor.WebAssembly.ClientHost/BootstrapBlazor.WebAssembly.ClientHost.csproj b/src/BootstrapBlazor.WebAssembly.ClientHost/BootstrapBlazor.WebAssembly.ClientHost.csproj index 37863aca1..1dc67bdf2 100644 --- a/src/BootstrapBlazor.WebAssembly.ClientHost/BootstrapBlazor.WebAssembly.ClientHost.csproj +++ b/src/BootstrapBlazor.WebAssembly.ClientHost/BootstrapBlazor.WebAssembly.ClientHost.csproj @@ -1,16 +1,14 @@ - + - netstandard2.1 - 3.0 + net5.0 service-worker-assets.js - - - - + + + @@ -18,8 +16,8 @@ - - + + diff --git a/src/BootstrapBlazor.WebAssembly.ServerHost/BootstrapBlazor.WebAssembly.ServerHost.csproj b/src/BootstrapBlazor.WebAssembly.ServerHost/BootstrapBlazor.WebAssembly.ServerHost.csproj index 61169fb7c..3ac5ccbec 100644 --- a/src/BootstrapBlazor.WebAssembly.ServerHost/BootstrapBlazor.WebAssembly.ServerHost.csproj +++ b/src/BootstrapBlazor.WebAssembly.ServerHost/BootstrapBlazor.WebAssembly.ServerHost.csproj @@ -1,12 +1,12 @@ - netcoreapp3.1 + net5.0 true - + - + diff --git a/src/BootstrapBlazor/BootstrapBlazor.csproj b/src/BootstrapBlazor/BootstrapBlazor.csproj index 9fa2e1eed..3d4e9df96 100644 --- a/src/BootstrapBlazor/BootstrapBlazor.csproj +++ b/src/BootstrapBlazor/BootstrapBlazor.csproj @@ -1,19 +1,21 @@  - netstandard2.1 - Library - 3.0 + net5.0 true logo.png - 3.1.29-beta02 + 5.0.0-beta01 更新日志：https://gitee.com/LongbowEnterprise/BootstrapBlazor/wikis - - - + + + + + + + diff --git a/src/BootstrapBlazor/Localization/Json/Internal/StringLocalizer.cs b/src/BootstrapBlazor/Localization/Json/Internal/StringLocalizer.cs index 2d3feac8f..1ec089ffc 100644 --- a/src/BootstrapBlazor/Localization/Json/Internal/StringLocalizer.cs +++ b/src/BootstrapBlazor/Localization/Json/Internal/StringLocalizer.cs @@ -1,7 +1,5 @@ using Microsoft.Extensions.Localization; -using System; using System.Collections.Generic; -using System.Globalization; namespace BootstrapBlazor.Localization.Json { @@ -22,8 +20,5 @@ namespace BootstrapBlazor.Localization.Json public LocalizedString this[string name, params object[] arguments] => _localizer[name, arguments]; public IEnumerable GetAllStrings(bool includeParentCultures) => _localizer.GetAllStrings(includeParentCultures); - - [Obsolete("This method is obsolete. Use `CurrentCulture` and `CurrentUICulture` instead.")] - public IStringLocalizer WithCulture(CultureInfo culture) => _localizer.WithCulture(culture); } } diff --git a/test/UnitTest/UnitTest.csproj b/test/UnitTest/UnitTest.csproj index aa1a8f782..deba05655 100644 --- a/test/UnitTest/UnitTest.csproj +++ b/test/UnitTest/UnitTest.csproj @@ -1,7 +1,7 @@ - netcoreapp3.1 + net5.0 false