Merge pull request #6404 from KevinRansom/ILVersionInfoAsStruct

Making ILVersionInfo a struct (#6392)

Author: cartermp

src/absil/il.fs

@@ -319,7 +319,16 @@ let sha1HashInt64 s = SHA1.sha1HashInt64 s
 // 
 // -------------------------------------------------------------------- 
 
-type ILVersionInfo = uint16 * uint16 * uint16 * uint16
+[<Struct>]
+type ILVersionInfo =
+
+    val Major: uint16
+    val Minor: uint16
+    val Build: uint16
+    val Revision: uint16
+
+    new(major, minor, build, revision) = 
+        { Major = major; Minor = minor; Build = build; Revision = revision }
 
 type Locale = string
 
@@ -410,7 +419,7 @@ type ILAssemblyRef(data) =
         let version = 
            match aname.Version with 
            | null -> None
-           | v -> Some (uint16 v.Major, uint16 v.Minor, uint16 v.Build, uint16 v.Revision)
+           | v -> Some (ILVersionInfo (uint16 v.Major, uint16 v.Minor, uint16 v.Build, uint16 v.Revision))
 
         let retargetable = aname.Flags = System.Reflection.AssemblyNameFlags.Retargetable
 
@@ -423,15 +432,15 @@ type ILAssemblyRef(data) =
         add(aref.Name)
         match aref.Version with 
         | None -> ()
-        | Some (a, b, c, d) -> 
+        | Some (version) -> 
             add ", Version="
-            add (string (int a))
+            add (string (int version.Major))
             add "."
-            add (string (int b))
+            add (string (int version.Minor))
             add "."
-            add (string (int c))
+            add (string (int version.Build))
             add "."
-            add (string (int d))
+            add (string (int version.Revision))
             add ", Culture="
             match aref.Locale with 
             | None -> add "neutral"
@@ -3559,7 +3568,7 @@ let et_MVAR = 0x1Euy
 let et_CMOD_REQD = 0x1Fuy
 let et_CMOD_OPT = 0x20uy
 
-let formatILVersion ((a, b, c, d):ILVersionInfo) = sprintf "%d.%d.%d.%d" (int a) (int b) (int c) (int d)
+let formatILVersion (version: ILVersionInfo) = sprintf "%d.%d.%d.%d" (int version.Major) (int version.Minor) (int version.Build) (int version.Revision)
 
 let encodeCustomAttrString s = 
     let arr = string_as_utf8_bytes s
@@ -4249,17 +4258,17 @@ let parseILVersion (vstr : string) =
     let zero32 n = if n < 0 then 0us else uint16(n)
     // since the minor revision will be -1 if none is specified, we need to truncate to 0 to not break existing code
     let minorRevision = if version.Revision = -1 then 0us else uint16(version.MinorRevision)   
-    (zero32 version.Major, zero32 version.Minor, zero32 version.Build, minorRevision)
+    ILVersionInfo(zero32 version.Major, zero32 version.Minor, zero32 version.Build, minorRevision)
 
 
-let compareILVersions (a1, a2, a3, a4) ((b1, b2, b3, b4) : ILVersionInfo) = 
-    let c = compare a1 b1
+let compareILVersions (version1 : ILVersionInfo) (version2 : ILVersionInfo) = 
+    let c = compare version1.Major version2.Major
     if c <> 0 then c else
-    let c = compare a2 b2
+    let c = compare version1.Minor version2.Minor
     if c <> 0 then c else
-    let c = compare a3 b3
+    let c = compare version1.Build version2.Build
     if c <> 0 then c else
-    let c = compare a4 b4
+    let c = compare version1.Revision version2.Revision
     if c <> 0 then c else
     0
 

src/absil/il.fsi

@@ -53,7 +53,15 @@ type PublicKey =
     member KeyToken: byte[]
     static member KeyAsToken: byte[] -> PublicKey 
 
-type ILVersionInfo = uint16 * uint16 * uint16 * uint16
+[<Struct>]
+type ILVersionInfo =
+
+    val Major: uint16
+    val Minor: uint16
+    val Build: uint16
+    val Revision: uint16
+
+    new : major: uint16 * minor: uint16 * build: uint16 * revision: uint16 -> ILVersionInfo
 
 [<Sealed>]
 type ILAssemblyRef =

src/absil/ilprint.fs

@@ -982,15 +982,15 @@ and goutput_lambdas env os lambdas =
 and goutput_tdefs contents enc env os (td: ILTypeDefs) =
   List.iter (goutput_tdef enc env contents os) td.AsList
 
-let output_ver os (a,b,c,d) =
+let output_ver os (version: ILVersionInfo) =
     output_string os " .ver "
-    output_u16 os a
+    output_u16 os version.Major
     output_string os " : "
-    output_u16 os b
+    output_u16 os version.Minor
     output_string os " : "
-    output_u16 os c
+    output_u16 os version.Build
     output_string os " : "
-    output_u16 os d
+    output_u16 os version.Revision
 
 let output_locale os s = output_string os " .Locale "; output_qstring os s
 

src/absil/ilread.fs

@@ -1667,7 +1667,7 @@ and seekReadAssemblyManifest (ctxt: ILMetadataReader) pectxt idx =
       AuxModuleHashAlgorithm=hash
       SecurityDeclsStored= ctxt.securityDeclsReader_Assembly
       PublicKey= pubkey  
-      Version= Some (v1, v2, v3, v4)
+      Version= Some (ILVersionInfo (v1, v2, v3, v4))
       Locale= readStringHeapOption ctxt localeIdx
       CustomAttrsStored = ctxt.customAttrsReader_Assembly
       MetadataIndex = idx
@@ -1700,12 +1700,12 @@ and seekReadAssemblyRefUncached ctxtH idx =
           | Some blob -> Some (if (flags &&& 0x0001) <> 0x0 then PublicKey blob else PublicKeyToken blob)
 
     ILAssemblyRef.Create
-        (name=nm, 
-         hash=readBlobHeapOption ctxt hashValueIdx, 
-         publicKey=publicKey, 
-         retargetable=((flags &&& 0x0100) <> 0x0), 
-         version=Some(v1, v2, v3, v4), 
-         locale=readStringHeapOption ctxt localeIdx)
+        (name = nm, 
+         hash = readBlobHeapOption ctxt hashValueIdx, 
+         publicKey = publicKey, 
+         retargetable = ((flags &&& 0x0100) <> 0x0), 
+         version = Some (ILVersionInfo (v1, v2, v3, v4)), 
+         locale = readStringHeapOption ctxt localeIdx)
 
 and seekReadModuleRef (ctxt: ILMetadataReader) mdv idx =
     let (nameIdx) = seekReadModuleRefRow ctxt mdv idx

src/absil/ilreflect.fs

@@ -310,8 +310,8 @@ let convAssemblyRef (aref: ILAssemblyRef) =
      | None -> ()
      | Some (PublicKey bytes) -> asmName.SetPublicKey(bytes)
      | Some (PublicKeyToken bytes) -> asmName.SetPublicKeyToken(bytes))
-    let setVersion (major, minor, build, rev) = 
-       asmName.Version <- System.Version (int32 major, int32 minor, int32 build, int32 rev)
+    let setVersion (version: ILVersionInfo) = 
+       asmName.Version <- System.Version (int32 version.Major, int32 version.Minor, int32 version.Build, int32 version.Revision)
     Option.iter setVersion aref.Version
     //  asmName.ProcessorArchitecture <- System.Reflection.ProcessorArchitecture.MSIL
 #if !FX_RESHAPED_GLOBALIZATION

src/absil/ilwrite.fs

@@ -709,10 +709,10 @@ let rec GetIdxForTypeDef cenv key =
 
 let rec GetAssemblyRefAsRow cenv (aref: ILAssemblyRef) =
     AssemblyRefRow 
-        ((match aref.Version with None -> 0us | Some (x, _, _, _) -> x), 
-         (match aref.Version with None -> 0us | Some (_, y, _, _) -> y), 
-         (match aref.Version with None -> 0us | Some (_, _, z, _) -> z), 
-         (match aref.Version with None -> 0us | Some (_, _, _, w) -> w), 
+        ((match aref.Version with None -> 0us | Some (version) -> version.Major), 
+         (match aref.Version with None -> 0us | Some (version) -> version.Minor), 
+         (match aref.Version with None -> 0us | Some (version) -> version.Build), 
+         (match aref.Version with None -> 0us | Some (version) -> version.Revision), 
          ((match aref.PublicKey with Some (PublicKey _) -> 0x0001 | _ -> 0x0000)
           ||| (if aref.Retargetable then 0x0100 else 0x0000)), 
          BlobIndex (match aref.PublicKey with 
@@ -2822,10 +2822,10 @@ and GenExportedTypesPass3 cenv (ce: ILExportedTypesAndForwarders) =
 and GetManifsetAsAssemblyRow cenv m = 
     UnsharedRow 
         [|ULong m.AuxModuleHashAlgorithm
-          UShort (match m.Version with None -> 0us | Some (x, _, _, _) -> x)
-          UShort (match m.Version with None -> 0us | Some (_, y, _, _) -> y)
-          UShort (match m.Version with None -> 0us | Some (_, _, z, _) -> z)
-          UShort (match m.Version with None -> 0us | Some (_, _, _, w) -> w)
+          UShort (match m.Version with None -> 0us | Some (version) -> version.Major)
+          UShort (match m.Version with None -> 0us | Some (version) -> version.Minor)
+          UShort (match m.Version with None -> 0us | Some (version) -> version.Build)
+          UShort (match m.Version with None -> 0us | Some (version) -> version.Revision)
           ULong 
             ( (match m.AssemblyLongevity with 
               | ILAssemblyLongevity.Unspecified -> 0x0000
@@ -3091,9 +3091,8 @@ let writeILMetadataAndCode (generatePdb, desiredMetadataVersion, ilg, emitTailca
 
     let (mdtableVersionMajor, mdtableVersionMinor) = metadataSchemaVersionSupportedByCLRVersion desiredMetadataVersion
 
-    let version = 
-      let (a, b, c, _) = desiredMetadataVersion
-      System.Text.Encoding.UTF8.GetBytes (sprintf "v%d.%d.%d" a b c)
+    let version =
+      System.Text.Encoding.UTF8.GetBytes (sprintf "v%d.%d.%d" desiredMetadataVersion.Major desiredMetadataVersion.Minor desiredMetadataVersion.Build)
 
 
     let paddedVersionLength = align 0x4 (Array.length version)
@@ -3634,7 +3633,7 @@ let writeBinaryAndReportMappings (outfile,
                 | ILScopeRef.Module(_) -> failwith "Expected mscorlib to be ILScopeRef.Assembly was ILScopeRef.Module"
                 | ILScopeRef.Assembly(aref) ->
                     match aref.Version with
-                    | Some (2us, _, _, _) -> parseILVersion "2.0.50727.0"
+                    | Some (version) when version.Major = 2us -> parseILVersion "2.0.50727.0"
                     | Some v -> v
                     | None -> failwith "Expected msorlib to have a version number"
 

src/fsharp/TastOps.fs

@@ -7004,13 +7004,13 @@ let tnames_SignatureDataVersionAttr = splitILTypeName tname_SignatureDataVersion
 
 let tref_SignatureDataVersionAttr () = mkILTyRef(IlxSettings.ilxFsharpCoreLibScopeRef (), tname_SignatureDataVersionAttr)
 
-let mkSignatureDataVersionAttr (g: TcGlobals) ((v1, v2, v3, _) : ILVersionInfo) = 
+let mkSignatureDataVersionAttr (g: TcGlobals) (version: ILVersionInfo)  = 
     mkILCustomAttribute g.ilg
         (tref_SignatureDataVersionAttr(), 
          [g.ilg.typ_Int32;g.ilg.typ_Int32;g.ilg.typ_Int32], 
-         [ILAttribElem.Int32 (int32 v1)
-          ILAttribElem.Int32 (int32 v2) 
-          ILAttribElem.Int32 (int32 v3)], [])
+         [ILAttribElem.Int32 (int32 version.Major)
+          ILAttribElem.Int32 (int32 version.Minor) 
+          ILAttribElem.Int32 (int32 version.Build)], [])
 
 let tname_AutoOpenAttr = FSharpLib.Core + ".AutoOpenAttribute"
 
@@ -7040,11 +7040,11 @@ let TryFindInternalsVisibleToAttr ilg cattr =
     else
         None
 
-let IsMatchingSignatureDataVersionAttr ilg ((v1, v2, v3, _) : ILVersionInfo) cattr = 
+let IsMatchingSignatureDataVersionAttr ilg (version: ILVersionInfo) cattr = 
     IsSignatureDataVersionAttr cattr &&
     match decodeILAttribData ilg cattr with 
-    | [ILAttribElem.Int32 u1; ILAttribElem.Int32 u2;ILAttribElem.Int32 u3 ], _ -> 
-        (v1 = uint16 u1) && (v2 = uint16 u2) && (v3 = uint16 u3)
+    |  [ILAttribElem.Int32 u1; ILAttribElem.Int32 u2;ILAttribElem.Int32 u3 ], _ -> 
+        (version.Major = uint16 u1) && (version.Minor = uint16 u2) && (version.Build = uint16 u3)
     | _ -> 
         warning(Failure(FSComp.SR.tastUnexpectedDecodeOfInterfaceDataVersionAttribute()))
         false

src/fsharp/TastPickle.fs

@@ -903,7 +903,7 @@ let p_ILPublicKey x st =
     | PublicKey b      -> p_byte 0 st; p_bytes b st
     | PublicKeyToken b -> p_byte 1 st; p_bytes b st
 
-let p_ILVersion x st = p_tup4 p_uint16 p_uint16 p_uint16 p_uint16 x st
+let p_ILVersion (x: ILVersionInfo) st = p_tup4 p_uint16 p_uint16 p_uint16 p_uint16 (x.Major, x.Minor, x.Build, x.Revision) st
 
 let p_ILModuleRef (x: ILModuleRef) st =
     p_tup3 p_string p_bool (p_option p_bytes) (x.Name, x.HasMetadata, x.Hash) st
@@ -926,7 +926,9 @@ let u_ILPublicKey st =
     | 1 -> u_bytes st |> PublicKeyToken
     | _ -> ufailwith st "u_ILPublicKey"
 
-let u_ILVersion st = u_tup4 u_uint16 u_uint16 u_uint16 u_uint16 st
+let u_ILVersion st = 
+    let (major, minor, build, revision) = u_tup4 u_uint16 u_uint16 u_uint16 u_uint16 st
+    ILVersionInfo(major, minor, build, revision)
 
 let u_ILModuleRef st =
     let (a, b, c) = u_tup3 u_string u_bool (u_option u_bytes) st

src/fsharp/fsc.fs

@@ -533,18 +533,18 @@ module VersionResourceFormat =
                for child in children do 
                    yield! child  |]
 
-    let Version((v1, v2, v3, v4):ILVersionInfo) = 
+    let Version(version: ILVersionInfo) = 
         [| // DWORD dwFileVersionMS
            // Specifies the most significant 32 bits of the file's binary 
            // version number. This member is used with dwFileVersionLS to form a 64-bit value used 
            // for numeric comparisons. 
-           yield! i32 (int32 v1 <<< 16 ||| int32 v2) 
+           yield! i32 (int32 version.Major <<< 16 ||| int32 version.Minor) 
 
            // DWORD dwFileVersionLS 
            // Specifies the least significant 32 bits of the file's binary 
            // version number. This member is used with dwFileVersionMS to form a 64-bit value used 
            // for numeric comparisons. 
-           yield! i32 (int32 v3 <<< 16 ||| int32 v4) 
+           yield! i32 (int32 version.Build <<< 16 ||| int32 version.Revision) 
         |]
 
     let String(string, value) = 
@@ -824,7 +824,7 @@ module MainModuleBuilder =
 
     let productVersion findStringAttr (fileVersion: ILVersionInfo) =
         let attrName = "System.Reflection.AssemblyInformationalVersionAttribute"
-        let toDotted (v1, v2, v3, v4) = sprintf "%d.%d.%d.%d" v1 v2 v3 v4
+        let toDotted (version: ILVersionInfo) = sprintf "%d.%d.%d.%d" version.Major version.Minor version.Build version.Revision
         match findStringAttr attrName with
         | None | Some "" -> fileVersion |> toDotted
         | Some (AttributeHelpers.ILVersion(v)) -> v |> toDotted
@@ -840,7 +840,7 @@ module MainModuleBuilder =
             |> Seq.takeWhile ((<>) 0us) 
             |> Seq.toList
         match validParts @ [0us; 0us; 0us; 0us] with
-        | major :: minor :: build :: rev :: _ -> (major, minor, build, rev)
+        | major :: minor :: build :: rev :: _ -> ILVersionInfo(major, minor, build, rev)
         | x -> failwithf "error converting product version '%s' to binary, tried '%A' " version x
 
 
@@ -986,8 +986,8 @@ module MainModuleBuilder =
                      // specify the major language, and the high-order 6 bits specify the sublanguage. 
                      // For a table of valid identifiers see Language Identifiers.                                           //
                      // see e.g. http://msdn.microsoft.com/en-us/library/aa912040.aspx 0000 is neutral and 04b0(hex)=1252(dec) is the code page.
-                      [ ("000004b0", [ yield ("Assembly Version", (let v1, v2, v3, v4 = assemblyVersion in sprintf "%d.%d.%d.%d" v1 v2 v3 v4))
-                                       yield ("FileVersion", (let v1, v2, v3, v4 = fileVersionInfo in sprintf "%d.%d.%d.%d" v1 v2 v3 v4))
+                      [ ("000004b0", [ yield ("Assembly Version", (sprintf "%d.%d.%d.%d" assemblyVersion.Major assemblyVersion.Minor assemblyVersion.Build assemblyVersion.Revision))
+                                       yield ("FileVersion", (sprintf "%d.%d.%d.%d" fileVersionInfo.Major fileVersionInfo.Minor fileVersionInfo.Build fileVersionInfo.Revision))
                                        yield ("ProductVersion", productVersionString)
                                        match tcConfig.outputFile with
                                        | Some f -> yield ("OriginalFilename", Path.GetFileName(f))