Skip to content

Commit bd6775d

Browse files
asbjornuasbjornu
committed
Upgraded NUnit with runners from v2.6.4 to v3.2
1 parent 135b6b4 commit bd6775d

File tree

8 files changed

+16
-16
lines changed

8 files changed

+16
-16
lines changed

‎.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ solution: src/GitVersion.sln
33
sudo: false
44
install:
55
- nuget restore src/GitVersion.sln
6-
- nuget install NUnit.Runners -Version 2.6.4 -OutputDirectory nunit
6+
- nuget install NUnit.Runners -Version 3.2.0 -OutputDirectory ./src/packages
77
script:
88
- xbuild "./src/GitVersion.sln"
9-
- 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
9+
- 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

‎src/GitVersionCore.Tests/GitVersionCore.Tests.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@
5858
<HintPath>..\packages\NUnitTestAdapter.2.0.0\lib\nunit.core.interfaces.dll</HintPath>
5959
<Private>True</Private>
6060
</Reference>
61-
<Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
62-
<SpecificVersion>False</SpecificVersion>
63-
<HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
61+
<Reference Include="nunit.framework, Version=3.2.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
62+
<HintPath>..\packages\NUnit.3.2.0\lib\net45\nunit.framework.dll</HintPath>
63+
<Private>True</Private>
6464
</Reference>
6565
<Reference Include="nunit.util, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
6666
<HintPath>..\packages\NUnitTestAdapter.2.0.0\lib\nunit.util.dll</HintPath>

‎src/GitVersionCore.Tests/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<package id="LibGit2Sharp.NativeBinaries" version="1.0.129" targetFramework="net45" />
77
<package id="ModuleInit.Fody" version="1.5.8.0" targetFramework="net45" developmentDependency="true" />
88
<package id="NSubstitute" version="1.9.2.0" targetFramework="net45" />
9-
<package id="NUnit" version="2.6.4" targetFramework="net45" />
9+
<package id="NUnit" version="3.2.0" targetFramework="net45" />
1010
<package id="NUnitTestAdapter" version="2.0.0" targetFramework="net45" />
1111
<package id="Shouldly" version="2.7.0-beta0002" targetFramework="net45" />
1212
<package id="TestStack.ConventionTests" version="3.0.0-beta0002" targetFramework="net45" />

‎src/GitVersionExe.Tests/GitVersionExe.Tests.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@
6363
<HintPath>..\packages\NUnitTestAdapter.2.0.0\lib\nunit.core.interfaces.dll</HintPath>
6464
<Private>True</Private>
6565
</Reference>
66-
<Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
67-
<SpecificVersion>False</SpecificVersion>
68-
<HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
66+
<Reference Include="nunit.framework, Version=3.2.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
67+
<HintPath>..\packages\NUnit.3.2.0\lib\net45\nunit.framework.dll</HintPath>
68+
<Private>True</Private>
6969
</Reference>
7070
<Reference Include="nunit.util, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
7171
<HintPath>..\packages\NUnitTestAdapter.2.0.0\lib\nunit.util.dll</HintPath>

‎src/GitVersionExe.Tests/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<package id="LibGit2Sharp" version="0.22.0" targetFramework="net45" />
44
<package id="LibGit2Sharp.NativeBinaries" version="1.0.129" targetFramework="net45" />
55
<package id="NSubstitute" version="1.9.2.0" targetFramework="net45" />
6-
<package id="NUnit" version="2.6.4" targetFramework="net45" />
6+
<package id="NUnit" version="3.2.0" targetFramework="net45" />
77
<package id="NUnitTestAdapter" version="2.0.0" targetFramework="net45" />
88
<package id="Shouldly" version="2.7.0-beta0002" targetFramework="net45" />
99
</packages>

‎src/GitVersionTask.Tests/AssemblyInfoBuilderTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,10 +109,10 @@ public void VerifyAssemblyVersion_MajorMinorPatchTag()
109109

110110
[Test]
111111
[MethodImpl(MethodImplOptions.NoInlining)]
112-
[ExpectedException(typeof(WarningException))]
113112
public void VerifyAssemblyVersion_Major_InvalidInformationalValue()
114113
{
115-
VerifyAssemblyVersion(AssemblyVersioningScheme.Major, "{ThisVariableDoesntExist}");
114+
var exception = Assert.Throws<WarningException>(() => VerifyAssemblyVersion(AssemblyVersioningScheme.Major, "{ThisVariableDoesntExist}"));
115+
Assert.That(exception.Message, Does.Contain("ThisVariableDoesntExist"));
116116
}
117117

118118
[Test]

‎src/GitVersionTask.Tests/GitVersionTask.Tests.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,9 @@
7373
<HintPath>..\packages\NUnitTestAdapter.2.0.0\lib\nunit.core.interfaces.dll</HintPath>
7474
<Private>True</Private>
7575
</Reference>
76-
<Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
77-
<SpecificVersion>False</SpecificVersion>
78-
<HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
76+
<Reference Include="nunit.framework, Version=3.2.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
77+
<HintPath>..\packages\NUnit.3.2.0\lib\net45\nunit.framework.dll</HintPath>
78+
<Private>True</Private>
7979
</Reference>
8080
<Reference Include="nunit.util, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
8181
<HintPath>..\packages\NUnitTestAdapter.2.0.0\lib\nunit.util.dll</HintPath>

‎src/GitVersionTask.Tests/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<package id="Microsoft.Web.Xdt" version="2.1.1" targetFramework="net45" />
1111
<package id="ModuleInit.Fody" version="1.5.8.0" targetFramework="net45" developmentDependency="true" />
1212
<package id="Newtonsoft.Json" version="7.0.1" targetFramework="net45" />
13-
<package id="NUnit" version="2.6.4" targetFramework="net45" />
13+
<package id="NUnit" version="3.2.0" targetFramework="net45" />
1414
<package id="NUnitTestAdapter" version="2.0.0" targetFramework="net45" />
1515
<package id="Shouldly" version="2.7.0-beta0002" targetFramework="net45" />
1616
<package id="System.Collections.Immutable" version="1.1.37" targetFramework="net45" />

0 commit comments

Comments
 (0)