Skip to content

Commit 95db06e

Browse files
committed
Marked appsettings...json files as AvaloniaResource and loaded them via Avalonias AssetLoader.
1 parent 2477b23 commit 95db06e

2 files changed

Lines changed: 12 additions & 10 deletions

File tree

src/CodeBreaker.Avalonia/CodeBreaker.Avalonia/CodeBreaker.Avalonia.csproj

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@
1111
</ItemGroup>
1212

1313
<ItemGroup>
14-
<Content Include="appsettings.Development.json">
14+
<AvaloniaResource Include="appsettings.Development.json">
1515
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
16-
</Content>
17-
<Content Include="appsettings.json">
16+
</AvaloniaResource>
17+
<AvaloniaResource Include="appsettings.json">
1818
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
19-
</Content>
20-
<Content Include="appsettings.Production.json">
19+
</AvaloniaResource>
20+
<AvaloniaResource Include="appsettings.Production.json">
2121
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
22-
</Content>
22+
</AvaloniaResource>
2323
</ItemGroup>
2424

2525
<ItemGroup>
@@ -28,7 +28,7 @@
2828
<PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.9" />
2929
<PackageReference Include="Avalonia.Fonts.Inter" Version="11.0.9" />
3030
<!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
31-
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.7" />
31+
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.9" />
3232
<PackageReference Include="Avalonia_Gif" Version="1.0.0" />
3333
<PackageReference Include="CNInnovation.Codebreaker.ViewModels" Version="3.5.0-beta.33" />
3434
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />

src/CodeBreaker.Avalonia/CodeBreaker.Avalonia/Extensions/ConfigurationExtensions.cs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using CodeBreaker.Avalonia;
1+
using Avalonia.Platform;
2+
using CodeBreaker.Avalonia;
23
using System;
34

45
namespace Microsoft.Extensions.Configuration;
@@ -19,7 +20,8 @@ public static string GetRequired(this IConfiguration configuration, string key)
1920

2021
public static void AddAppSettingsJson(this ConfigurationManager configuration)
2122
{
22-
configuration.AddJsonFile("appsettings.json", true);
23-
configuration.AddJsonFile($"appsettings.{Environment.GetEnvironmentVariable("DOTNET_ENVIRONMENT")}.json");
23+
var assemblyName = typeof(App).Assembly.GetName().Name;
24+
configuration.AddJsonStream(AssetLoader.Open(new($"avares://{assemblyName}/appsettings.json")));
25+
configuration.AddJsonStream(AssetLoader.Open(new($"avares://{assemblyName}/appsettings.{Environment.GetEnvironmentVariable("DOTNET_ENVIRONMENT")}.json")));
2426
}
2527
}

0 commit comments

Comments
 (0)