Fix issues arising from Migration to Platform 7, (Private internal members have moved.)

Author: Peter-Simpson

Conform/FrmConformMain.vb

@@ -896,9 +896,9 @@ Public Class FrmConformMain
                 Case DeviceType.Telescope
                     l_NewProgID = l_Chooser.Choose(g_TelescopeProgID)
                     If l_NewProgID <> "" Then
-                        g_Settings.DeviceTelescope = l_NewProgID 'Only update settings if OK pressed
-                        g_TelescopeProgID = l_NewProgID
-                    End If
+                            g_Settings.DeviceTelescope = l_NewProgID 'Only update settings if OK pressed
+                            g_TelescopeProgID = l_NewProgID
+                        End If
                 Case DeviceType.Switch
                     l_NewProgID = l_Chooser.Choose(g_SwitchProgID)
                     If l_NewProgID <> "" Then
@@ -1635,7 +1635,7 @@ Public Class FrmConformMain
     End Sub
     Private Function FindDriverExecutable() As String
         FindDriverExecutable = FindDriverInRegistry(Registry.ClassesRoot)
-        If ASCOM.Utilities.ApplicationBits = Utilities.Bitness.Bits64 Then ' Check the 32bit registry on a 64bit system if we haven't found an executable yet
+        If Utilities.Global.ApplicationBits() = Utilities.Global.Bitness.Bits64 Then ' Check the 32bit registry on a 64bit system if we haven't found an executable yet
             If String.IsNullOrEmpty(FindDriverExecutable) Then ' We are on a 64bit OS and haven't yet found an executable
                 LogMsg("FindDriverExecutable", MessageLevel.msgDebug, "We are a 64bit application and an executable has not yet been found, looking in 32bit registry")
                 'Using Reg As ASCOM.Utilities.RegistryAccess = New ASCOM.Utilities.RegistryAccess

Conform/FrmSetup.vb

@@ -1,6 +1,6 @@
 Imports ASCOM.DeviceInterface
 Imports System.Windows.Forms
-Imports ASCOM.Utilities
+Imports ASCOM.Utilities.Global
 
 Public Class frmSetup
     Private Sub BtnSetLogFileDir_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles btnSetLogFileDir.Click
@@ -24,7 +24,7 @@ Public Class frmSetup
         txtLastUpdate.Text = g_Settings.UpdateCheckDate.ToString
         chkDebug.Checked = g_Settings.Debug
         chkRunAs32Bit.Checked = g_Settings.RunAs32Bit
-        If VersionCode.OSBits = Bitness.Bits32 Then chkRunAs32Bit.Enabled = False 'If we are on a 32bit OS doable this option
+        If Utilities.Global.OSBits = Bitness.Bits32 Then chkRunAs32Bit.Enabled = False 'If we are on a 32bit OS doable this option
         chkInferStateFromErrorMessages.Checked = g_Settings.InterpretErrorMessages
         chkUseDriverAccess.Checked = g_Settings.UseDriverAccess
         UpDownObservingConditionsRetries.Value = Convert.ToDecimal(g_Settings.ObservingConditionsMaxRetries)
@@ -109,7 +109,7 @@ Public Class frmSetup
 
     Private Sub FrmSetup_FormClosed(ByVal sender As Object, ByVal e As FormClosedEventArgs) Handles Me.FormClosed
         Dim NewBitness As String
-        If VersionCode.OSBits = Utilities.Bitness.Bits64 Then 'Only test for a bitness switch if we are on a 64bt OS
+        If Utilities.Global.OSBits() = Utilities.Global.Bitness.Bits64 Then 'Only test for a bitness switch if we are on a 64bt OS
             If Not ((g_Settings.RunAs32Bit = (IntPtr.Size = 4)) Or (Not g_Settings.RunAs32Bit = (IntPtr.Size = 8))) Then
                 If g_Settings.RunAs32Bit Then
                     NewBitness = "32bit"

Conform/GlobalVarsAndCode.vb

@@ -341,7 +341,7 @@ Module GlobalVarsAndCode
         'Here we check if the user actually wants to run the 32bit version of Conform on a 64bit OS and start this if required
         'If g_Settings.Debug Then MsgBox("Conform: New " & IntPtr.Size & " " & g_Settings.RunAs32Bit & " " & Application.StartupPath & "\Conform32.exe")
 
-        If VersionCode.OSBits = Utilities.Bitness.Bits64 Then 'Only test for a bitness switch if we are on a 64bt OS
+        If Utilities.Global.OSBits() = Utilities.Global.Bitness.Bits64 Then 'Only test for a bitness switch if we are on a 64bt OS
             LogicString = g_Settings.RunAs32Bit.ToString & (IntPtr.Size = 4).ToString
             Select Case LogicString
                 Case "TrueFalse" 'Require 32bit but running as 64bit