temporarily remove NET40 define to see if we can get going without it · devtrack/pythonnet@2699fdc · GitHub

1. devtrack
2. pythonnet

Repository navigation

• Code
• Pull requests1 (1)
• Actions
• Projects
• Security and quality
• Insights

Commit 2699fdc

Browse filesBrowse the repository at this point in the historyBrowse files

lostmsu

committed

temporarily remove NET40 define to see if we can get going without it

1 parent 467d1fd commit 2699fdc
Copy full SHA for 2699fdc

3 files changed

+8-12Lines changed: 8 additions & 12 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• setup.py
• src/runtime
  • Python.Runtime.csproj
  • polyfill
    • ReflectionPolifills.cs

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎setup.py‎

Copy file name to clipboardExpand all lines: setup.py

-2Lines changed: 0 additions & 2 deletions

Original file line number	Diff line number	Diff line change
@@ -306,7 +306,6 @@ def build_extension(self, ext):
306	306	_config = "{0}Win".format(CONFIG)
307	307	_solution_file = "pythonnet.sln"
308	308	_custom_define_constants = False
309		- defines.append("NET40")
310	309	elif DEVTOOLS == "MsDev15":
311	310	_xbuild = '"{0}"'.format(self._find_msbuild_tool_15())
312	311	_config = "{0}Win".format(CONFIG)
@@ -317,7 +316,6 @@ def build_extension(self, ext):
317	316	_config = "{0}Mono".format(CONFIG)
318	317	_solution_file = "pythonnet.sln"
319	318	_custom_define_constants = False
320		- defines.append("NET40")
321	319	elif DEVTOOLS == "dotnet":
322	320	_xbuild = "dotnet msbuild"
323	321	_config = "{0}Mono".format(CONFIG)

Collapse file

‎src/runtime/Python.Runtime.csproj‎

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

+8-8Lines changed: 8 additions & 8 deletions

Original file line number	Diff line number	Diff line change
@@ -29,46 +29,46 @@
29	29	<PlatformTarget>x64</PlatformTarget>
30	30	</PropertyGroup>-->
31	31	<PropertyGroup Condition=" '$(Configuration)' == 'ReleaseMono'">
32		- <DefineConstants Condition="'$(DefineConstants)' == ''">NET40;PYTHON2;PYTHON27;UCS4</DefineConstants>
	32	+ <DefineConstants Condition="'$(DefineConstants)' == ''">PYTHON2;PYTHON27;UCS4</DefineConstants>
33	33	<Optimize>true</Optimize>
34	34	<DebugType>pdbonly</DebugType>
35	35	</PropertyGroup>
36	36	<PropertyGroup Condition=" '$(Configuration)' == 'ReleaseMonoPY3'">
37		- <DefineConstants Condition="'$(DefineConstants)' == ''">NET40;PYTHON3;PYTHON38;UCS4</DefineConstants>
	37	+ <DefineConstants Condition="'$(DefineConstants)' == ''">PYTHON3;PYTHON38;UCS4</DefineConstants>
38	38	<Optimize>true</Optimize>
39	39	<DebugType>pdbonly</DebugType>
40	40	</PropertyGroup>
41	41	<PropertyGroup Condition=" '$(Configuration)' == 'DebugMono'">
42	42	<DebugSymbols>true</DebugSymbols>
43		- <DefineConstants Condition="'$(DefineConstants)' == ''">NET40;PYTHON2;PYTHON27;UCS4;TRACE;DEBUG</DefineConstants>
	43	+ <DefineConstants Condition="'$(DefineConstants)' == ''">PYTHON2;PYTHON27;UCS4;TRACE;DEBUG</DefineConstants>
44	44	<Optimize>false</Optimize>
45	45	<DebugType>full</DebugType>
46	46	</PropertyGroup>
47	47	<PropertyGroup Condition=" '$(Configuration)' == 'DebugMonoPY3'">
48	48	<DebugSymbols>true</DebugSymbols>
49		- <DefineConstants Condition="'$(DefineConstants)' == ''">NET40;PYTHON3;PYTHON38;UCS4;TRACE;DEBUG</DefineConstants>
	49	+ <DefineConstants Condition="'$(DefineConstants)' == ''">PYTHON3;PYTHON38;UCS4;TRACE;DEBUG</DefineConstants>
50	50	<Optimize>false</Optimize>
51	51	<DebugType>full</DebugType>
52	52	</PropertyGroup>
53	53	<PropertyGroup Condition=" '$(Configuration)' == 'ReleaseWin'">
54		- <DefineConstants Condition="'$(DefineConstants)' == ''">NET40;PYTHON2;PYTHON27;UCS2</DefineConstants>
	54	+ <DefineConstants Condition="'$(DefineConstants)' == ''">PYTHON2;PYTHON27;UCS2</DefineConstants>
55	55	<Optimize>true</Optimize>
56	56	<DebugType>pdbonly</DebugType>
57	57	</PropertyGroup>
58	58	<PropertyGroup Condition=" '$(Configuration)' == 'ReleaseWinPY3'">
59		- <DefineConstants Condition="'$(DefineConstants)' == ''">NET40;PYTHON3;PYTHON38;UCS2</DefineConstants>
	59	+ <DefineConstants Condition="'$(DefineConstants)' == ''">PYTHON3;PYTHON38;UCS2</DefineConstants>
60	60	<Optimize>true</Optimize>
61	61	<DebugType>pdbonly</DebugType>
62	62	</PropertyGroup>
63	63	<PropertyGroup Condition=" '$(Configuration)' == 'DebugWin'">
64	64	<DebugSymbols>true</DebugSymbols>
65		- <DefineConstants Condition="'$(DefineConstants)' == ''">NET40;PYTHON2;PYTHON27;UCS2;TRACE;DEBUG</DefineConstants>
	65	+ <DefineConstants Condition="'$(DefineConstants)' == ''">PYTHON2;PYTHON27;UCS2;TRACE;DEBUG</DefineConstants>
66	66	<Optimize>false</Optimize>
67	67	<DebugType>full</DebugType>
68	68	</PropertyGroup>
69	69	<PropertyGroup Condition=" '$(Configuration)' == 'DebugWinPY3'">
70	70	<DebugSymbols>true</DebugSymbols>
71		- <DefineConstants Condition="'$(DefineConstants)' == ''">NET40;PYTHON3;PYTHON38;UCS2;TRACE;DEBUG</DefineConstants>
	71	+ <DefineConstants Condition="'$(DefineConstants)' == ''">PYTHON3;PYTHON38;UCS2;TRACE;DEBUG</DefineConstants>
72	72	<Optimize>false</Optimize>
73	73	<DebugType>full</DebugType>
74	74	</PropertyGroup>

Collapse file

‎src/runtime/polyfill/ReflectionPolifills.cs‎

Copy file name to clipboardExpand all lines: src/runtime/polyfill/ReflectionPolifills.cs

-2Lines changed: 0 additions & 2 deletions

Original file line number	Diff line number	Diff line change
@@ -19,7 +19,6 @@ public static Type CreateType(this TypeBuilder typeBuilder)
19	19	return typeBuilder.GetTypeInfo().GetType();
20	20	}
21	21	#endif
22		- #if NET40
23	22	public static T GetCustomAttribute<T>(this Type type) where T: Attribute
24	23	{
25	24	return type.GetCustomAttributes(typeof(T), inherit: false)
@@ -33,6 +32,5 @@ public static T GetCustomAttribute<T>(this Assembly assembly) where T: Attribute
33	32	.Cast<T>()
34	33	.SingleOrDefault();
35	34	}
36		- #endif
37	35	}
38	36	}

0 commit comments

Comments

0 (0)