FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

clang 2 gcc v2 (.NET 4.5) · pythonnet/pythonnet@d4bda42 · GitHub

  1. pythonnet
  2. pythonnet

Repository navigation

Commit d4bda42

Browse files
QuantApp
committed
clang 2 gcc v2 (.NET 4.5)
1 parent 3e82fc1 commit d4bda42

8 files changed

Lines changed: 214 additions & 16 deletions

File tree

‎setup.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,7 @@ def run(self):
368368

369369
setup(
370370
name="pythonnet",
371-
version="2.4.0.dev0",
371+
version="2.4.0.dev1",
372372
description=".Net and Mono integration for Python",
373373
url='https://pythonnet.github.io/',
374374
license='MIT',

‎src/clrmodule/clrmodule.csproj‎

Lines changed: 51 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
33
<PropertyGroup>
44
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -9,7 +9,7 @@
99
<RootNamespace>clrmodule</RootNamespace>
1010
<DocumentationFile>bin\clrmodule.xml</DocumentationFile>
1111
<OutputPath>bin\</OutputPath>
12-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1313
<TargetFrameworkProfile />
1414
<NoWarn>1591</NoWarn>
1515
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
@@ -65,6 +65,54 @@
6565
<Optimize>true</Optimize>
6666
<DebugType>pdbonly</DebugType>
6767
</PropertyGroup>
68+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugMonoPY3|x64'">
69+
<Prefer32Bit>false</Prefer32Bit>
70+
</PropertyGroup>
71+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugMonoPY3|x86'">
72+
<Prefer32Bit>false</Prefer32Bit>
73+
</PropertyGroup>
74+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugMono|x64'">
75+
<Prefer32Bit>false</Prefer32Bit>
76+
</PropertyGroup>
77+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugMono|x86'">
78+
<Prefer32Bit>false</Prefer32Bit>
79+
</PropertyGroup>
80+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugWinPY3|x64'">
81+
<Prefer32Bit>false</Prefer32Bit>
82+
</PropertyGroup>
83+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugWinPY3|x86'">
84+
<Prefer32Bit>false</Prefer32Bit>
85+
</PropertyGroup>
86+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugWin|x64'">
87+
<Prefer32Bit>false</Prefer32Bit>
88+
</PropertyGroup>
89+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugWin|x86'">
90+
<Prefer32Bit>false</Prefer32Bit>
91+
</PropertyGroup>
92+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseMonoPY3|x64'">
93+
<Prefer32Bit>false</Prefer32Bit>
94+
</PropertyGroup>
95+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseMonoPY3|x86'">
96+
<Prefer32Bit>false</Prefer32Bit>
97+
</PropertyGroup>
98+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseMono|x64'">
99+
<Prefer32Bit>false</Prefer32Bit>
100+
</PropertyGroup>
101+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseMono|x86'">
102+
<Prefer32Bit>false</Prefer32Bit>
103+
</PropertyGroup>
104+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseWinPY3|x64'">
105+
<Prefer32Bit>false</Prefer32Bit>
106+
</PropertyGroup>
107+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseWinPY3|x86'">
108+
<Prefer32Bit>false</Prefer32Bit>
109+
</PropertyGroup>
110+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseWin|x64'">
111+
<Prefer32Bit>false</Prefer32Bit>
112+
</PropertyGroup>
113+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseWin|x86'">
114+
<Prefer32Bit>false</Prefer32Bit>
115+
</PropertyGroup>
68116
<ItemGroup>
69117
<Reference Include="RGiesecke.DllExport.Metadata">
70118
<HintPath>..\..\packages\UnmanagedExports.1.2.7\lib\net\RGiesecke.DllExport.Metadata.dll</HintPath>
@@ -92,4 +140,4 @@
92140
<Copy SourceFiles="$(TargetAssemblyPdb)" Condition="Exists('$(TargetAssemblyPdb)')" DestinationFiles="$(PythonBuildDir)\clr.pdb" />
93141
</Target>
94142
<Import Project="../../packages/UnmanagedExports.1.2.7/tools/RGiesecke.DllExport.targets" Condition="Exists('../../packages/UnmanagedExports.1.2.7/tools/RGiesecke.DllExport.targets')" />
95-
</Project>
143+
</Project>

‎src/clrmodule/packages.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="UnmanagedExports" version="1.2.7" targetFramework="net40" />
4-
</packages>
4+
</packages>

‎src/console/Console.csproj‎

Lines changed: 54 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
33
<PropertyGroup>
44
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -9,7 +9,7 @@
99
<RootNamespace>Python.Runtime</RootNamespace>
1010
<DocumentationFile>bin\nPython.xml</DocumentationFile>
1111
<OutputPath>bin\</OutputPath>
12-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1313
<TargetFrameworkProfile />
1414
<NoWarn>1591</NoWarn>
1515
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
@@ -72,6 +72,54 @@
7272
<PropertyGroup Condition="'$(PythonManifest)' != ''">
7373
<ApplicationManifest>$(PythonManifest)</ApplicationManifest>
7474
</PropertyGroup>
75+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugMonoPY3|x64'">
76+
<Prefer32Bit>false</Prefer32Bit>
77+
</PropertyGroup>
78+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugMonoPY3|x86'">
79+
<Prefer32Bit>false</Prefer32Bit>
80+
</PropertyGroup>
81+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugMono|x64'">
82+
<Prefer32Bit>false</Prefer32Bit>
83+
</PropertyGroup>
84+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugMono|x86'">
85+
<Prefer32Bit>false</Prefer32Bit>
86+
</PropertyGroup>
87+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugWinPY3|x64'">
88+
<Prefer32Bit>false</Prefer32Bit>
89+
</PropertyGroup>
90+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugWinPY3|x86'">
91+
<Prefer32Bit>false</Prefer32Bit>
92+
</PropertyGroup>
93+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugWin|x64'">
94+
<Prefer32Bit>false</Prefer32Bit>
95+
</PropertyGroup>
96+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugWin|x86'">
97+
<Prefer32Bit>false</Prefer32Bit>
98+
</PropertyGroup>
99+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseMonoPY3|x64'">
100+
<Prefer32Bit>false</Prefer32Bit>
101+
</PropertyGroup>
102+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseMonoPY3|x86'">
103+
<Prefer32Bit>false</Prefer32Bit>
104+
</PropertyGroup>
105+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseMono|x64'">
106+
<Prefer32Bit>false</Prefer32Bit>
107+
</PropertyGroup>
108+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseMono|x86'">
109+
<Prefer32Bit>false</Prefer32Bit>
110+
</PropertyGroup>
111+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseWinPY3|x64'">
112+
<Prefer32Bit>false</Prefer32Bit>
113+
</PropertyGroup>
114+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseWinPY3|x86'">
115+
<Prefer32Bit>false</Prefer32Bit>
116+
</PropertyGroup>
117+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseWin|x64'">
118+
<Prefer32Bit>false</Prefer32Bit>
119+
</PropertyGroup>
120+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseWin|x86'">
121+
<Prefer32Bit>false</Prefer32Bit>
122+
</PropertyGroup>
75123
<ItemGroup>
76124
<Reference Include="System" />
77125
</ItemGroup>
@@ -94,8 +142,11 @@
94142
<Name>Python.Runtime</Name>
95143
</ProjectReference>
96144
</ItemGroup>
145+
<ItemGroup>
146+
<None Include="app.config" />
147+
</ItemGroup>
97148
<Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
98149
<Target Name="AfterBuild">
99150
<Copy SourceFiles="$(TargetPath)" DestinationFolder="$(PythonBuildDir)" />
100151
</Target>
101-
</Project>
152+
</Project>

‎src/console/app.config‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>

‎src/embed_tests/Python.EmbeddingTest.csproj‎

Lines changed: 49 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<RootNamespace>Python.EmbeddingTest</RootNamespace>
1010
<DocumentationFile>bin\Python.EmbeddingTest.xml</DocumentationFile>
1111
<OutputPath>bin\</OutputPath>
12-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1313
<TargetFrameworkProfile />
1414
<NoWarn>1591</NoWarn>
1515
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
@@ -68,6 +68,54 @@
6868
<Optimize>true</Optimize>
6969
<DebugType>pdbonly</DebugType>
7070
</PropertyGroup>
71+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugMonoPY3|x64'">
72+
<Prefer32Bit>false</Prefer32Bit>
73+
</PropertyGroup>
74+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugMonoPY3|x86'">
75+
<Prefer32Bit>false</Prefer32Bit>
76+
</PropertyGroup>
77+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugMono|x64'">
78+
<Prefer32Bit>false</Prefer32Bit>
79+
</PropertyGroup>
80+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugMono|x86'">
81+
<Prefer32Bit>false</Prefer32Bit>
82+
</PropertyGroup>
83+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugWinPY3|x64'">
84+
<Prefer32Bit>false</Prefer32Bit>
85+
</PropertyGroup>
86+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugWinPY3|x86'">
87+
<Prefer32Bit>false</Prefer32Bit>
88+
</PropertyGroup>
89+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugWin|x64'">
90+
<Prefer32Bit>false</Prefer32Bit>
91+
</PropertyGroup>
92+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugWin|x86'">
93+
<Prefer32Bit>false</Prefer32Bit>
94+
</PropertyGroup>
95+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseMonoPY3|x64'">
96+
<Prefer32Bit>false</Prefer32Bit>
97+
</PropertyGroup>
98+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseMonoPY3|x86'">
99+
<Prefer32Bit>false</Prefer32Bit>
100+
</PropertyGroup>
101+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseMono|x64'">
102+
<Prefer32Bit>false</Prefer32Bit>
103+
</PropertyGroup>
104+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseMono|x86'">
105+
<Prefer32Bit>false</Prefer32Bit>
106+
</PropertyGroup>
107+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseWinPY3|x64'">
108+
<Prefer32Bit>false</Prefer32Bit>
109+
</PropertyGroup>
110+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseWinPY3|x86'">
111+
<Prefer32Bit>false</Prefer32Bit>
112+
</PropertyGroup>
113+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseWin|x64'">
114+
<Prefer32Bit>false</Prefer32Bit>
115+
</PropertyGroup>
116+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseWin|x86'">
117+
<Prefer32Bit>false</Prefer32Bit>
118+
</PropertyGroup>
71119
<ItemGroup>
72120
<Reference Include="Microsoft.CSharp" />
73121
<Reference Include="nunit.framework, Version=3.6.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">

‎src/embed_tests/packages.config‎

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

‎src/testing/Python.Test.csproj‎

Lines changed: 51 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
33
<PropertyGroup>
44
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -9,7 +9,7 @@
99
<RootNamespace>Python.Test</RootNamespace>
1010
<DocumentationFile>bin\Python.Test.xml</DocumentationFile>
1111
<OutputPath>bin\</OutputPath>
12-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1313
<TargetFrameworkProfile />
1414
<NoWarn>1591,0067</NoWarn>
1515
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
@@ -69,6 +69,54 @@
6969
<Optimize>true</Optimize>
7070
<DebugType>pdbonly</DebugType>
7171
</PropertyGroup>
72+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugMonoPY3|x64'">
73+
<Prefer32Bit>false</Prefer32Bit>
74+
</PropertyGroup>
75+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugMonoPY3|x86'">
76+
<Prefer32Bit>false</Prefer32Bit>
77+
</PropertyGroup>
78+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugMono|x64'">
79+
<Prefer32Bit>false</Prefer32Bit>
80+
</PropertyGroup>
81+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugMono|x86'">
82+
<Prefer32Bit>false</Prefer32Bit>
83+
</PropertyGroup>
84+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugWinPY3|x64'">
85+
<Prefer32Bit>false</Prefer32Bit>
86+
</PropertyGroup>
87+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugWinPY3|x86'">
88+
<Prefer32Bit>false</Prefer32Bit>
89+
</PropertyGroup>
90+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugWin|x64'">
91+
<Prefer32Bit>false</Prefer32Bit>
92+
</PropertyGroup>
93+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugWin|x86'">
94+
<Prefer32Bit>false</Prefer32Bit>
95+
</PropertyGroup>
96+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseMonoPY3|x64'">
97+
<Prefer32Bit>false</Prefer32Bit>
98+
</PropertyGroup>
99+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseMonoPY3|x86'">
100+
<Prefer32Bit>false</Prefer32Bit>
101+
</PropertyGroup>
102+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseMono|x64'">
103+
<Prefer32Bit>false</Prefer32Bit>
104+
</PropertyGroup>
105+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseMono|x86'">
106+
<Prefer32Bit>false</Prefer32Bit>
107+
</PropertyGroup>
108+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseWinPY3|x64'">
109+
<Prefer32Bit>false</Prefer32Bit>
110+
</PropertyGroup>
111+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseWinPY3|x86'">
112+
<Prefer32Bit>false</Prefer32Bit>
113+
</PropertyGroup>
114+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseWin|x64'">
115+
<Prefer32Bit>false</Prefer32Bit>
116+
</PropertyGroup>
117+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseWin|x86'">
118+
<Prefer32Bit>false</Prefer32Bit>
119+
</PropertyGroup>
72120
<ItemGroup>
73121
<Compile Include="arraytest.cs" />
74122
<Compile Include="callbacktest.cs" />
@@ -110,4 +158,4 @@
110158
<Copy SourceFiles="$(TargetAssembly)" DestinationFolder="$(SolutionDir)\src\tests\fixtures" />
111159
<!--Copy SourceFiles="$(TargetAssemblyPdb)" Condition="Exists('$(TargetAssemblyPdb)')" DestinationFolder="$(PythonBuildDir)" /-->
112160
</Target>
113-
</Project>
161+
</Project>

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL