8000 Merge pull request #371 from vmuriart/nunit3_6 · pythonnet/pythonnet@d7942c8 · GitHub
[go: up one dir, main page]
Skip to content

Commit d7942c8

Browse files
vmuriartvmuriart
committed
Merge pull request #371 from vmuriart/nunit3_6
Upgrade NUnit to 3.6
2 parents 8add8d1 + 5f86154 commit d7942c8

File tree

5 files changed

+8
-7
lines changed

5 files changed

+8
-7
lines changed

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ install:
3737
script:
3838
- export PYTHONPATH=`pwd`:$PYTHONPATH
3939
- python -m pytest
40-
# - mono ./packages/NUnit.*/tools/nunit-console.exe src/embed_tests/bin/Python.EmbeddingTest.dll
40+
# - mono ./packages/NUnit.*/tools/nunit3-console.exe src/embed_tests/bin/Python.EmbeddingTest.dll
4141

4242
after_success:
4343
# Uncomment if need to geninterop, ie. py37 final

‎appveyor.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ environment:
1010
PYTHONUNBUFFERED: True
1111
PYTHONWARNINGS: 'ignore:::wheel.pep425tags:'
1212
PYTHONPATH: C:\testdir
13-
NUNIT: nunit-console
13+
NUNIT: nunit3-console
1414
CONDA_BLD: C:\conda
1515
CONDA_BLD_VERSION: 3.5
1616

@@ -35,7 +35,7 @@ init:
3535
- set CONDA_BLD_ARCH=%PLATFORM:x=%
3636
- set PYTHON=C:\PYTHON%PYTHON_VERSION:.=%
3737
- if %PLATFORM%==x86 (set CONDA_BLD_ARCH=32)
38-
- if %PLATFORM%==x86 (set NUNIT=%NUNIT%-x86)
38+
# - if %PLATFORM%==x86 (set NUNIT=%NUNIT%-x86)
3939
- if %PLATFORM%==x64 (set PYTHON=%PYTHON%-x64)
4040

4141
# Prepend newly installed Python to the PATH of this build

‎ci/appveyor_run_tests.ps1‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ if ($PYTHON_STATUS -ne 0) {
2828
Write-Host ("Starting embedded tests") -ForegroundColor "Green"
2929
.$OPENCOVER -register:user -searchdirs:"$RUNTIME_DIR" -output:cs.coverage `
3030
-target:"$NUNIT" -targetargs:"$CS_TESTS" `
31+
-filter:"+[*]Python.Runtime*" `
3132
-returntargetcode
3233
$NUNIT_STATUS = $LastExitCode
3334
if ($NUNIT_STATUS -ne 0) {

‎src/embed_tests/Python.EmbeddingTest.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@
6565
<DebugType>pdbonly</DebugType>
6666
</PropertyGroup>
6767
<ItemGroup>
68-
<Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
69-
<HintPath>..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
68+
<Reference Include="nunit.framework, Version=3.6.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
69+
<HintPath>..\..\packages\NUnit.3.6.0\lib\net40\nunit.framework.dll</HintPath>
7070
</Reference>
7171
<Reference Include="System" />
7272
</ItemGroup>

‎src/embed_tests/packages.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="NUnit" version="2.6.4" targetFramework="net40" />
4-
<package id="NUnit.Runners" version="2.6.4" targetFramework="net40" />
3+
<package id="NUnit" version="3.6.0" targetFramework="net40" />
4+
<package id="NUnit.ConsoleRunner" version="3.6.0" targetFramework="net40" />
55
</packages>

0 commit comments

Comments
 (0)
0