Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit f5a002f

Browse files
dmitriysedmitriyse
authored
Merge pull request #573 from pythonnet/master-merge-fix
#518 #519 #546 merge fix
2 parents 75e5231 + 194e5e6 commit f5a002f

File tree

3 files changed

+17
-11
lines changed

3 files changed

+17
-11
lines changed

‎setup.py

-1
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,6 @@ def build_extension(self, ext):
265265
subprocess.check_call(" ".join(cmd + ["/t:Build"]), shell=use_shell)
266266
if DEVTOOLS == "MsDev15" or DEVTOOLS == "dotnet":
267267
subprocess.check_call(" ".join(cmd + ['"/t:Console_15:publish;Python_EmbeddingTest_15:publish"', "/p:TargetFramework=netcoreapp2.0"]), shell=use_shell)
268-
269268
if DEVTOOLS == "Mono" or DEVTOOLS == "dotnet":
270269
self._build_monoclr()
271270

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

-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@
8484
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0'">
8585
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
8686
</ItemGroup>
87-
8887
<ItemGroup>
8988
<ProjectReference Include="..\runtime\Python.Runtime.15.csproj" />
9089
</ItemGroup>

‎src/runtime/Python.Runtime.15.csproj

+17-9
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,14 @@
3232
<DefineConstants Condition="'$(TargetFramework)'=='netstandard2.0'">$(DefineConstants);NETSTANDARD</DefineConstants>
3333
<DefineConstants Condition="'$(BuildingInsideVisualStudio)' == 'true' AND '$(CustomDefineConstants)' != '' AND $(Configuration.Contains('Debug'))">$(DefineConstants);TRACE;DEBUG</DefineConstants>
3434
<FrameworkPathOverride Condition="'$(TargetFramework)'=='net40' AND $(Configuration.Contains('Mono'))">$(NuGetPackageRoot)\microsoft.targetingpack.netframework.v4.5\1.0.1\lib\net45\</FrameworkPathOverride>
35+
<Python2Version>$(PYTHONNET_PY2_VERSION)</Python2Version>
36+
<Python2Version Condition="'$(Python2Version)'==''">PYTHON27</Python2Version>
37+
<Python3Version>$(PYTHONNET_PY3_VERSION)</Python3Version>
38+
<Python3Version Condition="'$(Python3Version)'==''">PYTHON36</Python3Version>
39+
<PythonWinDefineConstants>$(PYTHONNET_WIN_DEFINE_CONSTANTS)</PythonWinDefineConstants>
40+
<PythonWinDefineConstants Condition="'$(PythonWinDefineConstants)'==''">UCS2</PythonWinDefineConstants>
41+
<PythonMonoDefineConstants>$(PYTHONNET_MONO_DEFINE_CONSTANTS)</PythonMonoDefineConstants>
42+
<PythonMonoDefineConstants Condition="'$(PythonMonoDefineConstants)'==''">UCS4;MONO_LINUX;PYTHON_WITH_PYMALLOC</PythonMonoDefineConstants>
3543
<PythonInteropFile Condition="'$(PythonInteropFile)'==''">$(PYTHONNET_INTEROP_FILE)</PythonInteropFile>
3644
</PropertyGroup>
3745
<PropertyGroup Condition="$(Configuration.Contains('Debug')) AND '$(TargetFramework)'=='net40'">
@@ -54,28 +62,28 @@
5462
</PropertyGroup>
5563

5664
<PropertyGroup Condition=" '$(Configuration)' == 'ReleaseMono'">
57-
<DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);PYTHON2;PYTHON27;UCS4</DefineConstants>
65+
<DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);PYTHON2;$(Python2Version);$(PythonMonoDefineConstants)</DefineConstants>
5866
</PropertyGroup>
5967
<PropertyGroup Condition=" '$(Configuration)' == 'ReleaseMonoPY3'">
60-
<DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);PYTHON3;PYTHON36;UCS4</DefineConstants>
68+
<DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);PYTHON3;$(Python3Version);$(PythonMonoDefineConstants)</DefineConstants>
6169
</PropertyGroup>
6270
<PropertyGroup Condition=" '$(Configuration)' == 'DebugMono'">
63-
<DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);PYTHON2;PYTHON27;UCS4;TRACE;DEBUG</DefineConstants>
71+
<DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);PYTHON2;$(Python2Version);$(PythonMonoDefineConstants);TRACE;DEBUG</DefineConstants>
6472
</PropertyGroup>
6573
<PropertyGroup Condition=" '$(Configuration)' == 'DebugMonoPY3'">
66-
<DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);PYTHON3;PYTHON36;UCS4;TRACE;DEBUG</DefineConstants>
74+
<DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);PYTHON3;$(Python3Version);$(PythonMonoDefineConstants);TRACE;DEBUG</DefineConstants>
6775
</PropertyGroup>
6876
<PropertyGroup Condition=" '$(Configuration)' == 'ReleaseWin'">
69-
<DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);PYTHON2;PYTHON27;UCS2</DefineConstants>
77+
<DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);PYTHON2;$(Python2Version);$(PythonWinDefineConstants)</DefineConstants>
7078
</PropertyGroup>
7179
<PropertyGroup Condition=" '$(Configuration)' == 'ReleaseWinPY3'">
72-
<DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);PYTHON3;PYTHON36;UCS2</DefineConstants>
80+
<DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);PYTHON3;$(Python3Version);$(PythonWinDefineConstants)</DefineConstants>
7381
</PropertyGroup>
7482
<PropertyGroup Condition=" '$(Configuration)' == 'DebugWin'">
75-
<DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);PYTHON2;PYTHON27;UCS2;TRACE;DEBUG</DefineConstants>
83+
<DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);PYTHON2;$(Python2Version);$(PythonWinDefineConstants);TRACE;DEBUG</DefineConstants>
7684
</PropertyGroup>
7785
<PropertyGroup Condition=" '$(Configuration)' == 'DebugWinPY3'">
78-
<DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);PYTHON3;PYTHON36;UCS2;TRACE;DEBUG</DefineConstants>
86+
<DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);PYTHON3;$(Python3Version);$(PythonWinDefineConstants);TRACE;DEBUG</DefineConstants>
7987
</PropertyGroup>
8088

8189
<ItemGroup Condition=" '$(PythonInteropFile)' != '' ">
@@ -110,7 +118,7 @@
110118
<Reference Include="Microsoft.CSharp" />
111119
</ItemGroup>
112120

113-
<ItemGroup Condition="'$(TargetFramework)'=='net40' AND $(Configuration.Contains('Mono'))">
121+
<ItemGroup Condition="'$(TargetFramework)'=='net40'">
114122
<PackageReference Include="Microsoft.TargetingPack.NETFramework.v4.5" Version="1.0.1" ExcludeAssets="All" PrivateAssets="All" />
115123
</ItemGroup>
116124

0 commit comments

Comments
 (0)