Fix issuewith built assembly versioning

SteveGilham · Dec 31, 2017 · b4d96cc · b4d96cc
1 parent 9696697
commit b4d96cc
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/Build/build.fsx b/Build/build.fsx
@@ -64,8 +64,7 @@ Target "SetVersion" (fun _ ->
     let revision= ((int fraction.TotalSeconds) / 3)
     let appveyor = environVar "APPVEYOR_BUILD_VERSION"
     let majmin = if String.IsNullOrWhiteSpace appveyor then "1.4" else String.Join(".", appveyor.Split('.') |> Seq.take 2) // TODO read YAML
-    let version = if String.IsNullOrWhiteSpace appveyor then sprintf "%s.%d.%d" majmin diff.Days revision else appveyor
-    Version := version
+    Version := if String.IsNullOrWhiteSpace appveyor then sprintf "%s.%d.%d" majmin diff.Days revision else appveyor
     let copy = sprintf "© 2010-%d by Steve Gilham <SteveGilham@users.noreply.github.com>" now.Year
     Copyright := "Copyright " + copy
 
@@ -79,7 +78,7 @@ Target "SetVersion" (fun _ ->
 
     CreateFSharpAssemblyInfo "./_Generated/AssemblyVersion.fs"
         [Attribute.Version (majmin + ".0.0")
-         Attribute.FileVersion version
+         Attribute.FileVersion (!Version)
          Attribute.Company "Steve Gilham"
          Attribute.Product "AltCover"
          Attribute.Trademark ""
@@ -101,7 +100,7 @@ open System.Runtime.CompilerServices
 ()
 "
     let file = String.Format(System.Globalization.CultureInfo.InvariantCulture,
-                template, version, key.Replace("-", String.Empty), key2.Replace("-", String.Empty))
+                template, (!Version), key.Replace("-", String.Empty), key2.Replace("-", String.Empty))
     let path = @"_Generated\VisibleToTest.fs"
     // Update the file only if it would change
     let old = if File.Exists(path) then File.ReadAllText(path) else String.Empty
@@ -116,7 +115,7 @@ Target "BuildRelease" (fun _ ->
    ILMerge (fun p -> { p with DebugInfo = true
                               TargetKind = TargetKind.Exe
                               KeyFile = "./Build/Infrastructure.snk"
-                              Version = (!Version).Split('-') |> Seq.head
+                              Version = (String.Join(".", (!Version).Split('.') |> Seq.take 2) + ".0.0")
                               Internalize = InternalizeTypes.Internalize
                               Libraries = !! "./_Binaries/AltCover/Release+AnyCPU/Mono.C*.dll"
                               AttributeFile = "./_Binaries/AltCover/Release+AnyCPU/AltCover.exe"})