Skip to content

Commit 1991292

Browse files
vmuriartvmuriart
authored
Merge pull request #359 from vmuriart/develop
Clean-up project properties for netstandard
2 parents c197a64 + 24c61e6 commit 1991292

File tree

8 files changed

+140
-602
lines changed

8 files changed

+140
-602
lines changed

‎Python.Runtime.dll.config

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,20 @@
1-
<!-- Mono DLL map for Python.Runtime.dll
2-
3-
Keep this file next to Python.Runtime.dll
4-
5-
For more information read:
6-
http://www.mono-project.com/Config
7-
http://www.mono-project.com/Config_DllMap
8-
9-
-->
10-
1+
<?xml version="1.0" encoding="utf-8"?>
112
<configuration>
12-
<dllmap dll="python27" target="libpython2.7.so" os="!windows" />
13-
<dllmap dll="python33" target="libpython3.3.so" os="!windows" />
14-
<dllmap dll="python34" target="libpython3.4.so" os="!windows" />
3+
<!-- Mono DLL map for Python.Runtime.dll
4+
Keep this file next to Python.Runtime.dll
5+
For more information read:
6+
http://www.mono-project.com/Config
7+
http://www.mono-project.com/Config_DllMap -->
8+
<dllmap dll="python27" target="libpython2.7.so" os="!windows" />
9+
<dllmap dll="python33" target="libpython3.3.so" os="!windows" />
10+
<dllmap dll="python34" target="libpython3.4.so" os="!windows" />
1511
<dllmap dll="python35" target="libpython3.5.so" os="!windows" />
1612
<dllmap dll="python36" target="libpython3.6.so" os="!windows" />
17-
<dllmap dll="python27.dll" target="libpython2.7.so" os="!windows" />
18-
<dllmap dll="python33.dll" target="libpython3.3.so" os="!windows" />
19-
<dllmap dll="python34.dll" target="libpython3.4.so" os="!windows" />
13+
<dllmap dll="python37" target="libpython3.7.so" os="!windows" />
14+
<dllmap dll="python27.dll" target="libpython2.7.so" os="!windows" />
15+
<dllmap dll="python33.dll" target="libpython3.3.so" os="!windows" />
16+
<dllmap dll="python34.dll" target="libpython3.4.so" os="!windows" />
2017
<dllmap dll="python35.dll" target="libpython3.5.so" os="!windows" />
2118
<dllmap dll="python36.dll" target="libpython3.6.so" os="!windows" />
19+
<dllmap dll="python37.dll" target="libpython3.7.so" os="!windows" />
2220
</configuration>

‎src/clrmodule/clrmodule.csproj

Lines changed: 25 additions & 104 deletions
Original file line numberDiff line numberDiff line change
@@ -1,147 +1,68 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
33
<PropertyGroup>
44
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5-
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
6-
<ProductVersion>8.0.30703</ProductVersion>
7-
<SchemaVersion>2.0</SchemaVersion>
5+
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
86
<ProjectGuid>{86E834DE-1139-4511-96CC-69636A56E7AC}</ProjectGuid>
97
<OutputType>Library</OutputType>
10-
<RootNamespace>clrmodule</RootNamespace>
118
<AssemblyName>clrmodule</AssemblyName>
9+
<RootNamespace>clrmodule</RootNamespace>
10+
<DocumentationFile>bin\clrmodule.xml</DocumentationFile>
11+
<OutputPath>bin\</OutputPath>
1212
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
13-
<FileAlignment>512</FileAlignment>
13+
<TargetFrameworkProfile />
14+
<NoWarn>1591</NoWarn>
1415
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
1516
<PythonBuildDir Condition=" '$(PythonBuildDir)' == '' ">$(SolutionDir)</PythonBuildDir>
17+
<!--If need to freeze language version: <LangVersion>5</LangVersion> !-->
1618
<RestorePackages>true</RestorePackages>
17-
</PropertyGroup>
18-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugMono|x86'">
19-
<DebugSymbols>true</DebugSymbols>
20-
<OutputPath>bin\</OutputPath>
21-
<DefineConstants Condition="'$(DefineConstants)' == ''">TRACE;DEBUG;PYTHON2</DefineConstants>
22-
<DebugType>full</DebugType>
23-
<PlatformTarget>x86</PlatformTarget>
24-
<ErrorReport>prompt</ErrorReport>
25-
</PropertyGroup>
26-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugMono|x64'">
27-
<DebugSymbols>true</DebugSymbols>
28-
<OutputPath>bin\</OutputPath>
29-
<DefineConstants Condition="'$(DefineConstants)' == ''">TRACE;DEBUG;PYTHON2</DefineConstants>
30-
<DebugType>full</DebugType>
31-
<PlatformTarget>x64</PlatformTarget>
3219
<ErrorReport>prompt</ErrorReport>
3320
</PropertyGroup>
34-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseMono|x86'">
35-
<OutputPath>bin\</OutputPath>
36-
<DefineConstants Condition="'$(DefineConstants)' == ''">PYTHON2</DefineConstants>
37-
<Optimize>true</Optimize>
38-
<DebugType>pdbonly</DebugType>
21+
<PropertyGroup Condition=" '$(Platform)' == 'x86'">
3922
<PlatformTarget>x86</PlatformTarget>
40-
<ErrorReport>prompt</ErrorReport>
4123
</PropertyGroup>
42-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseMono|x64'">
43-
<OutputPath>bin\</OutputPath>
44-
<DefineConstants Condition="'$(DefineConstants)' == ''">PYTHON2</DefineConstants>
45-
<Optimize>true</Optimize>
46-
<DebugType>pdbonly</DebugType>
24+
<PropertyGroup Condition=" '$(Platform)' == 'x64'">
4725
<PlatformTarget>x64</PlatformTarget>
48-
<ErrorReport>prompt</ErrorReport>
49-
</PropertyGroup>
50-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugWin|x86'">
51-
<DebugSymbols>true</DebugSymbols>
52-
<OutputPath>bin\</OutputPath>
53-
<DefineConstants Condition="'$(DefineConstants)' == ''">TRACE;DEBUG;PYTHON2</DefineConstants>
54-
<DebugType>full</DebugType>
55-
<PlatformTarget>x86</PlatformTarget>
56-
<ErrorReport>prompt</ErrorReport>
5726
</PropertyGroup>
58-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugWin|x64'">
27+
<PropertyGroup Condition=" '$(Configuration)' == 'DebugMono'">
5928
<DebugSymbols>true</DebugSymbols>
60-
<OutputPath>bin\</OutputPath>
61-
<DefineConstants Condition="'$(DefineConstants)' == ''">TRACE;DEBUG;PYTHON2</DefineConstants>
29+
<DefineConstants Condition="'$(DefineConstants)' == ''">PYTHON2;TRACE;DEBUG</DefineConstants>
6230
<DebugType>full</DebugType>
63-
<PlatformTarget>x64</PlatformTarget>
64-
<ErrorReport>prompt</ErrorReport>
6531
</PropertyGroup>
66-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseWin|x86'">
67-
<OutputPath>bin\</OutputPath>
32+
<PropertyGroup Condition=" '$(Configuration)' == 'ReleaseMono'">
6833
<DefineConstants Condition="'$(DefineConstants)' == ''">PYTHON2</DefineConstants>
6934
<Optimize>true</Optimize>
7035
<DebugType>pdbonly</DebugType>
71-
<PlatformTarget>x86</PlatformTarget>
72-
<ErrorReport>prompt</ErrorReport>
7336
</PropertyGroup>
74-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseWin|x64'">
75-
<OutputPath>bin\</OutputPath>
37+
<PropertyGroup Condition=" '$(Configuration)' == 'DebugWin'">
38+
<DebugSymbols>true</DebugSymbols>
39+
<DefineConstants Condition="'$(DefineConstants)' == ''">PYTHON2;TRACE;DEBUG</DefineConstants>
40+
<DebugType>full</DebugType>
41+
</PropertyGroup>
42+
<PropertyGroup Condition=" '$(Configuration)' == 'ReleaseWin'">
7643
<DefineConstants Condition="'$(DefineConstants)' == ''">PYTHON2</DefineConstants>
7744
<Optimize>true</Optimize>
7845
<DebugType>pdbonly</DebugType>
79-
<PlatformTarget>x64</PlatformTarget>
80-
<ErrorReport>prompt</ErrorReport>
81-
</PropertyGroup>
82-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugMonoPY3|x86'">
83-
<DebugSymbols>true</DebugSymbols>
84-
<OutputPath>bin\</OutputPath>
85-
<DefineConstants Condition="'$(DefineConstants)' == ''">TRACE;DEBUG;PYTHON3</DefineConstants>
86-
<DebugType>full</DebugType>
87-
<PlatformTarget>x86</PlatformTarget>
88-
<ErrorReport>prompt</ErrorReport>
8946
</PropertyGroup>
90-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugMonoPY3|x64'">
47+
<PropertyGroup Condition=" '$(Configuration)' == 'DebugMonoPY3'">
9148
<DebugSymbols>true</DebugSymbols>
92-
<OutputPath>bin\</OutputPath>
93-
<DefineConstants Condition="'$(DefineConstants)' == ''">TRACE;DEBUG;PYTHON3</DefineConstants>
49+
<DefineConstants Condition="'$(DefineConstants)' == ''">PYTHON3;TRACE;DEBUG</DefineConstants>
9450
<DebugType>full</DebugType>
95-
<PlatformTarget>x64</PlatformTarget>
96-
<ErrorReport>prompt</ErrorReport>
97-
</PropertyGroup>
98-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseMonoPY3|x86'">
99-
<OutputPath>bin\</OutputPath>
100-
<DefineConstants Condition="'$(DefineConstants)' == ''">PYTHON3</DefineConstants>
101-
<Optimize>true</Optimize>
102-
<DebugType>pdbonly</DebugType>
103-
<PlatformTarget>x86</PlatformTarget>
104-
<ErrorReport>prompt</ErrorReport>
10551
</PropertyGroup>
106-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseMonoPY3|x64'">
107-
<OutputPath>bin\</OutputPath>
52+
<PropertyGroup Condition=" '$(Configuration)' == 'ReleaseMonoPY3'">
10853
<DefineConstants Condition="'$(DefineConstants)' == ''">PYTHON3</DefineConstants>
10954
<Optimize>true</Optimize>
11055
<DebugType>pdbonly</DebugType>
111-
<PlatformTarget>x64</PlatformTarget>
112-
<ErrorReport>prompt</ErrorReport>
113-
</PropertyGroup>
114-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugWinPY3|x86'">
115-
<DebugSymbols>true</DebugSymbols>
116-
<OutputPath>bin\</OutputPath>
117-
<DefineConstants Condition="'$(DefineConstants)' == ''">TRACE;DEBUG;PYTHON3</DefineConstants>
118-
<DebugType>full</DebugType>
119-
<PlatformTarget>x86</PlatformTarget>
120-
<ErrorReport>prompt</ErrorReport>
12156
</PropertyGroup>
122-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugWinPY3|x64'">
57+
<PropertyGroup Condition=" '$(Configuration)' == 'DebugWinPY3'">
12358
<DebugSymbols>true</DebugSymbols>
124-
<OutputPath>bin\</OutputPath>
125-
<DefineConstants Condition="'$(DefineConstants)' == ''">TRACE;DEBUG;PYTHON3</DefineConstants>
59+
<DefineConstants Condition="'$(DefineConstants)' == ''">PYTHON3;TRACE;DEBUG</DefineConstants>
12660
<DebugType>full</DebugType>
127-
<PlatformTarget>x64</PlatformTarget>
128-
<ErrorReport>prompt</ErrorReport>
12961
</PropertyGroup>
130-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseWinPY3|x86'">
131-
<OutputPath>bin\</OutputPath>
132-
<DefineConstants Condition="'$(DefineConstants)' == ''">PYTHON3</DefineConstants>
133-
<Optimize>true</Optimize>
134-
<DebugType>pdbonly</DebugType>
135-
<PlatformTarget>x86</PlatformTarget>
136-
<ErrorReport>prompt</ErrorReport>
137-
</PropertyGroup>
138-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseWinPY3|x64'">
139-
<OutputPath>bin\</OutputPath>
62+
<PropertyGroup Condition=" '$(Configuration)' == 'ReleaseWinPY3'">
14063
<DefineConstants Condition="'$(DefineConstants)' == ''">PYTHON3</DefineConstants>
14164
<Optimize>true</Optimize>
14265
<DebugType>pdbonly</DebugType>
143-
<PlatformTarget>x64</PlatformTarget>
144-
<ErrorReport>prompt</ErrorReport>
14566
</PropertyGroup>
14667
<ItemGroup>
14768
<Reference Include="RGiesecke.DllExport.Metadata">

‎src/clrmodule/packages.config

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
32
<packages>
43
<package id="UnmanagedExports" version="1.2.7" targetFramework="net40" />
54
</packages>

0 commit comments

Comments
 (0)