disables logging for final version

codingadventures · codingadventures · commit 19d00a2ac680 · 2018-04-02T16:52:04.000+01:00
diff --git a/Src/BridgeVs.Locations/CommonRegistryConfigurations.cs b/Src/BridgeVs.Locations/CommonRegistryConfigurations.cs
@@ -7,6 +7,7 @@ public class CommonRegistryConfigurations
         private const string LINQPadInstallationPathRegistryValue = "LINQPadInstallationPath";
         private const string LINQPadVersionPathRegistryValue = "LINQPadVersion";
 
+        // ReSharper disable once InconsistentNaming
         public static string LINQPadInstallationPath
         {
             get
@@ -25,6 +26,7 @@ public static string LINQPadInstallationPath
             }
         }
 
+        // ReSharper disable once InconsistentNaming
         public static string LINQPadVersion
         {
             get
diff --git a/Src/DynamicCore/DynamicObjectSource.cs b/Src/DynamicCore/DynamicObjectSource.cs
@@ -89,6 +89,7 @@ public static void BroadCastData(object target, Stream outgoingData)
             catch (Exception e)
             {
                 Log.Write(e, "Error in BroadCastData");
+                throw;
             }
         }
 
diff --git a/Src/DynamicVisualizer.V11/DynamicDebuggerVisualizerObjectSourceV11.cs b/Src/DynamicVisualizer.V11/DynamicDebuggerVisualizerObjectSourceV11.cs
@@ -36,4 +36,4 @@ public override void GetData(object target, Stream outgoingData)
             DynamicObjectSource.BroadCastData(target, outgoingData);
         }
     }
-}
+}
diff --git a/Src/Grapple/Truck.cs b/Src/Grapple/Truck.cs
@@ -65,9 +65,8 @@ public Truck(string truckName)
 
         internal Truck(string truckName, IGrapple grapple)
         {
-            Log.Configure("Grapple", string.Empty);
+            Log.Write($"Setting Up the Truck {truckName}");
 
-            Log.Write("Setting Up the Truck {0}", truckName);
             _truckName = truckName;
             _grapple = grapple;
             CreateDeliveryFolder(TruckPosition);
@@ -100,7 +99,7 @@ public void LoadCargo<T>(T item)
         /// <returns></returns>
         public bool DeliverTo(string address)
         {
-            Log.Write("Delivering Cargo to {0}", address);
+            Log.Write($"Delivering Cargo to {address}");
 
             try
             {
@@ -120,7 +119,7 @@ public bool DeliverTo(string address)
                         stream.Write(buffer.Item2, 0, buffer.Item2.Length);
                     }
                 }
-                Log.Write("Cargo Successfully Delivered {0}", address);
+                Log.Write($"Cargo Successfully Delivered {address}");
 
                 return true;
             }
diff --git a/Src/Logging/Log.cs b/Src/Logging/Log.cs
@@ -24,6 +24,7 @@
 #endregion
 
 using System;
+using System.Diagnostics;
 using System.Globalization;
 using System.IO;
 using System.IO.Compression;
@@ -36,43 +37,35 @@ namespace BridgeVs.Logging
     public static class Log
     {
         private static string _applicationName;
-        private static readonly string LocalApplicationData =
-            Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData);
+        private static readonly string LocalApplicationData = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData);
 
-        private static readonly MailAddress MailAddressFrom = new MailAddress("linqbridgevs@gmail.com", "No Reply Log");
-        private static string _logGzipFileName;
-
-        private static string _moduleName;
         private static string _logsDir;
         private static string _logTxtFilePath;
-        private static SmtpClient _smtpClient;
 
-        public static void Configure(string applicationName, string moduleName, SmtpClient smtpClient = null)
+        [Conditional("DEBUG")]
+        public static void Configure(string applicationName, string moduleName)
         {
             if (string.IsNullOrEmpty(applicationName))
                 throw new ArgumentNullException(nameof(applicationName), "Name of the application must not be null!");
 
             _applicationName = applicationName;
-            _moduleName = moduleName;
 
-            var logTxtFileName = string.Concat(moduleName, ".txt");
+            string logTxtFileName = string.Concat(moduleName, ".txt");
 
-            _logGzipFileName = string.Concat(_applicationName, ".gz");
             _logsDir = Path.Combine(LocalApplicationData, _applicationName);
 
             _logTxtFilePath = Path.Combine(_logsDir, logTxtFileName);
-
-            _smtpClient = smtpClient;
         }
 
+        [Conditional("DEBUG")]
         public static void Write(Exception ex, string context = null)
         {
             try
             {
-                var text = string.Concat(ex.GetType().Name, ": ", ex.Message, "\r\n", ex.StackTrace ?? "");
+                string text = string.Concat(ex.GetType().Name, ": ", ex.Message, "\r\n", ex.StackTrace ?? "");
                 if (ex.InnerException != null)
                 {
-                    var text2 = text;
+                    string text2 = text;
                     text = string.Concat(text2, "\r\nINNER: ", ex.InnerException.GetType().Name, ex.InnerException.Message, (ex.InnerException.StackTrace ?? "").Replace("\n", "\n  "));
                 }
                 if (!string.IsNullOrEmpty(context))
@@ -88,16 +81,17 @@ public static void Write(Exception ex, string context = null)
             }
         }
 
+        [Conditional("DEBUG")]
         private static void InternalWrite(string msg, params object[] args)
         {
 
             if (!Directory.Exists(_logsDir))
             {
                 try
                 {
-                    var sec = new DirectorySecurity();
+                    DirectorySecurity sec = new DirectorySecurity();
                     // Using this instead of the "Everyone" string means we work on non-English systems.
-                    var everyone = new SecurityIdentifier(WellKnownSidType.WorldSid, null);
+                    SecurityIdentifier everyone = new SecurityIdentifier(WellKnownSidType.WorldSid, null);
                     sec.AddAccessRule(new FileSystemAccessRule(everyone, FileSystemRights.Modify | FileSystemRights.Synchronize, InheritanceFlags.ContainerInherit | InheritanceFlags.ObjectInherit, PropagationFlags.None, AccessControlType.Allow));
                     Directory.CreateDirectory(_logsDir, sec);
                 }
@@ -127,6 +121,7 @@ private static void InternalWrite(string msg, params object[] args)
         /// <param name="msg">A composite format string (see Remarks) that contains text intermixed with zero or more format items, which correspond to objects in the <paramref name="args"/> array.</param><param name="args">An object array that contains zero or more objects to format. </param>
 
 
+        [Conditional("DEBUG")]
         public static void Write(string msg, params object[] args)
         {
             if (string.IsNullOrEmpty(_applicationName))
@@ -144,6 +139,7 @@ public static void Write(string msg, params object[] args)
             }
         }
 
+        [Conditional("DEBUG")]
         public static void WriteIf(bool condition, string msg, params object[] args)
         {
             if (!condition) return;
diff --git a/Src/VsExtension.Helper/Installer/Welcome.xaml.cs b/Src/VsExtension.Helper/Installer/Welcome.xaml.cs
@@ -31,44 +31,7 @@ public Welcome(DTE dte) : this()
         {
             _dte = dte;
         }
-
-        //private async void BtnNext_Click(object sender, RoutedEventArgs e)
-        //{
-        //    SetNextTab();
-        //    if (_currentTab.Value.Name == "hdrSteady")
-        //    {
-        //        if (!IsElevated)
-        //        {
-        //            grdPrerequisites.Visibility = Visibility.Visible;
-        //            grdInstallation.Visibility = Visibility.Hidden;
-        //            btnNext.IsEnabled = false;
-        //        }
-        //        else
-        //        {
-        //            grdPrerequisites.Visibility = Visibility.Hidden;
-        //            grdInstallation.Visibility = Visibility.Visible;
-        //            await Task.Run(() => Install());
-        //            prgInstallProgress.IsActive = false;
-        //            SetNextTab();
-        //            btnNext.Visibility = Visibility.Hidden;
-        //            btnSkip.Content = "Finish";
-        //        }
-        //    }
-
-        //    if (_currentTab.Value.Name == "hdrReady")
-        //    {
-        //        this.Close();
-        //    }
-        //}
-
-        //private void SetNextTab()
-        //{
-        //    _currentTab.Value.Focusable = false;
-        //    _currentTab = _currentTab.Next ?? _currentTab.List.First;
-        //    _currentTab.Value.Focusable = true;
-        //    _currentTab.Value.Focus();
-        //}
-       
+        
         private void btnRestart_Click(object sender, RoutedEventArgs e)
         {
             this.Close();
diff --git a/Src/VsExtension/Package/BridgeVsPackage.cs b/Src/VsExtension/Package/BridgeVsPackage.cs
@@ -67,6 +67,7 @@ public sealed class BridgeVsPackage : Microsoft.VisualStudio.Shell.Package
 
         //if this is not null means vs has to restart
         private Welcome _welcomePage;
+        private bool? _installationResult;
         public static bool IsElevated => new WindowsPrincipal(WindowsIdentity.GetCurrent()).IsInRole(WindowsBuiltInRole.Administrator);
 
         #region Package Members
@@ -135,9 +136,7 @@ protected override void Initialize()
                 }
                 else
                 {
-                    MessageBox.Show(!PackageConfigurator.Install(_dte.Version, _dte.Edition)
-                        ? "LINQBridgeVs wasn't successfully configured. Please restart Visual Studio"
-                        : "LINQBridgeVs has been successfully configured.");
+                    _installationResult = PackageConfigurator.Install(_dte.Version, _dte.Edition);
                 }
             }
             catch (Exception e)
@@ -150,6 +149,12 @@ protected override void Initialize()
         private void _dteEvents_OnStartupComplete()
         {
             _welcomePage?.Show();
+            if (_installationResult == null)
+                return;
+
+             MessageBox.Show(_installationResult.Value
+                ? "LINQBridgeVs has been successfully configured."
+                : "LINQBridgeVs wasn't successfully configured. Please restart Visual Studio");
         }
         #endregion
     }
diff --git a/Test/LINQBridgeVs.Test/LINQBridgeVsExtension.UnitTests/app.config b/Test/LINQBridgeVs.Test/LINQBridgeVsExtension.UnitTests/app.config
@@ -2,5 +2,24 @@
 <configuration>
   <runtime>
      
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+     
+         <dependentAssembly>
+     
+              <assemblyIdentity name="Microsoft.VisualStudio.Threading" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+     
+              <bindingRedirect oldVersion="0.0.0.0-15.6.0.0" newVersion="15.6.0.0" />
+     
+         </dependentAssembly>
+     
+         <dependentAssembly>
+     
+              <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+     
+              <bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0" />
+     
+         </dependentAssembly>
+     
+    </assemblyBinding>
   </runtime>
   </configuration>

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@ public class CommonRegistryConfigurations`
`7`	`7`	`private const string LINQPadInstallationPathRegistryValue = "LINQPadInstallationPath";`
`8`	`8`	`private const string LINQPadVersionPathRegistryValue = "LINQPadVersion";`
`9`	`9`
	`10`	`+ // ReSharper disable once InconsistentNaming`
`10`	`11`	`public static string LINQPadInstallationPath`
`11`	`12`	`{`
`12`	`13`	`get`
`@@ -25,6 +26,7 @@ public static string LINQPadInstallationPath`
`25`	`26`	`}`
`26`	`27`	`}`
`27`	`28`
	`29`	`+ // ReSharper disable once InconsistentNaming`
`28`	`30`	`public static string LINQPadVersion`
`29`	`31`	`{`
`30`	`32`	`get`
Original file line number	Diff line number	Diff line change
`@@ -89,6 +89,7 @@ public static void BroadCastData(object target, Stream outgoingData)`
`89`	`89`	`catch (Exception e)`
`90`	`90`	`{`
`91`	`91`	`Log.Write(e, "Error in BroadCastData");`
	`92`	`+ throw;`
`92`	`93`	`}`
`93`	`94`	`}`
`94`	`95`
Original file line number	Diff line number	Diff line change
`@@ -36,4 +36,4 @@ public override void GetData(object target, Stream outgoingData)`
`36`	`36`	`DynamicObjectSource.BroadCastData(target, outgoingData);`
`37`	`37`	`}`
`38`	`38`	`}`
`39`		`-}`
	`39`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -65,9 +65,8 @@ public Truck(string truckName)`
`65`	`65`
`66`	`66`	`internal Truck(string truckName, IGrapple grapple)`
`67`	`67`	`{`
`68`		`- Log.Configure("Grapple", string.Empty);`
	`68`	`+ Log.Write($"Setting Up the Truck {truckName}");`
`69`	`69`
`70`		`- Log.Write("Setting Up the Truck {0}", truckName);`
`71`	`70`	`_truckName = truckName;`
`72`	`71`	`_grapple = grapple;`
`73`	`72`	`CreateDeliveryFolder(TruckPosition);`
`@@ -100,7 +99,7 @@ public void LoadCargo<T>(T item)`
`100`	`99`	`/// <returns></returns>`
`101`	`100`	`public bool DeliverTo(string address)`
`102`	`101`	`{`
`103`		`- Log.Write("Delivering Cargo to {0}", address);`
	`102`	`+ Log.Write($"Delivering Cargo to {address}");`
`104`	`103`
`105`	`104`	`try`
`106`	`105`	`{`
`@@ -120,7 +119,7 @@ public bool DeliverTo(string address)`
`120`	`119`	`stream.Write(buffer.Item2, 0, buffer.Item2.Length);`
`121`	`120`	`}`
`122`	`121`	`}`
`123`		`- Log.Write("Cargo Successfully Delivered {0}", address);`
	`122`	`+ Log.Write($"Cargo Successfully Delivered {address}");`
`124`	`123`
`125`	`124`	`return true;`
`126`	`125`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@`
`24`	`24`	`#endregion`
`25`	`25`
`26`	`26`	`using System;`
	`27`	`+using System.Diagnostics;`
`27`	`28`	`using System.Globalization;`
`28`	`29`	`using System.IO;`
`29`	`30`	`using System.IO.Compression;`
`@@ -36,43 +37,35 @@ namespace BridgeVs.Logging`
`36`	`37`	`public static class Log`
`37`	`38`	`{`
`38`	`39`	`private static string _applicationName;`
`39`		`- private static readonly string LocalApplicationData =`
`40`		`- Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData);`
	`40`	`+ private static readonly string LocalApplicationData = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData);`
`41`	`41`
`42`		`- private static readonly MailAddress MailAddressFrom = new MailAddress("[email protected]", "No Reply Log");`
`43`		`- private static string _logGzipFileName;`
`44`		`-`
`45`		`- private static string _moduleName;`
`46`	`42`	`private static string _logsDir;`
`47`	`43`	`private static string _logTxtFilePath;`
`48`		`- private static SmtpClient _smtpClient;`
`49`	`44`
`50`		`- public static void Configure(string applicationName, string moduleName, SmtpClient smtpClient = null)`
	`45`	`+ [Conditional("DEBUG")]`
	`46`	`+ public static void Configure(string applicationName, string moduleName)`
`51`	`47`	`{`
`52`	`48`	`if (string.IsNullOrEmpty(applicationName))`
`53`	`49`	`throw new ArgumentNullException(nameof(applicationName), "Name of the application must not be null!");`
`54`	`50`
`55`	`51`	`_applicationName = applicationName;`
`56`		`- _moduleName = moduleName;`
`57`	`52`
`58`		`- var logTxtFileName = string.Concat(moduleName, ".txt");`
	`53`	`+ string logTxtFileName = string.Concat(moduleName, ".txt");`
`59`	`54`
`60`		`- _logGzipFileName = string.Concat(_applicationName, ".gz");`
`61`	`55`	`_logsDir = Path.Combine(LocalApplicationData, _applicationName);`
`62`	`56`
`63`	`57`	`_logTxtFilePath = Path.Combine(_logsDir, logTxtFileName);`
`64`		`-`
`65`		`- _smtpClient = smtpClient;`
`66`	`58`	`}`
`67`	`59`
	`60`	`+ [Conditional("DEBUG")]`
`68`	`61`	`public static void Write(Exception ex, string context = null)`
`69`	`62`	`{`
`70`	`63`	`try`
`71`	`64`	`{`
`72`		`- var text = string.Concat(ex.GetType().Name, ": ", ex.Message, "\r\n", ex.StackTrace ?? "");`
	`65`	`+ string text = string.Concat(ex.GetType().Name, ": ", ex.Message, "\r\n", ex.StackTrace ?? "");`
`73`	`66`	`if (ex.InnerException != null)`
`74`	`67`	`{`
`75`		`- var text2 = text;`
	`68`	`+ string text2 = text;`
`76`	`69`	`text = string.Concat(text2, "\r\nINNER: ", ex.InnerException.GetType().Name, ex.InnerException.Message, (ex.InnerException.StackTrace ?? "").Replace("\n", "\n "));`
`77`	`70`	`}`
`78`	`71`	`if (!string.IsNullOrEmpty(context))`
`@@ -88,16 +81,17 @@ public static void Write(Exception ex, string context = null)`
`88`	`81`	`}`
`89`	`82`	`}`
`90`	`83`
	`84`	`+ [Conditional("DEBUG")]`
`91`	`85`	`private static void InternalWrite(string msg, params object[] args)`
`92`	`86`	`{`
`93`	`87`
`94`	`88`	`if (!Directory.Exists(_logsDir))`
`95`	`89`	`{`
`96`	`90`	`try`
`97`	`91`	`{`
`98`		`- var sec = new DirectorySecurity();`
	`92`	`+ DirectorySecurity sec = new DirectorySecurity();`
`99`	`93`	`// Using this instead of the "Everyone" string means we work on non-English systems.`
`100`		`- var everyone = new SecurityIdentifier(WellKnownSidType.WorldSid, null);`
	`94`	`+ SecurityIdentifier everyone = new SecurityIdentifier(WellKnownSidType.WorldSid, null);`
`101`	`95`	`sec.AddAccessRule(new FileSystemAccessRule(everyone, FileSystemRights.Modify \| FileSystemRights.Synchronize, InheritanceFlags.ContainerInherit \| InheritanceFlags.ObjectInherit, PropagationFlags.None, AccessControlType.Allow));`
`102`	`96`	`Directory.CreateDirectory(_logsDir, sec);`
`103`	`97`	`}`
`@@ -127,6 +121,7 @@ private static void InternalWrite(string msg, params object[] args)`
`127`	`121`	`/// <param name="msg">A composite format string (see Remarks) that contains text intermixed with zero or more format items, which correspond to objects in the <paramref name="args"/> array.</param><param name="args">An object array that contains zero or more objects to format. </param>`
`128`	`122`
`129`	`123`
	`124`	`+ [Conditional("DEBUG")]`
`130`	`125`	`public static void Write(string msg, params object[] args)`
`131`	`126`	`{`
`132`	`127`	`if (string.IsNullOrEmpty(_applicationName))`
`@@ -144,6 +139,7 @@ public static void Write(string msg, params object[] args)`
`144`	`139`	`}`
`145`	`140`	`}`
`146`	`141`
	`142`	`+ [Conditional("DEBUG")]`
`147`	`143`	`public static void WriteIf(bool condition, string msg, params object[] args)`
`148`	`144`	`{`
`149`	`145`	`if (!condition) return;`
Original file line number	Diff line number	Diff line change
`@@ -67,6 +67,7 @@ public sealed class BridgeVsPackage : Microsoft.VisualStudio.Shell.Package`
`67`	`67`
`68`	`68`	`//if this is not null means vs has to restart`
`69`	`69`	`private Welcome _welcomePage;`
	`70`	`+ private bool? _installationResult;`
`70`	`71`	`public static bool IsElevated => new WindowsPrincipal(WindowsIdentity.GetCurrent()).IsInRole(WindowsBuiltInRole.Administrator);`
`71`	`72`
`72`	`73`	`#region Package Members`
`@@ -135,9 +136,7 @@ protected override void Initialize()`
`135`	`136`	`}`
`136`	`137`	`else`
`137`	`138`	`{`
`138`		`- MessageBox.Show(!PackageConfigurator.Install(_dte.Version, _dte.Edition)`
`139`		`- ? "LINQBridgeVs wasn't successfully configured. Please restart Visual Studio"`
`140`		`- : "LINQBridgeVs has been successfully configured.");`
	`139`	`+ _installationResult = PackageConfigurator.Install(_dte.Version, _dte.Edition);`
`141`	`140`	`}`
`142`	`141`	`}`
`143`	`142`	`catch (Exception e)`
`@@ -150,6 +149,12 @@ protected override void Initialize()`
`150`	`149`	`private void _dteEvents_OnStartupComplete()`
`151`	`150`	`{`
`152`	`151`	`_welcomePage?.Show();`
	`152`	`+ if (_installationResult == null)`
	`153`	`+ return;`
	`154`	`+`
	`155`	`+ MessageBox.Show(_installationResult.Value`
	`156`	`+ ? "LINQBridgeVs has been successfully configured."`
	`157`	`+ : "LINQBridgeVs wasn't successfully configured. Please restart Visual Studio");`
`153`	`158`	`}`
`154`	`159`	`#endregion`
`155`	`160`	`}`