Merge pull request #25 from ekonbenefits/fix-deployment-naming

Trying to fix deployment
ekonbenefits · Apr 5, 2018 · 8261b3f · 8261b3f
2 parents cfad02a + 2356268
commit 8261b3f
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 10 deletions.
diff --git a/Version.props b/Version.props
@@ -1,5 +1,5 @@
 <Project>
     <PropertyGroup>
-        <VersionPrefix>2.0.8</VersionPrefix>
+        <VersionPrefix>2.0.9</VersionPrefix>
     </PropertyGroup>
 </Project>
diff --git a/build.fsx b/build.fsx
@@ -22,24 +22,42 @@
 
 #I "packages/FAKE/tools"
 #r "FakeLib.dll"
+#r "System.Xml.Linq.dll"
 
 open Fake
+open System.Xml.Linq
+open System.Xml.XPath
 
 let sln = "./Dynamitey.sln"
 
 let commonBuild target =
     let buildMode = getBuildParamOrDefault "configuration" "Release"
     let vsuffix = getBuildParamOrDefault "vsuffix" ""
+
+    let versionPrefix = "Version.props" 
+                        |> System.IO.File.ReadAllText 
+                        |> XDocument.Parse
+                        |> (fun x -> x.XPathEvaluate("//VersionPrefix/text()"))
+                        |> (fun x-> x :?> seq<obj>)
+                        |> Seq.exactlyOne
+                        |> sprintf "%A"
+
+    let vProp =
+        if System.Text.RegularExpressions.Regex.IsMatch(vsuffix, "^\d+$") then 
+            "Version", versionPrefix + "." + vsuffix
+        else
+            "VersionSuffix", vsuffix
+
     let setParams defaults =
-                { defaults with
-                    Verbosity = Some(Quiet)
-                    Targets = [target]
-                    Properties =
-                        [
-                            "Configuration", buildMode
-                            "VersionSuffix", vsuffix
-                        ]
-                }
+            { defaults with
+                Verbosity = Some(Quiet)
+                Targets = [target]
+                Properties =
+                    [
+                        "Configuration", buildMode
+                        vProp
+                    ]
+            }
     build setParams sln
           |> DoNothing