Heku
2 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with
3 additions and
3 deletions
-
src/Android/Avalonia.Android/SingleViewLifetime.cs
-
src/Avalonia.Desktop/AppBuilderDesktopExtensions.cs
|
|
|
@ -10,7 +10,7 @@ internal class SingleViewLifetime : ISingleViewApplicationLifetime, ISingleTopLe |
|
|
|
private AvaloniaMainActivity? _activity; |
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
/// Since Main Activity can be swapped, we should adjust litetime as well.
|
|
|
|
/// Since Main Activity can be swapped, we should adjust lifetime as well.
|
|
|
|
/// </summary>
|
|
|
|
public AvaloniaMainActivity Activity |
|
|
|
{ |
|
|
|
|
|
|
|
@ -9,12 +9,12 @@ namespace Avalonia |
|
|
|
public static AppBuilder UsePlatformDetect(this AppBuilder builder) |
|
|
|
{ |
|
|
|
// We don't have the ability to load every assembly right now, so we are
|
|
|
|
// stuck with manual configuration here
|
|
|
|
// stuck with manual configuration here
|
|
|
|
// Helpers are extracted to separate methods to take the advantage of the fact
|
|
|
|
// that CLR doesn't try to load dependencies before referencing method is jitted
|
|
|
|
// Additionally, by having a hard reference to each assembly,
|
|
|
|
// we verify that the assemblies are in the final .deps.json file
|
|
|
|
// so .NET Core knows where to load the assemblies from,.
|
|
|
|
// so .NET Core knows where to load the assemblies from.
|
|
|
|
if (OperatingSystemEx.IsWindows()) |
|
|
|
{ |
|
|
|
LoadWin32(builder); |
|
|
|
|