Merge pull request #455 from unoplatform/dev/mazi/skia-fixes
Fixes for Skia GTK and WPF
This commit is contained in:
Коммит
824c6c4cb5
|
@ -13,6 +13,7 @@
|
||||||
<UpToDateCheckInput Include="..\ToDo.UI\**\*.xaml" />
|
<UpToDateCheckInput Include="..\ToDo.UI\**\*.xaml" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="7.0.0" />
|
||||||
<PackageReference Include="Microsoft.Identity.Client" Version="4.47.2" />
|
<PackageReference Include="Microsoft.Identity.Client" Version="4.47.2" />
|
||||||
<PackageReference Include="SkiaSharp.Views.Uno.WinUI" Version="2.88.3" />
|
<PackageReference Include="SkiaSharp.Views.Uno.WinUI" Version="2.88.3" />
|
||||||
<PackageReference Include="SkiaSharp.Skottie" Version="2.88.3" />
|
<PackageReference Include="SkiaSharp.Skottie" Version="2.88.3" />
|
||||||
|
|
|
@ -18,6 +18,7 @@
|
||||||
</AssemblyAttribute>
|
</AssemblyAttribute>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="7.0.0" />
|
||||||
<PackageReference Include="Microsoft.Identity.Client" Version="4.47.2" />
|
<PackageReference Include="Microsoft.Identity.Client" Version="4.47.2" />
|
||||||
<PackageReference Include="SkiaSharp.Views.Uno.WinUI" Version="2.88.3" />
|
<PackageReference Include="SkiaSharp.Views.Uno.WinUI" Version="2.88.3" />
|
||||||
<PackageReference Include="SkiaSharp.Skottie" Version="2.88.3" />
|
<PackageReference Include="SkiaSharp.Skottie" Version="2.88.3" />
|
||||||
|
|
|
@ -35,7 +35,7 @@ public sealed partial class App : Application
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if NET5_0_OR_GREATER && WINDOWS
|
#if NET5_0_OR_GREATER && WINDOWS && !HAS_UNO
|
||||||
_window = new Window();
|
_window = new Window();
|
||||||
#else
|
#else
|
||||||
_window = Microsoft.UI.Xaml.Window.Current;
|
_window = Microsoft.UI.Xaml.Window.Current;
|
||||||
|
|
Загрузка…
Ссылка в новой задаче