diff --git a/Directory.Build.targets b/Directory.Build.targets
deleted file mode 100644
index 080355c7d..000000000
--- a/Directory.Build.targets
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
- true
-
-
-
diff --git a/LibGit2Sharp.Tests/GlobalSettingsFixture.cs b/LibGit2Sharp.Tests/GlobalSettingsFixture.cs
index 381d13d65..55260a6f5 100644
--- a/LibGit2Sharp.Tests/GlobalSettingsFixture.cs
+++ b/LibGit2Sharp.Tests/GlobalSettingsFixture.cs
@@ -22,9 +22,9 @@ public void CanGetMinimumCompiledInFeatures()
public void CanRetrieveValidVersionString()
{
// Version string format is:
- // Major.Minor.Patch[-previewTag]+g{LibGit2Sharp_abbrev_hash}.libgit2-{libgit2_abbrev_hash} (x86|x64 - features)
+ // Major.Minor.Patch[-previewTag]+{LibGit2Sharp_abbrev_hash}.libgit2-{libgit2_abbrev_hash} (x86|x64 - features)
// Example output:
- // "0.25.0-preview.52+g871d13a67f.libgit2-15e1193 (x86 - Threads, Https)"
+ // "0.25.0-preview.52+871d13a67f.libgit2-15e1193 (x86 - Threads, Https)"
string versionInfo = GlobalSettings.Version.ToString();
@@ -33,14 +33,14 @@ public void CanRetrieveValidVersionString()
// git2SharpHash: '871d13a67f' LibGit2Sharp hash.
// arch: 'x86' or 'x64' libgit2 target.
// git2Features: 'Threads, Ssh' libgit2 features compiled with.
- string regex = @"^(?\d+\.\d+\.\d+(-[\w\-\.]+)?\+(g(?[a-f0-9]{10})\.)?libgit2-[a-f0-9]{7}) \((?\w+) - (?(?:\w*(?:, )*\w+)*)\)$";
+ string regex = @"^(?\d+\.\d+\.\d+(-[\w\-\.]+)?\+((?[a-f0-9]{10})\.)?libgit2-[a-f0-9]{7}) \((?\w+) - (?(?:\w*(?:, )*\w+)*)\)$";
Assert.NotNull(versionInfo);
Match regexResult = Regex.Match(versionInfo, regex);
Assert.True(regexResult.Success, "The following version string format is enforced:" +
- "Major.Minor.Patch[-previewTag]+g{LibGit2Sharp_abbrev_hash}.libgit2-{libgit2_abbrev_hash} (x86|x64 - features). " +
+ "Major.Minor.Patch[-previewTag]+{LibGit2Sharp_abbrev_hash}.libgit2-{libgit2_abbrev_hash} (x86|x64 - features). " +
"But found \"" + versionInfo + "\" instead.");
}
diff --git a/LibGit2Sharp.Tests/LibGit2Sharp.Tests.csproj b/LibGit2Sharp.Tests/LibGit2Sharp.Tests.csproj
index c31cb9476..3503801c9 100644
--- a/LibGit2Sharp.Tests/LibGit2Sharp.Tests.csproj
+++ b/LibGit2Sharp.Tests/LibGit2Sharp.Tests.csproj
@@ -1,7 +1,7 @@
- net46;netcoreapp2.0
+ net46;netcoreapp2.1
@@ -11,23 +11,20 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
- PreserveNewest
-
+
+
+
@@ -43,4 +40,4 @@
-
+
\ No newline at end of file
diff --git a/LibGit2Sharp.Tests/xunit.runner.json b/LibGit2Sharp.Tests/xunit.runner.json
new file mode 100644
index 000000000..e54567a36
--- /dev/null
+++ b/LibGit2Sharp.Tests/xunit.runner.json
@@ -0,0 +1,4 @@
+{
+ "$schema": "https://xunit.github.io/schema/current/xunit.runner.schema.json",
+ "shadowCopy": false
+}
diff --git a/LibGit2Sharp.sln b/LibGit2Sharp.sln
index 43b82cf6c..a81b0ce37 100644
--- a/LibGit2Sharp.sln
+++ b/LibGit2Sharp.sln
@@ -1,6 +1,6 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27009.1
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.28803.202
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibGit2Sharp", "LibGit2Sharp\LibGit2Sharp.csproj", "{EE6ED99F-CB12-4683-B055-D28FC7357A34}"
EndProject
@@ -11,7 +11,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
.gitignore = .gitignore
Targets\CodeGenerator.targets = Targets\CodeGenerator.targets
Directory.Build.props = Directory.Build.props
- Directory.Build.targets = Directory.Build.targets
Targets\GenerateNativeDllName.targets = Targets\GenerateNativeDllName.targets
nuget.config = nuget.config
version.json = version.json
diff --git a/LibGit2Sharp/LibGit2Sharp.csproj b/LibGit2Sharp/LibGit2Sharp.csproj
index 4dc5085e0..3982172fc 100644
--- a/LibGit2Sharp/LibGit2Sharp.csproj
+++ b/LibGit2Sharp/LibGit2Sharp.csproj
@@ -18,20 +18,18 @@
-
- TextTemplatingFileGenerator
- Objects.cs
-
-
+
+
+
-
+
diff --git a/LibGit2Sharp/Version.cs b/LibGit2Sharp/Version.cs
index 747529e84..3795382a3 100644
--- a/LibGit2Sharp/Version.cs
+++ b/LibGit2Sharp/Version.cs
@@ -55,7 +55,7 @@ private string RetrieveAbbrevShaFrom(string sha)
///
///
/// The format of the version number is as follows:
- /// Major.Minor.Patch[-previewTag]+g{LibGit2Sharp_abbrev_hash}.libgit2-{libgit2_abbrev_hash} (x86|x64 - features)
+ /// Major.Minor.Patch[-previewTag]+{LibGit2Sharp_abbrev_hash}.libgit2-{libgit2_abbrev_hash} (x86|x64 - features)
///
///
public override string ToString()
diff --git a/appveyor.yml b/appveyor.yml
index 6d5eebafa..3db8b2b8a 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -90,7 +90,7 @@ test_script:
{
.\packages\OpenCover\tools\OpenCover.Console.exe `
-register:user `
- "-target:""$Env:userprofile\.nuget\packages\xunit.runner.console\2.4.0\tools\net46\$runner""" `
+ "-target:""$Env:userprofile\.nuget\packages\xunit.runner.console\2.4.1\tools\net46\$runner""" `
"-targetargs:""$Env:APPVEYOR_BUILD_FOLDER\bin\LibGit2Sharp.Tests\Release\net46\LibGit2Sharp.Tests.dll"" -noshadow" `
"-filter:+[LibGit2Sharp]* -[LibGit2Sharp.Tests]*" `
-hideskipped:All `
@@ -98,12 +98,12 @@ test_script:
}
ElseIf ($Env:SHOULD_RUN_COVERITY_ANALYSIS -eq $False)
{
- & "$Env:userprofile\.nuget\packages\xunit.runner.console\2.4.0\tools\net46\$runner" `
+ & "$Env:userprofile\.nuget\packages\xunit.runner.console\2.4.1\tools\net46\$runner" `
"$Env:APPVEYOR_BUILD_FOLDER\bin\LibGit2Sharp.Tests\Release\net46\LibGit2Sharp.Tests.dll" -noshadow
}
}
-- dotnet test LibGit2Sharp.Tests/LibGit2Sharp.Tests.csproj -f netcoreapp2.0 --no-restore --no-build
+- dotnet test LibGit2Sharp.Tests/LibGit2Sharp.Tests.csproj -f netcoreapp2.1 --no-restore --no-build
after_test:
- ps: |
diff --git a/buildandtest.cmd b/buildandtest.cmd
index 3bc1d6656..612161b87 100644
--- a/buildandtest.cmd
+++ b/buildandtest.cmd
@@ -31,9 +31,9 @@ dotnet build "%~dp0\" /v:minimal /nologo /property:ExtraDefine="%EXTRADEFINE%"
@IF ERRORLEVEL 1 EXIT /B %ERRORLEVEL%
:: Run tests on Desktop and CoreCLR
-"%userprofile%\.nuget\packages\xunit.runner.console\2.4.0\tools\net452\xunit.console.exe" "%~dp0bin\LibGit2Sharp.Tests\%Configuration%\net46\LibGit2Sharp.Tests.dll" -noshadow
+"%userprofile%\.nuget\packages\xunit.runner.console\2.4.1\tools\net46\xunit.console.exe" "%~dp0bin\LibGit2Sharp.Tests\%Configuration%\net46\LibGit2Sharp.Tests.dll" -noshadow
@IF ERRORLEVEL 1 EXIT /B %ERRORLEVEL%
-dotnet test "%~dp0LibGit2Sharp.Tests/LibGit2Sharp.Tests.csproj" -f netcoreapp2.0 --no-restore --no-build
+dotnet test "%~dp0LibGit2Sharp.Tests/LibGit2Sharp.Tests.csproj" -f netcoreapp2.1 --no-restore --no-build
@IF ERRORLEVEL 1 EXIT /B %ERRORLEVEL%
EXIT /B %ERRORLEVEL%
diff --git a/buildandtest.sh b/buildandtest.sh
index a5501a042..24994cdae 100755
--- a/buildandtest.sh
+++ b/buildandtest.sh
@@ -15,7 +15,7 @@ export Configuration=release
# On linux we don't pack because we can't build for net40.
# We just build for CoreCLR and run tests for it.
dotnet restore
-dotnet build LibGit2Sharp.Tests -f netcoreapp2.0 -property:ExtraDefine="$EXTRADEFINE" -fl -flp:verbosity=detailed
-dotnet test LibGit2Sharp.Tests/LibGit2Sharp.Tests.csproj -f netcoreapp2.0 --no-restore --no-build
+dotnet build LibGit2Sharp.Tests -f netcoreapp2.1 -property:ExtraDefine="$EXTRADEFINE" -fl -flp:verbosity=detailed
+dotnet test LibGit2Sharp.Tests/LibGit2Sharp.Tests.csproj -f netcoreapp2.1 --no-restore --no-build
exit $?