Add correct flags for decoupling assembly and package version to the …

…build pipeline.
CSBiology · May 31, 2022 · 92609c4 · 92609c4
1 parent 1d30cf0
commit 92609c4
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 5 deletions.
diff --git a/build/BasicTasks.fs b/build/BasicTasks.fs
@@ -4,7 +4,6 @@ open BlackFox.Fake
 open Fake.IO
 open Fake.DotNet
 open Fake.IO.Globbing.Operators
-
 open ProjectInfo
 
 let setPrereleaseTag = BuildTask.create "SetPrereleaseTag" [] {
@@ -25,6 +24,19 @@ let clean = BuildTask.create "Clean" [] {
 }
 
 let build = BuildTask.create "Build" [clean] {
-    solutionFile
-    |> DotNet.build id
-}
+    !! "src/**/*.*proj"
+    -- "src/bin/*" 
+    |> Seq.iter (DotNet.build (fun p ->
+            let msBuildParams =
+                {p.MSBuildParams with 
+                    Properties = ([
+                        "AssemblyVersion", assemblyVersion
+                        "AssemblyInformationalVersion", stableVersionTag
+                    ] @ p.MSBuildParams.Properties)
+                }
+            {
+                p with 
+                    MSBuildParams = msBuildParams
+            }
+))
+}
diff --git a/build/PackageTasks.fs b/build/PackageTasks.fs
@@ -20,6 +20,8 @@ let pack = BuildTask.create "Pack" [clean; build; runTests] {
                     {p.MSBuildParams with 
                         Properties = ([
                             "Version",stableVersionTag
+                            "AssemblyVersion", assemblyVersion
+                            "AssemblyInformationalVersion", stableVersionTag
                             "PackageReleaseNotes",  (release.Notes |> String.concat "\r\n")
                         ] @ p.MSBuildParams.Properties)
                     }
@@ -42,6 +44,8 @@ let packPrerelease = BuildTask.create "PackPrerelease" [setPrereleaseTag; clean;
                             {p.MSBuildParams with 
                                 Properties = ([
                                     "Version", prereleaseTag
+                                    "AssemblyVersion", assemblyVersion
+                                    "AssemblyInformationalVersion", stableVersionTag
                                     "PackageReleaseNotes",  (release.Notes |> String.toLines )
                                 ] @ p.MSBuildParams.Properties)
                             }

diff --git a/build/ProjectInfo.fs b/build/ProjectInfo.fs
@@ -4,6 +4,8 @@ open Fake.Core
 
 let project = "DynamicObj"
 
+let summary = "F# library supporting Dynamic Objects including inheritance in functional style."
+
 let testProjects = 
     [
         "tests/UnitTests/UnitTests.fsproj"
@@ -28,6 +30,10 @@ let stableVersion = SemVer.parse release.NugetVersion
 
 let stableVersionTag = (sprintf "%i.%i.%i" stableVersion.Major stableVersion.Minor stableVersion.Patch )
 
+let assemblyVersion = $"{stableVersion.Major}.0.0"
+
+let assemblyInformationalVersion = $"{stableVersion.Major}.{stableVersion.Minor}.{stableVersion.Patch}"
+
 let mutable prereleaseSuffix = ""
 
 let mutable prereleaseTag = ""

diff --git a/src/DynamicObj/DynamicObj.fsproj b/src/DynamicObj/DynamicObj.fsproj
@@ -12,7 +12,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <Authors>Timo Mühlhaus, F# open source contributors</Authors>
+    <Authors>Timo Mühlhaus, Kevin Schneider, F# open source contributors</Authors>
     <Description>F# library supporting Dynamic Objects including inheritance in functional style.</Description>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageProjectUrl>https://csbiology.github.io/DynamicObj/</PackageProjectUrl>