global.json type provider does not like 2.1.300 as it now thinks its a date

Author: Mpdreamz

build/scripts/Building.fsx

@@ -16,13 +16,12 @@ open Versioning
 
 module Build =
 
-    type private GlobalJson = JsonProvider<"../../global.json">
+    type private GlobalJson = JsonProvider<"../../global.json", InferTypesFromValues = false>
     let private pinnedSdkVersion = GlobalJson.GetSample().Sdk.Version
 
     let msBuildProperties (projects: Versioning.AssemblyVersionInfo list) = 
         let props = (projects |> List.collect Versioning.MsBuildArgs)
-        let globalJson = GlobalJson.Load("../../global.json");
-        let v = globalJson.Versions.Repos.Remove(0, 1)
+        let v = Versioning.reposVersion()
         [(sprintf "/p:ReposVersion=v%s" v)] |> List.append props
 
     let Compile (projects: Versioning.AssemblyVersionInfo list) = 

build/scripts/Targets.fsx

@@ -40,7 +40,7 @@ Target "FullBuild"  <| fun _ ->
 Target "Version" <| fun _ -> 
     let changedResults = 
         Commandline.projects
-        |> List.map (fun p -> Versioning.writeVersionIntoGlobalJson (p.Project.project) (p.Informational.ToString()))
+        |> List.map (fun p -> Versioning.writeVersionIntoVersionsJson (p.Project.project) (p.Informational.ToString()))
         |> List.contains true
 
     setBuildParam "versionchanged" (if changedResults then "1" else "0")

build/scripts/Versioning.fsx

@@ -19,7 +19,7 @@ open Fake.Git
 
 module Versioning =
     type AssemblyVersionInfo = { Informational: SemVerInfo; Assembly: SemVerInfo; AssemblyFile: SemVerInfo; Project: ProjectInfo; }
-    type private GlobalJson = JsonProvider<"../../global.json">
+    type private VersionsJson = JsonProvider<"../../versions.json">
 
     let private canaryVersionOrCurrent version = 
         match getBuildParam "target" with
@@ -32,37 +32,41 @@ module Versioning =
         | _ -> version |> parse
 
     let private versionOf project =
-        let globalJson = GlobalJson.Load("../../global.json");
+        let globalJson = VersionsJson.Load("../../versions.json");
         match project with
         | Managed -> canaryVersionOrCurrent <| globalJson.Versions.Managed.Remove(0, 1)
         | Ephemeral -> canaryVersionOrCurrent <| globalJson.Versions.Ephemeral.Remove(0, 1)
         | Xunit -> canaryVersionOrCurrent <| globalJson.Versions.Xunit.Remove(0, 1)
+        
+    let reposVersion () =
+        let globalJson = VersionsJson.Load("../../versions.json");
+        globalJson.Versions.Repos.Remove(0, 1);
 
     let private assemblyVersionOf v = sprintf "%i.0.0" v.Major |> parse
 
     let private assemblyFileVersionOf v = sprintf "%i.%i.%i.0" v.Major v.Minor v.Patch |> parse
 
     //write it with a leading v in the json, needed for the json type provider to keep things strings
-    let writeGlobalJson reposVersion managedVersion ephemeralVersion xunitVersion =
-        let globalJson = GlobalJson.Load("../../global.json");
-        let versionsNode = GlobalJson.Versions(reposVersion, managedVersion, ephemeralVersion, xunitVersion)
+    let writeVersionsJson reposVersion managedVersion ephemeralVersion xunitVersion =
+        let globalJson = VersionsJson.Load("../../versions.json");
+        let versionsNode = VersionsJson.Versions(reposVersion, managedVersion, ephemeralVersion, xunitVersion)
 
-        let newGlobalJson = GlobalJson.Root (GlobalJson.Sdk(globalJson.Sdk.Version), versionsNode)
-        use tw = new StreamWriter("global.json")
-        newGlobalJson.JsonValue.WriteTo(tw, JsonSaveOptions.None)
+        let newVersionsJson = VersionsJson.Root (versionsNode)
+        use tw = new StreamWriter("versions.json")
+        newVersionsJson.JsonValue.WriteTo(tw, JsonSaveOptions.None)
 
     let private pre (v: string) = match (v.StartsWith("v")) with | true -> v | _ -> sprintf "v%s" v
     let private bumpVersion project version = 
-        let globalJson = GlobalJson.Load("../../global.json");
+        let globalJson = VersionsJson.Load("../../versions.json");
         let reposVersion = pre <| globalJson.Versions.Repos
         let managedVersion = match project with | Managed -> pre version | _ -> pre <| globalJson.Versions.Managed
         let ephemeralVersion = match project with | Ephemeral -> pre version | _ -> pre <| globalJson.Versions.Ephemeral
         let xunitVersion = match project with | Xunit -> pre version | _ -> pre <| globalJson.Versions.Xunit
-        writeGlobalJson reposVersion managedVersion ephemeralVersion xunitVersion
+        writeVersionsJson reposVersion managedVersion ephemeralVersion xunitVersion
         traceImportant <| sprintf "%s bumped version to (%O) in global.json " (nameOf project) version
 
-    let writeVersionIntoGlobalJson project version =
-        let globalJson = GlobalJson.Load("../../global.json");
+    let writeVersionIntoVersionsJson project version =
+        let globalJson = VersionsJson.Load("../../versions.json");
         let pv = pre version
         let changed = 
             match project with
@@ -78,14 +82,14 @@ module Versioning =
         changed
 
     let BumpGlobalVersion (projects: AssemblyVersionInfo list) = 
-        let globalJson = GlobalJson.Load("../../global.json");
+        let globalJson = VersionsJson.Load("../../versions.json");
         let v = globalJson.Versions.Repos.Remove(0, 1) |> parse
         let bumpedVersion = sprintf "v%i.%i.%i" v.Major v.Minor (v.Patch + 1)
 
         let managedVersion = pre <| globalJson.Versions.Managed
         let ephemeralVersion = pre <| globalJson.Versions.Ephemeral
         let xunitVersion = pre <| globalJson.Versions.Xunit
-        writeGlobalJson bumpedVersion managedVersion ephemeralVersion xunitVersion
+        writeVersionsJson bumpedVersion managedVersion ephemeralVersion xunitVersion
         traceImportant <| sprintf "bumped repos version to (%s) in global.json"  bumpedVersion
 
         let header p = sprintf "%s %O" p.Project.name p.Informational

global.json

@@ -1,11 +1,5 @@
 {
   "sdk": {
     "version": "2.1.300"
-  },
-  "versions": {
-    "repos": "v0.0.10",
-    "managed": "v0.0.1",
-    "ephemeral": "v0.0.1",
-    "xunit": "v0.0.5"
   }
 }

src/Elastic.Abstractions.sln

@@ -18,6 +18,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{73A4EA23
 		..\build\Versioning.targets = ..\build\Common.targets
 		..\appveyor.yml = ..\appveyor.yml
 		..\README.md = ..\README.md
+		..\versions.json = ..\versions.json
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Elastic.Managed", "Elastic.Managed\Elastic.Managed.csproj", "{0FCE020D-F4BD-4933-A0AB-27537EFA273E}"

versions.json

@@ -0,0 +1,8 @@
+{
+  "versions": {
+    "repos": "v0.0.10",
+    "managed": "v0.0.1",
+    "ephemeral": "v0.0.1",
+    "xunit": "v0.0.5"
+  }
+}