Merge pull request #346 from vmuriart/project · pythonnet/pythonnet@9d317bf · GitHub
Skip to content

Commit 9d317bf

Browse files
vmuriartvmuriart
authored
Merge pull request #346 from vmuriart/project
Fix Console config, Add pyproj, Add PY3 to configurationmanager
2 parents 7cf4ba9 + 3f914ca commit 9d317bf

10 files changed

Lines changed: 580 additions & 160 deletions

File tree

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion

‎ci/appveyor_run_tests.ps1‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ $NUNIT = Resolve-Path .\packages\NUnit.ConsoleRunner*\tools\nunit3-console.exe
77
$PY = Get-Command python
88

99
# Can't use ".\build\*\Python.EmbeddingTest.dll". Missing framework files.
10-
$CS_TESTS = Resolve-Path .\src\embed_tests\bin\*\*\Python.EmbeddingTest.dll
11-
$RUNTIME_DIR = Resolve-Path .\src\runtime\bin\*\ReleaseWin\
10+
$CS_TESTS = ".\src\embed_tests\bin\Python.EmbeddingTest.dll"
11+
$RUNTIME_DIR = ".\src\runtime\bin\"
1212

1313
# Run python tests with C# coverage
1414
# why `2>&1 | %{ "$_" }`? see: http://stackoverflow.com/a/20950421/5208670

‎pythonnet.sln‎

Lines changed: 106 additions & 23 deletions

0 commit comments

Comments
 (0)