CLJCLR-164: Change value of dotnet-version to be a map holding the components :major, :minor, :incremental, instead of a string.

Author: dmiller

Clojure/Clojure.Source/clojure/core_clr.clj

@@ -361,10 +361,16 @@
 
 (def framework-description System.Runtime.InteropServices.RuntimeInformation/FrameworkDescription)
 
+(defn- parse-version-string [^String s]
+  (let [[major minor build] (.Split s (char-array [\.]))]
+    {:major (when major (Int32/Parse ^String major))
+     :minor (when minor (Int32/Parse ^String minor))
+     :incremental (when build (Int32/Parse ^String build))}))
+
 (defn- parse-framework-description [] 
     (let [^String descr framework-description
           prefixes '(( ".NET Framework " :framework)  (".NET Native "  :native) (".NET Core " :core)  (".NET " :dotnet))          
-          try-parse (fn [[^String s k]] (when (.StartsWith descr s) [k (.Substring descr (.Length s))]))]
+          try-parse (fn [[^String s k]] (when (.StartsWith descr s) [k (parse-version-string (.Substring descr (.Length s)))]))]
         (some try-parse prefixes)))
 
 (def dotnet-platform (first (parse-framework-description)))

Clojure/Clojure.Source/clojure/math.clj

@@ -71,7 +71,7 @@
   Math/PI)
 
 
-(compile-when (>= (.CompareTo ^String dotnet-version "5") 0)
+(compile-when (>= (:major dotnet-version) 5)
 
 (def
   ^{:doc "Constant for tau, the number of radians in one turn.
@@ -506,7 +506,7 @@
 
 ) ;; compile-when
 
-(compile-when (>= (.CompareTo ^String dotnet-version "6") 0)
+(compile-when (>= (:major dotnet-version) 6)
 
 (defn reciprocal-estimate
   {:doc "Returns an estimate of the reciprocal of a specified number.

Clojure/Clojure.Tests/clojure/test_clojure/sequences.clj

@@ -1640,7 +1640,7 @@
     (cycle [1])
     (repeat 1)))
 
-(compile-when (>= (.CompareTo dotnet-version "6") 0)
+(compile-when (>= (:major dotnet-version) 6)
 (defspec iteration-seq-equals-reduce 1000
   (prop/for-all [initk gen/int
                  seed gen/int]