Merge branch 'master' into feature/sso

Author: grokys

scripts/Run-NUnit.ps1

@@ -40,7 +40,14 @@ $xml = Join-Path $rootDirectory "nunit-$Project.xml"
         exit -1
     }
 
-    Run-Process -Fatal $TimeoutDuration $consoleRunner $dll,"--where ""cat != Timings""","--result=$xml;format=AppVeyor"
+    $args = @()
+    if ($AppVeyor) {
+        $args = $dll, "--where", "cat!=Timings", "--result=$xml;format=AppVeyor"
+    } else {
+        $args = $dll, "--where", "cat!=Timings", "--result=$xml"
+    }
+
+    Run-Process -Fatal $TimeoutDuration $consoleRunner $args
     if (!$?) {
         Die 1 "$Project tests failed"
     }

scripts/test.ps1

@@ -30,7 +30,7 @@ if ($Trace) {
     Set-PSDebug -Trace 1
 }
 
-$env:PATH = "$$PSScriptRoot;$env:PATH"
+$env:PATH = "$PSScriptRoot;$env:PATH"
 
 $exitcode = 0
 

src/GitHub.UI.Reactive/Assets/Controls/ErrorMessageDisplay.xaml

@@ -17,7 +17,7 @@
                         </Grid.ColumnDefinitions>
                         <Viewbox
                             Grid.Column="0"
-                            VerticalAlignment="Center" 
+                            VerticalAlignment="Top" 
                             HorizontalAlignment="Right"
                             Margin="{TemplateBinding IconMargin}"
                             Width="16"

src/GitHub.VisualStudio/Views/Dialog/RepositoryCloneView.xaml

@@ -168,10 +168,11 @@
                 DockPanel.Dock="Top">
       <uirx:ErrorMessageDisplay x:Name="loadingFailedMessage"
                                 Margin="8,0"
-                                Content="{x:Static prop:Resources.loadingFailedMessageContent}"
                                 Icon="stop"
                                 Message="{x:Static prop:Resources.loadingFailedMessageMessage}"
-                                Visibility="{Binding LoadingFailed, Mode=OneWay, Converter={ui:BooleanToVisibilityConverter}}" />
+                                Visibility="{Binding LoadingFailed, Mode=OneWay, Converter={ui:BooleanToVisibilityConverter}}">
+        <TextBlock Text="{x:Static prop:Resources.loadingFailedMessageContent}" TextWrapping="Wrap" />
+      </uirx:ErrorMessageDisplay>  
     </StackPanel>
 
     <ui:OcticonCircleButton x:Name="cloneButton"

test.cmd

@@ -1,8 +1,2 @@
-@rem Tests currently only work on `Release` build.
-@if "%config%" == "" set config=Release
-
-call "%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\Common7\Tools\VsDevCmd.bat"
-
-msbuild GitHubVS.sln /p:Configuration=%Config%
-VSTest.Console.exe src\UnitTests\bin\%Config%\UnitTests.dll /TestAdapterPath:"."
-VSTest.Console.exe src\TrackingCollectionTests\bin\%Config%\TrackingCollectionTests.dll /TestAdapterPath:"."
+@if "%1" == "" echo Please specify Debug or Release && EXIT /B
+powershell -ExecutionPolicy Unrestricted scripts\test.ps1 -Config:%1