From 18454bc68a746d576f194d0e2bcacd9b7c5ece81 Mon Sep 17 00:00:00 2001
From: Yatao Li <yatli@microsoft.com>
Date: Tue, 11 Apr 2023 03:26:03 +0800
Subject: [PATCH] add trimmer options from latest avalonia templates

---
 Properties/launchSettings.json |  3 ++-
 app.manifest                   | 18 ++++++++++++++++++
 fvim.fsproj                    | 11 ++++++++++-
 fvim.fsproj.user               |  2 +-
 update.sh                      |  2 +-
 5 files changed, 32 insertions(+), 4 deletions(-)
 create mode 100644 app.manifest

diff --git a/Properties/launchSettings.json b/Properties/launchSettings.json
index c65962e..d911b5d 100644
--- a/Properties/launchSettings.json
+++ b/Properties/launchSettings.json
@@ -9,7 +9,8 @@
     },
     "norc": {
       "commandName": "Project",
-      "commandLineArgs": "-u NORC"
+      "commandLineArgs": "-u NORC",
+      "workingDirectory": "C:\\Users\\Yatao"
     },
     "built_nvim": {
       "commandName": "Project",
diff --git a/app.manifest b/app.manifest
new file mode 100644
index 0000000..dbe0016
--- /dev/null
+++ b/app.manifest
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
+  <!-- This manifest is used on Windows only.
+       Don't remove it as it might cause problems with window transparency and embedded controls.
+       For more details visit https://learn.microsoft.com/en-us/windows/win32/sbscs/application-manifests -->
+  <assemblyIdentity version="1.0.0.0" name="FVim"/>
+
+  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+    <application>
+      <!-- A list of the Windows versions that this application has been tested on
+           and is designed to work with. Uncomment the appropriate elements
+           and Windows will automatically select the most compatible environment. -->
+
+      <!-- Windows 10 -->
+      <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />
+    </application>
+  </compatibility>
+</assembly>
diff --git a/fvim.fsproj b/fvim.fsproj
index deb5b5b..a525715 100644
--- a/fvim.fsproj
+++ b/fvim.fsproj
@@ -1,13 +1,21 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <AssemblyName>FVim</AssemblyName>
     <Prefer32Bit>false</Prefer32Bit>
     <ApplicationIcon>Assets\fvim.ico</ApplicationIcon>
     <OutputType>Exe</OutputType>
+    <!--New options from https://github.com/AvaloniaUI/avalonia-dotnet-templates/blob/master/templates/fsharp/app/AvaloniaAppTemplate.fsproj below:-->
+    <BuiltInComInteropSupport>true</BuiltInComInteropSupport>
+    <ApplicationManifest>app.manifest</ApplicationManifest>
+    <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
   </PropertyGroup>
 
+  <ItemGroup>
+    <TrimmerRootAssembly Include="Avalonia.Themes.Fluent" />
+  </ItemGroup>
+
   <PropertyGroup Condition="'$(Configuration)' == 'Release'">
     <OutputType>WinExe</OutputType>
     <PublishTrimmed>true</PublishTrimmed>
@@ -84,6 +92,7 @@
     <PackageReference Include="Avalonia.ReactiveUI" Version="0.10.19" />
     <PackageReference Include="Avalonia.Diagnostics" Version="0.10.19" />
     <PackageReference Include="Avalonia.Svg" Version="0.10.18" />
+    <PackageReference Include="XamlNameReferenceGenerator" Version="1.6.1" />
 
     <PackageReference Include="FSharp.Control.Reactive" Version="5.0.5" />
     <PackageReference Include="FSharp.Data" Version="5.0.2" />
diff --git a/fvim.fsproj.user b/fvim.fsproj.user
index e7ae8fe..1d13a16 100644
--- a/fvim.fsproj.user
+++ b/fvim.fsproj.user
@@ -2,7 +2,7 @@
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <_LastSelectedProfileId>F:\git\fvim\Properties\PublishProfiles\FolderProfile.pubxml</_LastSelectedProfileId>
-    <ActiveDebugProfile>fvim</ActiveDebugProfile>
+    <ActiveDebugProfile>norc</ActiveDebugProfile>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <DebuggerFlavor>ProjectDebugger</DebuggerFlavor>
diff --git a/update.sh b/update.sh
index 96849f2..470b0b2 100755
--- a/update.sh
+++ b/update.sh
@@ -3,4 +3,4 @@
 pkill FVim
 dotnet build -c Release fvim.fsproj
 sudo rm -rf /usr/share/fvim/*
-sudo cp -r bin/Release/net5.0/* /usr/share/fvim/
+sudo cp -r bin/Release/net6.0/* /usr/share/fvim/