Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions MathCore.Hosting.WPF/ApplicationHosting.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ public abstract class ApplicationHosting : Application
/// <summary>Событие возникает в момент первичной конфигурации хоста</summary>
protected static event Action<IHostBuilder>? ConfigureHost;

private static readonly List<Action<IHostBuilder>> __HostBuilderConfigurations = new();
private static readonly List<Action<IHostBuilder>> __HostBuilderConfigurations = [];

/// <summary>Добавить действие конфигурации хоста</summary>
/// <param name="Configurator">Действие конфигурации</param>
Expand All @@ -26,10 +26,10 @@ public abstract class ApplicationHosting : Application
/// <summary>Событие, возникающее при инициализации хоста для добавления сервисов в контейнер</summary>
protected static event Action<HostBuilderContext, IServiceCollection>? ConfigureServices;

private static readonly List<Action<HostBuilderContext, IServiceCollection>> __ServicesConfigurators = new()
{
private static readonly List<Action<HostBuilderContext, IServiceCollection>> __ServicesConfigurators =
[
LoadingServiceFromExecutingAssembly,
};
];

public static IReadOnlyList<Assembly> ErrorLoadingServicesAssemblies { get; private set; } = Array.Empty<Assembly>();

Expand Down Expand Up @@ -107,6 +107,12 @@ public static IHostBuilder CreateHostBuilder(string[] Args)
foreach (var configurator in __HostBuilderConfigurations)
configurator(builder);

builder.ConfigureServices((context, services) =>
{
services.AddSingleton(context.HostingEnvironment);
services.AddSingleton(_ => Current);
});

ConfigureHost?.Invoke(builder);

foreach (var configurator in __ServicesConfigurators)
Expand Down
6 changes: 3 additions & 3 deletions MathCore.Hosting.WPF/MathCore.Hosting.WPF.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
</PropertyGroup>

<PropertyGroup>
<Version>0.0.14.1</Version>
<Version>0.0.13.1</Version>
<PackageReleaseNotes>
Мелкие исправления
Добавлен метод-расширение для MathCore.WPF.Command, обеспечивающий возможностьб логирования процесса выполнения
</PackageReleaseNotes>
</PropertyGroup>

Expand Down Expand Up @@ -51,7 +51,7 @@

<ItemGroup>
<PackageReference Include="MathCore.Hosting" Version="0.0.5.1" />
<PackageReference Include="MathCore.WPF" Version="0.0.48.1" />
<PackageReference Include="MathCore.WPF" Version="0.0.48.2" />
</ItemGroup>

<PropertyGroup Condition="'$(TargetFramework)'=='net7.0-windows'">
Expand Down