Browse Source

build: fix net461

gretmn102 4 years ago
parent
commit
44bcdb1722
2 changed files with 19 additions and 3 deletions
  1. 18 2
      build.fsx
  2. 1 1
      paket.lock

+ 18 - 2
build.fsx

@@ -38,7 +38,15 @@ Target.create "BuildServer" (fun _ ->
     serverProjPath
     |> Fake.IO.Path.getDirectory
     |> DotNet.build (fun x ->
-        { x with Configuration = buildConf }
+        // Чтобы в Linux'е не компилировался net461, дан этот костыль:
+        { x with
+                Configuration = buildConf
+                Framework = 
+                    if not Environment.isWindows then
+                        Some "netcoreapp3.1"
+                    else
+                        None
+                }
         |> dtntSmpl)
 )
 
@@ -46,7 +54,15 @@ Target.create "BuildTest" (fun _ ->
     testProjPath
     |> Fake.IO.Path.getDirectory
     |> DotNet.build (fun x ->
-        { x with Configuration = buildConf }
+        // Чтобы в Linux'е не компилировался net461, дан этот костыль:
+        { x with
+                Configuration = buildConf
+                Framework = 
+                    if not Environment.isWindows then
+                        Some "netcoreapp3.1"
+                    else
+                        None
+                }
         |> dtntSmpl)
 )
 

+ 1 - 1
paket.lock

@@ -16,7 +16,7 @@ GITHUB
     src/LanguageServerProtocol.fs (00797a8541ae01b7fa0631cd9bc8fdfd6923caf5)
 GIT
   remote: https://github.com/gretmn102/FsharpMyExtension.git
-     (f072a81d58ec11377633186726c686883c2f3a57)
+     (8a6078a74385ffddcc02b679268e0b4d1d515fde)
 GROUP Build
 NUGET
   remote: https://api.nuget.org/v3/index.json