Merge branch 'master' into fixes/string-culture-warnings

jcansdale · web-flow · commit ea571d4dc986 · 2018-12-14T15:53:37.000Z
diff --git a/src/GitHub.App/GlobalSuppressions.cs b/src/GitHub.App/GlobalSuppressions.cs
@@ -18,4 +18,4 @@
 [assembly: SuppressMessage("Microsoft.Globalization", "CA1305:SpecifyIFormatProvider", MessageId = "System.String.Format(System.String,System.Object,System.Object,System.Object)", Scope = "member", Target = "GitHub.Services.PullRequestService.#CreateTempFile(System.String,System.String,System.String,System.Text.Encoding)")]
 [assembly: SuppressMessage("Design", "CA1056:Uri properties should not be strings")]
 [assembly: SuppressMessage("Design", "CA1054:Uri parameters should not be strings")]
-
+[assembly: SuppressMessage("Reliability", "CA2007:Do not directly await a Task", Justification = "Discouraged for VSSDK projects.")]
diff --git a/src/GitHub.Exports.Reactive/GlobalSuppressions.cs b/src/GitHub.Exports.Reactive/GlobalSuppressions.cs
diff --git a/src/GitHub.Exports/GlobalSuppressions.cs b/src/GitHub.Exports/GlobalSuppressions.cs
diff --git a/src/GitHub.Exports/Models/DiffUtilities.cs b/src/GitHub.Exports/Models/DiffUtilities.cs
@@ -8,6 +8,8 @@
 
 #pragma warning disable CA1034 // Nested types should not be visible
 
+#pragma warning disable CA1034 // Nested types should not be visible
+
 namespace GitHub.Models
 {
     public static class DiffUtilities
diff --git a/src/GitHub.Exports/Settings/Guids.cs b/src/GitHub.Exports/Settings/Guids.cs
@@ -25,7 +25,7 @@ public static class Guids
 
 
         // UIContexts
-        public const string UIContext_Git = "565515AD-F4C1-4D59-BC14-AE77396DDDD7";
+        public const string GitContextPkgString = "565515AD-F4C1-4D59-BC14-AE77396DDDD7";
 
         // Guids defined in GitHub.VisualStudio.vsct
         public const string guidGitHubPkgString = "c3d3dc68-c977-411f-b3e8-03b0dccf7dfc";
diff --git a/src/GitHub.Extensions/GlobalSuppressions.cs b/src/GitHub.Extensions/GlobalSuppressions.cs
@@ -7,3 +7,4 @@
 
 [assembly: SuppressMessage("Design", "CA1054:Uri parameters should not be strings")]
 [assembly: SuppressMessage("Design", "CA1056:Uri properties should not be strings")]
+[assembly: SuppressMessage("Reliability", "CA2007:Do not directly await a Task", Justification = "Discouraged for VSSDK projects.")]
diff --git a/src/GitHub.InlineReviews/Commands/ToggleInlineCommentMarginCommand.cs b/src/GitHub.InlineReviews/Commands/ToggleInlineCommentMarginCommand.cs
@@ -3,13 +3,13 @@
 using System.ComponentModel.Composition;
 using GitHub.Commands;
 using GitHub.Services;
+using GitHub.Extensions;
 using GitHub.VisualStudio;
 using GitHub.InlineReviews.Margins;
 using GitHub.Services.Vssdk.Commands;
 using Microsoft.VisualStudio.TextManager.Interop;
 using Microsoft.VisualStudio;
 using Microsoft.VisualStudio.Editor;
-using GitHub.Extensions;
 
 namespace GitHub.InlineReviews.Commands
 {
diff --git a/src/GitHub.InlineReviews/InlineReviewsPackage.cs b/src/GitHub.InlineReviews/InlineReviewsPackage.cs
@@ -18,7 +18,7 @@ namespace GitHub.InlineReviews
 {
     [PackageRegistration(UseManagedResourcesOnly = true, AllowsBackgroundLoading = true)]
     [Guid(Guids.InlineReviewsPackageId)]
-    [ProvideAutoLoad(Guids.UIContext_Git, PackageAutoLoadFlags.BackgroundLoad)]
+    [ProvideAutoLoad(Guids.GitContextPkgString, PackageAutoLoadFlags.BackgroundLoad)]
     [ProvideMenuResource("Menus.ctmenu", 1)]
     public class InlineReviewsPackage : AsyncPackage
     {
@@ -59,7 +59,7 @@ async Task InitializeMenus()
 
             await JoinableTaskFactory.SwitchToMainThreadAsync();
             var menuService = (IMenuCommandService)(await GetServiceAsync(typeof(IMenuCommandService)));
-            Assumes.Present(componentModel);
+            Assumes.Present(menuService);
 
             menuService.AddCommands(commands);
         }
diff --git a/src/GitHub.InlineReviews/Margins/InlineCommentMarginProvider.cs b/src/GitHub.InlineReviews/Margins/InlineCommentMarginProvider.cs
@@ -37,7 +37,7 @@ public InlineCommentMarginProvider(
             this.tagAggregatorFactory = tagAggregatorFactory;
             this.peekService = peekService;
 
-            uiContext = UIContext.FromUIContextGuid(new Guid(Guids.UIContext_Git));
+            uiContext = UIContext.FromUIContextGuid(new Guid(Guids.GitContextPkgString));
         }
 
         public IWpfTextViewMargin CreateMargin(IWpfTextViewHost wpfTextViewHost, IWpfTextViewMargin parent)
diff --git a/src/GitHub.InlineReviews/Margins/PullRequestFileMarginProvider.cs b/src/GitHub.InlineReviews/Margins/PullRequestFileMarginProvider.cs
@@ -42,7 +42,7 @@ public PullRequestFileMarginProvider(
             this.packageSettings = packageSettings;
             this.usageTracker = usageTracker;
 
-            uiContext = UIContext.FromUIContextGuid(new Guid(Guids.UIContext_Git));
+            uiContext = UIContext.FromUIContextGuid(new Guid(Guids.GitContextPkgString));
         }
 
         /// <summary>
diff --git a/src/GitHub.InlineReviews/PullRequestStatusBarPackage.cs b/src/GitHub.InlineReviews/PullRequestStatusBarPackage.cs
@@ -12,7 +12,7 @@ namespace GitHub.InlineReviews
 {
     [Guid(Guids.PullRequestStatusPackageId)]
     [PackageRegistration(UseManagedResourcesOnly = true, AllowsBackgroundLoading = true)]
-    [ProvideAutoLoad(Guids.UIContext_Git, PackageAutoLoadFlags.BackgroundLoad)]
+    [ProvideAutoLoad(Guids.GitContextPkgString, PackageAutoLoadFlags.BackgroundLoad)]
     public class PullRequestStatusBarPackage : AsyncPackage
     {
         /// <summary>
diff --git a/src/GitHub.VisualStudio/Commands/OpenFromClipboardCommand.cs b/src/GitHub.VisualStudio/Commands/OpenFromClipboardCommand.cs
@@ -46,7 +46,7 @@ public OpenFromClipboardCommand(
             ParametersDescription = "u";    // accept a single url
 
             // This command is only visible when in the context of a Git repository
-            uiContext = new Lazy<UIContext>(() => UIContext.FromUIContextGuid(new Guid(Guids.UIContext_Git)));
+            uiContext = new Lazy<UIContext>(() => UIContext.FromUIContextGuid(new Guid(Guids.GitContextPkgString)));
         }
 
         public override async Task Execute(string url)
diff --git a/src/GitHub.VisualStudio/GitContextPackage.cs b/src/GitHub.VisualStudio/GitContextPackage.cs
@@ -11,11 +11,11 @@
 namespace GitHub.VisualStudio
 {
     /// <summary>
-    /// This package creates a custom UIContext <see cref="Guids.UIContext_Git"/> that is activated when a
+    /// This package creates a custom UIContext <see cref="Guids.GitContextPkgString"/> that is activated when a
     /// repository is active in <see cref="IVSGitExt"/> and the current process is Visual Studio (not Blend).
     /// </summary>
     [PackageRegistration(UseManagedResourcesOnly = true, AllowsBackgroundLoading = true)]
-    [Guid(Guids.UIContext_Git)]
+    [Guid(Guids.GitContextPkgString)]
     // Initialize when we enter the context of a Git repository
     [ProvideAutoLoad(UICONTEXT.RepositoryOpen_string, PackageAutoLoadFlags.BackgroundLoad)]
     public class GitContextPackage : AsyncPackage
@@ -24,14 +24,14 @@ protected async override Task InitializeAsync(CancellationToken cancellationToke
         {
             if (!ExportForVisualStudioProcessAttribute.IsVisualStudioProcess())
             {
-                // Don't activate 'UIContext_Git' for non-Visual Studio process
+                // Don't activate 'GitContextPkgString' for non-Visual Studio process
                 return;
             }
 
             var gitExt = (IVSGitExt)await GetServiceAsync(typeof(IVSGitExt));
             Assumes.Present(gitExt);
 
-            var context = UIContext.FromUIContextGuid(new Guid(Guids.UIContext_Git));
+            var context = UIContext.FromUIContextGuid(new Guid(Guids.GitContextPkgString));
             RefreshContext(context, gitExt);
             gitExt.ActiveRepositoriesChanged += () =>
             {
diff --git a/src/GitHub.VisualStudio/GitHubPackage.cs b/src/GitHub.VisualStudio/GitHubPackage.cs
@@ -32,7 +32,7 @@ namespace GitHub.VisualStudio
     [InstalledProductRegistration("#110", "#112", AssemblyVersionInformation.Version)]
     [Guid(Guids.guidGitHubPkgString)]
     [ProvideMenuResource("Menus.ctmenu", 1)]
-    [ProvideAutoLoad(Guids.UIContext_Git, PackageAutoLoadFlags.BackgroundLoad)]
+    [ProvideAutoLoad(Guids.GitContextPkgString, PackageAutoLoadFlags.BackgroundLoad)]
     [ProvideOptionPage(typeof(OptionsPage), "GitHub for Visual Studio", "General", 0, 0, supportsAutomation: true)]
     public class GitHubPackage : AsyncPackage
     {

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,8 @@`
`8`	`8`
`9`	`9`	`#pragma warning disable CA1034 // Nested types should not be visible`
`10`	`10`
	`11`	`+#pragma warning disable CA1034 // Nested types should not be visible`
	`12`	`+`
`11`	`13`	`namespace GitHub.Models`
`12`	`14`	`{`
`13`	`15`	`public static class DiffUtilities`
Original file line number	Diff line number	Diff line change
`@@ -7,3 +7,4 @@`
`7`	`7`
`8`	`8`	`[assembly: SuppressMessage("Design", "CA1054:Uri parameters should not be strings")]`
`9`	`9`	`[assembly: SuppressMessage("Design", "CA1056:Uri properties should not be strings")]`
	`10`	`+[assembly: SuppressMessage("Reliability", "CA2007:Do not directly await a Task", Justification = "Discouraged for VSSDK projects.")]`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ namespace GitHub.InlineReviews`
`18`	`18`	`{`
`19`	`19`	`[PackageRegistration(UseManagedResourcesOnly = true, AllowsBackgroundLoading = true)]`
`20`	`20`	`[Guid(Guids.InlineReviewsPackageId)]`
`21`		`- [ProvideAutoLoad(Guids.UIContext_Git, PackageAutoLoadFlags.BackgroundLoad)]`
	`21`	`+ [ProvideAutoLoad(Guids.GitContextPkgString, PackageAutoLoadFlags.BackgroundLoad)]`
`22`	`22`	`[ProvideMenuResource("Menus.ctmenu", 1)]`
`23`	`23`	`public class InlineReviewsPackage : AsyncPackage`
`24`	`24`	`{`
`@@ -59,7 +59,7 @@ async Task InitializeMenus()`
`59`	`59`
`60`	`60`	`await JoinableTaskFactory.SwitchToMainThreadAsync();`
`61`	`61`	`var menuService = (IMenuCommandService)(await GetServiceAsync(typeof(IMenuCommandService)));`
`62`		`- Assumes.Present(componentModel);`
	`62`	`+ Assumes.Present(menuService);`
`63`	`63`
`64`	`64`	`menuService.AddCommands(commands);`
`65`	`65`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public InlineCommentMarginProvider(`
`37`	`37`	`this.tagAggregatorFactory = tagAggregatorFactory;`
`38`	`38`	`this.peekService = peekService;`
`39`	`39`
`40`		`- uiContext = UIContext.FromUIContextGuid(new Guid(Guids.UIContext_Git));`
	`40`	`+ uiContext = UIContext.FromUIContextGuid(new Guid(Guids.GitContextPkgString));`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`public IWpfTextViewMargin CreateMargin(IWpfTextViewHost wpfTextViewHost, IWpfTextViewMargin parent)`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ public PullRequestFileMarginProvider(`
`42`	`42`	`this.packageSettings = packageSettings;`
`43`	`43`	`this.usageTracker = usageTracker;`
`44`	`44`
`45`		`- uiContext = UIContext.FromUIContextGuid(new Guid(Guids.UIContext_Git));`
	`45`	`+ uiContext = UIContext.FromUIContextGuid(new Guid(Guids.GitContextPkgString));`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`/// <summary>`