allow rollforwards, and unify proj-info versions since they'd drifted (…

…#818)
ionide · Jul 25, 2021 · 94ad926 · 94ad926
1 parent 0d3c341
commit 94ad926
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 26 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -42,23 +42,17 @@
               "lsp.Ionide WorkspaceLoader.codefix tests.remove unused binding"
             ]
         },
-        {
-            "name": ".NET Core mode stdio (debug)",
-            "type": "coreclr",
-            "request": "launch",
-            "preLaunchTask": "build_debug_netcore",
-            "program": "${workspaceFolder}/src/FsAutoComplete/bin/Debug/net5.0/fsautocomplete.dll",
-            "args": ["--mode", "stdio", "-v"],
-            "cwd": "${workspaceFolder}",
-            "console": "integratedTerminal",
-            "stopAtEntry": false,
-            "internalConsoleOptions": "openOnSessionStart"
-        },
         {
             "name": ".NET Core Attach",
             "type": "coreclr",
             "request": "attach",
-            "processId": "${command:pickProcess}"
+            "processId": "${command:pickProcess}",
+            "sourceLinkOptions": {
+              "*": {
+                "enabled": true
+              }
+            },
+            "justMyCode": false
         }
     ]
 }
diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
     "sdk": {
         "version": "5.0.301",
-        "rollForward": "feature"
+        "rollForward": "major"
     }
 }
diff --git a/paket.dependencies b/paket.dependencies
@@ -13,9 +13,9 @@ github TheAngryByrd/FsLibLog:f81cba440bf0476bb4e2262b57a067a0d6ab78a7 src/FsLibL
 nuget Argu ~> 5.2.0
 nuget Fantomas.Extras ~> 4.5
 nuget FSharp.Compiler.Service ~> 39
-nuget Ionide.ProjInfo
-nuget Ionide.ProjInfo.FCS
-nuget Ionide.ProjInfo.ProjectSystem
+nuget Ionide.ProjInfo 0.52
+nuget Ionide.ProjInfo.FCS 0.52
+nuget Ionide.ProjInfo.ProjectSystem 0.52
 nuget Microsoft.Build copy_local:false
 nuget Microsoft.Build.Framework copy_local:false
 nuget Microsoft.Build.Utilities.Core copy_local:false

diff --git a/paket.lock b/paket.lock
@@ -94,17 +94,17 @@ NUGET
       Ionide.ProjInfo.Sln (>= 0.52) - restriction: || (== net5.0) (&& (== netstandard2.0) (>= netcoreapp3.1))
       Microsoft.Build (>= 16.8) - restriction: || (== net5.0) (&& (== netstandard2.0) (>= netcoreapp3.1))
       Microsoft.Build.Locator (>= 1.4.1) - restriction: || (== net5.0) (&& (== netstandard2.0) (>= netcoreapp3.1))
-    Ionide.ProjInfo.FCS (0.51)
+    Ionide.ProjInfo.FCS (0.52)
       FSharp.Compiler.Service (>= 39.0) - restriction: || (== net5.0) (&& (== netstandard2.0) (>= net5.0))
       FSharp.Core (>= 5.0.1) - restriction: || (== net5.0) (&& (== netstandard2.0) (>= net5.0))
-      Ionide.ProjInfo (>= 0.51) - restriction: || (== net5.0) (&& (== netstandard2.0) (>= net5.0))
-    Ionide.ProjInfo.ProjectSystem (0.51)
+      Ionide.ProjInfo (>= 0.52) - restriction: || (== net5.0) (&& (== netstandard2.0) (>= net5.0))
+    Ionide.ProjInfo.ProjectSystem (0.52)
       FSharp.Compiler.Service (>= 39.0) - restriction: || (== net5.0) (&& (== netstandard2.0) (>= net5.0))
       FSharp.Control.Reactive (>= 4.5) - restriction: || (== net5.0) (&& (== netstandard2.0) (>= net5.0))
       FSharp.Core (>= 5.0.1) - restriction: || (== net5.0) (&& (== netstandard2.0) (>= net5.0))
-      Ionide.ProjInfo (>= 0.51) - restriction: || (== net5.0) (&& (== netstandard2.0) (>= net5.0))
-      Ionide.ProjInfo.FCS (>= 0.51) - restriction: || (== net5.0) (&& (== netstandard2.0) (>= net5.0))
-      Ionide.ProjInfo.Sln (>= 0.51) - restriction: || (== net5.0) (&& (== netstandard2.0) (>= net5.0))
+      Ionide.ProjInfo (>= 0.52) - restriction: || (== net5.0) (&& (== netstandard2.0) (>= net5.0))
+      Ionide.ProjInfo.FCS (>= 0.52) - restriction: || (== net5.0) (&& (== netstandard2.0) (>= net5.0))
+      Ionide.ProjInfo.Sln (>= 0.52) - restriction: || (== net5.0) (&& (== netstandard2.0) (>= net5.0))
       Newtonsoft.Json (>= 12.0.3) - restriction: || (== net5.0) (&& (== netstandard2.0) (>= net5.0))
     Ionide.ProjInfo.Sln (0.52) - restriction: || (== net5.0) (&& (== netstandard2.0) (>= netcoreapp3.1))
     MAB.DotIgnore (3.0.2)

diff --git a/src/FsAutoComplete.Core/Commands.fs b/src/FsAutoComplete.Core/Commands.fs
@@ -375,7 +375,8 @@ type Commands (checker: FSharpCompilerServiceChecker, state: State, backgroundSe
     do disposables.Add <| state.ProjectController.Notifications.Subscribe (fun ev ->
       match ev with
       | ProjectResponse.Project (p, isFromCache) ->
-        let opts = state.ProjectController.GetProjectOptionsForFsproj p.ProjectFileName
+        let controller = state.ProjectController
+        let opts = controller.GetProjectOptionsForFsproj p.ProjectFileName
         opts |> Option.iter (fun opts -> backgroundService.UpdateProject(p.ProjectFileName, opts))
 
         if not isFromCache then

diff --git a/src/FsAutoComplete/FsAutoComplete.fsproj b/src/FsAutoComplete/FsAutoComplete.fsproj
@@ -40,7 +40,9 @@
     <AssemblyName>dotnet-fsautocomplete</AssemblyName>
     <PackageId>fsautocomplete</PackageId>
     <PackageType>DotnetTool</PackageType>
-
+    <!-- This rollforward enables us to actually run on the .net 6 runtime without
+         retargeting the whole app, minimizing packaged binary size. -->
+    <RollForward>Major</RollForward>
     <!-- workaround for not being able to have p2p dependencies in tool output dir https://github.com/nuget/home/issues/3891#issuecomment-377319939 -->
     <TargetsForTfmSpecificBuildOutput>$(TargetsForTfmSpecificBuildOutput);CopyProjectReferencesToPackage</TargetsForTfmSpecificBuildOutput>
   </PropertyGroup>

diff --git a/src/FsAutoComplete/runtimeconfig.template.json b/src/FsAutoComplete/runtimeconfig.template.json
@@ -1,3 +1,3 @@
 {
-    "rollForwardOnNoCandidateFx": 2
+    "rollForward": "major"
 }