Skip to content

Commit

Permalink
add trimmer options from latest avalonia templates
Browse files Browse the repository at this point in the history
  • Loading branch information
Yatao Li committed Apr 10, 2023
1 parent ba6d628 commit 18454bc
Show file tree
Hide file tree
Showing 5 changed files with 32 additions and 4 deletions.
3 changes: 2 additions & 1 deletion Properties/launchSettings.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
},
"norc": {
"commandName": "Project",
"commandLineArgs": "-u NORC"
"commandLineArgs": "-u NORC",
"workingDirectory": "C:\\Users\\Yatao"
},
"built_nvim": {
"commandName": "Project",
Expand Down
18 changes: 18 additions & 0 deletions app.manifest
Original file line number Diff line number Diff line change
@@ -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>
11 changes: 10 additions & 1 deletion fvim.fsproj
Original file line number Diff line number Diff line change
@@ -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>
Expand Down Expand Up @@ -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" />
Expand Down
2 changes: 1 addition & 1 deletion fvim.fsproj.user
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion update.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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/

0 comments on commit 18454bc

Please sign in to comment.