Merge remote-tracking branch 'upstream/dotnetcore' into portable2

Author: AArnott

.travis.yml

@@ -2,28 +2,21 @@
 # see travis-ci.org for details
 
 language: csharp
-mono:
- - latest
+dist: trusty
+dotnet: 1.0.1
+mono: none
 
 os:
  - osx
  - linux
 
-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
  - env | sort
- - nuget help
 
-solution: LibGit2Sharp.sln
+install:
+ - git fetch --unshallow
 
 # Build libgit2, LibGit2Sharp and run the tests
 script:
@@ -35,6 +28,7 @@ branches:
    - master
    - /^maint.*/
    - portable
+   - dotnetcore
 
 # Notify of build changes
 notifications:

LibGit2Sharp.Tests/BranchFixture.cs

@@ -1113,7 +1113,7 @@ public void TrackedBranchExistsFromDefaultConfigInEmptyClone()
 
             using (var emptyRepo = new Repository(repoPath))
             {
-                uri = new Uri(emptyRepo.Info.Path);
+                uri = new Uri($"file://{emptyRepo.Info.Path}");
             }
 
             SelfCleaningDirectory scd2 = BuildSelfCleaningDirectory();

LibGit2Sharp.Tests/CloneFixture.cs

@@ -81,7 +81,7 @@ private void AssertLocalClone(string url, string path = null, bool isCloningAnEm
         [Fact]
         public void CanCloneALocalRepositoryFromALocalUri()
         {
-            var uri = new Uri(Path.GetFullPath(BareTestRepoPath));
+            var uri = new Uri($"file://{Path.GetFullPath(BareTestRepoPath)}");
             AssertLocalClone(uri.AbsoluteUri, BareTestRepoPath);
         }
 
@@ -361,7 +361,7 @@ private class CloneCallbackInfo
         [Fact]
         public void CanRecursivelyCloneSubmodules()
         {
-            var uri = new Uri(Path.GetFullPath(SandboxSubmoduleSmallTestRepo()));
+            var uri = new Uri($"file://{Path.GetFullPath(SandboxSubmoduleSmallTestRepo())}");
             var scd = BuildSelfCleaningDirectory();
             string relativeSubmodulePath = "submodule_target_wd";
 
@@ -512,7 +512,7 @@ public void CanRecursivelyCloneSubmodules()
         [Fact]
         public void CanCancelRecursiveClone()
         {
-            var uri = new Uri(Path.GetFullPath(SandboxSubmoduleSmallTestRepo()));
+            var uri = new Uri($"file://{Path.GetFullPath(SandboxSubmoduleSmallTestRepo())}");
             var scd = BuildSelfCleaningDirectory();
             string relativeSubmodulePath = "submodule_target_wd";
 

LibGit2Sharp.Tests/FetchFixture.cs

@@ -207,7 +207,7 @@ public void CanFetchAllTagsAfterAnInitialClone()
         public void FetchHonorsTheFetchPruneConfigurationEntry()
         {
             var source = SandboxBareTestRepo();
-            var url = new Uri(Path.GetFullPath(source)).AbsoluteUri;
+            var url = new Uri($"file://{Path.GetFullPath(source)}").AbsoluteUri;
 
             var scd = BuildSelfCleaningDirectory();
 

LibGit2Sharp.Tests/TestHelpers/Constants.cs

@@ -55,44 +55,32 @@ public static string BuildPath()
         {
             string tempPath = null;
 
-            if (IsRunningOnUnix)
+            const string LibGit2TestPath = "LibGit2TestPath";
+
+            // We're running on .Net/Windows
+            if (Environment.GetEnvironmentVariables().Contains(LibGit2TestPath))
             {
-                // We're running on Mono/*nix. Let's unwrap the path
-                tempPath = UnwrapUnixTempPath();
+                Trace.TraceInformation("{0} environment variable detected", LibGit2TestPath);
+                tempPath = Environment.GetEnvironmentVariables()[LibGit2TestPath] as String;
             }
-            else
+
+            if (String.IsNullOrWhiteSpace(tempPath) || !Directory.Exists(tempPath))
+            {
+                Trace.TraceInformation("Using default test path value");
+                tempPath = Path.GetTempPath();
+            }
+
+            //workaround macOS symlinking its temp folder
+            if (tempPath.StartsWith("/var"))
             {
-                const string LibGit2TestPath = "LibGit2TestPath";
-
-                // We're running on .Net/Windows
-                if (Environment.GetEnvironmentVariables().Contains(LibGit2TestPath))
-                {
-                    Trace.TraceInformation("{0} environment variable detected", LibGit2TestPath);
-                    tempPath = Environment.GetEnvironmentVariables()[LibGit2TestPath] as String;
-                }
-
-                if (String.IsNullOrWhiteSpace(tempPath) || !Directory.Exists(tempPath))
-                {
-                    Trace.TraceInformation("Using default test path value");
-                    tempPath = Path.GetTempPath();
-                }
+                tempPath = "/private" + tempPath;
             }
 
             string testWorkingDirectory = Path.Combine(tempPath, "LibGit2Sharp-TestRepos");
             Trace.TraceInformation("Test working directory set to '{0}'", testWorkingDirectory);
             return testWorkingDirectory;
         }
 
-        private static string UnwrapUnixTempPath()
-        {
-            var type = Type.GetType("Mono.Unix.UnixPath, Mono.Posix, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756");
-
-            return (string)type.GetMethod("GetCompleteRealPath",
-                BindingFlags.Static | BindingFlags.FlattenHierarchy |
-                BindingFlags.InvokeMethod | BindingFlags.Public).Invoke(
-                null, new object[] { Path.GetTempPath() });
-        }
-
         // To help with creating secure strings to test with.
         internal static SecureString StringToSecureString(string str)
         {

build.libgit2sharp.sh

@@ -9,7 +9,8 @@ EXTRADEFINE="$1"
 # working directory in its library search path, so it works without this value.
 export LD_LIBRARY_PATH=.
 
-nuget restore
-xbuild CI/build.msbuild /target:Deploy /property:ExtraDefine="$EXTRADEFINE"
+dotnet restore
+dotnet build LibGit2Sharp.Tests/LibGit2Sharp.Tests.csproj -c Release -f netcoreapp1.0 /property:ExtraDefine="$EXTRADEFINE"
+dotnet test LibGit2Sharp.Tests/LibGit2Sharp.Tests.csproj -c Release -f netcoreapp1.0 --no-build
 
 exit $?