holger/AvaloniaCoreRTDemo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #7 from josephmoresena/master

Browse Source 
Upgrade Avalonia UI Version
This commit is contained in:
Todor Totev 2021-02-11 23:07:11 +02:00 committed by GitHub
commit 97ea6eda82
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/AboutWindowViewModel.cs
View File

@ -5,6 +5,7 @@ using System.Reflection;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using Avalonia.Media.Imaging; using Avalonia.Media.Imaging;
using ReactiveUI; using ReactiveUI;
namespace AvaloniaCoreRTDemo namespace AvaloniaCoreRTDemo
{ {
public class AboutWindowViewModel : ReactiveObject public class AboutWindowViewModel : ReactiveObject

13
src/AvaloniaCoreRTDemo.csproj
View File

@ -8,12 +8,13 @@
<PropertyGroup> <PropertyGroup>
<!-- these can help when debugging weird exceptions especially when reflection is involved. See https://github.com/dotnet/corert/blob/master/Documentation/using-corert/optimizing-corert.md --> <!-- these can help when debugging weird exceptions especially when reflection is involved. See https://github.com/dotnet/corert/blob/master/Documentation/using-corert/optimizing-corert.md -->
<RootAllApplicationAssemblies>false</RootAllApplicationAssemblies> <!--RootAllApplicationAssemblies: False -> TrimMode:link See https://github.com/dotnet/runtimelab/issues/597 and https://github.com/dotnet/runtimelab/blob/feature/NativeAOT/docs/using-nativeaot/optimizing.md -->
<TrimMode>link</TrimMode>
<IlcGenerateCompleteTypeMetadata>false</IlcGenerateCompleteTypeMetadata> <IlcGenerateCompleteTypeMetadata>false</IlcGenerateCompleteTypeMetadata>
<IlcGenerateStackTraceData>false</IlcGenerateStackTraceData> <IlcGenerateStackTraceData>false</IlcGenerateStackTraceData>
<IlcDisableUnhandledExceptionExperience>true</IlcDisableUnhandledExceptionExperience> <IlcDisableUnhandledExceptionExperience>true</IlcDisableUnhandledExceptionExperience>
</PropertyGroup> </PropertyGroup>
<ItemGroup Condition="$(RuntimeIdentifier.StartsWith('win'))"> <ItemGroup Condition="$(RuntimeIdentifier.StartsWith('win'))">
<!-- Instruct CoreRT to use this native dependency, required to build Avalonia. This library comes from the Windows SDK. --> <!-- Instruct CoreRT to use this native dependency, required to build Avalonia. This library comes from the Windows SDK. -->
<NativeLibrary Include="WindowsApp.lib" /> <NativeLibrary Include="WindowsApp.lib" />
@ -32,12 +33,10 @@
<EmbeddedResource Include="windows.png" /> <EmbeddedResource Include="windows.png" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Avalonia" Version="0.9.11" /> <PackageReference Include="Avalonia" Version="0.10.0" />
<PackageReference Include="Avalonia.Desktop" Version="0.9.11" /> <PackageReference Include="Avalonia.Desktop" Version="0.10.0" />
<PackageReference Include="Avalonia.ReactiveUI" Version="0.9.11" /> <PackageReference Include="Avalonia.ReactiveUI" Version="0.10.0" />
<PackageReference Include="Microsoft.DotNet.ILCompiler" Version="6.0.0-*" /> <PackageReference Include="Microsoft.DotNet.ILCompiler" Version="6.0.0-*" />
<!-- This is a hack. Avalonia 0.9.10 depends on a version of System.Reactive prior 4.4.1, which contains a critical fix for building with CoreRT -->
<PackageReference Include="System.Reactive" Version="5.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<!-- Avalonia relies heavily on reflection. Describe types reflected upon here. --> <!-- Avalonia relies heavily on reflection. Describe types reflected upon here. -->

3
src/MainWindowViewModel.cs
View File

@ -1,5 +1,4 @@
using Avalonia; using Avalonia.Media.Imaging;
using Avalonia.Media.Imaging;
using ReactiveUI; using ReactiveUI;
using System; using System;
using System.Reactive; using System.Reactive;

8
src/Program.cs
View File

@ -1,8 +1,4 @@
using System; using Avalonia;
using Avalonia;
using Avalonia.Controls;
using Avalonia.Controls.ApplicationLifetimes;
using Avalonia.Logging.Serilog;
namespace AvaloniaCoreRTDemo namespace AvaloniaCoreRTDemo
{ {
@ -18,6 +14,6 @@ namespace AvaloniaCoreRTDemo
public static AppBuilder BuildAvaloniaApp() public static AppBuilder BuildAvaloniaApp()
=> AppBuilder.Configure<App>() => AppBuilder.Configure<App>()
.UsePlatformDetect() .UsePlatformDetect()
.LogToDebug(); .LogToTrace();
} }
} }