Skip to content
This repository was archived by the owner on Jun 21, 2023. It is now read-only.

Commit c7ad80b

Browse files
author
Meaghan Lewis
authored
Merge branch 'master' into feature/sso
2 parents c32a81a + 8ca54d7 commit c7ad80b

File tree

73 files changed

+1563
-2044
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+1563
-2044
lines changed

‎scripts/Run-XUnit.ps1‎

Lines changed: 0 additions & 55 deletions
This file was deleted.

‎scripts/test.ps1‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,13 @@ if (!$?) {
4747
}
4848

4949
Write-Output "Running UnitTests..."
50-
Run-XUnit test UnitTests $TimeoutDuration $config -AppVeyor:$AppVeyor
50+
Run-NUnit test UnitTests $TimeoutDuration $config -AppVeyor:$AppVeyor
5151
if (!$?) {
5252
$exitcode = 3
5353
}
5454

5555
Write-Output "Running GitHub.InlineReviews.UnitTests..."
56-
Run-XUnit test GitHub.InlineReviews.UnitTests $TimeoutDuration $config -AppVeyor:$AppVeyor
56+
Run-NUnit test GitHub.InlineReviews.UnitTests $TimeoutDuration $config -AppVeyor:$AppVeyor
5757
if (!$?) {
5858
$exitcode = 4
5959
}

‎src/GitHub.VisualStudio/Views/GitHubPane/PullRequestDetailView.xaml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,6 +294,7 @@
294294
Background="Transparent"
295295
BorderThickness="0"
296296
Margin="0 6 0 0"
297+
KeyUp="FileListKeyUp"
297298
MouseRightButtonDown="FileListMouseRightButtonDown"
298299
MouseDoubleClick="FileListMouseDoubleClick">
299300
<TreeView.ItemContainerStyle>
@@ -312,7 +313,8 @@
312313
</HierarchicalDataTemplate>
313314
<DataTemplate DataType="{x:Type vm:PullRequestFileNode}">
314315
<StackPanel Orientation="Horizontal"
315-
Tag="{Binding DataContext, RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type ui:SectionControl}}}">
316+
Tag="{Binding DataContext, RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type ui:SectionControl}}}"
317+
KeyboardNavigation.DirectionalNavigation="None">
316318
<ui:OcticonImage Icon="file_code" Margin="0,0,0,2">
317319
<ui:OcticonImage.Style>
318320
<Style TargetType="ui:OcticonImage" BasedOn="{StaticResource OcticonImage}">

‎src/GitHub.VisualStudio/Views/GitHubPane/PullRequestDetailView.xaml.cs‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,18 @@ void ShowErrorInStatusBar(string message, Exception e)
202202
ns?.ShowMessage(message + ": " + e.Message);
203203
}
204204

205+
private void FileListKeyUp(object sender, KeyEventArgs e)
206+
{
207+
if (e.Key == Key.Return)
208+
{
209+
var file = (e.OriginalSource as FrameworkElement)?.DataContext as IPullRequestFileNode;
210+
if (file != null)
211+
{
212+
DoDiffFile(file, false).Forget();
213+
}
214+
}
215+
}
216+
205217
void FileListMouseDoubleClick(object sender, MouseButtonEventArgs e)
206218
{
207219
var file = (e.OriginalSource as FrameworkElement)?.DataContext as IPullRequestFileNode;

‎test/GitHub.InlineReviews.UnitTests/GitHub.InlineReviews.UnitTests.csproj‎

Lines changed: 15 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\..\packages\xunit.runner.visualstudio.2.3.1\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\..\packages\xunit.runner.visualstudio.2.3.1\build\net20\xunit.runner.visualstudio.props')" />
4-
<Import Project="..\..\packages\xunit.runner.console.2.3.1\build\xunit.runner.console.props" Condition="Exists('..\..\packages\xunit.runner.console.2.3.1\build\xunit.runner.console.props')" />
5-
<Import Project="..\..\packages\xunit.core.2.3.1\build\xunit.core.props" Condition="Exists('..\..\packages\xunit.core.2.3.1\build\xunit.core.props')" />
6-
<Import Project="..\..\packages\LibGit2Sharp.NativeBinaries.1.0.164\build\LibGit2Sharp.NativeBinaries.props" Condition="Exists('..\..\packages\LibGit2Sharp.NativeBinaries.1.0.164\build\LibGit2Sharp.NativeBinaries.props')" />
7-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
83
<PropertyGroup>
94
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
105
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -69,6 +64,9 @@
6964
<HintPath>..\..\packages\NSubstitute.2.0.3\lib\net45\NSubstitute.dll</HintPath>
7065
<Private>True</Private>
7166
</Reference>
67+
<Reference Include="nunit.framework, Version=3.9.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
68+
<HintPath>..\..\packages\NUnit.3.9.0\lib\net45\nunit.framework.dll</HintPath>
69+
</Reference>
7270
<Reference Include="System" />
7371
<Reference Include="System.Core" />
7472
<Reference Include="System.Net.Http, Version=4.1.0.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
@@ -112,21 +110,21 @@
112110
<Reference Include="Microsoft.CSharp" />
113111
<Reference Include="System.Data" />
114112
<Reference Include="System.Xml" />
115-
<Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
116-
<HintPath>..\..\packages\xunit.abstractions.2.0.1\lib\net35\xunit.abstractions.dll</HintPath>
117-
<Private>True</Private>
113+
<Reference Include="nunit.core, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
114+
<HintPath>..\..\packages\NUnitTestAdapter.2.0.0\lib\nunit.core.dll</HintPath>
115+
<Private>False</Private>
118116
</Reference>
119-
<Reference Include="xunit.assert, Version=2.3.1.3858, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
120-
<HintPath>..\..\packages\xunit.assert.2.3.1\lib\netstandard1.1\xunit.assert.dll</HintPath>
121-
<Private>True</Private>
117+
<Reference Include="nunit.core.interfaces, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
118+
<HintPath>..\..\packages\NUnitTestAdapter.2.0.0\lib\nunit.core.interfaces.dll</HintPath>
119+
<Private>False</Private>
122120
</Reference>
123-
<Reference Include="xunit.core, Version=2.3.1.3858, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
124-
<HintPath>..\..\packages\xunit.extensibility.core.2.3.1\lib\netstandard1.1\xunit.core.dll</HintPath>
125-
<Private>True</Private>
121+
<Reference Include="nunit.util, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
122+
<HintPath>..\..\packages\NUnitTestAdapter.2.0.0\lib\nunit.util.dll</HintPath>
123+
<Private>False</Private>
126124
</Reference>
127-
<Reference Include="xunit.execution.desktop, Version=2.3.1.3858, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
128-
<HintPath>..\..\packages\xunit.extensibility.execution.2.3.1\lib\net452\xunit.execution.desktop.dll</HintPath>
129-
<Private>True</Private>
125+
<Reference Include="NUnit.VisualStudio.TestAdapter, Version=2.0.0.0, Culture=neutral, PublicKeyToken=4cb40d35494691ac, processorArchitecture=MSIL">
126+
<HintPath>..\..\packages\NUnitTestAdapter.2.0.0\lib\NUnit.VisualStudio.TestAdapter.dll</HintPath>
127+
<Private>False</Private>
130128
</Reference>
131129
</ItemGroup>
132130
<ItemGroup>
@@ -195,21 +193,12 @@
195193
<ItemGroup>
196194
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
197195
</ItemGroup>
198-
<ItemGroup>
199-
<Analyzer Include="..\..\packages\xunit.analyzers.0.7.0\analyzers\dotnet\cs\xunit.analyzers.dll" />
200-
</ItemGroup>
201196
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
202197
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
203198
<PropertyGroup>
204199
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
205200
</PropertyGroup>
206-
<Error Condition="!Exists('..\..\packages\LibGit2Sharp.NativeBinaries.1.0.164\build\LibGit2Sharp.NativeBinaries.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\LibGit2Sharp.NativeBinaries.1.0.164\build\LibGit2Sharp.NativeBinaries.props'))" />
207-
<Error Condition="!Exists('..\..\packages\xunit.core.2.3.1\build\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.core.2.3.1\build\xunit.core.props'))" />
208-
<Error Condition="!Exists('..\..\packages\xunit.core.2.3.1\build\xunit.core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.core.2.3.1\build\xunit.core.targets'))" />
209-
<Error Condition="!Exists('..\..\packages\xunit.runner.console.2.3.1\build\xunit.runner.console.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.runner.console.2.3.1\build\xunit.runner.console.props'))" />
210-
<Error Condition="!Exists('..\..\packages\xunit.runner.visualstudio.2.3.1\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.runner.visualstudio.2.3.1\build\net20\xunit.runner.visualstudio.props'))" />
211201
</Target>
212-
<Import Project="..\..\packages\xunit.core.2.3.1\build\xunit.core.targets" Condition="Exists('..\..\packages\xunit.core.2.3.1\build\xunit.core.targets')" />
213202
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
214203
Other similar extension points exist, see Microsoft.Common.targets.
215204
<Target Name="BeforeBuild">

0 commit comments

Comments
 (0)