Skip to content
This repository was archived by the owner on Jun 27, 2019. It is now read-only.

Commit 87a6b86

Browse files
committed
Upgrade NUnit
Upgrade NUnit from version 2.6.4 to version 3.2.1 and make ReSharper run the tests with NUnit 3.
1 parent 244a8d2 commit 87a6b86

File tree

4 files changed

+12
-11
lines changed

4 files changed

+12
-11
lines changed

src/GitTools.Core.Tests/GitTools.Core.Tests.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@
5050
<HintPath>..\packages\LibGit2Sharp.0.22.0\lib\net40\LibGit2Sharp.dll</HintPath>
5151
<Private>True</Private>
5252
</Reference>
53-
<Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
54-
<HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
53+
<Reference Include="nunit.framework, Version=3.2.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
54+
<HintPath>..\packages\NUnit.3.2.1\lib\net45\nunit.framework.dll</HintPath>
5555
<Private>True</Private>
5656
</Reference>
5757
<Reference Include="Shouldly, Version=2.7.0.0, Culture=neutral, PublicKeyToken=6042cbcb05cbc941, processorArchitecture=MSIL">

src/GitTools.Core.Tests/GlobalInitialization.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
[SetUpFixture]
44
public class GlobalInitialization
55
{
6-
[SetUp]
6+
[OneTimeSetUp]
77
public static void SetUp()
88
{
99
#if DEBUG
Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<packages>
3-
<package id="Atlassian.SDK" version="2.5.0" targetFramework="net45" />
4-
<package id="GitTools.Testing" version="1.1.0" targetFramework="net45" />
5-
<package id="LibGit2Sharp" version="0.22.0" targetFramework="net45" />
6-
<package id="LibGit2Sharp.NativeBinaries" version="1.0.129" targetFramework="net45" />
7-
<package id="NUnit" version="2.6.4" targetFramework="net45" />
8-
<package id="Shouldly" version="2.7.0" targetFramework="net45" />
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<package id="Atlassian.SDK" version="2.5.0" targetFramework="net45" />
4+
<package id="GitTools.Testing" version="1.1.0" targetFramework="net45" />
5+
<package id="LibGit2Sharp" version="0.22.0" targetFramework="net45" />
6+
<package id="LibGit2Sharp.NativeBinaries" version="1.0.129" targetFramework="net45" />
7+
<package id="NUnit" version="3.2.1" targetFramework="net45" />
8+
<package id="Shouldly" version="2.7.0" targetFramework="net45" />
99
</packages>

src/GitTools.Core.sln.DotSettings

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -448,6 +448,7 @@ II.2.12 &lt;HandlesEvent /&gt;&#xD;
448448
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAlwaysTreatStructAsNotReorderableMigration/@EntryIndexedValue">True</s:Boolean>
449449
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
450450
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean>
451+
<s:Boolean x:Key="/Default/Environment/UnitTesting/DisabledProviders/=NUnit2x/@EntryIndexedValue">True</s:Boolean>
451452
<s:String x:Key="/Default/Environment/UserInterface/ShortcutSchemeName/@EntryValue">None</s:String>
452453
<s:String x:Key="/Default/FilterSettingsManager/AttributeFilterXml/@EntryValue">&lt;data /&gt;</s:String>
453454
<s:String x:Key="/Default/FilterSettingsManager/CoverageFilterXml/@EntryValue">&lt;data&gt;&lt;IncludeFilters /&gt;&lt;ExcludeFilters /&gt;&lt;/data&gt;</s:String></wpf:ResourceDictionary>

0 commit comments

Comments
 (0)