Merge pull request #13 from ionide/better-packaging

Author: baronfel

build/build.fs

@@ -7,63 +7,12 @@ open Fake.DotNet
 open Fake.Core.TargetOperators
 open System
 
-let changelogFilename = __SOURCE_DIRECTORY__ </> ".." </> "CHANGELOG.md"
-let changelog = Changelog.load changelogFilename
-let mutable latestEntry =
-    if Seq.isEmpty changelog.Entries
-    then Changelog.ChangelogEntry.New("0.0.1", "0.0.1-alpha.1", Some DateTime.Today, None, [], false)
-    else changelog.LatestEntry
-
 let configuration = Environment.environVarOrDefault "configuration" "Release"
 let project = "LanguageServerProtocol"
 let buildDir = "src" </> project </> "bin" </> "Debug"
 let buildReleaseDir = "src" </> project </>  "bin" </> "Release"
 let releaseDir = "release"
 
-let summary =
-    "Building Language Server Protocol server and clients in F#"
-
-let authors = "chethusk; Krzysztof-Cieslak;"
-let tags = "LSP; editor tooling"
-
-let gitOwner = "ionide"
-let gitName = "LanguageServerProtocol"
-let gitHome = "https://github.com/" + gitOwner
-let gitUrl = gitHome + "/" + gitName
-
-let packageReleaseNotes =
-    sprintf "%s/blob/v%s/CHANGELOG.md" gitUrl latestEntry.NuGetVersion
-
-// Helper function to remove blank lines
-let isEmptyChange =
-    function
-    | Changelog.Change.Added s
-    | Changelog.Change.Changed s
-    | Changelog.Change.Deprecated s
-    | Changelog.Change.Fixed s
-    | Changelog.Change.Removed s
-    | Changelog.Change.Security s
-    | Changelog.Change.Custom (_, s) -> String.isNullOrWhiteSpace s.CleanedText
-
-let releaseNotes =
-    latestEntry.Changes
-    |> List.filter (isEmptyChange >> not)
-    |> List.map (fun c -> " * " + c.ToString())
-    |> String.concat "\n"
-
-let properties =
-    [   ("Version", latestEntry.AssemblyVersion)
-        ("Authors", authors)
-        ("PackageProjectUrl", gitUrl)
-        ("PackageTags", tags)
-        ("RepositoryType", "git")
-        ("RepositoryUrl", gitUrl)
-        ("PackageLicenseExpression", "MIT")
-        ("PackageReleaseNotes", packageReleaseNotes)
-        ("PackageDescription", summary)
-        ("EnableSourceLink", "true") ]
-
-
 let clean = fun _ ->
   Shell.cleanDirs [ buildDir; buildReleaseDir; ]
 
@@ -74,7 +23,7 @@ let build = fun _ ->
   DotNet.build (fun p ->
      { p with
          Configuration = DotNet.BuildConfiguration.fromString configuration
-         MSBuildParams = { MSBuild.CliArguments.Create () with Properties = properties } }) "LanguageServerProtocol.sln"
+         }) "LanguageServerProtocol.sln"
 
 
 let replaceFsLibLog = fun _ ->
@@ -95,7 +44,7 @@ let release = fun _ ->
        { p with
            OutputPath = Some (__SOURCE_DIRECTORY__ </> ".." </> releaseDir)
            Configuration = DotNet.BuildConfiguration.fromString configuration
-           MSBuildParams = { MSBuild.CliArguments.Create () with Properties = properties } }) "src/Ionide.LanguageServerProtocol.fsproj"
+           }) "src/Ionide.LanguageServerProtocol.fsproj"
 
 let push = fun _ ->
     let key =

paket.dependencies

@@ -6,6 +6,7 @@ framework: netstandard2.0
 nuget Newtonsoft.Json
 nuget FSharp.Core
 nuget Dotnet.ReproducibleBuilds copy_local:true
+nuget Ionide.KeepAChangelog.Tasks copy_local:true
 
 nuget Microsoft.NETFramework.ReferenceAssemblies
 github TheAngryByrd/FsLibLog:f81cba440bf0476bb4e2262b57a067a0d6ab78a7 src/FsLibLog/FsLibLog.fs

paket.lock

@@ -8,6 +8,7 @@ NUGET
       Microsoft.SourceLink.GitHub (>= 1.0)
       Microsoft.SourceLink.GitLab (>= 1.0)
     FSharp.Core (6.0.1)
+    Ionide.KeepAChangelog.Tasks (0.1) - copy_local: true
     Microsoft.Build.Tasks.Git (1.1.1) - copy_local: true
     Microsoft.NETFramework.ReferenceAssemblies (1.0.2)
     Microsoft.SourceLink.AzureRepos.Git (1.1.1) - copy_local: true

src/Ionide.LanguageServerProtocol.fsproj

@@ -3,13 +3,21 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <ChangelogFile>$(MSBuildThisFileDirectory)../CHANGELOG.md</ChangelogFile>
+    <Description>Library for implementing Language Server Protocol in F#.</Description>
+    <PackageTags>LSP, editor tooling</PackageTags>
+    <Authors>chethusk; Krzysztof-Cieslak</Authors>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    <PackageReadmeFile>README.md</PackageReadmeFile>
+    <PackageProjectUrl>https://github.com/ionide/LanguageServerProtocol</PackageProjectUrl>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="..\paket-files\TheAngryByrd\FsLibLog\src\FsLibLog\FsLibLog.fs">
       <Paket>True</Paket>
       <Link>paket-files/FsLibLog.fs</Link>
     </Compile>
     <Compile Include="LanguageServerProtocol.fs" />
+    <None Include="../README.md" Pack="true" PackagePath="\" />
   </ItemGroup>
   <Import Project="..\.paket\Paket.Restore.targets" />
 </Project>

src/paket.references

@@ -1,6 +1,7 @@
 Newtonsoft.Json
 FSharp.Core
 Dotnet.ReproducibleBuilds
+Ionide.KeepAChangelog.Tasks
 
 Microsoft.NETFramework.ReferenceAssemblies
 File: FsLibLog.fs