Merge build/sign-with-sha256 into release/1.0.16.3

github · Jan 19, 2016 · 1304b27 · 1304b27
2 parents 6a0da22 + 2c8f5a6
commit 1304b27
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -5,6 +5,10 @@ Most of the extension UI lives in the Team Explorer pane, which is available fro
 
 Official builds of this extension are available at [the official website](https://visualstudio.github.com).
 
+Older and pre-release/beta/untested versions are available at [the releases page](https://github.com/github/VisualStudio/releases), and also via a custom gallery feed for Visual Studio.
+
+You can configure the gallery by going to `Tools / Options / Extensions and Updates` and adding a new gallery with the url https://visualstudio.github.com/releases/feed.rss. The gallery will now be available from `Tools / Extensions and Updates`.
+
 [![Join the chat at https://gitter.im/github/VisualStudio](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/github/VisualStudio?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 ## Build requirements

diff --git a/deploy-local.cmd b/deploy-local.cmd
@@ -0,0 +1 @@
+powershell.exe .\script\deploy.ps1 production None -Force -NoChat -NoPush -NoUpload
diff --git a/script b/script
diff --git a/src/GitHub.App/Controllers/UIController.cs b/src/GitHub.App/Controllers/UIController.cs
@@ -256,13 +256,15 @@ public void Start([AllowNull] IConnection connection)
             else
             {
                 connectionManager
-                    .IsLoggedIn(hosts)
-                    .Do(loggedin =>
+                    .GetLoggedInConnections(hosts)
+                    .FirstOrDefaultAsync()
+                    .Select(c =>
                     {
+                        bool loggedin = c != null;
                         if (currentFlow != UIControllerFlow.Authentication)
                         {
                             if (loggedin) // register the first available connection so the viewmodel can use it
-                                uiProvider.AddService(connectionManager.Connections.First(c => hosts.LookupHost(c.HostAddress).IsLoggedIn));
+                                uiProvider.AddService(c);
                             else
                             {
                                 // a connection will be added to the list when auth is done, register it so the next
@@ -284,6 +286,8 @@ public void Start([AllowNull] IConnection connection)
                             .PermitIf(Trigger.Clone, UIViewType.Login, () => !loggedin)
                             .PermitIf(Trigger.Publish, UIViewType.Publish, () => loggedin)
                             .PermitIf(Trigger.Publish, UIViewType.Login, () => !loggedin);
+
+                        return loggedin;
                     })
                     .ObserveOn(RxApp.MainThreadScheduler)
                     .Subscribe(_ => { }, () =>

diff --git a/src/GitHub.Exports.Reactive/Extensions/ConnectionManagerExtensions.cs b/src/GitHub.Exports.Reactive/Extensions/ConnectionManagerExtensions.cs
@@ -12,17 +12,22 @@ public static IObservable<bool> IsLoggedIn(this IConnectionManager cm, IReposito
         {
             return cm.Connections.ToObservable()
                     .SelectMany(c => c.Login())
-                    .Select(c => hosts.LookupHost(c.HostAddress))
-                    .Any(h => h.IsLoggedIn);
+                    .Any(c => hosts.LookupHost(c.HostAddress).IsLoggedIn);
         }
 
         public static IObservable<bool> IsLoggedIn(this IConnectionManager cm, IRepositoryHosts hosts, HostAddress address)
         {
             return cm.Connections.ToObservable()
                     .Where(c => c.HostAddress.Equals(address))
                     .SelectMany(c => c.Login())
-                    .Select(c => hosts.LookupHost(c.HostAddress))
-                    .Any(h => h.IsLoggedIn);
+                    .Any(c => hosts.LookupHost(c.HostAddress).IsLoggedIn);
+        }
+
+        public static IObservable<IConnection> GetLoggedInConnections(this IConnectionManager cm, IRepositoryHosts hosts)
+        {
+            return cm.Connections.ToObservable()
+                    .SelectMany(c => c.Login())
+                    .Where(c => hosts.LookupHost(c.HostAddress).IsLoggedIn);
         }
     }
 }
diff --git a/src/GitHub.VisualStudio/TeamExplorer/Connect/GitHubConnectSection.cs b/src/GitHub.VisualStudio/TeamExplorer/Connect/GitHubConnectSection.cs
@@ -324,11 +324,11 @@ void StartFlow(UIControllerFlow controllerFlow)
             var uiProvider = ServiceProvider.GetExportedValue<IUIProvider>();
             uiProvider.GitServiceProvider = ServiceProvider;
             var ret = uiProvider.SetupUI(controllerFlow, SectionConnection);
-            ret.Subscribe(c =>
+            ret.Subscribe(_ => {}, () =>
             {
-                if (c.IsViewType(UIViewType.Clone))
+                if (controllerFlow == UIControllerFlow.Clone)
                     isCloning = true;
-                else if (c.IsViewType(UIViewType.Create))
+                else if (controllerFlow == UIControllerFlow.Create)
                     isCreating = true;
             });
             uiProvider.RunUI();

diff --git a/src/GitHub.VisualStudio/packages.config b/src/GitHub.VisualStudio/packages.config
@@ -2,6 +2,7 @@
 <packages>
   <package id="EditorUtils2013" version="1.4.1.1" targetFramework="net45" />
   <package id="Fody" version="1.28.0" targetFramework="net45" developmentDependency="true" />
+  <package id="Microsoft.VSSDK.Vsixsigntool" version="14.1.24720" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
   <package id="NLog" version="3.1.0" targetFramework="net45" />
   <package id="NullGuard.Fody" version="1.4.1" targetFramework="net45" developmentDependency="true" />
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		powershell.exe .\script\deploy.ps1 production None -Force -NoChat -NoPush -NoUpload