diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
index be1591fc6..aa9d91613 100644
--- a/.config/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@@ -9,7 +9,7 @@
]
},
"paket": {
- "version": "5.257.0",
+ "version": "6.0.0-rc002",
"commands": [
"paket"
]
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index dbc84f2a7..0c665afd0 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -8,7 +8,7 @@ jobs:
strategy:
matrix:
os: [windows-2019, macos-10.15, ubuntu-20.04]
- dotnet: [5.0.200]
+ dotnet: [5.0.300]
fail-fast: false # we have timing issues on some OS, so we want them all to run
runs-on: ${{ matrix.os }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index e7ecfdd83..335a3f502 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -16,7 +16,7 @@ jobs:
release:
strategy:
matrix:
- dotnet: [5.0.200]
+ dotnet: [5.0.300]
runs-on: ubuntu-20.04
diff --git a/Directory.Build.props b/Directory.Build.props
index a7f4bc0f4..54555e9c5 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -3,7 +3,6 @@
FsAutoComplete
FsAutoComplete
- A command line tool for interfacing with FSharp.Compiler.Service over a pipe.
Apache-2.0
3186
true
diff --git a/build.fsx b/build.fsx
index 15d7c0b12..846093bfb 100644
--- a/build.fsx
+++ b/build.fsx
@@ -66,6 +66,10 @@ Target.create "ReleaseArchive" (fun _ ->
|> Shell.copy "bin/pkgs"
)
+let versionProp = "Version", release.AssemblyVersion
+let packAsToolProp = "PackAsTool", "true"
+let latestReleaseNotesProp = "PackageReleaseNotes", release.Notes |> String.concat "\n"
+
Target.create "LocalRelease" (fun _ ->
Directory.ensure "bin/release_netcore"
Shell.cleanDirs [ "bin/release_netcore" ]
@@ -76,7 +80,7 @@ Target.create "LocalRelease" (fun _ ->
OutputPath = Some (__SOURCE_DIRECTORY__ "bin/release_netcore")
Framework = Some "net5.0"
Configuration = DotNet.BuildConfiguration.fromString configuration
- MSBuildParams = { MSBuild.CliArguments.Create () with Properties = [ "Version", release.AssemblyVersion ] } }) "src/FsAutoComplete"
+ MSBuildParams = { MSBuild.CliArguments.Create () with Properties = [ versionProp ] } }) "src/FsAutoComplete"
Directory.ensure "bin/release_as_tool"
Shell.cleanDirs [ "bin/release_as_tool" ]
@@ -84,7 +88,7 @@ Target.create "LocalRelease" (fun _ ->
{ p with
OutputPath = Some (__SOURCE_DIRECTORY__ "bin/release_as_tool")
Configuration = DotNet.BuildConfiguration.fromString configuration
- MSBuildParams = { MSBuild.CliArguments.Create () with Properties = [ "Version", release.AssemblyVersion; "PackAsTool", "true" ] } }) "src/FsAutoComplete"
+ MSBuildParams = { MSBuild.CliArguments.Create () with Properties = [ versionProp; packAsToolProp; latestReleaseNotesProp ] } }) "src/FsAutoComplete"
)
Target.create "Clean" (fun _ ->
diff --git a/global.json b/global.json
index 094d2c2d9..9505793e9 100644
--- a/global.json
+++ b/global.json
@@ -1,5 +1,5 @@
{
"sdk": {
- "version": "5.0.200"
+ "version": "5.0.300"
}
}
diff --git a/paket.dependencies b/paket.dependencies
index f7b2ff6a9..c0ae76cfd 100644
--- a/paket.dependencies
+++ b/paket.dependencies
@@ -70,3 +70,4 @@ group Build
nuget Fake.DotNet.MsBuild
nuget Fake.Api.GitHub
nuget Microsoft.Build
+ nuget MSBuild.StructuredLogger
diff --git a/paket.lock b/paket.lock
index e317e47a4..aec8639ed 100644
--- a/paket.lock
+++ b/paket.lock
@@ -856,7 +856,7 @@ NUGET
System.Security.AccessControl (>= 5.0)
System.Security.Principal.Windows (>= 5.0)
Mono.Posix.NETStandard (1.0)
- MSBuild.StructuredLogger (2.1.272)
+ MSBuild.StructuredLogger (2.1.507)
Microsoft.Build (>= 16.4)
Microsoft.Build.Framework (>= 16.4)
Microsoft.Build.Tasks.Core (>= 16.4)
diff --git a/src/FsAutoComplete.BackgroundServices/FsAutoComplete.BackgroundServices.fsproj b/src/FsAutoComplete.BackgroundServices/FsAutoComplete.BackgroundServices.fsproj
index d3aed743c..d4fb4852b 100644
--- a/src/FsAutoComplete.BackgroundServices/FsAutoComplete.BackgroundServices.fsproj
+++ b/src/FsAutoComplete.BackgroundServices/FsAutoComplete.BackgroundServices.fsproj
@@ -5,6 +5,7 @@
fsautocomplete.backgroundservices
true
true
+ false
diff --git a/src/FsAutoComplete.Core/FsAutoComplete.Core.fsproj b/src/FsAutoComplete.Core/FsAutoComplete.Core.fsproj
index f03f18456..eed7c4f64 100644
--- a/src/FsAutoComplete.Core/FsAutoComplete.Core.fsproj
+++ b/src/FsAutoComplete.Core/FsAutoComplete.Core.fsproj
@@ -1,6 +1,7 @@
net5.0
+ false
diff --git a/src/FsAutoComplete.Logging/FsAutoComplete.Logging.fsproj b/src/FsAutoComplete.Logging/FsAutoComplete.Logging.fsproj
index a7c8b3eed..a0fdf42e3 100644
--- a/src/FsAutoComplete.Logging/FsAutoComplete.Logging.fsproj
+++ b/src/FsAutoComplete.Logging/FsAutoComplete.Logging.fsproj
@@ -2,6 +2,7 @@
netstandard2.0
+ false
diff --git a/src/FsAutoComplete/FsAutoComplete.fsproj b/src/FsAutoComplete/FsAutoComplete.fsproj
index e99432cae..8027beb62 100644
--- a/src/FsAutoComplete/FsAutoComplete.fsproj
+++ b/src/FsAutoComplete/FsAutoComplete.fsproj
@@ -6,8 +6,17 @@
fsautocomplete
true
true
+
+ README.md
+ A community-developed Language Server Protocol implementation for F#
+ Apache-2.0
+ logo.png
+ $(RepositoryUrl)
+ FsAutoComplete contributors
+
+
@@ -26,9 +35,11 @@
+
dotnet-fsautocomplete
fsautocomplete
+ DotnetTool
$(TargetsForTfmSpecificBuildOutput);CopyProjectReferencesToPackage
diff --git a/src/FsAutoComplete/logo.png b/src/FsAutoComplete/logo.png
new file mode 100644
index 000000000..babbee57e
Binary files /dev/null and b/src/FsAutoComplete/logo.png differ
diff --git a/src/LanguageServerProtocol/LanguageServerProtocol.fsproj b/src/LanguageServerProtocol/LanguageServerProtocol.fsproj
index 889711cd6..1b8206270 100644
--- a/src/LanguageServerProtocol/LanguageServerProtocol.fsproj
+++ b/src/LanguageServerProtocol/LanguageServerProtocol.fsproj
@@ -2,6 +2,7 @@
netstandard2.0
+ false