Skip to content
This repository was archived by the owner on Jul 22, 2023. It is now read-only.

Commit dc7614d

Browse files
author
Barton Cline
committed
# Slashes in path are unix/linux (tested on Windows) #
# Target Framework is 3.5 # # nUnit version is 2.5.9.10348 # # nUnit state storage added #
1 parent 6f3ef30 commit dc7614d

3 files changed

Lines changed: 33 additions & 8 deletions

File tree

‎pythonnet/src/embed_tests/Embeddingtest.VisualState.xml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<VisualState xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ShowCheckBoxes="true">
3+
<TopNode>[0-1000]C:\Users\Barton\Documents\Visual Studio 2008\Projects\PySharp\trunk\pythonnet\src\embed_tests\Embeddingtest.nunit</TopNode>
4+
<SelectedNode>[0-1003]Python.EmbeddingTest.PyImportTest</SelectedNode>
5+
<ExcludeCategories>false</ExcludeCategories>
6+
<Nodes>
7+
<Node UniqueName="[0-1000]C:\Users\Barton\Documents\Visual Studio 2008\Projects\PySharp\trunk\pythonnet\src\embed_tests\Embeddingtest.nunit" Expanded="true" Checked="true" />
8+
<Node UniqueName="[0-1010]C:\Users\Barton\Documents\Visual Studio 2008\Projects\PySharp\trunk\pythonnet\src\embed_tests\bin\Debug\Python.EmbeddingTest.dll" Expanded="true" Checked="true" />
9+
<Node UniqueName="[0-1011]Python" Expanded="true" Checked="true" />
10+
<Node UniqueName="[0-1012]Python.EmbeddingTest" Expanded="true" Checked="true" />
11+
<Node UniqueName="[0-1003]Python.EmbeddingTest.PyImportTest" Expanded="true" Checked="true" />
12+
<Node UniqueName="[0-1004]Python.EmbeddingTest.PyImportTest.TestDottedName" Checked="true" />
13+
<Node UniqueName="[0-1001]Python.EmbeddingTest.PyIterTest" Expanded="true" Checked="true" />
14+
<Node UniqueName="[0-1002]Python.EmbeddingTest.PyIterTest.TestOnPyList" Checked="true" />
15+
<Node UniqueName="[0-1008]Python.EmbeddingTest.PyObjectTest" Expanded="true" Checked="true" />
16+
<Node UniqueName="[0-1009]Python.EmbeddingTest.PyObjectTest.TestUnicode" Checked="true" />
17+
<Node UniqueName="[0-1005]Python.EmbeddingTest.PythonExceptionTest" Expanded="true" Checked="true" />
18+
<Node UniqueName="[0-1006]Python.EmbeddingTest.PythonExceptionTest.TestMessage" Checked="true" />
19+
<Node UniqueName="[0-1007]Python.EmbeddingTest.PythonExceptionTest.TestNoError" Checked="true" />
20+
</Nodes>
21+
</VisualState>

‎pythonnet/src/embed_tests/Python.EmbeddingTest.csproj‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
<IsWebBootstrapper>false</IsWebBootstrapper>
2929
<UseApplicationTrust>false</UseApplicationTrust>
3030
<BootstrapperEnabled>true</BootstrapperEnabled>
31+
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
3132
</PropertyGroup>
3233
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
3334
<DebugSymbols>true</DebugSymbols>
@@ -57,8 +58,11 @@
5758
<PlatformTarget>AnyCPU</PlatformTarget>
5859
</PropertyGroup>
5960
<ItemGroup>
60-
<Reference Include="nunit.framework, Version=2.5.5.10112, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL" />
61+
<Reference Include="nunit.framework, Version=2.5.9.10348, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL" />
6162
<Reference Include="System" />
63+
<Reference Include="System.Core">
64+
<RequiredTargetFramework>3.5</RequiredTargetFramework>
65+
</Reference>
6266
</ItemGroup>
6367
<ItemGroup>
6468
<None Include="Embeddingtest.nunit" />
@@ -71,12 +75,6 @@
7175
<Compile Include="pyobject.cs" />
7276
<Compile Include="pythonexception.cs" />
7377
</ItemGroup>
74-
<ItemGroup>
75-
<ProjectReference Include="..\runtime\Python.Runtime.csproj">
76-
<Project>{097B4AC0-74E9-4C58-BCF8-C69746EC8271}</Project>
77-
<Name>Python.Runtime</Name>
78-
</ProjectReference>
79-
</ItemGroup>
8078
<ItemGroup>
8179
<BootstrapperPackage Include="Microsoft.Net.Framework.2.0">
8280
<Visible>False</Visible>
@@ -94,6 +92,12 @@
9492
<Install>false</Install>
9593
</BootstrapperPackage>
9694
</ItemGroup>
95+
<ItemGroup>
96+
<ProjectReference Include="..\runtime\Python.Runtime.csproj">
97+
<Project>{097B4AC0-74E9-4C58-BCF8-C69746EC8271}</Project>
98+
<Name>Python.Runtime</Name>
99+
</ProjectReference>
100+
</ItemGroup>
97101
<Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
98102
<ProjectExtensions>
99103
<VisualStudio AllowExistingFolder="true" />

‎pythonnet/src/embed_tests/pyimport.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public void SetUp()
2424
* Append the tests directory to sys.path
2525
* using reflection to circumvent the private modifires placed on most Runtime methods.
2626
*/
27-
string s = @"..\..\..\tests";
27+
string s = @"../../../tests";
2828

2929
Type RTClass = typeof(Runtime.Runtime);
3030

0 commit comments

Comments
 (0)