зеркало из https://github.com/github/VisualStudio.git
Merge master into shana/connections
This commit is contained in:
Коммит
498488d9d1
|
@ -323,8 +323,8 @@ Global
|
|||
{241C47DF-CA8E-4296-AA03-2C48BB646ABD}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{241C47DF-CA8E-4296-AA03-2C48BB646ABD}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{241C47DF-CA8E-4296-AA03-2C48BB646ABD}.Release|x86.Build.0 = Release|Any CPU
|
||||
{EB73ADDD-2FE9-44C0-A1AB-20709B979B64}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{EB73ADDD-2FE9-44C0-A1AB-20709B979B64}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{EB73ADDD-2FE9-44C0-A1AB-20709B979B64}.Debug|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{EB73ADDD-2FE9-44C0-A1AB-20709B979B64}.Debug|Any CPU.Build.0 = Release|Any CPU
|
||||
{EB73ADDD-2FE9-44C0-A1AB-20709B979B64}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{EB73ADDD-2FE9-44C0-A1AB-20709B979B64}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{EB73ADDD-2FE9-44C0-A1AB-20709B979B64}.Publish|Any CPU.ActiveCfg = Release|Any CPU
|
||||
|
|
|
@ -6,14 +6,11 @@ using System.ComponentModel.Composition.Primitives;
|
|||
using System.Globalization;
|
||||
using System.Linq;
|
||||
using System.Windows;
|
||||
using GitHub.VisualStudio.TeamExplorerConnect;
|
||||
using GitHub.Services;
|
||||
using GitHub.VisualStudio;
|
||||
using Microsoft.VisualStudio.ComponentModelHost;
|
||||
using Microsoft.VisualStudio.Shell;
|
||||
using Moq;
|
||||
using GitHub.Services;
|
||||
using GitHub.VisualStudio;
|
||||
using GitHub.ViewModels;
|
||||
using GitHub.Exports;
|
||||
|
||||
namespace DesignTimeStyleHelper
|
||||
{
|
||||
|
@ -33,14 +30,13 @@ namespace DesignTimeStyleHelper
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
public class Holder
|
||||
{
|
||||
[Import]
|
||||
public SVsServiceProvider ServiceProvider;
|
||||
|
||||
[Import]
|
||||
SComponentModel sc;
|
||||
public SComponentModel sc;
|
||||
|
||||
[Import]
|
||||
public IVisualStudioBrowser Browser;
|
||||
|
@ -121,7 +117,6 @@ namespace DesignTimeStyleHelper
|
|||
return m.Object;
|
||||
}
|
||||
|
||||
|
||||
public ExportProvider DefaultExportProvider { get; set; }
|
||||
public ComposablePartCatalog DefaultCatalog { get; set; }
|
||||
public ICompositionService DefaultCompositionService { get; set; }
|
||||
|
|
|
@ -33,6 +33,7 @@
|
|||
<DefineConstants>TRACE</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="Microsoft.VisualStudio.ComponentModelHost, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
|
||||
|
|
|
@ -29,7 +29,7 @@ public class LoginToGitHubViewModelTests
|
|||
|
||||
public class TheForgotPasswordCommand
|
||||
{
|
||||
[Fact(Skip = "It's flipflopping with xunit")]
|
||||
[Fact]
|
||||
public void LaunchesBrowserToForgotPasswordPage()
|
||||
{
|
||||
var repositoryHosts = Substitute.For<IRepositoryHosts>();
|
||||
|
|
|
@ -1 +1 @@
|
|||
Subproject commit e80fc5cda92dcffa947cd50185f68b82ce601e98
|
||||
Subproject commit bc8a472e14b9f1fb0363f8f7b92a93393c6cf54b
|
|
@ -1 +1 @@
|
|||
Subproject commit 5fb1bed95ee68379eecf8c09d8630cba0d41bc28
|
||||
Subproject commit 254c9ac15764d758c5e67a3dcab74a359b19c8eb
|
Загрузка…
Ссылка в новой задаче