Merge branch build/move-scripts-around into grokys/appveyor

Author: shana

GitHubVS.sln

@@ -52,7 +52,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Script", "Script", "{7B6C5F
 		script\Require-CleanWorkTree.ps1 = script\Require-CleanWorkTree.ps1
 		script\Run-NUnit.ps1 = script\Run-NUnit.ps1
 		script\Run-XUnit.ps1 = script\Run-XUnit.ps1
-		script\SolutionInfo.cs = script\SolutionInfo.cs
 		script\Upload-DirectoryToS3.ps1 = script\Upload-DirectoryToS3.ps1
 	EndProjectSection
 EndProject

ISSUE_TEMPLATE.md

@@ -1,13 +1,6 @@
-Thank you for contributing! Before you submit this issue please check that you have:
-- [ ] Read the ["Submitting an Issue"](https://github.com/github/VisualStudio/blob/master/CONTRIBUTING.md#submitting-an-issue) section of the Contributor Guidelines
+Hello! Please read the contributing guidelines before submitting an issue.
 
-### Version of the GitHub Extension
-The version of the extension is at `Tools\Extensions\Installed - GitHub Extension for Visual Studio`
+- GitHub Extension version:
+- Visual Studio version:
 
-### Version of Visual Studio
-The version of VS is on the `Help\About`, on the top left, above the copyright line.
-
-### What happened
-Tell us what went wrong
-
-### Steps to reproduce
+__What happened__ (with steps, logs and screenshots, if possible)

script

@@ -0,0 +1,47 @@
+<#
+.SYNOPSIS
+    Runs NUnit
+#>
+
+[CmdletBinding()]
+Param(
+    [Parameter(Mandatory=$true)]
+    [ValidateNotNullOrEmpty()]
+    [string]
+    $project,
+	[int]$timeoutDuration,
+	[string]$configuration
+)
+
+$rootDirectory = Split-Path (Split-Path $MyInvocation.MyCommand.Path)
+Push-Location $rootDirectory
+$dll = "src\$project\bin\$configuration\$project.dll"
+
+$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,47 @@
+<#
+.SYNOPSIS
+    Runs xUnit
+#>
+
+[CmdletBinding()]
+Param(
+    [Parameter(Mandatory=$true)]
+    [ValidateNotNullOrEmpty()]
+    [string]
+    $project,
+	[int]$timeoutDuration,
+	[string]$configuration
+)
+
+$rootDirectory = Split-Path (Split-Path $MyInvocation.MyCommand.Path)
+Push-Location $rootDirectory
+
+$dll = "src\$project\bin\$configuration\$project.dll"
+
+$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,14 +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<PullRequest> CreatePullRequest(NewPullRequest pullRequest, string owner, string repo)
+        {
+            return gitHubClient.PullRequest.Create(owner, repo, pullRequest);
+        }
+
         public IObservable<Repository> GetRepositories()
         {
             return gitHubClient.Repository.GetAllForCurrent();
         }
+
+        public IObservable<Branch> GetBranches(string owner, string repo)
+        {
+            return gitHubClient.Repository.GetAllBranches(owner, repo);
+        }
     }
 }

src/GitHub.App/Api/ApiClient.cs

@@ -105,7 +105,6 @@ internal enum Trigger
         readonly IUIFactory factory;
         readonly IUIProvider uiProvider;
         readonly IRepositoryHosts hosts;
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         readonly IConnectionManager connectionManager;
 
         readonly CompositeDisposable disposables = new CompositeDisposable();
@@ -333,7 +332,8 @@ void ConfigureUIHandlingStates()
                 .OnEntryFrom(triggers[Trigger.PRDetail], (arg, tr) => RunView(UIViewType.PRDetail, CalculateDirection(tr), arg))
                 .PermitDynamic(Trigger.Next, () => Go(Trigger.Next))
                 .PermitDynamic(Trigger.Cancel, () => Go(Trigger.Cancel))
-                .PermitDynamic(Trigger.Finish, () => Go(Trigger.Finish));
+                .PermitDynamic(Trigger.Finish, () => Go(Trigger.Finish))
+                .OnExit(() => DisposeView(activeFlow, UIViewType.PRDetail));
 
             uiStateMachine.Configure(UIViewType.PRCreation)
                 .OnEntry(tr => RunView(UIViewType.PRCreation, CalculateDirection(tr)))
@@ -622,6 +622,17 @@ void DisposeFlow(UIControllerFlow flow)
             list.Clear();
         }
 
+        void DisposeView(UIControllerFlow flow, UIViewType type)
+        {
+            var list = GetObjectsForFlow(flow);
+            IUIPair uipair = null;
+            if (list.TryGetValue(type, out uipair))
+            {
+                list.Remove(type);
+                uipair.Dispose();
+            }
+        }
+
         void RunView(UIViewType viewType, LoadDirection direction, ViewWithData arg = null)
         {
             if (requestedTarget?.ViewType == viewType)

src/GitHub.App/Controllers/UIController.cs

@@ -241,6 +241,37 @@ static IObservable<T> GetAndFetchLatestFromIndex<T>(this IBlobCache This,
                 .Replay().RefCount();
         }
 
+        /// <summary>
+        /// This method adds a new object to the database and updates the
+        /// corresponding index.
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="blobCache">The cache to retrieve the object from.</param>
+        /// <param name="key">The key to look up the cache value with.</param>
+        /// <param name="item">The item to add to the database</param>
+        /// <param name="maxCacheDuration">
+        /// The maximum age of a cache object before the object is treated as
+        /// expired and unusable. Cache objects older than this will be treated
+        /// as a cache miss.
+        /// <returns></returns>
+        public static IObservable<T> PutAndUpdateIndex<T>(this IBlobCache blobCache,
+            string key,
+            Func<IObservable<T>> fetchFunc,
+            TimeSpan maxCacheDuration)
+            where T : CacheItem
+        {
+            return Observable.Defer(() =>
+            {
+                var absoluteExpiration = blobCache.Scheduler.Now + maxCacheDuration;
+                return blobCache.GetOrCreateObject(key, () => CacheIndex.Create(key))
+                    .SelectMany(index => fetchFunc()
+                            .Catch<T, Exception>(Observable.Throw<T>)
+                            .SelectMany(x => x.Save<T>(blobCache, key, absoluteExpiration))
+                            .Do(x => index.AddAndSave(blobCache, key, x, absoluteExpiration))
+                    );
+            });
+        }
+
         static bool IsExpired(IBlobCache blobCache, DateTimeOffset itemCreatedAt, TimeSpan cacheDuration)
         {
             var elapsed = blobCache.Scheduler.Now - itemCreatedAt.ToUniversalTime();