going back to netcoreapp3.1 ... -_-

yatli · Nov 16, 2020 · 1351556 · 1351556
1 parent 4343ca6
commit 1351556
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 15 deletions.
diff --git a/Properties/PublishProfiles/FolderProfile.pubxml b/Properties/PublishProfiles/FolderProfile.pubxml
@@ -6,9 +6,9 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
   <PropertyGroup>
     <Configuration>Release</Configuration>
     <Platform>Any CPU</Platform>
-    <PublishDir>bin\Release\net5\publish\</PublishDir>
+    <PublishDir>bin\Release\netcoreapp3.1\publish\</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
-    <TargetFramework>net5</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
     <SelfContained>true</SelfContained>
     <PublishSingleFile>False</PublishSingleFile>

diff --git a/README.md b/README.md
@@ -18,9 +18,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-5+ installed):
+    - Compile from Source (having dotnet-sdk-3.1+ installed):
         ```
-            git clone https://github.com/yatli/fvim && cd fvim && dotnet publish -f net5 -c Release -r linux-x64 --self-contained
+            git clone https://github.com/yatli/fvim && cd fvim && dotnet publish -f netcoreapp3.1 -c Release -r linux-x64 --self-contained
         ```
 
 ### Features
@@ -70,7 +70,7 @@ endif
 ![fluent_cursor](https://raw.githubusercontent.com/yatli/fvim/master/images/fluent_cursor.gif)
 
 ### Building from source
-We're now targeting `net5` so make sure to install the latest preview SDK from the [.NET site](https://dotnet.microsoft.com/download/dotnet-core/3.1).
+We're now targeting `netcoreapp3.1` so make sure to install the latest preview SDK from the [.NET site](https://dotnet.microsoft.com/download/dotnet-core/3.1).
 We're actively tracking the head of `Avalonia`, and fetch the nightly packages from myget (see `NuGet.config`).
 
 Then, simply:

diff --git a/fvim.fsproj b/fvim.fsproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <AssemblyName>FVim</AssemblyName>
     <Prefer32Bit>false</Prefer32Bit>
     <ApplicationIcon>fvim.ico</ApplicationIcon>
@@ -77,6 +77,7 @@
 
     <PackageReference Include="FSharp.Control.Reactive" Version="4.4.2" />
     <PackageReference Include="FSharp.Data" Version="3.3.3" />
+    <PackageReference Include="FSharp.Core" Version="5.0" />
     <PackageReference Include="MessagePack" Version="1.9.11" />
     <PackageReference Include="Microsoft.Win32.Registry" Version="4.7.0" />
     <PackageReference Include="NSubsys" Version="1.0.0">

diff --git a/model.fs b/model.fs
@@ -18,6 +18,7 @@ open System.ComponentModel
 open SkiaSharp
 open Avalonia.Layout
 open System.Threading.Tasks
+open System.Threading
 
 #nowarn "0058"
 #nowarn "0025"

diff --git a/neovim.fs b/neovim.fs
@@ -264,7 +264,7 @@ type Nvim() =
     member this.subscribe (ctx: SynchronizationContext) (fn: Event -> unit) =
         this.events
         |> Observable.observeOnContext ctx
-        |> Observable.synchronize
+        (*|> Observable.synchronize*)
         |> Observable.subscribe fn
         |> this.pushSubscription
 

diff --git a/pack.ps1 b/pack.ps1
@@ -8,15 +8,15 @@ Remove-Item -Recurse -Force bin\ -ErrorAction SilentlyContinue
 Remove-Item publish\*
 
 foreach($i in $plat) {
-    dotnet publish -f net5 -c Release --self-contained -r $i
+    dotnet publish -f netcoreapp3.1 -c Release --self-contained -r $i
     if ($i -eq "win-x64") {
 # replace the coreclr hosting exe with an icon-patched one
-        Copy-Item lib/fvim-win10.exe bin/Release/net5/$i/publish/FVim.exe
+        Copy-Item lib/fvim-win10.exe bin/Release/netcoreapp3.1/$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/net5/$i/publish/
+        Copy-Item ~/.nuget/packages/avalonia.angle.windows.natives/2.1.0.2020091801/runtimes/win7-x64/native/av_libglesv2.dll bin/Release/netcoreapp3.1/$i/publish/
     } elseif ($i -eq "win7-x64") {
-        Copy-Item lib/fvim-win7.exe bin/Release/net5/$i/publish/FVim.exe
+        Copy-Item lib/fvim-win7.exe bin/Release/netcoreapp3.1/$i/publish/FVim.exe
     }
-    Compress-Archive -Path bin/Release/net5/$i/publish/* -DestinationPath publish/fvim-$i.zip -Force
+    Compress-Archive -Path bin/Release/netcoreapp3.1/$i/publish/* -DestinationPath publish/fvim-$i.zip -Force
 }
 
diff --git a/pack.sh b/pack.sh
@@ -10,8 +10,8 @@ rm -ir publish/*
 PKG_TFM=$1
 VERSION=$(git describe)
 VERSION=${VERSION:1}
-PKG_ROOT="bin/Release/net5/$PKG_TFM/publish"
-dotnet publish -f net5 -c Release --self-contained -r $PKG_TFM
+PKG_ROOT="bin/Release/netcoreapp3.1/$PKG_TFM/publish"
+dotnet publish -f netcoreapp3.1 -c Release --self-contained -r $PKG_TFM
 
 function pack-linux-x64()
 {

diff --git a/update.ps1 b/update.ps1
@@ -1,5 +1,5 @@
 Stop-Process -Name "fvim"
 dotnet build -c Release
-cp bin/Release/net5/FVim* C:/tools/fvim/
+cp bin/Release/netcoreapp3.1/FVim* C:/tools/fvim/
 cp lib/fvim-win10.exe C:/tools/fvim/FVim.exe
 fvim