remove several runtime warnings

iTrace-Dev · Oct 4, 2018 · b89a4c3 · b89a4c3
1 parent 345e99d
commit b89a4c3
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/iTraceVS/iTraceVS.csproj b/iTraceVS/iTraceVS.csproj
@@ -105,7 +105,7 @@
   </ItemGroup>
   <ItemGroup>
     <Reference Include="envdte, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-      <EmbedInteropTypes>True</EmbedInteropTypes>
+      <EmbedInteropTypes>False</EmbedInteropTypes>
     </Reference>
     <Reference Include="EnvDTE100, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <EmbedInteropTypes>False</EmbedInteropTypes>

diff --git a/iTraceVS/itrace_windowCommand.cs b/iTraceVS/itrace_windowCommand.cs
@@ -85,6 +85,7 @@ public static void Initialize(Package package)
         /// <param name="e">The event args.</param>
         private void ShowToolWindow(object sender, EventArgs e)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
             // Get the instance number 0 of this tool window. This window is single instance so this instance
             // is actually the only one.
             // The last flag is set to true so that if the tool window does not exists it will be created.

diff --git a/iTraceVS/status_bar.cs b/iTraceVS/status_bar.cs
@@ -1,4 +1,6 @@
-using Microsoft.VisualStudio.Shell.Interop;
+using Microsoft;
+using Microsoft.VisualStudio.Shell;
+using Microsoft.VisualStudio.Shell.Interop;
 using System;
 using System.Windows.Threading;
 
@@ -14,9 +16,9 @@ class status_bar
         //Must be created on UI Thread
         public status_bar()
         {
-            Microsoft.VisualStudio.Shell.ThreadHelper.ThrowIfNotOnUIThread();
+            ThreadHelper.ThrowIfNotOnUIThread();
             statusBar = (IVsStatusbar)itrace_windowCommand.Instance.ServiceProvider.GetService(typeof(SVsStatusbar));
-
+            Assumes.Present(statusBar);
             statusBarRefreshTimer = new DispatcherTimer();
             statusBarRefreshTimer.Tick += statusBarRefreshTimer_Tick;
             statusBarRefreshTimer.Interval = TimeSpan.FromSeconds(1);
@@ -34,7 +36,7 @@ public void stopUpdating()
 
         private void statusBarRefreshTimer_Tick(object sender, object e)
         {
-            Microsoft.VisualStudio.Shell.ThreadHelper.ThrowIfNotOnUIThread();
+            ThreadHelper.ThrowIfNotOnUIThread();
 
             int frozen;
 

diff --git a/iTraceVS/xml_writer.cs b/iTraceVS/xml_writer.cs
@@ -78,6 +78,7 @@ public static void writeResponse(Int64 sessionTime, double x, double y) {
         }
 
         static void getVSData(double x, double y) {
+            ThreadHelper.ThrowIfNotOnUIThread();
             DTE dte = Package.GetGlobalService(typeof(DTE)) as DTE;
             //Var to print
             String lineHeight = "", fontHeight = "", lineBaseX = "", lineBaseY = "";