From 7603e649abc66b8cf21f70248eb7ce4375fd1190 Mon Sep 17 00:00:00 2001 From: Robin Munn Date: Fri, 15 Nov 2024 11:44:02 +0700 Subject: [PATCH] Update to net8.0 --- .vscode/launch.json | 2 +- README.md | 6 +++--- azure-pipelines.yml | 14 +++++++------- fvim.fsproj | 2 +- pack.ps1 | 12 ++++++------ pack.sh | 4 ++-- update.ps1 | 4 ++-- update.sh | 2 +- 8 files changed, 23 insertions(+), 23 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index a61e974..735833b 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -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, diff --git a/README.md b/README.md index dfd024c..2fa1301 100644 --- a/README.md +++ b/README.md @@ -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 @@ -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: diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 4100bab..b7d125d 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -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 @@ -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 @@ -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 @@ -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: @@ -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: @@ -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: @@ -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: diff --git a/fvim.fsproj b/fvim.fsproj index a525715..3c29dba 100644 --- a/fvim.fsproj +++ b/fvim.fsproj @@ -1,7 +1,7 @@  - net6.0 + net8.0 FVim false Assets\fvim.ico diff --git a/pack.ps1 b/pack.ps1 index 569d84f..1d53741 100644 --- a/pack.ps1 +++ b/pack.ps1 @@ -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 } diff --git a/pack.sh b/pack.sh index 779e437..a054221 100755 --- a/pack.sh +++ b/pack.sh @@ -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() { diff --git a/update.ps1 b/update.ps1 index 2e53fd8..7665a3b 100644 --- a/update.ps1 +++ b/update.ps1 @@ -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 diff --git a/update.sh b/update.sh index 470b0b2..cb2831e 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/net6.0/* /usr/share/fvim/ +sudo cp -r bin/Release/net8.0/* /usr/share/fvim/