From f670d1d70ccc016324b97195d0db9bd994e65364 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asbj=C3=B8rn=20Ulsberg?= Date: Wed, 30 Mar 2016 09:24:33 +0200 Subject: [PATCH 01/23] Upgrade LibGit2Sharp Upgraded LibGit2Sharp from version 0.22.0-pre20150716071016 to version 0.22.0 and its associated LibGit2Sharp.NativeBinaries from version 1.0.72 to version 1.0.129. --- src/GitVersionCore.Tests/Mocks/MockRepository.cs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/GitVersionCore.Tests/Mocks/MockRepository.cs b/src/GitVersionCore.Tests/Mocks/MockRepository.cs index efee409966..17d2cc5e8c 100644 --- a/src/GitVersionCore.Tests/Mocks/MockRepository.cs +++ b/src/GitVersionCore.Tests/Mocks/MockRepository.cs @@ -97,6 +97,12 @@ public void Reset(ResetMode resetMode, Commit commit, CheckoutOptions options) throw new NotImplementedException(); } + public void Reset(ResetMode resetMode, Commit commit, CheckoutOptions options) + { + throw new NotImplementedException(); + } + + public Dictionary LookupResults { get; set; } public Commit Commit(string message, Signature author, Signature committer, bool amendPreviousCommit = false) From 65068b722a5c7602d63723e8db04fddc9873679e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asbj=C3=B8rn=20Ulsberg?= Date: Wed, 30 Mar 2016 10:47:42 +0200 Subject: [PATCH 02/23] Fixed some obsolete warnings Changed usage of `Branch.Name` to `Branch.FriendlyName` and a few other properties and methods made obsolete by LibGit2Sharp v0.22.0. --- src/GitVersionCore.Tests/Mocks/MockBranch.cs | 17 +++++++++-------- .../Mocks/MockBranchCollection.cs | 4 ++-- src/GitVersionCore.Tests/Mocks/MockTag.cs | 2 ++ 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/src/GitVersionCore.Tests/Mocks/MockBranch.cs b/src/GitVersionCore.Tests/Mocks/MockBranch.cs index 174da040ea..6dd8a39eed 100644 --- a/src/GitVersionCore.Tests/Mocks/MockBranch.cs +++ b/src/GitVersionCore.Tests/Mocks/MockBranch.cs @@ -1,3 +1,4 @@ +using System; using System.Collections; using System.Collections.Generic; using System.Linq; @@ -5,14 +6,14 @@ public class MockBranch : Branch, ICollection { - public MockBranch(string name) + public MockBranch(string friendlyName) { - this.name = name; - canonicalName = name; + this.friendlyName = friendlyName; + this.canonicalName = friendlyName; } - public MockBranch(string name, string canonicalName) + public MockBranch(string friendlyName, string canonicalName) { - this.name = name; + this.friendlyName = friendlyName; this.canonicalName = canonicalName; } @@ -21,9 +22,9 @@ public MockBranch() } MockCommitLog commits = new MockCommitLog(); - string name; + string friendlyName; string canonicalName; - public override string FriendlyName { get { return name; } } + public override string FriendlyName { get { return friendlyName; } } public override ICommitLog Commits { get { return commits; } } public override Commit Tip { get { return commits.First(); } } public override bool IsTracking { get { return true; } } @@ -35,7 +36,7 @@ public override string CanonicalName public override int GetHashCode() { - return name.GetHashCode(); + return this.friendlyName.GetHashCode(); } public override bool Equals(object obj) diff --git a/src/GitVersionCore.Tests/Mocks/MockBranchCollection.cs b/src/GitVersionCore.Tests/Mocks/MockBranchCollection.cs index 540166aeca..d7fdf41441 100644 --- a/src/GitVersionCore.Tests/Mocks/MockBranchCollection.cs +++ b/src/GitVersionCore.Tests/Mocks/MockBranchCollection.cs @@ -11,9 +11,9 @@ public override IEnumerator GetEnumerator() return Branches.GetEnumerator(); } - public override Branch this[string name] + public override Branch this[string friendlyName] { - get { return Branches.FirstOrDefault(x => x.FriendlyName == name); } + get { return Branches.FirstOrDefault(x => x.FriendlyName == friendlyName); } } public void Add(Branch item) diff --git a/src/GitVersionCore.Tests/Mocks/MockTag.cs b/src/GitVersionCore.Tests/Mocks/MockTag.cs index a4816ff377..cb4065e38e 100644 --- a/src/GitVersionCore.Tests/Mocks/MockTag.cs +++ b/src/GitVersionCore.Tests/Mocks/MockTag.cs @@ -1,3 +1,5 @@ +using System; + using LibGit2Sharp; public class MockTag : Tag From 78702316e4dd32e1e3e7e498b471a0f5a9387940 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asbj=C3=B8rn=20Ulsberg?= Date: Wed, 30 Mar 2016 15:10:30 +0200 Subject: [PATCH 03/23] Added Unix guards Added Unix guards on the `AfterBuild` MSBuild target, so `ilmerge.exe` won't be attempted to run under Mono, where it will fail with an exit code of `126` (whatever that means). --- src/GitVersionExe/GitVersionExe.csproj | 2 +- src/GitVersionTask/GitVersionTask.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/GitVersionExe/GitVersionExe.csproj b/src/GitVersionExe/GitVersionExe.csproj index a7ca56fc59..737c3e2b30 100644 --- a/src/GitVersionExe/GitVersionExe.csproj +++ b/src/GitVersionExe/GitVersionExe.csproj @@ -133,7 +133,7 @@ ]]> - + mono diff --git a/src/GitVersionTask/GitVersionTask.csproj b/src/GitVersionTask/GitVersionTask.csproj index 4f9b0dbac1..ccfdcfa1d2 100644 --- a/src/GitVersionTask/GitVersionTask.csproj +++ b/src/GitVersionTask/GitVersionTask.csproj @@ -105,7 +105,7 @@ - + mono From 82fee0ff0c7e1bdd46c50340c20bba6091c2e834 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asbj=C3=B8rn=20Ulsberg?= Date: Wed, 30 Mar 2016 15:30:05 +0200 Subject: [PATCH 04/23] Added NUnit.Runners Added reference to NUnit.Runners so we can run unit tests in the console (for Mono/Travis builds, especially). --- src/GitVersionCore.Tests/packages.config | 1 + 1 file changed, 1 insertion(+) diff --git a/src/GitVersionCore.Tests/packages.config b/src/GitVersionCore.Tests/packages.config index 716e1572f8..ea230f83a3 100644 --- a/src/GitVersionCore.Tests/packages.config +++ b/src/GitVersionCore.Tests/packages.config @@ -9,6 +9,7 @@ + From 40dfbf9b84db43b15dffb5eee95526f646df85cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asbj=C3=B8rn=20Ulsberg?= Date: Wed, 30 Mar 2016 15:41:21 +0200 Subject: [PATCH 05/23] Added Travis build file --- .travis.yml | 10 ++++++++++ src/GitVersion.sln | 1 + 2 files changed, 11 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000000..83a927949b --- /dev/null +++ b/.travis.yml @@ -0,0 +1,10 @@ +language: csharp +solution: src/GitVersion.sln +sudo: false +install: + - mkdir -p src/.nuget + - wget -NO src/.nuget/nuget.exe https://dist.nuget.org/win-x86-commandline/latest/nuget.exe +script: + - mono --runtime=v4.0.30319 "src/.nuget/nuget.exe" Restore "./src/GitVersion.sln" + - xbuild "./src/GitVersion.sln" + - mono --debug --runtime=v4.0.30319 ./src/packages/NUnit.Runners.2.6.4/tools/nunit-console.exe ./src/GitVersionTask.Tests/bin/Debug/GitVersionTask.Tests.dll ./src/GitVersionCore.Tests/bin/Debug/GitVersionCore.Tests.dll ./src/GitVersionTask.Tests/bin/Debug/GitVersionTask.Tests.dll ./src/GitVersionExe.Tests/bin/Debug/GitVersionExe.Tests.dll -nodots \ No newline at end of file diff --git a/src/GitVersion.sln b/src/GitVersion.sln index 40edb86d9b..21be8e6c7c 100644 --- a/src/GitVersion.sln +++ b/src/GitVersion.sln @@ -13,6 +13,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitVersionCore.Tests", "Git EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{3EFFC5D6-88D0-49D9-BB53-E1B7EB49DD45}" ProjectSection(SolutionItems) = preProject + ..\.travis.yml = ..\.travis.yml ..\appveyor.yml = ..\appveyor.yml ..\BREAKING CHANGES.md = ..\BREAKING CHANGES.md ..\Build.cmd = ..\Build.cmd From 926c734664f935a18a88f51a6ebc14ebbd84c628 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asbj=C3=B8rn=20Ulsberg?= Date: Thu, 31 Mar 2016 07:24:45 +0200 Subject: [PATCH 06/23] Use NuGet directly from Travis and install NUnit.Runners in the install step --- .travis.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 83a927949b..d7da408675 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,9 +2,8 @@ language: csharp solution: src/GitVersion.sln sudo: false install: - - mkdir -p src/.nuget - - wget -NO src/.nuget/nuget.exe https://dist.nuget.org/win-x86-commandline/latest/nuget.exe + - nuget restore src/GitVersion.sln + - nuget install NUnit.Runners -Version 2.6.4 -OutputDirectory nunit script: - - mono --runtime=v4.0.30319 "src/.nuget/nuget.exe" Restore "./src/GitVersion.sln" - - xbuild "./src/GitVersion.sln" - - mono --debug --runtime=v4.0.30319 ./src/packages/NUnit.Runners.2.6.4/tools/nunit-console.exe ./src/GitVersionTask.Tests/bin/Debug/GitVersionTask.Tests.dll ./src/GitVersionCore.Tests/bin/Debug/GitVersionCore.Tests.dll ./src/GitVersionTask.Tests/bin/Debug/GitVersionTask.Tests.dll ./src/GitVersionExe.Tests/bin/Debug/GitVersionExe.Tests.dll -nodots \ No newline at end of file + - xbuild /p:Configuration=Debug "./src/GitVersion.sln" + - mono --debug --runtime=v4.0.30319 ./nunit/NUnit.Runners.2.6.4/tools/nunit-console.exe ./src/GitVersionTask.Tests/bin/Debug/GitVersionTask.Tests.dll ./src/GitVersionCore.Tests/bin/Debug/GitVersionCore.Tests.dll ./src/GitVersionTask.Tests/bin/Debug/GitVersionTask.Tests.dll ./src/GitVersionExe.Tests/bin/Debug/GitVersionExe.Tests.dll -nodots \ No newline at end of file From a0e035847bfdb5f7b44a5a46b20d9603143382f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asbj=C3=B8rn=20Ulsberg?= Date: Thu, 31 Mar 2016 07:28:00 +0200 Subject: [PATCH 07/23] Don't send in the "Debug" configuration parameter --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d7da408675..47d3afd4c4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,5 +5,5 @@ install: - nuget restore src/GitVersion.sln - nuget install NUnit.Runners -Version 2.6.4 -OutputDirectory nunit script: - - xbuild /p:Configuration=Debug "./src/GitVersion.sln" + - xbuild "./src/GitVersion.sln" - mono --debug --runtime=v4.0.30319 ./nunit/NUnit.Runners.2.6.4/tools/nunit-console.exe ./src/GitVersionTask.Tests/bin/Debug/GitVersionTask.Tests.dll ./src/GitVersionCore.Tests/bin/Debug/GitVersionCore.Tests.dll ./src/GitVersionTask.Tests/bin/Debug/GitVersionTask.Tests.dll ./src/GitVersionExe.Tests/bin/Debug/GitVersionExe.Tests.dll -nodots \ No newline at end of file From d0e45db978945b6a509da2a17a888cdd7b74c75e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asbj=C3=B8rn=20Ulsberg?= Date: Thu, 31 Mar 2016 08:20:39 +0200 Subject: [PATCH 08/23] Removed NUnit.Runners as Travis should install it --- src/GitVersionCore.Tests/packages.config | 1 - 1 file changed, 1 deletion(-) diff --git a/src/GitVersionCore.Tests/packages.config b/src/GitVersionCore.Tests/packages.config index ea230f83a3..716e1572f8 100644 --- a/src/GitVersionCore.Tests/packages.config +++ b/src/GitVersionCore.Tests/packages.config @@ -9,7 +9,6 @@ - From 2b19400e21f31d183a526de7af410c6ade16ed40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asbj=C3=B8rn=20Ulsberg?= Date: Thu, 31 Mar 2016 08:57:03 +0200 Subject: [PATCH 09/23] Upgraded NUnit with runners from v2.6.4 to v3.2 --- .travis.yml | 4 ++-- src/GitVersionCore.Tests/GitVersionCore.Tests.csproj | 6 +++--- src/GitVersionCore.Tests/packages.config | 2 +- src/GitVersionExe.Tests/GitVersionExe.Tests.csproj | 6 +++--- src/GitVersionExe.Tests/packages.config | 2 +- src/GitVersionTask.Tests/AssemblyInfoBuilderTests.cs | 4 ++-- src/GitVersionTask.Tests/GitVersionTask.Tests.csproj | 6 +++--- src/GitVersionTask.Tests/packages.config | 2 +- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.travis.yml b/.travis.yml index 47d3afd4c4..0f86297f36 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ solution: src/GitVersion.sln sudo: false install: - nuget restore src/GitVersion.sln - - nuget install NUnit.Runners -Version 2.6.4 -OutputDirectory nunit + - nuget install NUnit.Runners -Version 3.2.0 -OutputDirectory ./src/packages script: - xbuild "./src/GitVersion.sln" - - mono --debug --runtime=v4.0.30319 ./nunit/NUnit.Runners.2.6.4/tools/nunit-console.exe ./src/GitVersionTask.Tests/bin/Debug/GitVersionTask.Tests.dll ./src/GitVersionCore.Tests/bin/Debug/GitVersionCore.Tests.dll ./src/GitVersionTask.Tests/bin/Debug/GitVersionTask.Tests.dll ./src/GitVersionExe.Tests/bin/Debug/GitVersionExe.Tests.dll -nodots \ No newline at end of file + - mono --debug --runtime=v4.0.30319 ./src/packages/NUnit.ConsoleRunner.3.2.0/tools/nunit3-console.exe ./src/GitVersionTask.Tests/bin/Debug/GitVersionTask.Tests.dll ./src/GitVersionCore.Tests/bin/Debug/GitVersionCore.Tests.dll ./src/GitVersionTask.Tests/bin/Debug/GitVersionTask.Tests.dll ./src/GitVersionExe.Tests/bin/Debug/GitVersionExe.Tests.dll \ No newline at end of file diff --git a/src/GitVersionCore.Tests/GitVersionCore.Tests.csproj b/src/GitVersionCore.Tests/GitVersionCore.Tests.csproj index 914aa94967..ec247b6845 100644 --- a/src/GitVersionCore.Tests/GitVersionCore.Tests.csproj +++ b/src/GitVersionCore.Tests/GitVersionCore.Tests.csproj @@ -66,9 +66,9 @@ ..\packages\NUnitTestAdapter.2.0.0\lib\nunit.core.interfaces.dll True - - False - ..\packages\NUnit.2.6.4\lib\nunit.framework.dll + + ..\packages\NUnit.3.2.0\lib\net45\nunit.framework.dll + True ..\packages\NUnitTestAdapter.2.0.0\lib\nunit.util.dll diff --git a/src/GitVersionCore.Tests/packages.config b/src/GitVersionCore.Tests/packages.config index 716e1572f8..abfea4ee49 100644 --- a/src/GitVersionCore.Tests/packages.config +++ b/src/GitVersionCore.Tests/packages.config @@ -8,7 +8,7 @@ - + diff --git a/src/GitVersionExe.Tests/GitVersionExe.Tests.csproj b/src/GitVersionExe.Tests/GitVersionExe.Tests.csproj index 30bbfcd843..3129325fae 100644 --- a/src/GitVersionExe.Tests/GitVersionExe.Tests.csproj +++ b/src/GitVersionExe.Tests/GitVersionExe.Tests.csproj @@ -59,9 +59,9 @@ ..\packages\NUnitTestAdapter.2.0.0\lib\nunit.core.interfaces.dll True - - False - ..\packages\NUnit.2.6.4\lib\nunit.framework.dll + + ..\packages\NUnit.3.2.0\lib\net45\nunit.framework.dll + True ..\packages\NUnitTestAdapter.2.0.0\lib\nunit.util.dll diff --git a/src/GitVersionExe.Tests/packages.config b/src/GitVersionExe.Tests/packages.config index e2133b0c62..ff1dcaa78f 100644 --- a/src/GitVersionExe.Tests/packages.config +++ b/src/GitVersionExe.Tests/packages.config @@ -5,7 +5,7 @@ - + \ No newline at end of file diff --git a/src/GitVersionTask.Tests/AssemblyInfoBuilderTests.cs b/src/GitVersionTask.Tests/AssemblyInfoBuilderTests.cs index b8a8ec7a43..ae2c184e6b 100644 --- a/src/GitVersionTask.Tests/AssemblyInfoBuilderTests.cs +++ b/src/GitVersionTask.Tests/AssemblyInfoBuilderTests.cs @@ -148,10 +148,10 @@ public void VerifyAssemblyVersion_MajorMinorPatchTag([ValueSource("compilers")]I [Test] [MethodImpl(MethodImplOptions.NoInlining)] - [ExpectedException(typeof(WarningException))] public void VerifyAssemblyVersion_Major_InvalidInformationalValue([ValueSource("compilers")]ICompiler compiler) { - VerifyAssemblyVersion(compiler, AssemblyVersioningScheme.Major, "{ThisVariableDoesntExist}"); + var exception = Assert.Throws(() => VerifyAssemblyVersion(compiler, AssemblyVersioningScheme.Major, "{ThisVariableDoesntExist}")); + Assert.That(exception.Message, Does.Contain("ThisVariableDoesntExist")); } [Test] diff --git a/src/GitVersionTask.Tests/GitVersionTask.Tests.csproj b/src/GitVersionTask.Tests/GitVersionTask.Tests.csproj index 8bddac280a..7780aab59b 100644 --- a/src/GitVersionTask.Tests/GitVersionTask.Tests.csproj +++ b/src/GitVersionTask.Tests/GitVersionTask.Tests.csproj @@ -94,9 +94,9 @@ ..\packages\NUnitTestAdapter.2.0.0\lib\nunit.core.interfaces.dll True - - False - ..\packages\NUnit.2.6.4\lib\nunit.framework.dll + + ..\packages\NUnit.3.2.0\lib\net45\nunit.framework.dll + True ..\packages\NUnitTestAdapter.2.0.0\lib\nunit.util.dll diff --git a/src/GitVersionTask.Tests/packages.config b/src/GitVersionTask.Tests/packages.config index 21b6dd0081..4e7083bf76 100644 --- a/src/GitVersionTask.Tests/packages.config +++ b/src/GitVersionTask.Tests/packages.config @@ -14,7 +14,7 @@ - + From 82fe18ff7f98406be6597ed40bbb942819bb2a57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asbj=C3=B8rn=20Ulsberg?= Date: Fri, 1 Apr 2016 11:38:29 +0200 Subject: [PATCH 10/23] Let's try to create the whole NuGetRefBuild path --- src/GitVersionCore/GitVersionCore.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/GitVersionCore/GitVersionCore.csproj b/src/GitVersionCore/GitVersionCore.csproj index 0a8e7ddd8e..f93388714f 100644 --- a/src/GitVersionCore/GitVersionCore.csproj +++ b/src/GitVersionCore/GitVersionCore.csproj @@ -198,7 +198,7 @@ - + From 0921fc266a40d9620754b155e38dcd84272834b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asbj=C3=B8rn=20Ulsberg?= Date: Fri, 1 Apr 2016 12:59:53 +0200 Subject: [PATCH 11/23] Explicitly build in debug configuration and output detailed build logs --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0f86297f36..34bb368d5f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,5 +5,5 @@ install: - nuget restore src/GitVersion.sln - nuget install NUnit.Runners -Version 3.2.0 -OutputDirectory ./src/packages script: - - xbuild "./src/GitVersion.sln" - - mono --debug --runtime=v4.0.30319 ./src/packages/NUnit.ConsoleRunner.3.2.0/tools/nunit3-console.exe ./src/GitVersionTask.Tests/bin/Debug/GitVersionTask.Tests.dll ./src/GitVersionCore.Tests/bin/Debug/GitVersionCore.Tests.dll ./src/GitVersionTask.Tests/bin/Debug/GitVersionTask.Tests.dll ./src/GitVersionExe.Tests/bin/Debug/GitVersionExe.Tests.dll \ No newline at end of file + - xbuild "./src/GitVersion.sln" /property:Configuration="Debug" /verbosity:detailed + - mono --debug --runtime=v4.0.30319 ./src/packages/NUnit.ConsoleRunner.3.2.0/tools/nunit3-console.exe ./src/GitVersionTask.Tests/bin/Debug/GitVersionTask.Tests.dll ./src/GitVersionCore.Tests/bin/Debug/GitVersionCore.Tests.dll ./src/GitVersionTask.Tests/bin/Debug/GitVersionTask.Tests.dll ./src/GitVersionExe.Tests/bin/Debug/GitVersionExe.Tests.dll From 4a6d3aa056a620bc038e5941d0cf904dc7bf9cc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asbj=C3=B8rn=20Ulsberg?= Date: Fri, 1 Apr 2016 13:02:12 +0200 Subject: [PATCH 12/23] Ignore backup files created by gedit --- .gitignore | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.gitignore b/.gitignore index c0722ac4b8..ad5bc2edb4 100644 --- a/.gitignore +++ b/.gitignore @@ -94,3 +94,10 @@ site/ .idea *.sln.iml + +############ +## Linux +############ + +# Ignore backup files created by gedit +*~ From 359c2f2eb19c76083b2e3980b8a21543ae1eb819 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asbj=C3=B8rn=20Ulsberg?= Date: Fri, 1 Apr 2016 13:02:58 +0200 Subject: [PATCH 13/23] Only include GitVersionCore.pdb if it exists (which it won't on Linux) --- src/GitVersionCore/GitVersionCore.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/GitVersionCore/GitVersionCore.csproj b/src/GitVersionCore/GitVersionCore.csproj index f93388714f..b98c502ae9 100644 --- a/src/GitVersionCore/GitVersionCore.csproj +++ b/src/GitVersionCore/GitVersionCore.csproj @@ -208,4 +208,4 @@ - \ No newline at end of file + From b0667377d7d4afb4f9526d9482a06100d0707424 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asbj=C3=B8rn=20Ulsberg?= Date: Fri, 1 Apr 2016 14:52:23 +0200 Subject: [PATCH 14/23] Run tests with NUnit 3 on AppVeyor --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 3a12c0b69e..08c6d51efe 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -30,7 +30,7 @@ build_script: - cmd: appveyor PushArtifact "build\GitVersionTfsTaskBuild\gittools.gitversion-%GitVersion_SemVer%.vsix" test_script: - - nunit-console "src\GitVersionTask.Tests\bin\%CONFIGURATION%\GitVersionTask.Tests.dll" "src\GitVersionExe.Tests\bin\%CONFIGURATION%\GitVersionExe.Tests.dll" "src\GitVersionCore.Tests\bin\%CONFIGURATION%\GitVersionCore.Tests.dll" /noshadow + - nunit3-console "src\GitVersionTask.Tests\bin\%CONFIGURATION%\GitVersionTask.Tests.dll" "src\GitVersionExe.Tests\bin\%CONFIGURATION%\GitVersionExe.Tests.dll" "src\GitVersionCore.Tests\bin\%CONFIGURATION%\GitVersionCore.Tests.dll" /noshadow cache: - src\packages -> **\packages.config # preserve "packages" directory in the root of build folder but will reset it if packages.config is modified From 48f443fbea223e1bc6934ce3e7c4623efd2f9c3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asbj=C3=B8rn=20Ulsberg?= Date: Fri, 1 Apr 2016 15:04:49 +0200 Subject: [PATCH 15/23] Remove noshadow argument Since `nunit3-console` is not backwards compatible with the console of NUnit 2, remove the `/noshadow` argument. --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 08c6d51efe..46018c2de1 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -30,7 +30,7 @@ build_script: - cmd: appveyor PushArtifact "build\GitVersionTfsTaskBuild\gittools.gitversion-%GitVersion_SemVer%.vsix" test_script: - - nunit3-console "src\GitVersionTask.Tests\bin\%CONFIGURATION%\GitVersionTask.Tests.dll" "src\GitVersionExe.Tests\bin\%CONFIGURATION%\GitVersionExe.Tests.dll" "src\GitVersionCore.Tests\bin\%CONFIGURATION%\GitVersionCore.Tests.dll" /noshadow + - nunit3-console "src\GitVersionTask.Tests\bin\%CONFIGURATION%\GitVersionTask.Tests.dll" "src\GitVersionExe.Tests\bin\%CONFIGURATION%\GitVersionExe.Tests.dll" "src\GitVersionCore.Tests\bin\%CONFIGURATION%\GitVersionCore.Tests.dll" cache: - src\packages -> **\packages.config # preserve "packages" directory in the root of build folder but will reset it if packages.config is modified From 7e0d7a904f4d29ae5a5726e8d6cecc0013c981b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asbj=C3=B8rn=20Ulsberg?= Date: Wed, 6 Apr 2016 13:14:30 +0200 Subject: [PATCH 16/23] Make the compiler field static According to nunit/nunit#947, `ValueSourceAttributes` expects the referenced field to be `static` in NUnit 3. --- src/GitVersionTask.Tests/AssemblyInfoBuilderTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/GitVersionTask.Tests/AssemblyInfoBuilderTests.cs b/src/GitVersionTask.Tests/AssemblyInfoBuilderTests.cs index ae2c184e6b..f82f335a47 100644 --- a/src/GitVersionTask.Tests/AssemblyInfoBuilderTests.cs +++ b/src/GitVersionTask.Tests/AssemblyInfoBuilderTests.cs @@ -54,7 +54,7 @@ public Compilation Compile(string assemblyInfoText) public string ApprovedSubFolder { get { return Path.Combine("Approved", "VisualBasic"); } } } - private readonly ICompiler[] compilers = new ICompiler[] + private static readonly ICompiler[] compilers = new ICompiler[] { new CSharpCompiler(), new VisualBasicCompiler() From ab883a1171c6ba9f5917d90277d34a86077ec6d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asbj=C3=B8rn=20Ulsberg?= Date: Wed, 13 Apr 2016 14:54:40 +0200 Subject: [PATCH 17/23] Removed merge issue --- src/GitVersionCore.Tests/Mocks/MockRepository.cs | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/GitVersionCore.Tests/Mocks/MockRepository.cs b/src/GitVersionCore.Tests/Mocks/MockRepository.cs index 17d2cc5e8c..b10691906c 100644 --- a/src/GitVersionCore.Tests/Mocks/MockRepository.cs +++ b/src/GitVersionCore.Tests/Mocks/MockRepository.cs @@ -97,14 +97,6 @@ public void Reset(ResetMode resetMode, Commit commit, CheckoutOptions options) throw new NotImplementedException(); } - public void Reset(ResetMode resetMode, Commit commit, CheckoutOptions options) - { - throw new NotImplementedException(); - } - - - public Dictionary LookupResults { get; set; } - public Commit Commit(string message, Signature author, Signature committer, bool amendPreviousCommit = false) { throw new NotImplementedException(); From b18fa6815b10faab244678fe5bb3f5ce045ad4f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asbj=C3=B8rn=20Ulsberg?= Date: Wed, 13 Apr 2016 14:56:51 +0200 Subject: [PATCH 18/23] Ignore file cleanup --- .gitignore | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index ad5bc2edb4..178add35c0 100644 --- a/.gitignore +++ b/.gitignore @@ -87,17 +87,11 @@ GitVersion.sln.ide/ Packages/ build/ site/ +/TestResult.xml ################ # Project Rider ################ .idea -*.sln.iml - -############ -## Linux -############ - -# Ignore backup files created by gedit -*~ +*.sln.iml \ No newline at end of file From 1f5f9eba1643dff41b28872dd971a4a51118d6b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asbj=C3=B8rn=20Ulsberg?= Date: Wed, 13 Apr 2016 16:03:11 +0200 Subject: [PATCH 19/23] Upgraded LibGit2Sharp - Upgraded LibGit2Sharp from v0.22.0 to v0.23.0-dev - Upgraded LibGit2Sharp.NativeBinaries from v1.0.129 to v1.0.137 --- src/GitVersionCore.Tests/GitVersionCore.Tests.csproj | 8 ++++---- src/GitVersionCore.Tests/app.config | 4 ++++ src/GitVersionCore.Tests/packages.config | 4 ++-- src/GitVersionCore/GitVersionCore.csproj | 11 ++++++----- src/GitVersionCore/app.config | 11 +++++++++++ src/GitVersionCore/packages.config | 4 ++-- src/GitVersionExe.Tests/GitVersionExe.Tests.csproj | 8 ++++---- src/GitVersionExe.Tests/app.config | 4 ++++ src/GitVersionExe.Tests/packages.config | 4 ++-- src/GitVersionExe/GitVersionExe.csproj | 9 +++++---- src/GitVersionExe/app.config | 11 +++++++++++ src/GitVersionExe/packages.config | 4 ++-- src/GitVersionTask.Tests/GitVersionTask.Tests.csproj | 8 ++++---- src/GitVersionTask.Tests/app.config | 4 ++++ src/GitVersionTask.Tests/packages.config | 4 ++-- src/GitVersionTask/GitVersionTask.csproj | 9 +++++---- src/GitVersionTask/app.config | 11 +++++++++++ src/GitVersionTask/packages.config | 4 ++-- 18 files changed, 85 insertions(+), 37 deletions(-) create mode 100644 src/GitVersionCore/app.config create mode 100644 src/GitVersionExe/app.config create mode 100644 src/GitVersionTask/app.config diff --git a/src/GitVersionCore.Tests/GitVersionCore.Tests.csproj b/src/GitVersionCore.Tests/GitVersionCore.Tests.csproj index ec247b6845..323644d0f3 100644 --- a/src/GitVersionCore.Tests/GitVersionCore.Tests.csproj +++ b/src/GitVersionCore.Tests/GitVersionCore.Tests.csproj @@ -1,6 +1,6 @@  - + Debug @@ -50,8 +50,8 @@ ..\packages\GitTools.Testing.1.1.0\lib\net4\GitTools.Testing.dll True - - ..\packages\LibGit2Sharp.0.22.0\lib\net40\LibGit2Sharp.dll + + ..\packages\LibGit2Sharp.0.23.0-dev00000000000000\lib\net40\LibGit2Sharp.dll True @@ -193,8 +193,8 @@ This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + \ No newline at end of file diff --git a/src/GitVersionCore.Tests/app.config b/src/GitVersionCore.Tests/app.config index b1d2a5a3c8..c24557fb8a 100644 --- a/src/GitVersionCore.Tests/app.config +++ b/src/GitVersionCore.Tests/app.config @@ -6,6 +6,10 @@ + + + + \ No newline at end of file diff --git a/src/GitVersionCore.Tests/packages.config b/src/GitVersionCore.Tests/packages.config index abfea4ee49..eb605a0fa3 100644 --- a/src/GitVersionCore.Tests/packages.config +++ b/src/GitVersionCore.Tests/packages.config @@ -4,8 +4,8 @@ - - + + diff --git a/src/GitVersionCore/GitVersionCore.csproj b/src/GitVersionCore/GitVersionCore.csproj index b98c502ae9..5a19eca519 100644 --- a/src/GitVersionCore/GitVersionCore.csproj +++ b/src/GitVersionCore/GitVersionCore.csproj @@ -1,6 +1,6 @@  - + Debug @@ -46,8 +46,8 @@ ..\packages\JetBrainsAnnotations.Fody.1.0.4.0\Lib\JetBrains.Annotations.dll False - - ..\packages\LibGit2Sharp.0.22.0\lib\net40\LibGit2Sharp.dll + + ..\packages\LibGit2Sharp.0.23.0-dev00000000000000\lib\net40\LibGit2Sharp.dll True @@ -171,6 +171,7 @@ + Designer @@ -183,8 +184,8 @@ This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + @@ -208,4 +209,4 @@ - + \ No newline at end of file diff --git a/src/GitVersionCore/app.config b/src/GitVersionCore/app.config new file mode 100644 index 0000000000..b57ccf84c3 --- /dev/null +++ b/src/GitVersionCore/app.config @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/src/GitVersionCore/packages.config b/src/GitVersionCore/packages.config index c4122be15d..206bb4537e 100644 --- a/src/GitVersionCore/packages.config +++ b/src/GitVersionCore/packages.config @@ -4,8 +4,8 @@ - - + + diff --git a/src/GitVersionExe.Tests/GitVersionExe.Tests.csproj b/src/GitVersionExe.Tests/GitVersionExe.Tests.csproj index 3129325fae..95501713f6 100644 --- a/src/GitVersionExe.Tests/GitVersionExe.Tests.csproj +++ b/src/GitVersionExe.Tests/GitVersionExe.Tests.csproj @@ -1,6 +1,6 @@  - + Debug @@ -43,8 +43,8 @@ ..\packages\GitTools.Testing.1.1.0\lib\net4\GitTools.Testing.dll True - - ..\packages\LibGit2Sharp.0.22.0\lib\net40\LibGit2Sharp.dll + + ..\packages\LibGit2Sharp.0.23.0-dev00000000000000\lib\net40\LibGit2Sharp.dll True @@ -129,6 +129,6 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + \ No newline at end of file diff --git a/src/GitVersionExe.Tests/app.config b/src/GitVersionExe.Tests/app.config index b1d2a5a3c8..c24557fb8a 100644 --- a/src/GitVersionExe.Tests/app.config +++ b/src/GitVersionExe.Tests/app.config @@ -6,6 +6,10 @@ + + + + \ No newline at end of file diff --git a/src/GitVersionExe.Tests/packages.config b/src/GitVersionExe.Tests/packages.config index ff1dcaa78f..2a9dd595e7 100644 --- a/src/GitVersionExe.Tests/packages.config +++ b/src/GitVersionExe.Tests/packages.config @@ -2,8 +2,8 @@ - - + + diff --git a/src/GitVersionExe/GitVersionExe.csproj b/src/GitVersionExe/GitVersionExe.csproj index 737c3e2b30..6240b7d3c9 100644 --- a/src/GitVersionExe/GitVersionExe.csproj +++ b/src/GitVersionExe/GitVersionExe.csproj @@ -1,6 +1,6 @@  - + Debug AnyCPU @@ -48,8 +48,8 @@ ..\packages\JetBrainsAnnotations.Fody.1.0.4.0\Lib\JetBrains.Annotations.dll False - - ..\packages\LibGit2Sharp.0.22.0\lib\net40\LibGit2Sharp.dll + + ..\packages\LibGit2Sharp.0.23.0-dev00000000000000\lib\net40\LibGit2Sharp.dll True @@ -72,6 +72,7 @@ + @@ -211,8 +212,8 @@ This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + diff --git a/src/GitVersionExe/app.config b/src/GitVersionExe/app.config new file mode 100644 index 0000000000..b57ccf84c3 --- /dev/null +++ b/src/GitVersionExe/app.config @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/src/GitVersionExe/packages.config b/src/GitVersionExe/packages.config index 3128a80399..309594701b 100644 --- a/src/GitVersionExe/packages.config +++ b/src/GitVersionExe/packages.config @@ -5,8 +5,8 @@ - - + + \ No newline at end of file diff --git a/src/GitVersionTask.Tests/GitVersionTask.Tests.csproj b/src/GitVersionTask.Tests/GitVersionTask.Tests.csproj index 7780aab59b..e1f6b09799 100644 --- a/src/GitVersionTask.Tests/GitVersionTask.Tests.csproj +++ b/src/GitVersionTask.Tests/GitVersionTask.Tests.csproj @@ -1,6 +1,6 @@  - + Debug AnyCPU @@ -59,8 +59,8 @@ ..\packages\GitTools.Core.1.0.0\lib\net45\GitTools.Core.dll True - - ..\packages\LibGit2Sharp.0.22.0\lib\net40\LibGit2Sharp.dll + + ..\packages\LibGit2Sharp.0.23.0-dev00000000000000\lib\net40\LibGit2Sharp.dll True @@ -189,8 +189,8 @@ This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + \ No newline at end of file diff --git a/src/GitVersionTask.Tests/app.config b/src/GitVersionTask.Tests/app.config index 22651277da..43526a820e 100644 --- a/src/GitVersionTask.Tests/app.config +++ b/src/GitVersionTask.Tests/app.config @@ -14,6 +14,10 @@ + + + + \ No newline at end of file diff --git a/src/GitVersionTask.Tests/packages.config b/src/GitVersionTask.Tests/packages.config index 4e7083bf76..aad096b921 100644 --- a/src/GitVersionTask.Tests/packages.config +++ b/src/GitVersionTask.Tests/packages.config @@ -5,8 +5,8 @@ - - + + diff --git a/src/GitVersionTask/GitVersionTask.csproj b/src/GitVersionTask/GitVersionTask.csproj index ccfdcfa1d2..0d33c95c8d 100644 --- a/src/GitVersionTask/GitVersionTask.csproj +++ b/src/GitVersionTask/GitVersionTask.csproj @@ -1,6 +1,6 @@  - + Debug @@ -42,8 +42,8 @@ ..\packages\GitTools.Core.1.0.0\lib\net4\GitTools.Core.dll True - - ..\packages\LibGit2Sharp.0.22.0\lib\net40\LibGit2Sharp.dll + + ..\packages\LibGit2Sharp.0.23.0-dev00000000000000\lib\net40\LibGit2Sharp.dll True @@ -77,6 +77,7 @@ + Designer @@ -143,8 +144,8 @@ This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + diff --git a/src/GitVersionTask/app.config b/src/GitVersionTask/app.config new file mode 100644 index 0000000000..b57ccf84c3 --- /dev/null +++ b/src/GitVersionTask/app.config @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/src/GitVersionTask/packages.config b/src/GitVersionTask/packages.config index e6683c7c8b..8ed4c8e530 100644 --- a/src/GitVersionTask/packages.config +++ b/src/GitVersionTask/packages.config @@ -4,8 +4,8 @@ - - + + \ No newline at end of file From b43697fa6f930aab0326d69ccd4db23c195ecd74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asbj=C3=B8rn=20Ulsberg?= Date: Tue, 19 Apr 2016 22:02:54 +0200 Subject: [PATCH 20/23] Upgraded LibGit2Sharp Upgraded LibGit2Sharp from version 0.23.0-dev000000000000 to version 0.23.0-pre20150419160303. --- src/GitVersionCore.Tests/GitVersionCore.Tests.csproj | 2 +- src/GitVersionCore.Tests/packages.config | 2 +- src/GitVersionCore/GitVersionCore.csproj | 2 +- src/GitVersionCore/packages.config | 2 +- src/GitVersionExe.Tests/GitVersionExe.Tests.csproj | 2 +- src/GitVersionExe.Tests/packages.config | 2 +- src/GitVersionExe/GitVersionExe.csproj | 2 +- src/GitVersionExe/packages.config | 2 +- src/GitVersionTask.Tests/GitVersionTask.Tests.csproj | 2 +- src/GitVersionTask.Tests/packages.config | 2 +- src/GitVersionTask/GitVersionTask.csproj | 2 +- src/GitVersionTask/packages.config | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/GitVersionCore.Tests/GitVersionCore.Tests.csproj b/src/GitVersionCore.Tests/GitVersionCore.Tests.csproj index 323644d0f3..e22b86cfeb 100644 --- a/src/GitVersionCore.Tests/GitVersionCore.Tests.csproj +++ b/src/GitVersionCore.Tests/GitVersionCore.Tests.csproj @@ -51,7 +51,7 @@ True - ..\packages\LibGit2Sharp.0.23.0-dev00000000000000\lib\net40\LibGit2Sharp.dll + ..\packages\LibGit2Sharp.0.23.0-pre20150419160303\lib\net40\LibGit2Sharp.dll True diff --git a/src/GitVersionCore.Tests/packages.config b/src/GitVersionCore.Tests/packages.config index eb605a0fa3..5fe1a0a63f 100644 --- a/src/GitVersionCore.Tests/packages.config +++ b/src/GitVersionCore.Tests/packages.config @@ -4,7 +4,7 @@ - + diff --git a/src/GitVersionCore/GitVersionCore.csproj b/src/GitVersionCore/GitVersionCore.csproj index 5a19eca519..f2792ac12d 100644 --- a/src/GitVersionCore/GitVersionCore.csproj +++ b/src/GitVersionCore/GitVersionCore.csproj @@ -47,7 +47,7 @@ False - ..\packages\LibGit2Sharp.0.23.0-dev00000000000000\lib\net40\LibGit2Sharp.dll + ..\packages\LibGit2Sharp.0.23.0-pre20150419160303\lib\net40\LibGit2Sharp.dll True diff --git a/src/GitVersionCore/packages.config b/src/GitVersionCore/packages.config index 206bb4537e..aafec85572 100644 --- a/src/GitVersionCore/packages.config +++ b/src/GitVersionCore/packages.config @@ -4,7 +4,7 @@ - + diff --git a/src/GitVersionExe.Tests/GitVersionExe.Tests.csproj b/src/GitVersionExe.Tests/GitVersionExe.Tests.csproj index 95501713f6..a57ad6440a 100644 --- a/src/GitVersionExe.Tests/GitVersionExe.Tests.csproj +++ b/src/GitVersionExe.Tests/GitVersionExe.Tests.csproj @@ -44,7 +44,7 @@ True - ..\packages\LibGit2Sharp.0.23.0-dev00000000000000\lib\net40\LibGit2Sharp.dll + ..\packages\LibGit2Sharp.0.23.0-pre20150419160303\lib\net40\LibGit2Sharp.dll True diff --git a/src/GitVersionExe.Tests/packages.config b/src/GitVersionExe.Tests/packages.config index 2a9dd595e7..e837143936 100644 --- a/src/GitVersionExe.Tests/packages.config +++ b/src/GitVersionExe.Tests/packages.config @@ -2,7 +2,7 @@ - + diff --git a/src/GitVersionExe/GitVersionExe.csproj b/src/GitVersionExe/GitVersionExe.csproj index 6240b7d3c9..c235a3c665 100644 --- a/src/GitVersionExe/GitVersionExe.csproj +++ b/src/GitVersionExe/GitVersionExe.csproj @@ -49,7 +49,7 @@ False - ..\packages\LibGit2Sharp.0.23.0-dev00000000000000\lib\net40\LibGit2Sharp.dll + ..\packages\LibGit2Sharp.0.23.0-pre20150419160303\lib\net40\LibGit2Sharp.dll True diff --git a/src/GitVersionExe/packages.config b/src/GitVersionExe/packages.config index 309594701b..9700f9c3f0 100644 --- a/src/GitVersionExe/packages.config +++ b/src/GitVersionExe/packages.config @@ -5,7 +5,7 @@ - + diff --git a/src/GitVersionTask.Tests/GitVersionTask.Tests.csproj b/src/GitVersionTask.Tests/GitVersionTask.Tests.csproj index e1f6b09799..30e36c06c5 100644 --- a/src/GitVersionTask.Tests/GitVersionTask.Tests.csproj +++ b/src/GitVersionTask.Tests/GitVersionTask.Tests.csproj @@ -60,7 +60,7 @@ True - ..\packages\LibGit2Sharp.0.23.0-dev00000000000000\lib\net40\LibGit2Sharp.dll + ..\packages\LibGit2Sharp.0.23.0-pre20150419160303\lib\net40\LibGit2Sharp.dll True diff --git a/src/GitVersionTask.Tests/packages.config b/src/GitVersionTask.Tests/packages.config index aad096b921..693d0d6fd4 100644 --- a/src/GitVersionTask.Tests/packages.config +++ b/src/GitVersionTask.Tests/packages.config @@ -5,7 +5,7 @@ - + diff --git a/src/GitVersionTask/GitVersionTask.csproj b/src/GitVersionTask/GitVersionTask.csproj index 0d33c95c8d..59eb9a61ef 100644 --- a/src/GitVersionTask/GitVersionTask.csproj +++ b/src/GitVersionTask/GitVersionTask.csproj @@ -43,7 +43,7 @@ True - ..\packages\LibGit2Sharp.0.23.0-dev00000000000000\lib\net40\LibGit2Sharp.dll + ..\packages\LibGit2Sharp.0.23.0-pre20150419160303\lib\net40\LibGit2Sharp.dll True diff --git a/src/GitVersionTask/packages.config b/src/GitVersionTask/packages.config index 8ed4c8e530..c3f4e728a2 100644 --- a/src/GitVersionTask/packages.config +++ b/src/GitVersionTask/packages.config @@ -4,7 +4,7 @@ - + From 8f5a4310c6b03445444b0a411b3038393c9fba6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asbj=C3=B8rn=20Ulsberg?= Date: Tue, 19 Apr 2016 23:06:36 +0200 Subject: [PATCH 21/23] Upgraded NUnit Upgraded NUnit from version 3.2.0 to version 3.2.1 --- .travis.yml | 4 ++-- src/GitVersionCore.Tests/GitVersionCore.Tests.csproj | 4 ++-- src/GitVersionCore.Tests/packages.config | 2 +- src/GitVersionExe.Tests/GitVersionExe.Tests.csproj | 4 ++-- src/GitVersionExe.Tests/packages.config | 2 +- src/GitVersionTask.Tests/GitVersionTask.Tests.csproj | 4 ++-- src/GitVersionTask.Tests/packages.config | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index 34bb368d5f..2769f258c3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ solution: src/GitVersion.sln sudo: false install: - nuget restore src/GitVersion.sln - - nuget install NUnit.Runners -Version 3.2.0 -OutputDirectory ./src/packages + - nuget install NUnit.Runners -Version 3.2.1 -OutputDirectory ./src/packages script: - xbuild "./src/GitVersion.sln" /property:Configuration="Debug" /verbosity:detailed - - mono --debug --runtime=v4.0.30319 ./src/packages/NUnit.ConsoleRunner.3.2.0/tools/nunit3-console.exe ./src/GitVersionTask.Tests/bin/Debug/GitVersionTask.Tests.dll ./src/GitVersionCore.Tests/bin/Debug/GitVersionCore.Tests.dll ./src/GitVersionTask.Tests/bin/Debug/GitVersionTask.Tests.dll ./src/GitVersionExe.Tests/bin/Debug/GitVersionExe.Tests.dll + - mono --debug --runtime=v4.0.30319 ./src/packages/NUnit.ConsoleRunner.3.2.1/tools/nunit3-console.exe ./src/GitVersionTask.Tests/bin/Debug/GitVersionTask.Tests.dll ./src/GitVersionCore.Tests/bin/Debug/GitVersionCore.Tests.dll ./src/GitVersionTask.Tests/bin/Debug/GitVersionTask.Tests.dll ./src/GitVersionExe.Tests/bin/Debug/GitVersionExe.Tests.dll diff --git a/src/GitVersionCore.Tests/GitVersionCore.Tests.csproj b/src/GitVersionCore.Tests/GitVersionCore.Tests.csproj index e22b86cfeb..b96a38ec6f 100644 --- a/src/GitVersionCore.Tests/GitVersionCore.Tests.csproj +++ b/src/GitVersionCore.Tests/GitVersionCore.Tests.csproj @@ -66,8 +66,8 @@ ..\packages\NUnitTestAdapter.2.0.0\lib\nunit.core.interfaces.dll True - - ..\packages\NUnit.3.2.0\lib\net45\nunit.framework.dll + + ..\packages\NUnit.3.2.1\lib\net45\nunit.framework.dll True diff --git a/src/GitVersionCore.Tests/packages.config b/src/GitVersionCore.Tests/packages.config index 5fe1a0a63f..64850ea5be 100644 --- a/src/GitVersionCore.Tests/packages.config +++ b/src/GitVersionCore.Tests/packages.config @@ -8,7 +8,7 @@ - + diff --git a/src/GitVersionExe.Tests/GitVersionExe.Tests.csproj b/src/GitVersionExe.Tests/GitVersionExe.Tests.csproj index a57ad6440a..bbfdee8cea 100644 --- a/src/GitVersionExe.Tests/GitVersionExe.Tests.csproj +++ b/src/GitVersionExe.Tests/GitVersionExe.Tests.csproj @@ -59,8 +59,8 @@ ..\packages\NUnitTestAdapter.2.0.0\lib\nunit.core.interfaces.dll True - - ..\packages\NUnit.3.2.0\lib\net45\nunit.framework.dll + + ..\packages\NUnit.3.2.1\lib\net45\nunit.framework.dll True diff --git a/src/GitVersionExe.Tests/packages.config b/src/GitVersionExe.Tests/packages.config index e837143936..996730901b 100644 --- a/src/GitVersionExe.Tests/packages.config +++ b/src/GitVersionExe.Tests/packages.config @@ -5,7 +5,7 @@ - + \ No newline at end of file diff --git a/src/GitVersionTask.Tests/GitVersionTask.Tests.csproj b/src/GitVersionTask.Tests/GitVersionTask.Tests.csproj index 30e36c06c5..0bf7c40f18 100644 --- a/src/GitVersionTask.Tests/GitVersionTask.Tests.csproj +++ b/src/GitVersionTask.Tests/GitVersionTask.Tests.csproj @@ -94,8 +94,8 @@ ..\packages\NUnitTestAdapter.2.0.0\lib\nunit.core.interfaces.dll True - - ..\packages\NUnit.3.2.0\lib\net45\nunit.framework.dll + + ..\packages\NUnit.3.2.1\lib\net45\nunit.framework.dll True diff --git a/src/GitVersionTask.Tests/packages.config b/src/GitVersionTask.Tests/packages.config index 693d0d6fd4..80f0c9d374 100644 --- a/src/GitVersionTask.Tests/packages.config +++ b/src/GitVersionTask.Tests/packages.config @@ -14,7 +14,7 @@ - + From 5730673894a28947b2349c249657717b4396d1ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asbj=C3=B8rn=20Ulsberg?= Date: Wed, 20 Apr 2016 07:58:53 +0200 Subject: [PATCH 22/23] Update NuGet Update NuGet in the Travis install step --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 2769f258c3..cf56fe073f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,7 @@ language: csharp solution: src/GitVersion.sln sudo: false install: + - nuget update -self - nuget restore src/GitVersion.sln - nuget install NUnit.Runners -Version 3.2.1 -OutputDirectory ./src/packages script: From b2b6084cbb92d64082c9bd19d795439a1eaf9050 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Asbj=C3=B8rn=20Ulsberg?= Date: Wed, 20 Apr 2016 08:19:54 +0200 Subject: [PATCH 23/23] Require sudo to self-update NuGet --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index cf56fe073f..161938fd53 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,8 @@ language: csharp solution: src/GitVersion.sln -sudo: false +sudo: true install: - - nuget update -self + - sudo nuget update -self - nuget restore src/GitVersion.sln - nuget install NUnit.Runners -Version 3.2.1 -OutputDirectory ./src/packages script: