Merge branch 'master' into l10n_master

Author: StanleyGoldman

src/GitHub.App/Services/DialogService.cs

@@ -31,15 +31,21 @@ public DialogService(
 
         public async Task<CloneDialogResult> ShowCloneDialog(IConnection connection)
         {
-            Guard.ArgumentNotNull(connection, nameof(connection));
-
             var viewModel = factory.CreateViewModel<IRepositoryCloneViewModel>();
 
-            return (CloneDialogResult)await showDialog.Show(
-                viewModel,
-                connection,
-                ApiClientConfiguration.RequestedScopes)
-                .ConfigureAwait(false);
+            if (connection != null)
+            {
+                return (CloneDialogResult)await showDialog.Show(
+                    viewModel,
+                    connection,
+                    ApiClientConfiguration.RequestedScopes)
+                    .ConfigureAwait(false);
+            }
+            else
+            {
+                return (CloneDialogResult)await showDialog.ShowWithFirstConnection(viewModel)
+                    .ConfigureAwait(false);
+            }
         }
 
         public async Task<string> ShowReCloneDialog(IRepositoryModel repository)

src/GitHub.Exports/Extensions/ServiceProviderExtensions.cs

@@ -8,7 +8,7 @@ namespace GitHub.Extensions
 {
     public static class IServiceProviderExtensions
     {
-        static readonly ILogger log = LogManager.ForContext<VSServices>();
+        static readonly ILogger log = LogManager.ForContext(typeof(IServiceProviderExtensions));
 
         /// <summary>
         /// Safe variant of GetService that doesn't throw exceptions if the service is

src/GitHub.TeamFoundation.14/Base/TeamExplorerSectionBase.cs

@@ -118,7 +118,8 @@ public virtual void SaveContext(object sender, SectionSaveContextEventArgs e)
 
         protected ITeamExplorerSection GetSection(Guid section)
         {
-            var tep = (ITeamExplorerPage)TEServiceProvider.GetServiceSafe(typeof(ITeamExplorerPage));
+            // Return null if section hasn't been initialized yet
+            var tep = (ITeamExplorerPage)TEServiceProvider?.GetServiceSafe(typeof(ITeamExplorerPage));
             return tep?.GetSection(section);
         }
     }

src/GitHub.VisualStudio/Services/ShowDialogService.cs

@@ -75,10 +75,10 @@ public async Task<object> ShowWithFirstConnection<TViewModel>(TViewModel viewMod
             using (var dialogViewModel = CreateViewModel())
             using (dialogViewModel.Done.Take(1).Subscribe(x => result = x))
             {
-                await dialogViewModel.StartWithConnection(viewModel);
-
+                var task = dialogViewModel.StartWithConnection(viewModel);
                 var window = new GitHubDialogWindow(dialogViewModel);
                 window.ShowModal();
+                await task;
             }
 
             return result;