Skip to content

Commit 18454bc

Browse files
author
Yatao Li
committed
add trimmer options from latest avalonia templates
1 parent ba6d628 commit 18454bc

File tree

5 files changed

+32
-4
lines changed

5 files changed

+32
-4
lines changed

Properties/launchSettings.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
},
1010
"norc": {
1111
"commandName": "Project",
12-
"commandLineArgs": "-u NORC"
12+
"commandLineArgs": "-u NORC",
13+
"workingDirectory": "C:\\Users\\Yatao"
1314
},
1415
"built_nvim": {
1516
"commandName": "Project",

app.manifest

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
3+
<!-- This manifest is used on Windows only.
4+
Don't remove it as it might cause problems with window transparency and embedded controls.
5+
For more details visit https://learn.microsoft.com/en-us/windows/win32/sbscs/application-manifests -->
6+
<assemblyIdentity version="1.0.0.0" name="FVim"/>
7+
8+
<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
9+
<application>
10+
<!-- A list of the Windows versions that this application has been tested on
11+
and is designed to work with. Uncomment the appropriate elements
12+
and Windows will automatically select the most compatible environment. -->
13+
14+
<!-- Windows 10 -->
15+
<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />
16+
</application>
17+
</compatibility>
18+
</assembly>

fvim.fsproj

+10-1
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,21 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net7.0</TargetFramework>
4+
<TargetFramework>net6.0</TargetFramework>
55
<AssemblyName>FVim</AssemblyName>
66
<Prefer32Bit>false</Prefer32Bit>
77
<ApplicationIcon>Assets\fvim.ico</ApplicationIcon>
88
<OutputType>Exe</OutputType>
9+
<!--New options from https://github.com/AvaloniaUI/avalonia-dotnet-templates/blob/master/templates/fsharp/app/AvaloniaAppTemplate.fsproj below:-->
10+
<BuiltInComInteropSupport>true</BuiltInComInteropSupport>
11+
<ApplicationManifest>app.manifest</ApplicationManifest>
12+
<AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
913
</PropertyGroup>
1014

15+
<ItemGroup>
16+
<TrimmerRootAssembly Include="Avalonia.Themes.Fluent" />
17+
</ItemGroup>
18+
1119
<PropertyGroup Condition="'$(Configuration)' == 'Release'">
1220
<OutputType>WinExe</OutputType>
1321
<PublishTrimmed>true</PublishTrimmed>
@@ -84,6 +92,7 @@
8492
<PackageReference Include="Avalonia.ReactiveUI" Version="0.10.19" />
8593
<PackageReference Include="Avalonia.Diagnostics" Version="0.10.19" />
8694
<PackageReference Include="Avalonia.Svg" Version="0.10.18" />
95+
<PackageReference Include="XamlNameReferenceGenerator" Version="1.6.1" />
8796

8897
<PackageReference Include="FSharp.Control.Reactive" Version="5.0.5" />
8998
<PackageReference Include="FSharp.Data" Version="5.0.2" />

fvim.fsproj.user

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
44
<_LastSelectedProfileId>F:\git\fvim\Properties\PublishProfiles\FolderProfile.pubxml</_LastSelectedProfileId>
5-
<ActiveDebugProfile>fvim</ActiveDebugProfile>
5+
<ActiveDebugProfile>norc</ActiveDebugProfile>
66
</PropertyGroup>
77
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
88
<DebuggerFlavor>ProjectDebugger</DebuggerFlavor>

update.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
pkill FVim
44
dotnet build -c Release fvim.fsproj
55
sudo rm -rf /usr/share/fvim/*
6-
sudo cp -r bin/Release/net5.0/* /usr/share/fvim/
6+
sudo cp -r bin/Release/net6.0/* /usr/share/fvim/

0 commit comments

Comments
 (0)