Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build",
"program": "${workspaceFolder}/bin/Debug/net6.0/FVim.dll",
"program": "${workspaceFolder}/bin/Debug/net8.0/FVim.dll",
"args": ["--daemon"],
"cwd": "${workspaceFolder}",
"stopAtEntry": false,
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ Cross platform Neovim front-end UI, built with [F#](https://fsharp.org/) + [Aval
- Arch Linux: [Install via AUR](https://aur.archlinux.org/packages/fvim/)
- RPM-based distributions: `rpm -ivh fvim_package_name.rpm`
- Fedora: `dnf install fvim_package_name.rpm`
- Compile from Source (having dotnet-sdk-6.0.x installed):
- Compile from Source (having dotnet-sdk-8.0.x installed):
```
git clone https://github.com/yatli/fvim && cd fvim && dotnet publish -f net6.0 -c Release -r linux-x64 --self-contained
git clone https://github.com/yatli/fvim && cd fvim && dotnet publish -f net8.0 -c Release -r linux-x64 --self-contained
```

### Features
Expand Down Expand Up @@ -88,7 +88,7 @@ Custom popup menu entry icons (see below for how to configure):


### Building from source
We're now targeting `net6.0` so make sure to install the latest preview SDK from the [.NET site](https://dotnet.microsoft.com/download/dotnet/6.0).
We're now targeting `net8.0` so make sure to install the latest SDK from the [.NET site](https://dotnet.microsoft.com/download/dotnet/8.0).
We're actively tracking the head of `Avalonia`, and fetch the nightly packages from myget (see `NuGet.config`).

Then, simply:
Expand Down
14 changes: 7 additions & 7 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
inputs:
packageType: sdk
includePreviewVersions: false
version: 6.0.x
version: 8.0.x
installationPath: $(Agent.ToolsDirectory)/dotnet
- task: NuGetToolInstaller@1
- task: PowerShell@2
Expand All @@ -37,7 +37,7 @@ jobs:
inputs:
packageType: sdk
includePreviewVersions: false
version: 6.0.x
version: 8.0.x
installationPath: $(Agent.ToolsDirectory)/dotnet
- task: NuGetToolInstaller@1
- task: PowerShell@2
Expand All @@ -58,7 +58,7 @@ jobs:
inputs:
packageType: sdk
includePreviewVersions: false
version: 6.0.x
version: 8.0.x
installationPath: $(Agent.ToolsDirectory)/dotnet
- task: NuGetToolInstaller@1
- task: PowerShell@2
Expand All @@ -80,7 +80,7 @@ jobs:
inputs:
packageType: sdk
includePreviewVersions: false
version: 6.0.x
version: 8.0.x
installationPath: $(Agent.ToolsDirectory)/dotnet
- task: Bash@3
inputs:
Expand All @@ -107,7 +107,7 @@ jobs:
inputs:
packageType: sdk
includePreviewVersions: false
version: 6.0.x
version: 8.0.x
installationPath: $(Agent.ToolsDirectory)/dotnet
- task: Bash@3
inputs:
Expand Down Expand Up @@ -135,7 +135,7 @@ jobs:
inputs:
packageType: sdk
includePreviewVersions: false
version: 6.0.x
version: 8.0.x
installationPath: $(Agent.ToolsDirectory)/dotnet
- task: Bash@3
inputs:
Expand All @@ -156,7 +156,7 @@ jobs:
inputs:
packageType: sdk
includePreviewVersions: false
version: 6.0.x
version: 8.0.x
installationPath: $(Agent.ToolsDirectory)/dotnet
- task: Bash@3
inputs:
Expand Down
2 changes: 1 addition & 1 deletion fvim.fsproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<AssemblyName>FVim</AssemblyName>
<Prefer32Bit>false</Prefer32Bit>
<ApplicationIcon>Assets\fvim.ico</ApplicationIcon>
Expand Down
12 changes: 6 additions & 6 deletions pack.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,17 @@ Remove-Item -Recurse -Force bin\ -ErrorAction SilentlyContinue
Remove-Item publish\*

foreach($i in $plat) {
dotnet publish -f net6.0 -c Release --self-contained -r $i fvim.fsproj
dotnet publish -f net8.0 -c Release --self-contained -r $i fvim.fsproj
if ($i -eq "win-x64") {
# replace the coreclr hosting exe with an icon-patched one
Copy-Item lib/fvim-win10.exe bin/Release/net6.0/$i/publish/FVim.exe
Copy-Item lib/fvim-win10.exe bin/Release/net8.0/$i/publish/FVim.exe
# Avalonia 0.10.0-preview6 fix: manually copy ANGLE from win7-x64
Copy-Item ~/.nuget/packages/avalonia.angle.windows.natives/2.1.0.2020091801/runtimes/win7-x64/native/av_libglesv2.dll bin/Release/net6.0/$i/publish/
Copy-Item ~/.nuget/packages/avalonia.angle.windows.natives/2.1.0.2020091801/runtimes/win7-x64/native/av_libglesv2.dll bin/Release/net8.0/$i/publish/
} elseif ($i -eq "win7-x64") {
Copy-Item lib/fvim-win7.exe bin/Release/net6.0/$i/publish/FVim.exe
Copy-Item lib/fvim-win7.exe bin/Release/net8.0/$i/publish/FVim.exe
} elseif ($i -eq "win-arm64") {
Copy-Item lib/fvim-win10-arm64.exe bin/Release/net6.0/$i/publish/FVim.exe
Copy-Item lib/fvim-win10-arm64.exe bin/Release/net8.0/$i/publish/FVim.exe
}
Compress-Archive -Path bin/Release/net6.0/$i/publish/* -DestinationPath publish/fvim-$i.zip -Force
Compress-Archive -Path bin/Release/net8.0/$i/publish/* -DestinationPath publish/fvim-$i.zip -Force
}

4 changes: 2 additions & 2 deletions pack.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ rm -ir publish/*
PKG_TFM=$1
VERSION=$(git describe)
VERSION=${VERSION:1}
PKG_ROOT="bin/Release/net6.0/$PKG_TFM/publish"
dotnet publish -f net6.0 -c Release --self-contained -r $PKG_TFM fvim.fsproj
PKG_ROOT="bin/Release/net8.0/$PKG_TFM/publish"
dotnet publish -f net8.0 -c Release --self-contained -r $PKG_TFM fvim.fsproj

function pack-linux-x64()
{
Expand Down
4 changes: 2 additions & 2 deletions update.ps1
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Stop-Process -Name "fvim"
dotnet publish -f net6.0 -c Release --self-contained -r win-x64 fvim.fsproj
cp bin/Release/net6.0/win-x64/publish/FVim* C:/tools/fvim/
dotnet publish -f net8.0 -c Release --self-contained -r win-x64 fvim.fsproj
cp bin/Release/net8.0/win-x64/publish/FVim* C:/tools/fvim/
cp lib/fvim-win10.exe C:/tools/fvim/FVim.exe
cp fvim.vim C:/tools/fvim/fvim.vim
fvim
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/net6.0/* /usr/share/fvim/
sudo cp -r bin/Release/net8.0/* /usr/share/fvim/
Loading