get repo building end-to-end

ionide · baronfel · May 6, 2024 · May 6, 2024 · May 6, 2024 · May 6, 2024
commit e34513dd122232705197a7eaa9a9dfdef1b18d04
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -1,30 +1,24 @@
-{
-  "version": 1,
-  "isRoot": true,
-  "tools": {
-    "paket": {
-      "version": "8.0.3",
-      "commands": [
-        "paket"
-      ]
-    },
-    "dotnet-reportgenerator-globaltool": {
-      "version": "5.0.2",
-      "commands": [
-        "reportgenerator"
-      ]
-    },
-    "fantomas": {
-      "version": "6.3.1",
-      "commands": [
-        "fantomas"
-      ]
-    },
-    "fsharp-analyzers": {
-      "version": "0.25.0",
-      "commands": [
-        "fsharp-analyzers"
-      ]
-    }
-  }
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "dotnet-reportgenerator-globaltool": {
+      "version": "5.0.2",
+      "commands": [
+        "reportgenerator"
+      ]
+    },
+    "fantomas": {
+      "version": "6.3.1",
+      "commands": [
+        "fantomas"
+      ]
+    },
+    "fsharp-analyzers": {
+      "version": "0.25.0",
+      "commands": [
+        "fsharp-analyzers"
+      ]
+    }
+  }
 }
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -1,15 +1,18 @@
 {
-	"name": "F# (.NET 7.0)",
-	"dockerFile": "Dockerfile",
-	"settings": {
-			"terminal.integrated.shell.linux": "/bin/bash",
-			"FSharp.useSdkScripts":true,
-			"FSharp.workspacePath": "FsAutoComplete.sln"
-		},
-	"onCreateCommand": "dotnet tool restore && dotnet restore",
-	"extensions": [
-			"Ionide.Ionide-fsharp",
-			"Ionide.Ionide-Paket",
-			"ms-vscode.csharp"
-		]
-}
+  "name": "F# (.NET 7.0)",
+  "dockerFile": "Dockerfile",
+  "customizations": {
+    "vscode": {
+      "settings": {
+        "terminal.integrated.shell.linux": "/bin/bash",
+        "FSharp.useSdkScripts": true,
+        "FSharp.workspacePath": "FsAutoComplete.sln"
+      },
+      "extensions": [
+        "Ionide.Ionide-fsharp",
+        "ms-vscode.csharp"
+      ]
+    }
+  },
+  "onCreateCommand": "dotnet restore"
+}
diff --git a/.gitignore b/.gitignore
@@ -46,4 +46,4 @@ test/FsAutoComplete.Tests.Lsp/TestResults/
 .tool-versions
 BenchmarkDotNet.Artifacts/
 
-*.sarif
+*.sarif
diff --git a/.paket/Paket.Restore.targets b/.paket/Paket.Restore.targets
diff --git a/.paket/paket.targets b/.paket/paket.targets
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -4,11 +4,10 @@
     <Title>FsAutoComplete</Title>
     <Product>FsAutoComplete</Product>
     <PackageLicenseExpression Condition=" '$(PackAsTool)' != 'true' ">Apache-2.0</PackageLicenseExpression>
-    <NoWarn>$(NoWarn);3186,0042</NoWarn><!-- circumvent an error with the fake dependencymanager for
-    paket: https://github.com/dotnet/fsharp/issues/8678 -->
+    <NoWarn>$(NoWarn);3186,0042</NoWarn><!-- circumvent an error with the fake dependencymanager for paket: https://github.com/dotnet/fsharp/issues/8678 -->
     <NoWarn>$(NoWarn);NU1902</NoWarn><!-- NU1902 - package vulnerability detected -->
     <WarnOn>$(WarnOn);1182</WarnOn> <!-- Unused variables,https://learn.microsoft.com/en-us/dotnet/fsharp/language-reference/compiler-options#opt-in-warnings -->
-    <NoWarn>$(NoWarn);FS0044</NoWarn>       <!-- Ignore deprecations -->
+    <NoWarn>$(NoWarn);FS0044</NoWarn><!-- Ignore deprecations -->
     <WarnOn>$(WarnOn);3390</WarnOn><!-- Malformed XML doc comments -->
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <ChangelogFile>$(MSBuildThisFileDirectory)CHANGELOG.md</ChangelogFile>

diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -3,35 +3,37 @@
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
   </PropertyGroup>
   <ItemGroup>
-    <PackageVersion Include="FSharp.Data.Adaptive" Version="1.2.15" />
-    <PackageVersion Include="FSharp.Core" Version="8.0.200" />
+    <PackageVersion Include="BenchmarkDotNet" Version="0.13.12" />
+    <PackageVersion Include="CliWrap" Version="3.6.6" />
+    <PackageVersion Include="CommunityToolkit.HighPerformance" Version="8.2.2" />
+    <PackageVersion Include="Destructurama.FSharp" Version="2.0.0" />
+    <PackageVersion Include="Expecto.Diff" Version="10.2.1" />
+    <PackageVersion Include="Expecto" Version="10.2.1 " />
+    <PackageVersion Include="Fantomas.Client" Version="0.9.0" />
+    <PackageVersion Include="FSharp.Analyzers.SDK" Version="0.25.0" />
     <PackageVersion Include="FSharp.Compiler.Service" Version="43.8.200" />
-    <PackageVersion Include="IcedTasks" Version="0.11.5" />
+    <PackageVersion Include="FSharp.Core" Version="8.0.200" />
+    <PackageVersion Include="FSharp.Data.Adaptive" Version="1.2.15" />
     <PackageVersion Include="FSharp.UMX" Version="1.1.0" />
-    <PackageVersion Include="Ionide.LanguageServerProtocol" Version="0.5.0" />
-    <PackageVersion Include="System.Reactive" Version="5.0.0" />
-    <PackageVersion Include="CommunityToolkit.HighPerformance" Version="8.2.2" />
-    <PackageVersion Include="LinkDotNet.Stringbuilder" Version="1.20.0" />
+    <PackageVersion Include="FSharpx.Async" Version="1.14.1" />
     <PackageVersion Include="FsToolkit.ErrorHandling.IcedTasks" Version="4.15.2" />
-    <PackageVersion Include="Microsoft.CodeAnalysis" Version="4.9.2" />
+    <PackageVersion Include="IcedTasks" Version="0.11.5" />
     <PackageVersion Include="ICSharpCode.Decompiler" Version="8.2.0.7535" />
+    <PackageVersion Include="Ionide.LanguageServerProtocol" Version="0.5.0" />
     <PackageVersion Include="Ionide.ProjInfo.ProjectSystem" Version="0.64.0" />
+    <PackageVersion Include="LinkDotNet.Stringbuilder" Version="1.20.0" />
+    <PackageVersion Include="Microsoft.CodeAnalysis" Version="4.9.2" />
     <PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="8.0.0" />
-    <PackageVersion Include="Fantomas.Client" Version="0.9.0" />
-    <PackageVersion Include="FSharp.Analyzers.SDK" Version="0.25.0" />
-    <PackageVersion Include="CliWrap" Version="3.6.6" />
-    <PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
-    <PackageVersion Include="Serilog" Version="3.1.1" />
-    <PackageVersion Include="OpenTelemetry" Version="1.8.1" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
     <PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.8.1" />
-    <PackageVersion Include="Destructurama.FSharp" Version="2.0.0" />
+    <PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.8.0" />
+    <PackageVersion Include="OpenTelemetry" Version="1.8.1" />
     <PackageVersion Include="Serilog.Sinks.Async" Version="1.5.0" />
-    <PackageVersion Include="Serilog.Sinks.File" Version="5.0.0" />
     <PackageVersion Include="Serilog.Sinks.Console" Version="5.0.1" />
-    <PackageVersion Include="Expecto" Version="10.2.1 " />
-    <PackageVersion Include="FSharpx.Async" Version="1.14.1" />
-    <PackageVersion Include="Expecto.Diff" Version="10.2.1" />
+    <PackageVersion Include="Serilog.Sinks.File" Version="5.0.0" />
+    <PackageVersion Include="Serilog" Version="3.1.1" />
+    <PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
+    <PackageVersion Include="System.Reactive" Version="5.0.0" />
     <PackageVersion Include="YoloDev.Expecto.TestSdk" Version="0.14.3" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
   </ItemGroup>
 </Project>
diff --git a/FsAutoComplete.sln b/FsAutoComplete.sln
@@ -3,12 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.28803.452
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".paket", ".paket", "{1BE8AF57-B314-4C92-82A9-64CD9B7A4990}"
-	ProjectSection(SolutionItems) = preProject
-		paket.dependencies = paket.dependencies
-		paket.lock = paket.lock
-	EndProjectSection
-EndProject
 Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FsAutoComplete", "src\FsAutoComplete\FsAutoComplete.fsproj", "{B6AB4EF3-8F60-41A1-AB0C-851A6DEB169E}"
 EndProject
 Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FsAutoComplete.Core", "src\FsAutoComplete.Core\FsAutoComplete.Core.fsproj", "{4E4786F3-4566-44E1-8787-91790007F0F6}"

diff --git a/README.md b/README.md
@@ -29,8 +29,7 @@ Requirements:
 * .NET SDK, see [global.json](global.json) for the exact version.
    Minimum: >= 6.0, Recommended: >= 7.0 
 
-1. Restore dotnet tools to install local Paket `dotnet tool restore`
-2. Build FSAC with `dotnet build`
+1. Build FSAC with `dotnet build`
 
 * To build release fsautocomplete binaries in `~/bin` directory, use the `LocalRelease` target
 * To build, run all tests and create packages, use the `All` target

diff --git a/benchmarks/benchmarks.fsproj b/benchmarks/benchmarks.fsproj
@@ -11,5 +11,7 @@
   <ItemGroup>
     <ProjectReference Include="..\src\FsAutoComplete\FsAutoComplete.fsproj" />
   </ItemGroup>
-  <Import Project="..\.paket\Paket.Restore.targets" />
+ <ItemGroup>
+ <PackageReference Include="BenchmarkDotNet" />
+ </ItemGroup>
 </Project>
diff --git a/src/FsAutoComplete/FsAutoComplete.fsproj b/src/FsAutoComplete/FsAutoComplete.fsproj
@@ -47,7 +47,6 @@
     <Compile Include="Parser.fsi" />
     <Compile Include="Parser.fs" />
     <Compile Include="Program.fs" />
-    <None Include="FsAutoComplete.fsproj.paket.references" />
     <Content Include="default.win32manifest">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
@@ -87,6 +86,7 @@
     <PackageReference Include="Serilog.Sinks.File" />
     <PackageReference Include="Serilog.Sinks.Console" />
     <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" />
+    <PackageReference Include="OpenTelemetry.Instrumentation.Runtime" />
     <PackageReference Include="Destructurama.FSharp" />
   </ItemGroup>
 </Project>
diff --git a/src/FsAutoComplete/LspServers/AdaptiveFSharpLspServer.fs b/src/FsAutoComplete/LspServers/AdaptiveFSharpLspServer.fs
@@ -2957,7 +2957,7 @@ type AdaptiveFSharpLspServer
 
     override x.Dispose() = disposables.Dispose()
 
-    member this.WorkDoneProgressCancel(token: WorkDoneProgressCancelParams) : Async<unit> =
+    member this.WorkDoneProgressCancel(param: WorkDoneProgressCancelParams) : Async<unit> =
       async {
 
         let tags = [ "WorkDoneProgressCancelParams", box param ]
-Original file line number
+Diff line change
@@ Expand Up / @@ -46,4 +46,4 @@ test/FsAutoComplete.Tests.Lsp/TestResults/ @@
     .tool-versions
     BenchmarkDotNet.Artifacts/
-    *.sarif
+    *.sarif