From 225a954bb3feeae3ddcb3ed8ff2660b9d7642c16 Mon Sep 17 00:00:00 2001
From: Joseph Moreno <44370115+josephmoresena@users.noreply.github.com>
Date: Sat, 9 Oct 2021 12:02:31 -0500
Subject: [PATCH] Update to ILCompiler 7.0.0-*

Official support added to MacOS x64
---
 src/AvaloniaCoreRTDemo.csproj | 11 +++++++++--
 test.command                  |  7 +++++++
 test.sh                       |  3 +++
 3 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100755 test.command
 create mode 100644 test.sh

diff --git a/src/AvaloniaCoreRTDemo.csproj b/src/AvaloniaCoreRTDemo.csproj
index 1e09e55..0da74cb 100644
--- a/src/AvaloniaCoreRTDemo.csproj
+++ b/src/AvaloniaCoreRTDemo.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
 	<!-- if you want to check exceptions, change this to "Exe" and start your app from the console -->
     <OutputType>WinExe</OutputType>
@@ -36,7 +36,7 @@
     <PackageReference Include="Avalonia" Version="0.10.7" />
     <PackageReference Include="Avalonia.Desktop" Version="0.10.7" />
     <PackageReference Include="Avalonia.ReactiveUI" Version="0.10.7" />
-    <PackageReference Include="Microsoft.DotNet.ILCompiler" Version="6.0.0-*" />
+    <PackageReference Include="Microsoft.DotNet.ILCompiler" Version="7.0.0-*" />
   </ItemGroup>
   <ItemGroup>
     <!-- Avalonia relies heavily on reflection. Describe types reflected upon here. -->
@@ -50,4 +50,11 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
+  <Target Name="ConfigureTrimming" BeforeTargets="PrepareForILLink">
+    <ItemGroup>
+      <ManagedAssemblyToLink>
+        <TrimMode>link</TrimMode>
+      </ManagedAssemblyToLink>
+    </ItemGroup>
+  </Target>
 </Project>
diff --git a/test.command b/test.command
new file mode 100755
index 0000000..0ad68db
--- /dev/null
+++ b/test.command
@@ -0,0 +1,7 @@
+#!/bin/bash
+dir=${0%/*}
+if [ -d "$dir" ]; then
+  cd "$dir"
+fi
+rm -f src/packages.lock.json
+dotnet publish -r osx-x64 -c release /p:RestoreLockedMode=true
\ No newline at end of file
diff --git a/test.sh b/test.sh
new file mode 100644
index 0000000..ee52df7
--- /dev/null
+++ b/test.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+rm -f src/packages.lock.json
+dotnet publish -r linux-x64 -c release /p:RestoreLockedMode=true