diff --git a/src/GitTools.Core.Tests/Git/DynamicRepositoriesTests.cs b/src/GitTools.Core.Tests/Git/DynamicRepositoriesTests.cs
index 21843fd..0b777cc 100644
--- a/src/GitTools.Core.Tests/Git/DynamicRepositoriesTests.cs
+++ b/src/GitTools.Core.Tests/Git/DynamicRepositoriesTests.cs
@@ -32,7 +32,7 @@ public void WorksCorrectlyWithRemoteRepository(string branchName, string expecte
{
using (var fixture = new EmptyRepositoryFixture())
{
- var expectedDynamicRepoLocation = Path.Combine(tempPath, fixture.RepositoryPath.Split(Path.DirectorySeparatorChar).Last());
+ var expectedDynamicRepoLocation = Path.Combine(tempPath, fixture.RepositoryPath.Split(new[] { Path.DirectorySeparatorChar }, StringSplitOptions.RemoveEmptyEntries).Last());
fixture.Repository.MakeCommits(5);
fixture.Repository.CreateFileAndCommit("TestFile.txt");
@@ -50,7 +50,7 @@ public void WorksCorrectlyWithRemoteRepository(string branchName, string expecte
using (var dynamicRepository = DynamicRepositories.CreateOrOpen(repositoryInfo, tempPath, branchName, branch.Tip.Sha))
{
dynamicRepositoryPath = dynamicRepository.Repository.Info.Path;
- dynamicRepository.Repository.Info.Path.ShouldBe(Path.Combine(expectedDynamicRepoLocation, ".git\\"));
+ dynamicRepository.Repository.Info.Path.ShouldBe(Path.Combine(expectedDynamicRepoLocation, ".git" + Path.DirectorySeparatorChar));
var currentBranch = dynamicRepository.Repository.Head.CanonicalName;
@@ -130,7 +130,7 @@ public void PicksAnotherDirectoryNameWhenDynamicRepoFolderTaken()
{
var head = fixture.Repository.CreateFileAndCommit("TestFile.txt");
File.Copy(Path.Combine(fixture.RepositoryPath, "TestFile.txt"), Path.Combine(tempDir, "TestFile.txt"));
- expectedDynamicRepoLocation = Path.Combine(tempPath, fixture.RepositoryPath.Split(Path.DirectorySeparatorChar).Last());
+ expectedDynamicRepoLocation = Path.Combine(tempPath, fixture.RepositoryPath.Split(new[] { Path.DirectorySeparatorChar }, StringSplitOptions.RemoveEmptyEntries).Last());
Directory.CreateDirectory(expectedDynamicRepoLocation);
var repositoryInfo = new RepositoryInfo
@@ -140,7 +140,7 @@ public void PicksAnotherDirectoryNameWhenDynamicRepoFolderTaken()
using (var dynamicRepository = DynamicRepositories.CreateOrOpen(repositoryInfo, tempPath, "master", head.Sha))
{
- dynamicRepository.Repository.Info.Path.ShouldBe(Path.Combine(expectedDynamicRepoLocation + "_1", ".git\\"));
+ dynamicRepository.Repository.Info.Path.ShouldBe(Path.Combine(expectedDynamicRepoLocation + "_1", ".git" + Path.DirectorySeparatorChar));
}
}
}
diff --git a/src/GitTools.Core.Tests/Git/GitRepositoryHelperTests.cs b/src/GitTools.Core.Tests/Git/GitRepositoryHelperTests.cs
index db79be5..b02e8a2 100644
--- a/src/GitTools.Core.Tests/Git/GitRepositoryHelperTests.cs
+++ b/src/GitTools.Core.Tests/Git/GitRepositoryHelperTests.cs
@@ -220,7 +220,7 @@ public void GitHubFlowMajorRelease()
// fixture.AssertFullSemver("2.0.0");
fixture.MakeACommit();
-#if !NETCOREAPP1_1
+#if !NETCOREAPP2_0
fixture.Repository.DumpGraph();
#endif
// fixture.AssertFullSemver("2.0.1+1");
diff --git a/src/GitTools.Core.Tests/GitTools.Core.Tests.csproj b/src/GitTools.Core.Tests/GitTools.Core.Tests.csproj
index 509fd05..9dea5a5 100644
--- a/src/GitTools.Core.Tests/GitTools.Core.Tests.csproj
+++ b/src/GitTools.Core.Tests/GitTools.Core.Tests.csproj
@@ -1,26 +1,25 @@
-
+
Debug
- Any CPU
+ Any CPU
Library
- net46
- netcoreapp1.1;net46
+ netcoreapp2.0;net461
true
- full
+ full
..\..\output\debug\GitTools.Core.Tests\$(TargetFramework)\
- TRACE;DEBUG
+ TRACE;DEBUG
pdbonly
true
..\..\output\release\GitTools.Core.Tests\$(TargetFramework)\
- TRACE
+ TRACE
-
-
+
+
@@ -29,20 +28,20 @@
-
-
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
+
+
+
-
-
+
+
\ No newline at end of file
diff --git a/src/GitTools.Core/Git/DynamicRepositories.cs b/src/GitTools.Core/Git/DynamicRepositories.cs
index 244c551..ec344ea 100644
--- a/src/GitTools.Core/Git/DynamicRepositories.cs
+++ b/src/GitTools.Core/Git/DynamicRepositories.cs
@@ -70,7 +70,7 @@ static string GetLockFile(string repoPath)
static string GetAndLockTemporaryRepositoryPath(string targetUrl, string dynamicRepositoryLocation)
{
- var repositoryName = targetUrl.Split('/', '\\').Last().Replace(".git", string.Empty);
+ var repositoryName = targetUrl.Split(new[] { '/', '\\' }, StringSplitOptions.RemoveEmptyEntries).Last().Replace(".git", string.Empty);
var possiblePath = Path.Combine(dynamicRepositoryLocation, repositoryName);
var i = 1;
diff --git a/src/GitTools.Core/Git/Extensions/LibGitExtensions.cs b/src/GitTools.Core/Git/Extensions/LibGitExtensions.cs
index 043eed2..bffb5ae 100644
--- a/src/GitTools.Core/Git/Extensions/LibGitExtensions.cs
+++ b/src/GitTools.Core/Git/Extensions/LibGitExtensions.cs
@@ -150,7 +150,7 @@ public static void CheckoutFilesIfExist(this IRepository repository, params stri
}
}
-#if !NETSTANDARD1_3
+#if !NETSTANDARD2_0
public static void DumpGraph(this IRepository repository, Action writer = null, int? maxCommits = null)
{
DumpGraph(repository.Info.Path, writer, maxCommits);
diff --git a/src/GitTools.Core/GitTools.Core.csproj b/src/GitTools.Core/GitTools.Core.csproj
index 174fce8..2f82a17 100644
--- a/src/GitTools.Core/GitTools.Core.csproj
+++ b/src/GitTools.Core/GitTools.Core.csproj
@@ -2,7 +2,7 @@
Library
- netstandard1.3;net45;net40
+ netstandard2.0;net461
GitTools.Core
@@ -17,43 +17,29 @@
https://raw.github.com/GitTools/GitTools.Core/master/GitTools_logo.png
-
- TRACE;NET45;NETDESKTOP
+
+ TRACE;NET461;NETDESKTOP
-
- TRACE;NET40;NETDESKTOP
-
-
- TRACE;LIBLOG_PORTABLE;NETSTANDARD1_3;
+
+ TRACE;LIBLOG_PORTABLE;NETSTANDARD2_0;
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
-
+
+
-
-
+
+
\ No newline at end of file
diff --git a/src/GitTools.Core/GitTools.Core.nuspec b/src/GitTools.Core/GitTools.Core.nuspec
index f85439f..7eb871d 100644
--- a/src/GitTools.Core/GitTools.Core.nuspec
+++ b/src/GitTools.Core/GitTools.Core.nuspec
@@ -19,11 +19,8 @@
-
-
-
-
-
-
+
+
+
\ No newline at end of file
diff --git a/src/GitTools.Core/Helpers/ProcessHelper.cs b/src/GitTools.Core/Helpers/ProcessHelper.cs
index 2e57085..46f2b8e 100644
--- a/src/GitTools.Core/Helpers/ProcessHelper.cs
+++ b/src/GitTools.Core/Helpers/ProcessHelper.cs
@@ -1,6 +1,6 @@
-#if !NETSTANDARD1_3
+#if !NETSTANDARD2_0
namespace GitTools
-{
+{
using System;
using System.Collections.Generic;
using System.ComponentModel;
@@ -8,7 +8,7 @@ namespace GitTools
using System.IO;
using System.Runtime.InteropServices;
using System.Threading;
-
+
public static class ProcessHelper
{