Converted to AsyncPackage

[release]

Author: madskristensen

src/WebCompilerVsix/Logger.cs

@@ -12,7 +12,7 @@ public static class Logger
         private static IServiceProvider _provider;
         private static string _name;
 
-        public static void Initialize(IServiceProvider provider, string name)
+        public static void Initialize(Microsoft.VisualStudio.Shell.Package provider, string name)
         {
             _provider = provider;
             _name = name;

src/WebCompilerVsix/WebCompilerPackage.cs

@@ -1,6 +1,8 @@
 using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Runtime.InteropServices;
+using System.Threading;
+using System.Threading.Tasks;
 using System.Windows.Threading;
 using EnvDTE;
 using EnvDTE80;
@@ -12,21 +14,23 @@
 
 namespace WebCompilerVsix
 {
-    [PackageRegistration(UseManagedResourcesOnly = true)]
+    [PackageRegistration(UseManagedResourcesOnly = true, AllowsBackgroundLoading = true)]
     [InstalledProductRegistration("#110", "#112", Version, IconResourceID = 400)]
     [ProvideMenuResource("Menus.ctmenu", 1)]
     [Guid(PackageGuids.guidCompilerPackageString)]
-    [ProvideAutoLoad(UIContextGuids80.SolutionExists)]
-    public sealed class WebCompilerPackage : Package
+    [ProvideAutoLoad(UIContextGuids80.SolutionExists, PackageAutoLoadFlags.BackgroundLoad)]
+    public sealed class WebCompilerPackage : AsyncPackage
     {
         public const string Version = "1.4.167";
         public static DTE2 _dte;
         public static Package Package;
         private SolutionEvents _solutionEvents;
         private BuildEvents _buildEvents;
 
-        protected override void Initialize()
+        protected override async System.Threading.Tasks.Task InitializeAsync(CancellationToken cancellationToken, IProgress<ServiceProgressData> progress)
         {
+            await ThreadHelper.JoinableTaskFactory.SwitchToMainThreadAsync();
+
             _dte = GetService(typeof(DTE)) as DTE2;
             Package = this;
 
@@ -46,8 +50,6 @@ protected override void Initialize()
             RemoveConfig.Initialize(this);
             CompileAllFiles.Initialize(this);
             CleanOutputFiles.Initialize(this);
-
-            base.Initialize();
         }
 
         private void OnBuildBegin(vsBuildScope Scope, vsBuildAction Action)
@@ -74,15 +76,18 @@ public static bool IsDocumentDirty(string documentPath, out IVsPersistDocData pe
         }
     }
 
-    [ProvideAutoLoad(UIContextGuids80.SolutionExists)]
-    [ProvideAutoLoad(UIContextGuids80.NoSolution)]
-    public sealed class WebCompilerInitPackage : Package
+    [PackageRegistration(UseManagedResourcesOnly = true, AllowsBackgroundLoading = true)]
+    [ProvideAutoLoad(UIContextGuids80.SolutionExists, PackageAutoLoadFlags.BackgroundLoad)]
+    [ProvideAutoLoad(UIContextGuids80.NoSolution, PackageAutoLoadFlags.BackgroundLoad)]
+    public sealed class WebCompilerInitPackage : AsyncPackage
     {
         public static Dispatcher _dispatcher;
         public static DTE2 _dte;
 
-        protected override void Initialize()
+        protected override async System.Threading.Tasks.Task InitializeAsync(CancellationToken cancellationToken, IProgress<ServiceProgressData> progress)
         {
+            await JoinableTaskFactory.SwitchToMainThreadAsync();
+
             _dispatcher = Dispatcher.CurrentDispatcher;
             _dte = GetService(typeof(DTE)) as DTE2;
 

src/WebCompilerVsix/WebCompilerVsix.csproj

@@ -209,6 +209,7 @@
     <Reference Include="Microsoft.VisualStudio.TextManager.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
       <Private>False</Private>
     </Reference>
+    <Reference Include="Microsoft.VisualStudio.Threading, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
     <Reference Include="Microsoft.VisualStudio.Utilities, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <Private>False</Private>
     </Reference>