33using System . Diagnostics ;
44using System . Globalization ;
55using System . Runtime . InteropServices ;
6+ using System . Threading ;
7+ using System . Threading . Tasks ;
68using Microsoft . VisualStudio . Shell ;
79using Microsoft . VisualStudio . Shell . Interop ;
810
@@ -14,13 +16,13 @@ namespace Sharomank.RegexTester
1416 /// The minimum requirement for a class to be considered a valid package for Visual Studio
1517 /// is to implement the IVsPackage interface and register itself with the shell.
1618 /// This package uses the helper classes defined inside the Managed Package Framework (MPF)
17- /// to do it: it derives from the Package class that provides the implementation of the
18- /// IVsPackage interface and uses the registration attributes defined in the framework to
19+ /// to do it: it derives from the Package class that provides the implementation of the
20+ /// IVsPackage interface and uses the registration attributes defined in the framework to
1921 /// register itself and its components with the shell.
2022 /// </summary>
2123 // This attribute tells the PkgDef creation utility (CreatePkgDef.exe) that this class is
2224 // a package.
23- [ PackageRegistration ( UseManagedResourcesOnly = true ) ]
25+ [ PackageRegistration ( UseManagedResourcesOnly = true , AllowsBackgroundLoading = true ) ]
2426 // This attribute is used to register the informations needed to show the this package
2527 // in the Help/About dialog of Visual Studio.
2628 [ InstalledProductRegistration ( "#110" , "#112" , "1.0" , IconResourceID = 400 ) ]
@@ -29,13 +31,13 @@ namespace Sharomank.RegexTester
2931 // This attribute registers a tool window exposed by this package.
3032 [ ProvideToolWindow ( typeof ( RegexTesterWindow ) ) ]
3133 [ Guid ( GuidList . guidRegexTesterPkgString ) ]
32- public sealed class RegexTesterPackage : Package
34+ public sealed class RegexTesterPackage : AsyncPackage
3335 {
3436 /// <summary>
3537 /// Default constructor of the package.
36- /// Inside this method you can place any initialization code that does not require
37- /// any Visual Studio service because at this point the package object is created but
38- /// not sited yet inside Visual Studio environment. The place to do all the other
38+ /// Inside this method you can place any initialization code that does not require
39+ /// any Visual Studio service because at this point the package object is created but
40+ /// not sited yet inside Visual Studio environment. The place to do all the other
3941 /// initialization is the Initialize method.
4042 /// </summary>
4143 public RegexTesterPackage ( )
@@ -44,12 +46,13 @@ public RegexTesterPackage()
4446 }
4547
4648 /// <summary>
47- /// This function is called when the user clicks the menu item that shows the
48- /// tool window. See the Initialize method to see how the menu item is associated to
49+ /// This function is called when the user clicks the menu item that shows the
50+ /// tool window. See the Initialize method to see how the menu item is associated to
4951 /// this function using the OleMenuCommandService service and the MenuCommand class.
5052 /// </summary>
5153 private void ShowToolWindow ( object sender , EventArgs e )
5254 {
55+ ThreadHelper . ThrowIfNotOnUIThread ( ) ;
5356 // Get the instance number 0 of this tool window. This window is single instance so this instance
5457 // is actually the only one.
5558 // The last flag is set to true so that if the tool window does not exists it will be created.
@@ -71,21 +74,26 @@ private void ShowToolWindow(object sender, EventArgs e)
7174 /// Initialization of the package; this method is called right after the package is sited, so this is the place
7275 /// where you can put all the initilaization code that rely on services provided by VisualStudio.
7376 /// </summary>
74- protected override void Initialize ( )
77+ protected async override System . Threading . Tasks . Task InitializeAsync ( CancellationToken cancellationToken , IProgress < ServiceProgressData > progress )
7578 {
76- Trace . WriteLine ( string . Format ( CultureInfo . CurrentCulture , "Entering Initialize() of: {0}" , this . ToString ( ) ) ) ;
77- base . Initialize ( ) ;
79+ Trace . WriteLine ( string . Format ( CultureInfo . CurrentCulture , "Entering InitializeAsync of: {0}" , this . ToString ( ) ) ) ;
80+ await base . InitializeAsync ( cancellationToken , progress ) ;
7881
79- // Add our command handlers for menu (commands must exist in the .vsct file)
80- OleMenuCommandService mcs = GetService ( typeof ( IMenuCommandService ) ) as OleMenuCommandService ;
81- if ( null != mcs )
82+
83+ await JoinableTaskFactory . SwitchToMainThreadAsync ( cancellationToken ) ;
84+
85+ // Add our command handlers for menu (commands must exist in the .vsct file)
86+ OleMenuCommandService mcs = await GetServiceAsync ( typeof ( IMenuCommandService ) ) as OleMenuCommandService ;
87+ if ( null != mcs )
8288 {
8389 // Create the command for the tool window
8490 CommandID toolwndCommandID = new CommandID ( GuidList . guidRegexTesterCmdSet , ( int ) PkgCmdIDList . cmdidRegexTester ) ;
8591 MenuCommand menuToolWin = new MenuCommand ( ShowToolWindow , toolwndCommandID ) ;
86- mcs . AddCommand ( menuToolWin ) ;
92+ mcs . AddCommand ( menuToolWin ) ;
8793 }
94+
8895 }
96+
8997 #endregion
9098
9199 }
0 commit comments