From 3eddc52c6a7f4753aa075f79f7ec038a54d2e9fc Mon Sep 17 00:00:00 2001
From: Colin <me@cjdawson.com>
Date: Sat, 24 Aug 2019 22:38:16 +0100
Subject: [PATCH] Tidy up a few code inspection issues and add the MIT License
 to the installer.

---
 Meade.net.Setup/License.rtf             | Bin 0 -> 1457 bytes
 Meade.net.Setup/Meade.net.Setup.wixproj |   1 +
 Meade.net.Setup/Product.wxs             |   8 ++------
 Meade.net.Telescope/Telescope.cs        |   4 ++--
 Meade.net.focuser/Focuser.cs            |  20 ++++++--------------
 5 files changed, 11 insertions(+), 22 deletions(-)
 create mode 100644 Meade.net.Setup/License.rtf

diff --git a/Meade.net.Setup/License.rtf b/Meade.net.Setup/License.rtf
new file mode 100644
index 0000000000000000000000000000000000000000..db6e68d206c11358588c456f573a0f4636bae962
GIT binary patch
literal 1457
zcma)6&2Hm15bilZ-eHhayAWd8-R+{AlVZ~`v9e@H@}>rOp(V;<OOpmktv4|I?j6cb
z+VoT-u*2cZ_cKHC#H??}jB6)ZBic4*+VrwE`vdnU)*9{oR^dM}YqeCYtvha=@G(re
zl3Obu&ga{k6RV9f7Bk_2S<%F7XNAx)+p1nnK7D!^az3z~(86+WEEKZtL^FwD9N)+H
z<Im$?Kc3llDUN?h-F#$yJ%-yGcHp*Qj!)v4IW_tG8-DM5<;Q~@H<>WS_3n3=n!}5g
zyUxQT9*3op8fN_Hj1CYNpxc|3uzTs8G#aFXPFS&hft}^rizb2=6@zIZ7~F{nyaBFX
z;2<o*fZ2L3wbVP{P$ON)^c})D)A}Q~0+Soy&Y4<r#Dm7v{a$F#ec)@Q5)OX$oq)UY
zT5<QwK+*`V0QH8w*DW|o-<jTn70z2(2aE`lYSlME!|S$^dwFFD<wFl#P~JOq5OhYc
zH;rt=uNZ6{`mK_#i=dGKdfR)<bRk#^9jegB2nXbZQUO7t?!oIn>V}-ag1tfhYl{Zn
zV`uj7onVXF-fE=8reIBDuw?_|pQ8355|p<_DRT_gYNHz&{JJmyo?V4Wd~3do!PRBh
z+ISQ_G=3PxAm=jQ>z3;{y4Z?q>reqUI)q-0q0fHnJRSjwQ#jxe4$S{GeE&|#f<T$i
ztLLO3KucH^`8PTvGq_7iT;E0TOshq{t^hNNB&#-%&mqY+@Req>2*@9+f|MoX1<>Ux
zr37O%o2Kg-&7R;9>$1FplrCw7pj8eP5?-Mw!MZstNikg@a`H%1T5Tej(<%#?a|BIb
zl@t}7uG6G|)w)>aB|-Wb!e%s^7sx`EB&+U`6=OiY;R4D<lBNSyvPSjApl_P5HU)iJ
zRItd?8NuKqL1oEfN-k7rYMLf=8Nn=BCQm_K0XYgThP11?=LH!;$d};Xw4!+yY)td4
zDsUO0%c6QKeWoReASq}W8Zs|(gb(e+iqNwx)Mey?5?Vc|ewzrUgodrr^qZC$Nm9hZ
z@nr9k-_13>TmbOmhrgVU2Hylc&L@2Rq)^R?ePFG^`{(>=v00G<F~36R{lR@1jm!bB
ukLhhK?v34zuGh(paEx$1BZO+KQ~vZn@>#E9R=4pPKW{JH@Q&d#`qSSkDBt`5

literal 0
HcmV?d00001

diff --git a/Meade.net.Setup/Meade.net.Setup.wixproj b/Meade.net.Setup/Meade.net.Setup.wixproj
index 9f6c619..a02f724 100644
--- a/Meade.net.Setup/Meade.net.Setup.wixproj
+++ b/Meade.net.Setup/Meade.net.Setup.wixproj
@@ -48,6 +48,7 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="Config.wxi" />
+    <Content Include="License.rtf" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Meade.net.focuser\Meade.net.focuser.csproj">
diff --git a/Meade.net.Setup/Product.wxs b/Meade.net.Setup/Product.wxs
index ce95dc0..8cf95a1 100644
--- a/Meade.net.Setup/Product.wxs
+++ b/Meade.net.Setup/Product.wxs
@@ -30,12 +30,7 @@
       <![CDATA[Installed OR NETFRAMEWORK40FULL]]>
     </Condition>
 
-    <!--todo create a method to check if ASCOM is installed.-->
-    <!--<Condition Message="This application requires ASCOM Platform 6.4 or later.  Please install this and try again.">
-      <![CDATA[Installed or WIX_IS_NETFRAMEWORK_471_OR_LATER_INSTALLED]]>
-    </Condition>-->
-
-   <!-- <Condition Message="Please use the correct installer for your operating system - x86 for 32-bit, x64 for 64-bit.">
+    <!-- <Condition Message="Please use the correct installer for your operating system - x86 for 32-bit, x64 for 64-bit.">
       <?if $(var.Win64) = "yes" ?>
       VersionNT64
       <?else?>
@@ -46,6 +41,7 @@
     
     <UIRef Id="InstallationUI"/>
     <Property Id="WIXUI_INSTALLDIR" Value="INSTALLFOLDER" />
+    <WixVariable Id="WixUILicenseRtf" Value="License.rtf" />
 
     <FeatureGroupRef Id="fgRoot"/>
 	</Product>
diff --git a/Meade.net.Telescope/Telescope.cs b/Meade.net.Telescope/Telescope.cs
index 31b9ffa..e83f852 100644
--- a/Meade.net.Telescope/Telescope.cs
+++ b/Meade.net.Telescope/Telescope.cs
@@ -525,7 +525,7 @@ namespace ASCOM.Meade.net
             return highPrecision;
         }
 
-        public void TelescopePointingPrecision(bool high)
+        private void TelescopePointingPrecision(bool high)
         {
             var currentPrecision = TogglePrecision();
 
@@ -2313,7 +2313,7 @@ namespace ASCOM.Meade.net
         /// <summary>
         /// Read the device configuration from the ASCOM Profile store
         /// </summary>
-        internal void ReadProfile()
+        private void ReadProfile()
         {
             ProfileProperties profileProperties = _sharedResourcesWrapper.ReadProfile();
             _tl.Enabled = profileProperties.TraceLogger;
diff --git a/Meade.net.focuser/Focuser.cs b/Meade.net.focuser/Focuser.cs
index 81362d9..95476d2 100644
--- a/Meade.net.focuser/Focuser.cs
+++ b/Meade.net.focuser/Focuser.cs
@@ -37,7 +37,7 @@ namespace ASCOM.Meade.net
         /// The DeviceID is used by ASCOM applications to load the driver at runtime.
         /// </summary>
         //internal static string driverID = "ASCOM.Meade.net.Focuser";
-        private static readonly string DriverId = Marshal.GenerateProgIdForType(MethodBase.GetCurrentMethod().DeclaringType);
+        private static readonly string DriverId = Marshal.GenerateProgIdForType(MethodBase.GetCurrentMethod().DeclaringType ?? throw new System.InvalidOperationException());
         // TODO Change the descriptive string for your driver then remove this line
         /// <summary>
         /// Driver description that displays in the ASCOM Chooser.
@@ -54,7 +54,7 @@ namespace ASCOM.Meade.net
         /// <summary>
         /// Variable to hold the trace logger object (creates a diagnostic log file with information that you specify)
         /// </summary>
-        internal static TraceLogger Tl;
+        private static TraceLogger Tl;
 
         private readonly ISharedResourcesWrapper _sharedResourcesWrapper;
 
@@ -358,16 +358,7 @@ namespace ASCOM.Meade.net
             if (position == 0)
                 return;
 
-            if (position > 0)
-            {
-                //desired move direction is out
-                MoveFocuser(true, Math.Abs(position));
-            }
-            else
-            {
-                //desired move direction is in
-                MoveFocuser(false, Math.Abs(position));
-            }
+            MoveFocuser(position > 0, Math.Abs(position));
         }
 
         private void MoveFocuser(bool directionOut, int steps)
@@ -426,6 +417,7 @@ namespace ASCOM.Meade.net
                 Tl.LogMessage("TempComp Get", false.ToString());
                 return false;
             }
+            // ReSharper disable once ValueParameterNotUsed
             set
             {
                 Tl.LogMessage("TempComp Set", "Not implemented");
@@ -551,7 +543,7 @@ namespace ASCOM.Meade.net
         /// <summary>
         /// Read the device configuration from the ASCOM Profile store
         /// </summary>
-        internal void ReadProfile()
+        private void ReadProfile()
         {
             var profileProperties = _sharedResourcesWrapper.ReadProfile();
             Tl.Enabled = profileProperties.TraceLogger;
@@ -567,7 +559,7 @@ namespace ASCOM.Meade.net
         /// <param name="identifier"></param>
         /// <param name="message"></param>
         /// <param name="args"></param>
-        internal static void LogMessage(string identifier, string message, params object[] args)
+        private static void LogMessage(string identifier, string message, params object[] args)
         {
             var msg = string.Format(message, args);
             Tl.LogMessage(identifier, msg);