Version 3.5-alpha

Author: Tarmil

src/build/WebSharper.Build/Config.fs

@@ -26,9 +26,9 @@ module Config =
     let PackageId = "WebSharper"
     let CompilerPackageId = "WebSharper.Compiler"
     let PlainVersion = "3.5"
-    let PackageVersion = PlainVersion
+    let VersionSuffix = Some "-alpha"
+    let PackageVersion = PlainVersion + defaultArg VersionSuffix ""
     let NumericVersion = Version(PlainVersion + ".0.0")
-    let VersionSuffix = None
     let Company = "IntelliFactory"
     let Description = "F#-to-JavaScript compiler and web application framework"
     let CompilerDescription = "F#-to-JavaScript compiler"

src/build/WebSharper.Build/Main.fs

@@ -152,8 +152,8 @@ module Main =
             }
         let compilerNuPkg =
             let bt =
-                bt.PackageId(Config.CompilerPackageId)
-                |> PackageVersion.Full.Custom (Version(nuPkg.GetComputedVersion()))
+                bt.PackageId(Config.CompilerPackageId, Config.PackageVersion)
+                |> PackageVersion.Full.Custom (Version(nuPkg.GetComputedVersion().Split('-').[0]))
             bt.NuGet.CreatePackage()
                 .Configure(fun x ->
                     {

tools/UpdateVersion.fsx

@@ -21,14 +21,17 @@ let UpdateAsmVersionAttr (filePath: string) (version: string) =
         else l
     )
 
-let UpdateConfigFs (filePath: string) (version: string) (suffix: string) =
+let UpdateConfigFs (filePath: string) (version: string) (suffix: option<string>) =
     ReplacePerLine filePath (fun l ->
         if l.Contains "let PlainVersion" then
             Regex("\"[0-9.]+\"")
                 .Replace(l, "\"" + version + "\"")
-        elif l.Contains "let PackageVersion" then
-            Regex("\".*\"")
-                .Replace(l, "\"" + suffix + "\"")
+        elif l.Contains "let VersionSuffix" then
+            Regex("None|Some \".*\"")
+                .Replace(l,
+                    match suffix with
+                    | None -> "None"
+                    | Some suffix -> "Some \"" + suffix + "\"")
         else l
     )
 
@@ -63,8 +66,8 @@ do
         UpdateWebsiteConfigFs (sln +/ "tests" +/ "Website" +/ "Config.fs") v
         UpdateOptionsFs (src +/ "compiler" +/ "WebSharper" +/ "Options.fs") v
     match fsi.CommandLineArgs with
-    | [| _fsx; v |] -> run v ""
-    | [| _fsx; v; s |] -> run v ("-" + s)
+    | [| _fsx; v |] -> run v None
+    | [| _fsx; v; s |] -> run v (Some ("-" + s))
     | args ->
         eprintfn "Usage: UpdateVersion VERSION [SUFFIX]"
         eprintfn "%A" args