From 48d100013b24045ac8655cc5498f70fceb9d995e Mon Sep 17 00:00:00 2001
From: Joseph Moreno <44370115+josephmoresena@users.noreply.github.com>
Date: Tue, 26 Jan 2021 18:56:08 -0500
Subject: [PATCH 1/2] Upgrade Avalonia UI Version

Avalonia UI package upgrade to 0.10.0, System.Reactive isn't longer required by now.
---
 src/AboutWindowViewModel.cs   |  1 +
 src/AvaloniaCoreRTDemo.csproj | 10 ++++------
 src/MainWindowViewModel.cs    |  3 +--
 src/Program.cs                |  8 ++------
 4 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/src/AboutWindowViewModel.cs b/src/AboutWindowViewModel.cs
index 9b443b3..424a18d 100644
--- a/src/AboutWindowViewModel.cs
+++ b/src/AboutWindowViewModel.cs
@@ -5,6 +5,7 @@ using System.Reflection;
 using System.Runtime.InteropServices;
 using Avalonia.Media.Imaging;
 using ReactiveUI;
+
 namespace AvaloniaCoreRTDemo
 {
     public class AboutWindowViewModel : ReactiveObject
diff --git a/src/AvaloniaCoreRTDemo.csproj b/src/AvaloniaCoreRTDemo.csproj
index 5bad490..5f996a3 100644
--- a/src/AvaloniaCoreRTDemo.csproj
+++ b/src/AvaloniaCoreRTDemo.csproj
@@ -13,7 +13,7 @@
     <IlcGenerateStackTraceData>false</IlcGenerateStackTraceData>
     <IlcDisableUnhandledExceptionExperience>true</IlcDisableUnhandledExceptionExperience>
   </PropertyGroup>
-  
+    
   <ItemGroup Condition="$(RuntimeIdentifier.StartsWith('win'))">
     <!-- Instruct CoreRT to use this native dependency, required to build Avalonia. This library comes from the Windows SDK. -->
     <NativeLibrary Include="WindowsApp.lib" />
@@ -32,12 +32,10 @@
     <EmbeddedResource Include="windows.png" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="0.9.11" />
-    <PackageReference Include="Avalonia.Desktop" Version="0.9.11" />
-    <PackageReference Include="Avalonia.ReactiveUI" Version="0.9.11" />
+    <PackageReference Include="Avalonia" Version="0.10.0" />
+    <PackageReference Include="Avalonia.Desktop" Version="0.10.0" />
+    <PackageReference Include="Avalonia.ReactiveUI" Version="0.10.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>
     <!-- Avalonia relies heavily on reflection. Describe types reflected upon here. -->
diff --git a/src/MainWindowViewModel.cs b/src/MainWindowViewModel.cs
index e61fb39..fad3eb4 100644
--- a/src/MainWindowViewModel.cs
+++ b/src/MainWindowViewModel.cs
@@ -1,5 +1,4 @@
-using Avalonia;
-using Avalonia.Media.Imaging;
+using Avalonia.Media.Imaging;
 using ReactiveUI;
 using System;
 using System.Reactive;
diff --git a/src/Program.cs b/src/Program.cs
index 105bcd3..a90b6af 100644
--- a/src/Program.cs
+++ b/src/Program.cs
@@ -1,8 +1,4 @@
-using System;
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Controls.ApplicationLifetimes;
-using Avalonia.Logging.Serilog;
+using Avalonia;
 
 namespace AvaloniaCoreRTDemo
 {
@@ -18,6 +14,6 @@ namespace AvaloniaCoreRTDemo
         public static AppBuilder BuildAvaloniaApp()
             => AppBuilder.Configure<App>()
                 .UsePlatformDetect()
-                .LogToDebug();
+                .LogToTrace();
     }
 }

From c283769b54fa4fa4124b68fe630253a0e040fe50 Mon Sep 17 00:00:00 2001
From: Joseph Moreno <44370115+josephmoresena@users.noreply.github.com>
Date: Wed, 27 Jan 2021 08:21:30 -0500
Subject: [PATCH 2/2] RootAllApplicationAssemblies -> TrimMode

According docs https://github.com/dotnet/runtimelab/blob/feature/NativeAOT/docs/using-nativeaot/optimizing.md RootAllApplicationAssemblies: false isn't more valid and must be replaced by TrimMode: link.

It prevents warnings and reduces at leas to half of RAM consumption at compilation process.
---
 src/AvaloniaCoreRTDemo.csproj | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/AvaloniaCoreRTDemo.csproj b/src/AvaloniaCoreRTDemo.csproj
index 5f996a3..1435406 100644
--- a/src/AvaloniaCoreRTDemo.csproj
+++ b/src/AvaloniaCoreRTDemo.csproj
@@ -8,7 +8,8 @@
   
   <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 -->  
-    <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>
     <IlcGenerateStackTraceData>false</IlcGenerateStackTraceData>
     <IlcDisableUnhandledExceptionExperience>true</IlcDisableUnhandledExceptionExperience>