Merge remote-tracking branch 'upstream/master' into portable

AArnott · AArnott · commit 58a537fd1118 · 2017-04-01T20:08:21.000-07:00
diff --git a/.travis.yml b/.travis.yml
@@ -3,20 +3,20 @@
 
 language: csharp
 mono:
- - 3.12.0
- - 4.2.3
+ - latest
 
 os:
  - osx
  - linux
 
-# The newer image cannot find mono 3.12 in the PATH
-osx_image: xcode6.4
-
 env:
  global:
   - MONO_OPTIONS=--debug
 
+install:
+  - curl -L -o nuget.exe https://dist.nuget.org/win-x86-commandline/latest/nuget.exe
+  - mono nuget.exe restore LibGit2Sharp.sln
+
 before_install:
  - date -u
  - uname -a
diff --git a/LibGit2Sharp.Tests/ConfigurationFixture.cs b/LibGit2Sharp.Tests/ConfigurationFixture.cs
@@ -366,7 +366,7 @@ public static IEnumerable<object[]> ConfigAccessors
             }
         }
 
-        [Theory, PropertyData("ConfigAccessors")]
+        [Theory, MemberData(nameof(ConfigAccessors))]
         public void CanAccessConfigurationWithoutARepository(Func<string, string> localConfigurationPathProvider)
         {
             var path = SandboxStandardTestRepoGitDir();
diff --git a/LibGit2Sharp.Tests/ConflictFixture.cs b/LibGit2Sharp.Tests/ConflictFixture.cs
@@ -112,7 +112,7 @@ public void CanGetOriginalNamesOfRenameConflicts()
             }
         }
 
-        [Theory, PropertyData("ConflictData")]
+        [Theory, MemberData(nameof(ConflictData))]
         public void CanRetrieveSingleConflictByPath(string filepath, string ancestorId, string ourId, string theirId)
         {
             var path = SandboxMergedTestRepo();
diff --git a/LibGit2Sharp.Tests/IndexFixture.cs b/LibGit2Sharp.Tests/IndexFixture.cs
@@ -158,28 +158,34 @@ public void CanMoveAnExistingFileOverANonExistingFile(string sourcePath, FileSta
         }
 
         [Theory]
-        [InlineData("README", FileStatus.Unaltered, new[] { "README", "new_tracked_file.txt", "modified_staged_file.txt", "modified_unstaged_file.txt", "new_untracked_file.txt" })]
-        [InlineData("new_tracked_file.txt", FileStatus.NewInIndex, new[] { "README", "new_tracked_file.txt", "modified_staged_file.txt", "modified_unstaged_file.txt", "new_untracked_file.txt" })]
-        [InlineData("modified_staged_file.txt", FileStatus.ModifiedInIndex, new[] { "README", "new_tracked_file.txt", "modified_staged_file.txt", "modified_unstaged_file.txt", "new_untracked_file.txt" })]
-        [InlineData("modified_unstaged_file.txt", FileStatus.ModifiedInWorkdir, new[] { "README", "new_tracked_file.txt", "modified_staged_file.txt", "modified_unstaged_file.txt", "new_untracked_file.txt" })]
-        public void MovingOverAnExistingFileThrows(string sourcePath, FileStatus sourceStatus, IEnumerable<string> destPaths)
+        [InlineData("README", FileStatus.Unaltered)]
+        [InlineData("new_tracked_file.txt", FileStatus.NewInIndex)]
+        [InlineData("modified_staged_file.txt", FileStatus.ModifiedInIndex)]
+        [InlineData("modified_unstaged_file.txt", FileStatus.ModifiedInWorkdir)]
+        public void MovingOverAnExistingFileThrows(string sourcePath, FileStatus sourceStatus)
         {
+            var destPaths = new[] { "README", "new_tracked_file.txt", "modified_staged_file.txt", "modified_unstaged_file.txt", "new_untracked_file.txt" };
+
             InvalidMoveUseCases(sourcePath, sourceStatus, destPaths);
         }
 
         [Theory]
-        [InlineData("new_untracked_file.txt", FileStatus.NewInWorkdir, new[] { "README", "new_tracked_file.txt", "modified_staged_file.txt", "modified_unstaged_file.txt", "new_untracked_file.txt", "deleted_unstaged_file.txt", "deleted_staged_file.txt", "i_dont_exist.txt" })]
-        public void MovingAFileWichIsNotUnderSourceControlThrows(string sourcePath, FileStatus sourceStatus, IEnumerable<string> destPaths)
+        [InlineData("new_untracked_file.txt", FileStatus.NewInWorkdir)]
+        public void MovingAFileWichIsNotUnderSourceControlThrows(string sourcePath, FileStatus sourceStatus)
         {
+            var destPaths = new[] { "README", "new_tracked_file.txt", "modified_staged_file.txt", "modified_unstaged_file.txt", "new_untracked_file.txt", "deleted_unstaged_file.txt", "deleted_staged_file.txt", "i_dont_exist.txt" };
+
             InvalidMoveUseCases(sourcePath, sourceStatus, destPaths);
         }
 
         [Theory]
-        [InlineData("deleted_unstaged_file.txt", FileStatus.DeletedFromWorkdir, new[] { "README", "new_tracked_file.txt", "modified_staged_file.txt", "modified_unstaged_file.txt", "new_untracked_file.txt", "deleted_unstaged_file.txt", "deleted_staged_file.txt", "i_dont_exist.txt" })]
-        [InlineData("deleted_staged_file.txt", FileStatus.DeletedFromIndex, new[] { "README", "new_tracked_file.txt", "modified_staged_file.txt", "modified_unstaged_file.txt", "new_untracked_file.txt", "deleted_unstaged_file.txt", "deleted_staged_file.txt", "i_dont_exist.txt" })]
-        [InlineData("i_dont_exist.txt", FileStatus.Nonexistent, new[] { "README", "new_tracked_file.txt", "modified_staged_file.txt", "modified_unstaged_file.txt", "new_untracked_file.txt", "deleted_unstaged_file.txt", "deleted_staged_file.txt", "i_dont_exist.txt" })]
-        public void MovingAFileNotInTheWorkingDirectoryThrows(string sourcePath, FileStatus sourceStatus, IEnumerable<string> destPaths)
+        [InlineData("deleted_unstaged_file.txt", FileStatus.DeletedFromWorkdir)]
+        [InlineData("deleted_staged_file.txt", FileStatus.DeletedFromIndex)]
+        [InlineData("i_dont_exist.txt", FileStatus.Nonexistent)]
+        public void MovingAFileNotInTheWorkingDirectoryThrows(string sourcePath, FileStatus sourceStatus)
         {
+            var destPaths = new[] { "README", "new_tracked_file.txt", "modified_staged_file.txt", "modified_unstaged_file.txt", "new_untracked_file.txt", "deleted_unstaged_file.txt", "deleted_staged_file.txt", "i_dont_exist.txt" };
+
             InvalidMoveUseCases(sourcePath, sourceStatus, destPaths);
         }
 
diff --git a/LibGit2Sharp.Tests/LibGit2Sharp.Tests.csproj b/LibGit2Sharp.Tests/LibGit2Sharp.Tests.csproj
@@ -17,12 +17,12 @@
     <ProjectReference Include="..\LibGit2Sharp\LibGit2Sharp.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Moq" Version="4.2.1507.0118" />
-    <PackageReference Include="xunit" Version="1.9.2" />
-    <PackageReference Include="xunit.extensions" Version="1.9.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.1.0" />
-    <PackageReference Include="xunit.runner.console" Version="2.0.0" />
-    <PackageReference Include="xunit.runner.msbuild" Version="2.0.0" />
+    <PackageReference Include="Moq" Version="4.7.8" />
+    <PackageReference Include="xunit" Version="2.2.0" />
+    <PackageReference Include="xunit.skippablefact" Version="1.3.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
+    <PackageReference Include="xunit.runner.console" Version="2.2.0" />
+    <PackageReference Include="xunit.runner.msbuild" Version="2.2.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
   </ItemGroup>
   <Import Project="..\LibGit2Sharp\ExtraDefine.targets" />
diff --git a/LibGit2Sharp.Tests/Properties/AssemblyInfo.cs b/LibGit2Sharp.Tests/Properties/AssemblyInfo.cs
@@ -0,0 +1,3 @@
+﻿using Xunit;
+
+[assembly: CollectionBehavior(DisableTestParallelization = true)]
diff --git a/LibGit2Sharp.Tests/StageFixture.cs b/LibGit2Sharp.Tests/StageFixture.cs
@@ -101,8 +101,8 @@ public void CanStageAnUnknownFileWithLaxUnmatchedExplicitPathsValidation(string
                 Assert.Null(repo.Index[relativePath]);
                 Assert.Equal(status, repo.RetrieveStatus(relativePath));
 
-                Assert.DoesNotThrow(() => Commands.Stage(repo, relativePath));
-                Assert.DoesNotThrow(() => Commands.Stage(repo, relativePath, new StageOptions { ExplicitPathsOptions = new ExplicitPathsOptions { ShouldFailOnUnmatchedPath = false } }));
+                Commands.Stage(repo, relativePath);
+                Commands.Stage(repo, relativePath, new StageOptions { ExplicitPathsOptions = new ExplicitPathsOptions { ShouldFailOnUnmatchedPath = false } });
 
                 Assert.Equal(status, repo.RetrieveStatus(relativePath));
             }
@@ -405,8 +405,7 @@ public void CanSuccessfullyStageTheContentOfAModifiedFileOfTheSameSizeWithinTheS
 
                     Commands.Stage(repo, "test.txt");
 
-                    Assert.DoesNotThrow(() => repo.Commit(
-                                "Commit", Constants.Signature, Constants.Signature));
+                    repo.Commit("Commit", Constants.Signature, Constants.Signature);
                 }
             }
         }
diff --git a/LibGit2Sharp.Tests/TestHelpers/SkippableFactAttribute.cs b/LibGit2Sharp.Tests/TestHelpers/SkippableFactAttribute.cs
diff --git a/LibGit2Sharp.Tests/UnstageFixture.cs b/LibGit2Sharp.Tests/UnstageFixture.cs
@@ -125,7 +125,8 @@ public void CanUnstageUnknownPathsWithLaxUnmatchedExplicitPathsValidation(string
             {
                 Assert.Equal(currentStatus, repo.RetrieveStatus(relativePath));
 
-                Assert.DoesNotThrow(() => Commands.Unstage(repo, relativePath, new ExplicitPathsOptions() { ShouldFailOnUnmatchedPath = false }));
+                Commands.Unstage(repo, relativePath, new ExplicitPathsOptions() { ShouldFailOnUnmatchedPath = false });
+
                 Assert.Equal(currentStatus, repo.RetrieveStatus(relativePath));
             }
         }
@@ -201,8 +202,9 @@ public void CanUnstageUnknownPathsAgainstAnOrphanedHeadWithLaxUnmatchedExplicitP
 
                 Assert.Equal(currentStatus, repo.RetrieveStatus(relativePath));
 
-                Assert.DoesNotThrow(() => Commands.Unstage(repo, relativePath));
-                Assert.DoesNotThrow(() => Commands.Unstage(repo, relativePath, new ExplicitPathsOptions { ShouldFailOnUnmatchedPath = false }));
+                Commands.Unstage(repo, relativePath);
+                Commands.Unstage(repo, relativePath, new ExplicitPathsOptions { ShouldFailOnUnmatchedPath = false });
+
                 Assert.Equal(currentStatus, repo.RetrieveStatus(relativePath));
             }
         }
diff --git a/LibGit2Sharp.Tests/app.config b/LibGit2Sharp.Tests/app.config
@@ -1,11 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="xunit" publicKeyToken="8d05b1bb7a6fdb6c" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-1.9.2.1705" newVersion="1.9.2.1705" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
+  <startup>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6" />
+  </startup>
 </configuration>
diff --git a/appveyor.yml b/appveyor.yml
@@ -99,15 +99,15 @@ test_script:
     {
       .\packages\OpenCover\tools\OpenCover.Console.exe `
         -register:user `
-        "-target:""$Env:userprofile\.nuget\packages\xunit.runner.console\2.0.0\tools\$Env:xunit_runner""" `
+        "-target:""$Env:userprofile\.nuget\packages\xunit.runner.console\2.2.0\tools\$Env:xunit_runner""" `
         "-targetargs:""$Env:APPVEYOR_BUILD_FOLDER\bin\LibGit2Sharp.Tests\Release\net46\LibGit2Sharp.Tests.dll"" -noshadow" `
         "-filter:+[LibGit2Sharp]* -[LibGit2Sharp.Tests]*" `
         -hideskipped:All `
         -output:opencoverCoverage.xml
     }
     ElseIf ($Env:SHOULD_RUN_COVERITY_ANALYSIS -eq $False)
     {
-      & "$Env:userprofile\.nuget\packages\xunit.runner.console\2.0.0\tools\$Env:xunit_runner" `
+      & "$Env:userprofile\.nuget\packages\xunit.runner.console\2.2.0\tools\$Env:xunit_runner" `
           "$Env:APPVEYOR_BUILD_FOLDER\bin\LibGit2Sharp.Tests\Release\net46\LibGit2Sharp.Tests.dll" -noshadow
     }
 

Original file line number	Diff line number	Diff line change
`@@ -366,7 +366,7 @@ public static IEnumerable<object[]> ConfigAccessors`
`366`	`366`	`}`
`367`	`367`	`}`
`368`	`368`
`369`		`- [Theory, PropertyData("ConfigAccessors")]`
	`369`	`+ [Theory, MemberData(nameof(ConfigAccessors))]`
`370`	`370`	`public void CanAccessConfigurationWithoutARepository(Func<string, string> localConfigurationPathProvider)`
`371`	`371`	`{`
`372`	`372`	`var path = SandboxStandardTestRepoGitDir();`
Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ public void CanGetOriginalNamesOfRenameConflicts()`
`112`	`112`	`}`
`113`	`113`	`}`
`114`	`114`
`115`		`- [Theory, PropertyData("ConflictData")]`
	`115`	`+ [Theory, MemberData(nameof(ConflictData))]`
`116`	`116`	`public void CanRetrieveSingleConflictByPath(string filepath, string ancestorId, string ourId, string theirId)`
`117`	`117`	`{`
`118`	`118`	`var path = SandboxMergedTestRepo();`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+using Xunit;`
	`2`	`+`
	`3`	`+[assembly: CollectionBehavior(DisableTestParallelization = true)]`
Original file line number	Diff line number	Diff line change
`@@ -101,8 +101,8 @@ public void CanStageAnUnknownFileWithLaxUnmatchedExplicitPathsValidation(string`
`101`	`101`	`Assert.Null(repo.Index[relativePath]);`
`102`	`102`	`Assert.Equal(status, repo.RetrieveStatus(relativePath));`
`103`	`103`
`104`		`- Assert.DoesNotThrow(() => Commands.Stage(repo, relativePath));`
`105`		`- Assert.DoesNotThrow(() => Commands.Stage(repo, relativePath, new StageOptions { ExplicitPathsOptions = new ExplicitPathsOptions { ShouldFailOnUnmatchedPath = false } }));`
	`104`	`+ Commands.Stage(repo, relativePath);`
	`105`	`+ Commands.Stage(repo, relativePath, new StageOptions { ExplicitPathsOptions = new ExplicitPathsOptions { ShouldFailOnUnmatchedPath = false } });`
`106`	`106`
`107`	`107`	`Assert.Equal(status, repo.RetrieveStatus(relativePath));`
`108`	`108`	`}`
`@@ -405,8 +405,7 @@ public void CanSuccessfullyStageTheContentOfAModifiedFileOfTheSameSizeWithinTheS`
`405`	`405`
`406`	`406`	`Commands.Stage(repo, "test.txt");`
`407`	`407`
`408`		`- Assert.DoesNotThrow(() => repo.Commit(`
`409`		`- "Commit", Constants.Signature, Constants.Signature));`
	`408`	`+ repo.Commit("Commit", Constants.Signature, Constants.Signature);`
`410`	`409`	`}`
`411`	`410`	`}`
`412`	`411`	`}`
Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,8 @@ public void CanUnstageUnknownPathsWithLaxUnmatchedExplicitPathsValidation(string`
`125`	`125`	`{`
`126`	`126`	`Assert.Equal(currentStatus, repo.RetrieveStatus(relativePath));`
`127`	`127`
`128`		`- Assert.DoesNotThrow(() => Commands.Unstage(repo, relativePath, new ExplicitPathsOptions() { ShouldFailOnUnmatchedPath = false }));`
	`128`	`+ Commands.Unstage(repo, relativePath, new ExplicitPathsOptions() { ShouldFailOnUnmatchedPath = false });`
	`129`	`+`
`129`	`130`	`Assert.Equal(currentStatus, repo.RetrieveStatus(relativePath));`
`130`	`131`	`}`
`131`	`132`	`}`
`@@ -201,8 +202,9 @@ public void CanUnstageUnknownPathsAgainstAnOrphanedHeadWithLaxUnmatchedExplicitP`
`201`	`202`
`202`	`203`	`Assert.Equal(currentStatus, repo.RetrieveStatus(relativePath));`
`203`	`204`
`204`		`- Assert.DoesNotThrow(() => Commands.Unstage(repo, relativePath));`
`205`		`- Assert.DoesNotThrow(() => Commands.Unstage(repo, relativePath, new ExplicitPathsOptions { ShouldFailOnUnmatchedPath = false }));`
	`205`	`+ Commands.Unstage(repo, relativePath);`
	`206`	`+ Commands.Unstage(repo, relativePath, new ExplicitPathsOptions { ShouldFailOnUnmatchedPath = false });`
	`207`	`+`
`206`	`208`	`Assert.Equal(currentStatus, repo.RetrieveStatus(relativePath));`
`207`	`209`	`}`
`208`	`210`	`}`