Merge branch 'master' into features/check-suite-annotations-inline-markers

Author: StanleyGoldman

GitHubVS.sln

@@ -0,0 +1,64 @@
+# .NET Desktop
+# Build and run tests for .NET Desktop or Windows classic desktop solutions.
+# Add steps that publish symbols, save build artifacts, and more:
+# https://docs.microsoft.com/azure/devops/pipelines/apps/windows/dot-net
+
+pool:
+  vmImage: 'VS2017-Win2016'
+
+variables:
+  solution: '**/*.sln'
+  buildPlatform: 'Any CPU'
+  buildConfiguration: 'Release'
+
+steps:
+- task: InstallSSHKey@0
+  inputs:
+    hostName: github.com ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ==
+    sshPublicKey: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCx/AxLjr4mhH7XFlbISb65GBxQnVnKh1owmAT1bK/Qt1b4/Z0SL68IvV88DpgLyKbica2giEVfKo/Z4dkO+P8M2bGXrNgazzfO910DlR+e1vt8BSU/Dbvscz0i1lsfKb3PnfSouCkQev6Th0v+hBdgkuackWgaBw22DDLkp9Uf/cAo+QYLz56p5KVctEESRRgGgIIlZyUc8OYDMSU2wQhG9x31mSyJ4ODuOZsi1RgBBHrgUb2QRhLJ9nZWfQgGBRDxGYTKLWiWIQwgSVQ9x1Az/Rei+CbPRvLcVGg+5vHt8lcu+HxEgrY4IsjXdMqosPqxQ+TT6f+G4GQDn8+IQ4wOpTVi84PkOQX3JPE2QSJwWA0AHNe5NTSns6WWYQyzxFJYBN2pLPuMnj9/+ozV3GaeQqn47WHfUH3s5IawNQPTFDxcl4qsmU66Ybfqa4eFIPEvCCp1leQcuXyDHxKLq80x1szN4kn0oyL2W0zbkwTaZG4I5l4Rto0hErUf3qx7FlZjMGEFMdJVskgnRMkKdqngF0FmSYQICpmqqYD8TydUc6jxZVOCvFF5gbqwxV/F2lk10D7FnetUNeWvpcZKbFUX4e5Ff15vibJZp4/5FUbksv+glfbPwk6tGuNj3xPFODP7KG8Y5wtcbknX11XI0vi+iL8TxL0Vk30TpZUMXWYYvQ==
+    sshKeySecureFile: id_rsa
+
+- script: git submodule init && git submodule deinit script && git submodule update
+  displayName: Submodule init
+
+# Can't use the NuGet tasks because of https://github.com/Microsoft/azure-pipelines-tasks/issues/6790
+#- task: NuGetToolInstaller@0
+#- task: NuGetCommand@2
+#  inputs:
+#    restoreSolution: '$(solution)'
+#    feedsToUse: 'config'
+#    nugetConfigPath: nuget.config
+
+# Instead run nuget manually.
+- script: tools\nuget\nuget.exe restore
+  displayName: NuGet restore
+
+# Ideally we'd run NerdBank.GitVersioning but that will come later. For now bump the
+# version with the azure BuildId
+- task: PowerShell@2
+  inputs:
+    targetType: filePath
+    filePath: '$(Build.SourcesDirectory)\scripts\Bump-Version.ps1'
+    arguments: -BumpBuild -BuildNumber:$(Build.BuildId)
+    displayName: Bump version
+
+- task: VSBuild@1
+  inputs:
+    solution: GitHubVS.sln
+    platform: '$(buildPlatform)'
+    configuration: '$(buildConfiguration)'
+
+# VSTest is hanging. Skip tests for now; we're still running Appveyor which will handle the tests.
+#- task: VSTest@2
+#  inputs:
+#    searchFolder: '$(Build.SourcesDirectory)\test'
+#    testAssemblyVer2: '**\bin\**\*Tests.dll'
+#    platform: '$(buildPlatform)'
+#    configuration: '$(buildConfiguration)'
+#    diagnosticsEnabled: true
+#    runSettingsFile: '$(Build.SourcesDirectory)\test\test.runsettings'
+
+- task: PublishBuildArtifacts@1
+  inputs:
+    pathtoPublish: '$(Build.SourcesDirectory)\build\Release\GitHub.VisualStudio.vsix' 
+    artifactName: 'vsix' 

azure-pipelines.yml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <packageSources>
-    <add key="nuget.org" value="https://www.nuget.org/api/v2/" />
+    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
     <add key="dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
     <add key="vsixtesting" value="https://www.myget.org/F/vsixtesting/api/v3/index.json" />
     <add key="Custom Packages for GHfVS" value="lib" />

nuget.config

@@ -40,14 +40,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="EnvDTE" Version="8.0.1" />
     <PackageReference Include="LibGit2Sharp" Version="0.23.1" />
     <PackageReference Include="LibGit2Sharp.NativeBinaries" Version="1.0.164" />
+    <PackageReference Include="Madskristensen.VisualStudio.SDK" Version="14.3.75-pre" />
     <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.6.1" />
-    <PackageReference Include="Microsoft.VisualStudio.ComponentModelHost" Version="14.0.25424" />
-    <PackageReference Include="Microsoft.VisualStudio.Editor" Version="14.3.25407" />
-    <PackageReference Include="Microsoft.VisualStudio.SDK.EmbedInteropTypes" Version="15.0.17" />
-    <PackageReference Include="Microsoft.VisualStudio.Shell.14.0" Version="14.3.25407" />
     <PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
     <PackageReference Include="Octokit.GraphQL" Version="0.1.2-beta" />
     <PackageReference Include="Rothko" Version="0.0.3-ghfvs" />

script

@@ -45,6 +45,7 @@ public sealed class GitHubPaneViewModel : ViewModelBase, IGitHubPaneViewModel, I
         readonly ILoggedOutViewModel loggedOut;
         readonly INotAGitHubRepositoryViewModel notAGitHubRepository;
         readonly INotAGitRepositoryViewModel notAGitRepository;
+        readonly INoRemoteOriginViewModel noRemoteOrigin;
         readonly ILoginFailedViewModel loginFailed;
         readonly SemaphoreSlim navigating = new SemaphoreSlim(1);
         readonly ObservableAsPropertyHelper<ContentOverride> contentOverride;
@@ -72,6 +73,7 @@ public GitHubPaneViewModel(
             ILoggedOutViewModel loggedOut,
             INotAGitHubRepositoryViewModel notAGitHubRepository,
             INotAGitRepositoryViewModel notAGitRepository,
+            INoRemoteOriginViewModel noRemoteOrigin,
             ILoginFailedViewModel loginFailed)
         {
             Guard.ArgumentNotNull(viewModelFactory, nameof(viewModelFactory));
@@ -84,6 +86,7 @@ public GitHubPaneViewModel(
             Guard.ArgumentNotNull(loggedOut, nameof(loggedOut));
             Guard.ArgumentNotNull(notAGitHubRepository, nameof(notAGitHubRepository));
             Guard.ArgumentNotNull(notAGitRepository, nameof(notAGitRepository));
+            Guard.ArgumentNotNull(noRemoteOrigin, nameof(noRemoteOrigin));
             Guard.ArgumentNotNull(loginFailed, nameof(loginFailed));
 
             this.viewModelFactory = viewModelFactory;
@@ -94,6 +97,7 @@ public GitHubPaneViewModel(
             this.loggedOut = loggedOut;
             this.notAGitHubRepository = notAGitHubRepository;
             this.notAGitRepository = notAGitRepository;
+            this.noRemoteOrigin = noRemoteOrigin;
             this.loginFailed = loginFailed;
 
             var contentAndNavigatorContent = Observable.CombineLatest(
@@ -433,8 +437,17 @@ async Task UpdateContent(LocalRepositoryModel repository)
             }
             else if (string.IsNullOrWhiteSpace(repository.CloneUrl))
             {
-                log.Debug("Not a GitHub repository: {CloneUrl}", repository?.CloneUrl);
-                Content = notAGitHubRepository;
+                if (repository.HasRemotesButNoOrigin)
+                {
+                    log.Debug("No origin remote");
+                    Content = noRemoteOrigin;
+                }
+                else
+                {
+                    log.Debug("Not a GitHub repository: {CloneUrl}", repository?.CloneUrl);
+                    Content = notAGitHubRepository;
+                }
+
                 return;
             }
 
@@ -490,7 +503,7 @@ async Task UpdateContent(LocalRepositoryModel repository)
                     Content = loggedOut;
                 }
             }
-            
+
             if (notGitHubRepo)
             {
                 log.Debug("Not a GitHub repository: {CloneUrl}", repository?.CloneUrl);

src/GitHub.App/GitHub.App.csproj

@@ -0,0 +1,28 @@
+using System;
+using System.Reactive;
+using System.Threading.Tasks;
+using System.ComponentModel.Composition;
+using GitHub.Services;
+using ReactiveUI;
+
+namespace GitHub.ViewModels.GitHubPane
+{
+    /// <summary>
+    /// The view model for the "No Origin Remote" view in the GitHub pane.
+    /// </summary>
+    [Export(typeof(INoRemoteOriginViewModel))]
+    [PartCreationPolicy(CreationPolicy.NonShared)]
+    public class NoRemoteOriginViewModel : PanePageViewModelBase, INoRemoteOriginViewModel
+    {
+        ITeamExplorerServices teamExplorerServices;
+
+        [ImportingConstructor]
+        public NoRemoteOriginViewModel(ITeamExplorerServices teamExplorerServices)
+        {
+            this.teamExplorerServices = teamExplorerServices;
+            EditRemotes = ReactiveCommand.CreateFromTask(teamExplorerServices.ShowRepositorySettingsRemotesAsync);
+        }
+
+        public ReactiveCommand<Unit, Unit> EditRemotes { get; }
+    }
+}

src/GitHub.App/ViewModels/GitHubPane/GitHubPaneViewModel.cs

@@ -27,6 +27,5 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.6.1" />
-    <PackageReference Include="Microsoft.VisualStudio.Language.Intellisense" Version="14.3.25407" />
   </ItemGroup>
 </Project>

src/GitHub.App/ViewModels/GitHubPane/NoRemoteOriginViewModel.cs

@@ -0,0 +1,16 @@
+using System.Reactive;
+using ReactiveUI;
+
+namespace GitHub.ViewModels.GitHubPane
+{
+    /// <summary>
+    /// Defines the view model for the "No Origin Remote" view in the GitHub pane.
+    /// </summary>
+    public interface INoRemoteOriginViewModel : IPanePageViewModel
+    {
+        /// <summary>
+        /// Gets a command that will allow the user to rename remotes.
+        /// </summary>
+        ReactiveCommand<Unit, Unit> EditRemotes { get; }
+    }
+}

src/GitHub.Exports.Reactive/GitHub.Exports.Reactive.csproj

@@ -23,18 +23,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="EnvDTE" Version="8.0.1" />
-    <PackageReference Include="EnvDTE80" Version="8.0.1" />
     <PackageReference Include="LibGit2Sharp" Version="0.23.1" />
     <PackageReference Include="LibGit2Sharp.NativeBinaries" Version="1.0.164" />
+    <PackageReference Include="Madskristensen.VisualStudio.SDK" Version="14.3.75-pre" />
     <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.6.1" />
-    <PackageReference Include="Microsoft.VisualStudio.ComponentModelHost" Version="14.0.25424" />
-    <PackageReference Include="Microsoft.VisualStudio.Editor" Version="14.3.25407" />
-    <PackageReference Include="Microsoft.VisualStudio.SDK.EmbedInteropTypes" Version="15.0.17" />
     <PackageReference Include="Microsoft.VisualStudio.Setup.Configuration.Interop" Version="1.15.103" />
-    <PackageReference Include="Microsoft.VisualStudio.Shell.14.0" Version="14.3.25407" />
-    <PackageReference Include="Microsoft.VisualStudio.Shell.Interop.11.0" Version="11.0.61030" />
-    <PackageReference Include="Microsoft.VisualStudio.Shell.Interop.12.0" Version="12.0.30110" />
     <PackageReference Include="Rothko" Version="0.0.3-ghfvs" />
     <PackageReference Include="Serilog" Version="2.5.0" />
     <PackageReference Include="SerilogAnalyzer" Version="0.12.0.0" />