Target netstandard 2.0 with lib, update project to .net 8

kMutagene · Jan 4, 2024 · 6560990 · 6560990
1 parent c2cc3bb
commit 6560990
Show file tree

Hide file tree

Showing 14 changed files with 138 additions and 111 deletions.
diff --git a/build/BasicTasks.fs b/build/BasicTasks.fs
@@ -24,7 +24,22 @@ let clean = BuildTask.create "Clean" [] {
     |> Shell.cleanDirs 
 }
 
-let build = BuildTask.create "Build" [clean] {
-    solutionFile
-    |> DotNet.build id
-}
+let buildSolution =
+    BuildTask.create "BuildSolution" [ clean ] { 
+        solutionFile 
+        |> DotNet.build (fun p ->
+            let msBuildParams =
+                {p.MSBuildParams with 
+                    Properties = ([
+                        "warnon", "3390"
+                    ])
+                    DisableInternalBinLog = true
+                }
+            {
+                p with 
+                    MSBuildParams = msBuildParams
+
+            }
+            |> DotNet.Options.withCustomParams (Some "-tl")
+        )
+    }
diff --git a/build/Build.fs b/build/Build.fs
@@ -21,28 +21,28 @@ open ReleaseTasks
 let _release = 
     BuildTask.createEmpty 
         "Release" 
-        [clean; build; runTests; pack; buildDocs; createTag; publishNuget; releaseDocs]
+        [clean; buildSolution; runTests; pack; buildDocs; createTag; publishNuget; releaseDocs]
 
 /// Full release of nuget package, git tag, and documentation for the prerelease version.
 let _preRelease = 
     BuildTask.createEmpty 
         "PreRelease" 
-        [setPrereleaseTag; clean; build; runTests; packPrerelease; buildDocsPrerelease; createPrereleaseTag; publishNugetPrerelease; prereleaseDocs]
+        [setPrereleaseTag; clean; buildSolution; runTests; packPrerelease; buildDocsPrerelease; createPrereleaseTag; publishNugetPrerelease; prereleaseDocs]
 
 /// Full release of nuget package for the prerelease version.
 let _releaseNoDocs = 
     BuildTask.createEmpty 
         "ReleaseNoDocs" 
-        [clean; build; runTests; pack; createTag; publishNuget;]
+        [clean; buildSolution; runTests; pack; createTag; publishNuget;]
 
 /// Full release of nuget package for the prerelease version.
 let _preReleaseNoDocs = 
     BuildTask.createEmpty 
         "PreReleaseNoDocs" 
-        [setPrereleaseTag; clean; build; runTests; packPrerelease; createPrereleaseTag; publishNugetPrerelease]
+        [setPrereleaseTag; clean; buildSolution; runTests; packPrerelease; createPrereleaseTag; publishNugetPrerelease]
 
 ReleaseNotesTasks.updateReleaseNotes |> ignore
 
 [<EntryPoint>]
 let main args = 
-    runOrDefault build args
+    runOrDefault buildSolution args
diff --git a/build/DocumentationTasks.fs b/build/DocumentationTasks.fs
@@ -6,28 +6,28 @@ open BasicTasks
 
 open BlackFox.Fake
 
-let buildDocs = BuildTask.create "BuildDocs" [build] {
+let buildDocs = BuildTask.create "BuildDocs" [buildSolution] {
     printfn "building docs with stable version %s" stableVersionTag
     runDotNet 
         (sprintf "fsdocs build --eval --clean --properties Configuration=Release --parameters fsdocs-package-version %s" stableVersionTag)
         "./"
 }
 
-let buildDocsPrerelease = BuildTask.create "BuildDocsPrerelease" [setPrereleaseTag; build] {
+let buildDocsPrerelease = BuildTask.create "BuildDocsPrerelease" [setPrereleaseTag; buildSolution] {
     printfn "building docs with prerelease version %s" prereleaseTag
     runDotNet 
         (sprintf "fsdocs build --eval --clean --properties Configuration=Release --parameters fsdocs-package-version %s" prereleaseTag)
         "./"
 }
 
-let watchDocs = BuildTask.create "WatchDocs" [build] {
+let watchDocs = BuildTask.create "WatchDocs" [buildSolution] {
     printfn "watching docs with stable version %s" stableVersionTag
     runDotNet 
         (sprintf "fsdocs watch --eval --clean --properties Configuration=Release --parameters fsdocs-package-version %s" stableVersionTag)
         "./"
 }
 
-let watchDocsPrerelease = BuildTask.create "WatchDocsPrerelease" [setPrereleaseTag; build] {
+let watchDocsPrerelease = BuildTask.create "WatchDocsPrerelease" [setPrereleaseTag; buildSolution] {
     printfn "watching docs with prerelease version %s" prereleaseTag
     runDotNet 
         (sprintf "fsdocs watch --eval --clean --properties Configuration=Release --parameters fsdocs-package-version %s" prereleaseTag)

diff --git a/build/PackageTasks.fs b/build/PackageTasks.fs
@@ -8,6 +8,7 @@ open TestTasks
 
 open BlackFox.Fake
 open Fake.Core
+open Fake.DotNet
 open Fake.IO.Globbing.Operators
 
 open System.Text.RegularExpressions
@@ -17,7 +18,7 @@ let private replaceCommitLink input =
     let commitLinkPattern = @"\[\[#[a-z0-9]*\]\(.*\)\] "
     Regex.Replace(input,commitLinkPattern,"")
 
-let pack = BuildTask.create "Pack" [clean; build; runTests] {
+let pack = BuildTask.create "Pack" [clean; buildSolution; runTests] {
     if promptYesNo (sprintf "creating stable package with version %s OK?" stableVersionTag ) 
         then
             !! "src/**/*.*proj"
@@ -29,35 +30,39 @@ let pack = BuildTask.create "Pack" [clean; build; runTests] {
                             "Version",stableVersionTag
                             "PackageReleaseNotes",  (release.Notes |> List.map replaceCommitLink |> String.concat "\r\n" )
                         ] @ p.MSBuildParams.Properties)
+                        DisableInternalBinLog = true
                     }
                 {
                     p with 
                         MSBuildParams = msBuildParams
                         OutputPath = Some pkgDir
                 }
+                |> DotNet.Options.withCustomParams (Some "-tl")
             ))
     else failwith "aborted"
 }
 
-let packPrerelease = BuildTask.create "PackPrerelease" [setPrereleaseTag; clean; build; runTests] {
+let packPrerelease = BuildTask.create "PackPrerelease" [setPrereleaseTag; clean; buildSolution; runTests] {
     if promptYesNo (sprintf "package tag will be %s OK?" prereleaseTag )
         then 
             !! "src/**/*.*proj"
             -- "src/bin/*"
             |> Seq.iter (Fake.DotNet.DotNet.pack (fun p ->
-                        let msBuildParams =
-                            {p.MSBuildParams with 
-                                Properties = ([
-                                    "Version", prereleaseTag
-                                    "PackageReleaseNotes",  (release.Notes |> List.map replaceCommitLink  |> String.toLines )
-                                ] @ p.MSBuildParams.Properties)
-                            }
-                        {
-                            p with 
-                                VersionSuffix = Some prereleaseSuffix
-                                OutputPath = Some pkgDir
-                                MSBuildParams = msBuildParams
-                        }
+                let msBuildParams =
+                    {p.MSBuildParams with 
+                        Properties = ([
+                            "Version", prereleaseTag
+                            "PackageReleaseNotes",  (release.Notes |> List.map replaceCommitLink  |> String.toLines )
+                        ] @ p.MSBuildParams.Properties)
+                        DisableInternalBinLog = true
+                    }
+                {
+                    p with 
+                        VersionSuffix = Some prereleaseSuffix
+                        OutputPath = Some pkgDir
+                        MSBuildParams = msBuildParams
+                }
+                |> DotNet.Options.withCustomParams (Some "-tl")
             ))
     else
         failwith "aborted"

diff --git a/build/ReleaseTasks.fs b/build/ReleaseTasks.fs
@@ -15,15 +15,15 @@ open Fake.Tools
 open Fake.IO
 open Fake.IO.Globbing.Operators
 
-let createTag = BuildTask.create "CreateTag" [clean; build; runTests; pack] {
+let createTag = BuildTask.create "CreateTag" [clean; buildSolution; runTests; pack] {
     if promptYesNo (sprintf "tagging branch with %s OK?" stableVersionTag ) then
         Git.Branches.tag "" stableVersionTag
         Git.Branches.pushTag "" projectRepo stableVersionTag
     else
         failwith "aborted"
 }
 
-let createPrereleaseTag = BuildTask.create "CreatePrereleaseTag" [setPrereleaseTag; clean; build; runTests; packPrerelease] {
+let createPrereleaseTag = BuildTask.create "CreatePrereleaseTag" [setPrereleaseTag; clean; buildSolution; runTests; packPrerelease] {
     if promptYesNo (sprintf "tagging branch with %s OK?" prereleaseTag ) then 
         Git.Branches.tag "" prereleaseTag
         Git.Branches.pushTag "" projectRepo prereleaseTag
@@ -32,7 +32,7 @@ let createPrereleaseTag = BuildTask.create "CreatePrereleaseTag" [setPrereleaseT
 }
 
 
-let publishNuget = BuildTask.create "PublishNuget" [clean; build; runTests; pack] {
+let publishNuget = BuildTask.create "PublishNuget" [clean; buildSolution; runTests; pack] {
     let targets = (!! (sprintf "%s/*.*pkg" pkgDir ))
     for target in targets do printfn "%A" target
     let msg = sprintf "release package with version %s?" stableVersionTag
@@ -45,7 +45,7 @@ let publishNuget = BuildTask.create "PublishNuget" [clean; build; runTests; pack
     else failwith "aborted"
 }
 
-let publishNugetPrerelease = BuildTask.create "PublishNugetPrerelease" [clean; build; runTests; packPrerelease] {
+let publishNugetPrerelease = BuildTask.create "PublishNugetPrerelease" [clean; buildSolution; runTests; packPrerelease] {
     let targets = (!! (sprintf "%s/*.*pkg" pkgDir ))
     for target in targets do printfn "%A" target
     let msg = sprintf "release package with version %s?" prereleaseTag 

diff --git a/build/TestTasks.fs b/build/TestTasks.fs
@@ -6,7 +6,7 @@ open Fake.DotNet
 open ProjectInfo
 open BasicTasks
 
-let runTests = BuildTask.create "RunTests" [clean; build] {
+let runTests = BuildTask.create "RunTests" [clean; buildSolution] {
     testProjects
     |> Seq.iter (fun testProject ->
         Fake.DotNet.DotNet.test(fun testParams ->
@@ -15,29 +15,9 @@ let runTests = BuildTask.create "RunTests" [clean; build] {
                     Logger = Some "console;verbosity=detailed"
                     Configuration = DotNet.BuildConfiguration.fromString configuration
                     NoBuild = true
+                    MSBuildParams = { testParams.MSBuildParams with DisableInternalBinLog = true}
             }
-        ) testProject
-    )
-}
-
-// to do: use this once we have actual tests
-let runTestsWithCodeCov = BuildTask.create "RunTestsWithCodeCov" [clean; build] {
-    let standardParams = Fake.DotNet.MSBuild.CliArguments.Create ()
-    testProjects
-    |> Seq.iter(fun testProject -> 
-        Fake.DotNet.DotNet.test(fun testParams ->
-            {
-                testParams with
-                    MSBuildParams = {
-                        standardParams with
-                            Properties = [
-                                "AltCover","true"
-                                "AltCoverCobertura","../../codeCov.xml"
-                                "AltCoverForce","true"
-                            ]
-                    };
-                    Logger = Some "console;verbosity=detailed"
-            }
+            |> DotNet.Options.withCustomParams (Some "-tl")
         ) testProject
     )
 }
diff --git a/build/build.fsproj b/build/build.fsproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
 

diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "6.0.100",
+    "version": "8.0.100",
     "rollForward": "latestMinor"
   }
 }
diff --git a/src/AnyBadge.NET.Tool/AnyBadge.NET.Tool.fsproj b/src/AnyBadge.NET.Tool/AnyBadge.NET.Tool.fsproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/AnyBadge.NET/AnyBadge.NET.fsproj b/src/AnyBadge.NET/AnyBadge.NET.fsproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <OutputType>Library</OutputType>
     <!-- Optional: Declare that the Repository URL can be published to NuSpec -->
     <PublishRepositoryUrl>true</PublishRepositoryUrl>

diff --git a/src/AnyBadge.NET/Badge.fs b/src/AnyBadge.NET/Badge.fs
@@ -65,7 +65,7 @@ type Badge(
         | None -> value
 
     // text_color can be passed as a single value or a pair of comma delimited values
-    let textColors = textColor.Split(",")
+    let textColors = textColor.Split(',')
     let labelTextColor = textColors.[0]
     let valueTextColor = 
         if textColors.Length > 1 then
@@ -355,7 +355,7 @@ type Badge(
             Globals.GITLAB_SCOPED_TEMPLATE
         else
             // Identify whether template is a file or the actual template text
-            if this.Template.Split("\n").Length = 1 then
+            if this.Template.Split('\n').Length = 1 then
                 try 
                     File.ReadAllText(this.Template)
                 with _ ->

diff --git a/src/AnyBadge.NET/Helpers.fs b/src/AnyBadge.NET/Helpers.fs
@@ -59,7 +59,7 @@ module Helpers =
 
         for c in text do
             for k in char_width_percentages.Keys do
-                if k.Contains(c) then
+                if Array.contains c (k.ToCharArray()) then
                     size <- size + (char_width_percentages[k] * float(fontWidth))
 
         int(size)