From 47f5732b84993470929a65837b8424f7a0aeeb6c Mon Sep 17 00:00:00 2001
From: Maksym Katsydan <maxkatz6@outlook.com>
Date: Sat, 12 Nov 2022 03:48:48 -0500
Subject: [PATCH] Use net7 AOT

---
 src/AvaloniaCoreRTDemo.csproj | 30 +++++++---------------
 src/nuget.config              |  2 +-
 src/rd.xml                    | 48 -----------------------------------
 3 files changed, 10 insertions(+), 70 deletions(-)
 delete mode 100644 src/rd.xml

diff --git a/src/AvaloniaCoreRTDemo.csproj b/src/AvaloniaCoreRTDemo.csproj
index 274ea79..57a8a7f 100644
--- a/src/AvaloniaCoreRTDemo.csproj
+++ b/src/AvaloniaCoreRTDemo.csproj
@@ -3,12 +3,11 @@
   <PropertyGroup>
     <!-- if you want to check exceptions, change this to "Exe" and start your app from the console -->
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <Platforms>x64</Platforms>
     <ApplicationIcon>Assets/app.ico</ApplicationIcon>
     <InvariantGlobalization>true</InvariantGlobalization>
-    <!--https://docs.microsoft.com/en-us/dotnet/core/deploying/trimming/trimming-options-->
-    <TrimmerDefaultAction>link</TrimmerDefaultAction>
+    <PublishAot>true</PublishAot>
 
     <IsWindows Condition="$([MSBuild]::IsOSPlatform('Windows'))">true</IsWindows>
     <IsLinux Condition="$([MSBuild]::IsOSPlatform('Linux'))">true</IsLinux>
@@ -21,12 +20,8 @@
     <IlcGenerateCompleteTypeMetadata>false</IlcGenerateCompleteTypeMetadata>
     <IlcGenerateStackTraceData>false</IlcGenerateStackTraceData>
     <IlcDisableUnhandledExceptionExperience>true</IlcDisableUnhandledExceptionExperience>
+    <StripSymbols>true</StripSymbols>
   </PropertyGroup>
-
-  <!-- Instruct NativeAOT to use this native dependency, required to build Avalonia. This library comes from the Windows SDK. -->
-  <ItemGroup Condition="'$(IsWindows)'=='true'">
-    <NativeLibrary Include="WindowsApp.lib" />
-  </ItemGroup>
   
   <ItemGroup>
     <AvaloniaResource Include="Assets/**" />
@@ -45,13 +40,13 @@
   </ItemGroup>
     
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="11.0.0-preview4" />
-    <PackageReference Include="Avalonia.Desktop" Version="11.0.0-preview4" />
-    <PackageReference Include="Avalonia.ReactiveUI" Version="11.0.0-preview4" />
-    <PackageReference Include="Avalonia.Themes.Simple" Version="11.0.0-preview4" />
-    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.0-preview4" />
+    <PackageReference Include="Avalonia" Version="11.0.999-cibuild0026098-beta" />
+    <PackageReference Include="Avalonia.Desktop" Version="11.0.999-cibuild0026098-beta" />
+    <PackageReference Include="Avalonia.ReactiveUI" Version="11.0.999-cibuild0026098-beta" />
+    <PackageReference Include="Avalonia.Themes.Simple" Version="11.0.999-cibuild0026098-beta" />
+    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.999-cibuild0026098-beta" />
     <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-    <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.0-preview4" />
+    <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.999-cibuild0026098-beta" />
     <!--Condition below is needed to generate macOS App only.-->
     <PackageReference Include="Dotnet.Bundle" Version="*" Condition="$(RuntimeIdentifier.StartsWith('osx'))" />
   </ItemGroup>
@@ -72,12 +67,5 @@
     <!-- Optional -->
     <NSRequiresAquaSystemAppearance>true</NSRequiresAquaSystemAppearance>
   </PropertyGroup>
-  
-  <ItemGroup>
-    <PackageReference Include="Microsoft.DotNet.ILCompiler" Version="7.0.0-*" />
-    <!-- Avalonia relies heavily on reflection. Describe types reflected upon here. -->
-    <RdXmlFile Include="rd.xml" />
-    <RuntimeHostConfigurationOption Include="Switch.System.Reflection.Assembly.SimulatedCallingAssembly" Value="true" />
-  </ItemGroup>
 
 </Project>
diff --git a/src/nuget.config b/src/nuget.config
index 73b40f7..0fd24d3 100644
--- a/src/nuget.config
+++ b/src/nuget.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <packageSources>
-	<add key="dotnet7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7/nuget/v3/index.json" />
+	<add key="avalonia" value="https://nuget.avaloniaui.net/repository/avalonia-all/index.json" />
     <add key="nuget" value="https://api.nuget.org/v3/index.json" />
   </packageSources>
 </configuration>
diff --git a/src/rd.xml b/src/rd.xml
deleted file mode 100644
index ba932c4..0000000
--- a/src/rd.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<Directives>
-	<Application>
-	<!-- main app assembly provides types which needs to be reflected upon -->
-	<Assembly Name="AvaloniaCoreRTDemo" Dynamic="Required All"></Assembly>
-	
-	<!-- these are needed when you show images and draw text -->
-	<Assembly Name="Avalonia.Animation">
-		<Type Name="Avalonia.Animation.Easings.QuadraticEaseIn" Dynamic="Required All" />
-		<Type Name="Avalonia.Animation.Easings.QuadraticEaseOut" Dynamic="Required All" />
-		<Type Name="Avalonia.Animation.Easings.CubicEaseOut" Dynamic="Required All" />
-		<Type Name="Avalonia.Animation.Easings.LinearEasing" Dynamic="Required All" />
-	</Assembly>
-	<Assembly Name="Avalonia.Themes.Default" Dynamic="Required All"></Assembly>
-	<Assembly Name="Avalonia.Visuals" Dynamic="Required All">
-		<Type Name="Avalonia.Media.SolidColorBrush" Dynamic="Required All" />
-	</Assembly>
-	<Assembly Name="SkiaSharp" Dynamic="Required All"></Assembly>
-	
-	<!-- To support Fluent themes trimming the final assembly we need to add this entry -->
-	<Assembly Name="Avalonia.Themes.Fluent" Dynamic="Required All"></Assembly>
-	
-	<!-- Not known if and when you need these:
-	<Assembly Name="Avalonia.Controls" Dynamic="Required All"></Assembly>
-	<Assembly Name="Avalonia.Base" Dynamic="Required All"></Assembly>
-	<Assembly Name="Avalonia" Dynamic="Required All"></Assembly>
-	<Assembly Name="Avalonia.Interactivity" Dynamic="Required All"></Assembly>
-	<Assembly Name="Avalonia.Layout" Dynamic="Required All"></Assembly>
-	<Assembly Name="Avalonia.Markup" Dynamic="Required All"></Assembly>
-	<Assembly Name="Avalonia.Markup.Xaml" Dynamic="Required All"></Assembly>
-	<Assembly Name="Avalonia.Styling" Dynamic="Required All"></Assembly>
-	<Assembly Name="Avalonia.DesktopRuntime" Dynamic="Required All"></Assembly>
-	<Assembly Name="Avalonia.DesignerSupport" Dynamic="Required All"></Assembly>
-	<Assembly Name="Avalonia.Diagnostics" Dynamic="Required All"></Assembly>
-	<Assembly Name="Avalonia.Dialogs" Dynamic="Required All"></Assembly>
-	<Assembly Name="Avalonia.Input" Dynamic="Required All"></Assembly>
-	<Assembly Name="Avalonia.Logging.Serilog" Dynamic="Required All"></Assembly>
-	<Assembly Name="Avalonia.OpenGL" Dynamic="Required All"></Assembly>
-	<Assembly Name="Avalonia.Desktop" Dynamic="Required All"></Assembly>
-	<Assembly Name="Avalonia.Direct2D1" Dynamic="Required All"></Assembly>
-	<Assembly Name="Avalonia.ReactiveUI" Dynamic="Required All"></Assembly>
-	<Assembly Name="Avalonia.Skia" Dynamic="Required All"></Assembly>
-	<Assembly Name="Avalonia.Win32" Dynamic="Required All"></Assembly>
-	<Assembly Name="ReactiveUI" Dynamic="Required All"></Assembly>
-	<Assembly Name="System.Reactive" Dynamic="Required All"></Assembly>
-	<Assembly Name="Splat" Dynamic="Required All"></Assembly>
-	-->
-	</Application>
-</Directives>