Skip to content

Commit

Permalink
Merge pull request #188 from BobSilent/update-nunit-2.7.1
Browse files Browse the repository at this point in the history
Update nunit reference to 2.7.1
  • Loading branch information
OsirisTerje authored May 6, 2020
2 parents be6d50a + 122925d commit f0cf833
Show file tree
Hide file tree
Showing 13 changed files with 18 additions and 10,920 deletions.
Binary file removed lib/mock-assembly.dll
Binary file not shown.
Binary file removed lib/nunit.core.dll
Binary file not shown.
Binary file removed lib/nunit.core.interfaces.dll
Binary file not shown.
Binary file removed lib/nunit.framework.dll
Binary file not shown.
10,899 changes: 0 additions & 10,899 deletions lib/nunit.framework.xml

This file was deleted.

Binary file modified lib/nunit.util.dll
Binary file not shown.
10 changes: 4 additions & 6 deletions src/NUnitTestAdapter/NUnitTestAdapter.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -64,13 +64,11 @@
<Reference Include="Mono.Cecil.Rocks, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
<HintPath>..\..\packages\Mono.Cecil.0.9.6.4\lib\net35\Mono.Cecil.Rocks.dll</HintPath>
</Reference>
<Reference Include="nunit.core">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\lib\nunit.core.dll</HintPath>
<Reference Include="nunit.core, Version=2.7.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
<HintPath>..\..\packages\NUnitV2.Core.2.7.1\lib\nunit.core.dll</HintPath>
</Reference>
<Reference Include="nunit.core.interfaces">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\lib\nunit.core.interfaces.dll</HintPath>
<Reference Include="nunit.core.interfaces, Version=2.7.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
<HintPath>..\..\packages\NUnitV2.Core.2.7.1\lib\nunit.core.interfaces.dll</HintPath>
</Reference>
<Reference Include="nunit.util">
<SpecificVersion>False</SpecificVersion>
Expand Down
1 change: 1 addition & 0 deletions src/NUnitTestAdapter/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@
<packages>
<package id="Microsoft.VisualStudio.TestPlatform.ObjectModel" version="0.0.3" targetFramework="net35" />
<package id="Mono.Cecil" version="0.9.6.4" targetFramework="net35" />
<package id="NUnitV2.Core" version="2.7.1" targetFramework="net35" />
</packages>
10 changes: 4 additions & 6 deletions src/NUnitTestAdapterInstall/NUnitTestAdapterInstall.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -114,13 +114,11 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\packages\Mono.Cecil.0.9.6.4\lib\net35\Mono.Cecil.Rocks.dll</HintPath>
</Reference>
<Reference Include="nunit.core, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\lib\nunit.core.dll</HintPath>
<Reference Include="nunit.core, Version=2.7.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
<HintPath>..\..\packages\NUnitV2.Core.2.7.1\lib\nunit.core.dll</HintPath>
</Reference>
<Reference Include="nunit.core.interfaces, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\lib\nunit.core.interfaces.dll</HintPath>
<Reference Include="nunit.core.interfaces, Version=2.7.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
<HintPath>..\..\packages\NUnitV2.Core.2.7.1\lib\nunit.core.interfaces.dll</HintPath>
</Reference>
<Reference Include="nunit.util, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
Expand Down
2 changes: 1 addition & 1 deletion src/NUnitTestAdapterInstall/packages.config
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Microsoft.VSSDK.BuildTools" version="15.0.26201" targetFramework="net45" developmentDependency="true" />

<package id="NUnitV2.Core" version="2.7.1" targetFramework="net45" />
</packages>
9 changes: 4 additions & 5 deletions src/NUnitTestAdapterTests/NUnitTestAdapterTests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,11 @@
<Reference Include="Mono.Cecil.Rocks, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
<HintPath>..\..\packages\Mono.Cecil.0.9.6.4\lib\net45\Mono.Cecil.Rocks.dll</HintPath>
</Reference>
<Reference Include="nunit.core, Version=2.4.8.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\lib\nunit.core.dll</HintPath>
<Reference Include="nunit.core, Version=2.7.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
<HintPath>..\..\packages\NUnitV2.Core.2.7.1\lib\nunit.core.dll</HintPath>
</Reference>
<Reference Include="nunit.core.interfaces">
<HintPath>..\..\lib\nunit.core.interfaces.dll</HintPath>
<Reference Include="nunit.core.interfaces, Version=2.7.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
<HintPath>..\..\packages\NUnitV2.Core.2.7.1\lib\nunit.core.interfaces.dll</HintPath>
</Reference>
<Reference Include="nunit.framework, Version=2.7.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
<HintPath>..\..\packages\NUnit.2.7.0\lib\nunit.framework.dll</HintPath>
Expand Down
6 changes: 3 additions & 3 deletions src/NUnitTestAdapterTests/ProjectTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,14 @@ public void ThatTheReferenceToMicrosoftTestObjectModelPointsToVS2012Version()
}

[Test]
public void ThatAdapterReferencesThe264VersionOfFramework()
public void ThatAdapterReferencesThe271VersionOfFramework()
{
var dir = Directory.GetCurrentDirectory();
var assembly = Assembly.LoadFrom(dir + "/NUnit.VisualStudio.TestAdapter.dll");
var refNames = assembly.GetReferencedAssemblies().Where(ass => ass.Name == "nunit.core").ToList();
Assert.IsTrue(refNames != null && refNames.Count() == 1, "No reference to Microsoft.VisualStudio.TestPlatform.ObjectModel found");
var nunitVersion = refNames[0].Version;
Assert.IsTrue(nunitVersion.Major == 2 && nunitVersion.Minor == 6 && nunitVersion.Build == 4, "nunit must be of version 2.6.4");
Assert.IsTrue(nunitVersion.Major == 2 && nunitVersion.Minor == 7 && nunitVersion.Build == 1, "nunit must be of version 2.7.1");
}

[Test]
Expand All @@ -64,6 +64,6 @@ public void ThatAllDllsUsedAreNetFramework35()
}
}


}
}
1 change: 1 addition & 0 deletions src/NUnitTestAdapterTests/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@
<package id="Microsoft.VisualStudio.TestPlatform.ObjectModel" version="0.0.3" targetFramework="net45" />
<package id="Mono.Cecil" version="0.9.6.4" targetFramework="net45" />
<package id="NUnit" version="2.7.0" targetFramework="net45" />
<package id="NUnitV2.Core" version="2.7.1" targetFramework="net45" />
</packages>

0 comments on commit f0cf833

Please sign in to comment.