Cast IMenuCommandService on Main thread

jcansdale · jcansdale · commit 474685916506 · 2018-04-04T15:18:43.000+01:00
We should always cast STA COM services on Main thread.
diff --git a/src/GitHub.InlineReviews/InlineReviewsPackage.cs b/src/GitHub.InlineReviews/InlineReviewsPackage.cs
@@ -35,7 +35,6 @@ protected override async Task InitializeAsync(
 
         async Task InitializeMenus()
         {
-            var menuService = (IMenuCommandService)(await GetServiceAsync(typeof(IMenuCommandService)));
             var componentModel = (IComponentModel)(await GetServiceAsync(typeof(SComponentModel)));
             var exports = componentModel.DefaultExportProvider;
             var commands = new IVsCommandBase[]
@@ -45,6 +44,7 @@ async Task InitializeMenus()
             };
 
             await JoinableTaskFactory.SwitchToMainThreadAsync();
+            var menuService = (IMenuCommandService)(await GetServiceAsync(typeof(IMenuCommandService)));
             menuService.AddCommands(commands);
         }
     }
diff --git a/src/GitHub.VisualStudio/GitHubPackage.cs b/src/GitHub.VisualStudio/GitHubPackage.cs
@@ -54,7 +54,6 @@ void LogVersionInformation()
 
         async Task InitializeMenus()
         {
-            var menuService = (IMenuCommandService)(await GetServiceAsync(typeof(IMenuCommandService)));
             var componentModel = (IComponentModel)(await GetServiceAsync(typeof(SComponentModel)));
             var exports = componentModel.DefaultExportProvider;
             var commands = new IVsCommandBase[]
@@ -70,6 +69,7 @@ async Task InitializeMenus()
             };
 
             await JoinableTaskFactory.SwitchToMainThreadAsync();
+            var menuService = (IMenuCommandService)(await GetServiceAsync(typeof(IMenuCommandService)));
             menuService.AddCommands(commands);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,6 @@ protected override async Task InitializeAsync(`
`35`	`35`
`36`	`36`	`async Task InitializeMenus()`
`37`	`37`	`{`
`38`		`- var menuService = (IMenuCommandService)(await GetServiceAsync(typeof(IMenuCommandService)));`
`39`	`38`	`var componentModel = (IComponentModel)(await GetServiceAsync(typeof(SComponentModel)));`
`40`	`39`	`var exports = componentModel.DefaultExportProvider;`
`41`	`40`	`var commands = new IVsCommandBase[]`
`@@ -45,6 +44,7 @@ async Task InitializeMenus()`
`45`	`44`	`};`
`46`	`45`
`47`	`46`	`await JoinableTaskFactory.SwitchToMainThreadAsync();`
	`47`	`+ var menuService = (IMenuCommandService)(await GetServiceAsync(typeof(IMenuCommandService)));`
`48`	`48`	`menuService.AddCommands(commands);`
`49`	`49`	`}`
`50`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,6 @@ void LogVersionInformation()`
`54`	`54`
`55`	`55`	`async Task InitializeMenus()`
`56`	`56`	`{`
`57`		`- var menuService = (IMenuCommandService)(await GetServiceAsync(typeof(IMenuCommandService)));`
`58`	`57`	`var componentModel = (IComponentModel)(await GetServiceAsync(typeof(SComponentModel)));`
`59`	`58`	`var exports = componentModel.DefaultExportProvider;`
`60`	`59`	`var commands = new IVsCommandBase[]`
`@@ -70,6 +69,7 @@ async Task InitializeMenus()`
`70`	`69`	`};`
`71`	`70`
`72`	`71`	`await JoinableTaskFactory.SwitchToMainThreadAsync();`
	`72`	`+ var menuService = (IMenuCommandService)(await GetServiceAsync(typeof(IMenuCommandService)));`
`73`	`73`	`menuService.AddCommands(commands);`
`74`	`74`	`}`
`75`	`75`