Merge pull request #573 from pythonnet/master-merge-fix · attackgithub/pythonnet@f5a002f · GitHub

1. attackgithub
2. pythonnet

Repository navigation

• Code
• Pull requests
• Actions
• Projects
• Security and quality
• Insights

Commit f5a002f

Browse filesBrowse the repository at this point in the historyBrowse files

dmitriyse

authored

Merge pull request pythonnet#573 from pythonnet/master-merge-fix

pythonnet#518 pythonnet#519 pythonnet#546 merge fix

2 parents 75e5231 + 194e5e6 commit f5a002f
Copy full SHA for f5a002f

3 files changed

+17-11Lines changed: 17 additions & 11 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• setup.py
• src
  • embed_tests
    • Python.EmbeddingTest.15.csproj
  • runtime
    • Python.Runtime.15.csproj

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎setup.py‎

Copy file name to clipboardExpand all lines: setup.py

-1Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -265,7 +265,6 @@ def build_extension(self, ext):
265	265	subprocess.check_call(" ".join(cmd + ["/t:Build"]), shell=use_shell)
266	266	if DEVTOOLS == "MsDev15" or DEVTOOLS == "dotnet":
267	267	subprocess.check_call(" ".join(cmd + ['"/t:Console_15:publish;Python_EmbeddingTest_15:publish"', "/p:TargetFramework=netcoreapp2.0"]), shell=use_shell)
268		-
269	268	if DEVTOOLS == "Mono" or DEVTOOLS == "dotnet":
270	269	self._build_monoclr()
271	270

Collapse file

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

Copy file name to clipboardExpand all lines: src/embed_tests/Python.EmbeddingTest.15.csproj

-1Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -84,7 +84,6 @@
84	84	<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0'">
85	85	<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
86	86	</ItemGroup>
87		-
88	87	<ItemGroup>
89	88	<ProjectReference Include="..\runtime\Python.Runtime.15.csproj" />
90	89	</ItemGroup>

Collapse file

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

Copy file name to clipboardExpand all lines: src/runtime/Python.Runtime.15.csproj

+17-9Lines changed: 17 additions & 9 deletions

Original file line number	Diff line number	Diff line change
@@ -32,6 +32,14 @@
32	32	<DefineConstants Condition="'$(TargetFramework)'=='netstandard2.0'">$(DefineConstants);NETSTANDARD</DefineConstants>
33	33	<DefineConstants Condition="'$(BuildingInsideVisualStudio)' == 'true' AND '$(CustomDefineConstants)' != '' AND $(Configuration.Contains('Debug'))">$(DefineConstants);TRACE;DEBUG</DefineConstants>
34	34	<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>
35	43	<PythonInteropFile Condition="'$(PythonInteropFile)'==''">$(PYTHONNET_INTEROP_FILE)</PythonInteropFile>
36	44	</PropertyGroup>
37	45	<PropertyGroup Condition="$(Configuration.Contains('Debug')) AND '$(TargetFramework)'=='net40'">
@@ -54,28 +62,28 @@
54	62	</PropertyGroup>
55	63
56	64	<PropertyGroup Condition=" '$(Configuration)' == 'ReleaseMono'">
57		- <DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);PYTHON2;PYTHON27;UCS4</DefineConstants>
	65	+ <DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);PYTHON2;$(Python2Version);$(PythonMonoDefineConstants)</DefineConstants>
58	66	</PropertyGroup>
59	67	<PropertyGroup Condition=" '$(Configuration)' == 'ReleaseMonoPY3'">
60		- <DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);PYTHON3;PYTHON36;UCS4</DefineConstants>
	68	+ <DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);PYTHON3;$(Python3Version);$(PythonMonoDefineConstants)</DefineConstants>
61	69	</PropertyGroup>
62	70	<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>
64	72	</PropertyGroup>
65	73	<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>
67	75	</PropertyGroup>
68	76	<PropertyGroup Condition=" '$(Configuration)' == 'ReleaseWin'">
69		- <DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);PYTHON2;PYTHON27;UCS2</DefineConstants>
	77	+ <DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);PYTHON2;$(Python2Version);$(PythonWinDefineConstants)</DefineConstants>
70	78	</PropertyGroup>
71	79	<PropertyGroup Condition=" '$(Configuration)' == 'ReleaseWinPY3'">
72		- <DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);PYTHON3;PYTHON36;UCS2</DefineConstants>
	80	+ <DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);PYTHON3;$(Python3Version);$(PythonWinDefineConstants)</DefineConstants>
73	81	</PropertyGroup>
74	82	<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>
76	84	</PropertyGroup>
77	85	<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>
79	87	</PropertyGroup>
80	88
81	89	<ItemGroup Condition=" '$(PythonInteropFile)' != '' ">
@@ -110,7 +118,7 @@
110	118	<Reference Include="Microsoft.CSharp" />
111	119	</ItemGroup>
112	120
113		- <ItemGroup Condition="'$(TargetFramework)'=='net40' AND $(Configuration.Contains('Mono'))">
	121	+ <ItemGroup Condition="'$(TargetFramework)'=='net40'">
114	122	<PackageReference Include="Microsoft.TargetingPack.NETFramework.v4.5" Version="1.0.1" ExcludeAssets="All" PrivateAssets="All" />
115	123	</ItemGroup>
116	124

0 commit comments

Comments

0 (0)