Merge master into release/1.0.99.7

Author: shana

.gitignore

@@ -20,6 +20,7 @@ build/
 
 # Roslyn cache directories
 *.ide/
+.vs/
 
 # MSTest test Results
 [Tt]est[Rr]esult*/

ISSUE_TEMPLATE.md

@@ -0,0 +1,6 @@
+Hello! Please read the contributing guidelines before submitting an issue.
+
+- GitHub Extension version:
+- Visual Studio version:
+
+__What happened__ (with steps, logs and screenshots, if possible)

appveyor.yml

@@ -0,0 +1,26 @@
+version: '{build}'
+install:
+- ps: >-
+    $full_build = Test-Path env:GHFVS_KEY
+
+    git submodule init
+
+    if ($full_build) {
+      $fileContent = "-----BEGIN RSA PRIVATE KEY-----`n"
+      $fileContent += $env:GHFVS_KEY.Replace(' ', "`n")
+      $fileContent += "`n-----END RSA PRIVATE KEY-----`n"
+      Set-Content c:\users\appveyor\.ssh\id_rsa $fileContent
+    } else {
+      git submodule deinit script
+    }
+
+    git submodule update
+
+    nuget restore GitHubVS.sln
+build_script:
+- cmd: msbuild "GitHubVS.sln" /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" /p:Configuration=Release /p:DeployExtension=false /verbosity:minimal /p:VisualStudioVersion=14.0
+test_script:
+- ps: >-
+    scripts\Run-Nunit.ps1 TrackingCollectionTests 180 Release -AppVeyor
+
+    scripts\Run-Xunit.ps1 UnitTests 180 Release -AppVeyor

script

@@ -0,0 +1,62 @@
+<#
+.SYNOPSIS
+    Runs NUnit
+#>
+
+[CmdletBinding()]
+Param(
+    [Parameter(Mandatory=$true)]
+    [ValidateNotNullOrEmpty()]
+    [string]
+    $Project,
+    [int]
+    $TimeoutDuration,
+    [string]
+    $Configuration,
+    [switch]
+    $AppVeyor = $false
+)
+
+$rootDirectory = Split-Path (Split-Path $MyInvocation.MyCommand.Path)
+Push-Location $rootDirectory
+$dll = "src\$Project\bin\$Configuration\$Project.dll"
+
+if ($AppVeyor) {
+    $nunitDirectory = Join-Path $rootDirectory packages\NUnit.Runners.2.6.4\tools
+    $consoleRunner = Join-Path $nunitDirectory nunit-console-x86.exe
+    $args = "-noshadow", "-framework:net-4.5", "-exclude:Timings", $dll
+    [object[]] $output = "$consoleRunner " + ($args -join " ")
+    & $consoleRunner ($args | %{ "`"$_`"" })
+    if($LastExitCode -ne 0) {
+        $host.SetShouldExit($LastExitCode)
+    }
+} else {
+    $nunitDirectory = Join-Path $rootDirectory packages\NUnit.Runners.2.6.4\tools
+    $consoleRunner = Join-Path $nunitDirectory nunit-console-x86.exe
+
+    $xml = Join-Path $rootDirectory "nunit-$Project.xml"
+    $outputPath = [System.IO.Path]::GetTempFileName()
+
+    $args = "-noshadow", "-xml:$xml", "-framework:net-4.5", "-exclude:Timings", $dll
+    [object[]] $output = "$consoleRunner " + ($args -join " ")
+
+    $process = Start-Process -PassThru -NoNewWindow -RedirectStandardOutput $outputPath $consoleRunner ($args | %{ "`"$_`"" })
+    Wait-Process -InputObject $process -Timeout $TimeoutDuration -ErrorAction SilentlyContinue
+    if ($process.HasExited) {
+        $output += Get-Content $outputPath
+        $exitCode = $process.ExitCode
+    } else {
+        $output += "Tests timed out. Backtrace:"
+        $output += Get-DotNetStack $process.Id
+        $exitCode = 9999
+    }
+
+    Stop-Process -InputObject $process
+    Remove-Item $outputPath
+    Pop-Location
+
+    $result = New-Object System.Object
+    $result | Add-Member -Type NoteProperty -Name Output -Value $output
+    $result | Add-Member -Type NoteProperty -Name ExitCode -Value $exitCode
+    $result
+}

scripts/Run-NUnit.ps1

@@ -0,0 +1,62 @@
+<#
+.SYNOPSIS
+    Runs xUnit
+#>
+
+[CmdletBinding()]
+Param(
+    [Parameter(Mandatory=$true)]
+    [ValidateNotNullOrEmpty()]
+    [string]
+    $Project,
+    [int]
+    $TimeoutDuration,
+    [string]
+    $Configuration,
+    [switch]
+    $AppVeyor = $false
+)
+
+$rootDirectory = Split-Path (Split-Path $MyInvocation.MyCommand.Path)
+Push-Location $rootDirectory
+
+$dll = "src\$Project\bin\$Configuration\$Project.dll"
+
+if ($AppVeyor) {
+    $xunitDirectory = Join-Path $rootDirectory packages\xunit.runner.console.2.1.0\tools
+    $consoleRunner = Join-Path $xunitDirectory xunit.console.x86.exe
+    $args = $dll, "-noshadow", "-parallel", "all", "-appveyor"
+    [object[]] $output = "$consoleRunner " + ($args -join " ")
+    & $consoleRunner ($args | %{ "`"$_`"" })
+    if($LastExitCode -ne 0) {
+        $host.SetShouldExit($LastExitCode)
+    }
+} else {
+    $xunitDirectory = Join-Path $rootDirectory packages\xunit.runner.console.2.1.0\tools
+    $consoleRunner = Join-Path $xunitDirectory xunit.console.x86.exe
+    $xml = Join-Path $rootDirectory "nunit-$Project.xml"
+    $outputPath = [System.IO.Path]::GetTempFileName()
+
+    $args = $dll, "-noshadow", "-xml", $xml, "-parallel", "all"
+
+    [object[]] $output = "$consoleRunner " + ($args -join " ")
+
+    $process = Start-Process -PassThru -NoNewWindow -RedirectStandardOutput $outputPath $consoleRunner ($args | %{ "`"$_`"" })
+    Wait-Process -InputObject $process -Timeout $TimeoutDuration -ErrorAction SilentlyContinue
+    if ($process.HasExited) {
+        $output += Get-Content $outputPath
+        $exitCode = $process.ExitCode
+    } else {
+        $output += "Tests timed out. Backtrace:"
+        $output += Get-DotNetStack $process.Id
+        $exitCode = 9999
+    }
+    Stop-Process -InputObject $process
+    Remove-Item $outputPath
+    Pop-Location
+
+    $result = New-Object System.Object
+    $result | Add-Member -Type NoteProperty -Name Output -Value $output
+    $result | Add-Member -Type NoteProperty -Name ExitCode -Value $exitCode
+    $result
+}

scripts/Run-XUnit.ps1

@@ -120,6 +120,9 @@
     </Page>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="..\common\SolutionInfo.cs">
+      <Link>Properties\SolutionInfo.cs</Link>
+    </Compile>
     <Compile Include="Properties\AssemblyInfo.cs">
       <SubType>Code</SubType>
     </Compile>

src/DesignTimeStyleHelper/DesignTimeStyleHelper.csproj

@@ -1,25 +1,8 @@
 using System.Reflection;
-using System.Resources;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
 using System.Windows;
 
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
 [assembly: AssemblyTitle("DesignTimeStyleHelper")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("DesignTimeStyleHelper")]
-[assembly: AssemblyCopyright("Copyright ©  2015")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
+[assembly: AssemblyDescription("Helper app for UI testing")]
 
 //In order to begin building localizable applications, set 
 //<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
@@ -39,17 +22,3 @@
                                               //(used if a resource is not found in the page, 
                                               // app, or any theme specific resource dictionaries)
 )]
-
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]

src/DesignTimeStyleHelper/Properties/AssemblyInfo.cs

@@ -232,20 +232,25 @@ public IObservable<PullRequest> GetPullRequestsForRepository(string owner, strin
         {
             return gitHubClient.PullRequest.GetAllForRepository(owner, name,
                 new PullRequestRequest {
-                    State = ItemState.All,
+                    State = ItemStateFilter.All,
                     SortProperty = PullRequestSort.Updated,
                     SortDirection = SortDirection.Descending
                 });
         }
 
-        public IObservable<Branch> GetBranches(string owner, string repo)
+        public IObservable<PullRequest> CreatePullRequest(NewPullRequest pullRequest, string owner, string repo)
         {
-            return gitHubClient.Repository.GetAllBranches(owner, repo);
+            return gitHubClient.PullRequest.Create(owner, repo, pullRequest);
         }
 
-        public IObservable<PullRequest> CreatePullRequest(NewPullRequest pullRequest, string owner, string repo)
+        public IObservable<Repository> GetRepositories()
         {
-            return gitHubClient.PullRequest.Create(owner, repo, pullRequest);
+            return gitHubClient.Repository.GetAllForCurrent();
+        }
+
+        public IObservable<Branch> GetBranches(string owner, string repo)
+        {
+            return gitHubClient.Repository.GetAllBranches(owner, repo);
         }
     }
 }

src/GitHub.App/Api/ApiClient.cs

@@ -10,6 +10,11 @@ namespace GitHub.Caches
 {
     public class CacheIndex
     {
+        public const string PRPrefix = "index:pr";
+        public const string RepoPrefix = "index:repos";
+        public const string GitIgnoresPrefix = "index:ignores";
+        public const string LicensesPrefix = "index:licenses";
+
         public static CacheIndex Create(string key)
         {
             return new CacheIndex { IndexKey = key };