Skip to content

Commit 043b80d

Browse files
authored
chore(Hosting): remove Microsoft.Extensions.Hosting.Abstractions deps (#7492)
1 parent b346242 commit 043b80d

6 files changed

Lines changed: 3 additions & 101 deletions

File tree

src/BootstrapBlazor/Components/ErrorLogger/BootstrapBlazorErrorBoundary.cs

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
using Microsoft.AspNetCore.Components.Rendering;
77
using Microsoft.Extensions.Configuration;
8-
using Microsoft.Extensions.Hosting;
98
using Microsoft.Extensions.Logging;
109
using System.Reflection;
1110

@@ -32,10 +31,6 @@ class BootstrapBlazorErrorBoundary : ErrorBoundaryBase
3231
[NotNull]
3332
private NavigationManager? NavigationManager { get; set; }
3433

35-
[Inject]
36-
[NotNull]
37-
private IHostEnvironment? HostEnvironment { get; set; }
38-
3934
/// <summary>
4035
/// 获得/设置 自定义错误处理回调方法
4136
/// </summary>
@@ -161,16 +156,8 @@ public async Task RenderException(Exception exception, IHandlerException? handle
161156

162157
if (handler != null)
163158
{
164-
if (HostEnvironment.IsDevelopment())
165-
{
166-
// IHandlerException 处理异常逻辑
167-
await handler.HandlerExceptionAsync(exception, ExceptionContent);
168-
}
169-
else
170-
{
171-
// 非开发模式下弹窗提示错误信息
172-
await ToastService.Error(ToastTitle, exception.Message);
173-
}
159+
// 非开发模式下弹窗提示错误信息
160+
await ToastService.Error(ToastTitle, exception.Message);
174161
return;
175162
}
176163

src/BootstrapBlazor/Directory.Build.props

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="$(NET8Version)" />
3737
<PackageReference Include="Microsoft.Extensions.Localization" Version="$(NET6Version)" />
3838
<PackageReference Include="Microsoft.Extensions.Http" Version="$(NET8Version)" />
39-
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="$(NET8Version)" />
4039
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="$(NET8Version)" />
4140
</ItemGroup>
4241

@@ -47,7 +46,6 @@
4746
<PackageReference Include="Microsoft.Extensions.Localization" Version="$(NET7Version)" />
4847
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="$(NET8Version)" />
4948
<PackageReference Include="Microsoft.Extensions.Http" Version="$(NET8Version)" />
50-
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="$(NET8Version)" />
5149
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="$(NET8Version)" />
5250
</ItemGroup>
5351

@@ -57,7 +55,6 @@
5755
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="$(NET10Version)" />
5856
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="$(NET10Version)" />
5957
<PackageReference Include="Microsoft.Extensions.Http" Version="$(NET10Version)" />
60-
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="$(NET10Version)" />
6158
<PackageReference Include="Microsoft.Extensions.Localization" Version="$(NET8Version)" />
6259
</ItemGroup>
6360

@@ -67,7 +64,6 @@
6764
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="$(NET10Version)" />
6865
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="$(NET10Version)" />
6966
<PackageReference Include="Microsoft.Extensions.Http" Version="$(NET10Version)" />
70-
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="$(NET10Version)" />
7167
<PackageReference Include="Microsoft.Extensions.Localization" Version="$(NET9Version)" />
7268
</ItemGroup>
7369

@@ -77,7 +73,6 @@
7773
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="$(NET10Version)" />
7874
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="$(NET10Version)" />
7975
<PackageReference Include="Microsoft.Extensions.Http" Version="$(NET10Version)" />
80-
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="$(NET10Version)" />
8176
<PackageReference Include="Microsoft.Extensions.Localization" Version="$(NET10Version)" />
8277
</ItemGroup>
8378

src/BootstrapBlazor/Extensions/BootstrapBlazorServiceCollectionExtensions.cs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1-
// Licensed to the .NET Foundation under one or more agreements.
1+
// Licensed to the .NET Foundation under one or more agreements.
22
// The .NET Foundation licenses this file to you under the Apache 2.0 License
33
// See the LICENSE file in the project root for more information.
44
// Maintainer: Argo Zhang(argo@live.ca) Website: https://www.blazor.zone
55

66
using Microsoft.Extensions.Configuration;
77
using Microsoft.Extensions.DependencyInjection.Extensions;
8-
using Microsoft.Extensions.Hosting;
98
using System.Globalization;
109

1110
namespace Microsoft.Extensions.DependencyInjection;
@@ -37,9 +36,6 @@ public static IServiceCollection AddBootstrapBlazor(this IServiceCollection serv
3736
services.TryAddSingleton<IZipArchiveService, DefaultZipArchiveService>();
3837
services.TryAddSingleton(typeof(IDispatchService<>), typeof(DefaultDispatchService<>));
3938

40-
// 增加 IHostEnvironment 服务
41-
services.TryAddSingleton<IHostEnvironment, MockWasmHostEnvironment>();
42-
4339
// 增加 OtpOptions 配置支持
4440
services.AddOptionsMonitor<OtpOptions>();
4541

src/BootstrapBlazor/Extensions/HostEnvironmentExtensions.cs

Lines changed: 0 additions & 21 deletions
This file was deleted.

src/BootstrapBlazor/Services/MockWasmHostEnvironment.cs

Lines changed: 0 additions & 25 deletions
This file was deleted.

test/UnitTest/Extensions/HostEnvironmentExtensionsTest.cs

Lines changed: 0 additions & 30 deletions
This file was deleted.

0 commit comments

Comments
 (0)