pdb generation improved for all conditions Net 4.0/NetStandard 2.0 x … · SandersAlex/pythonnet@7293223 · GitHub

1. SandersAlex
2. pythonnet

Repository navigation

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

Commit 7293223

Browse filesBrowse the repository at this point in the historyBrowse files

dse

committed

pdb generation improved for all conditions Net 4.0/NetStandard 2.0 x Debug/Release.

1 parent 447da7d commit 7293223
Copy full SHA for 7293223

5 files changed

+63-112Lines changed: 63 additions & 112 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• src
  • clrmodule
    • clrmodule.15.csproj
  • console
    • Console.15.csproj
  • embed_tests
    • Python.EmbeddingTest.15.csproj
  • runtime
    • Python.Runtime.15.csproj
  • testing
    • Python.Test.15.csproj

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎src/clrmodule/clrmodule.15.csproj‎

Copy file name to clipboardExpand all lines: src/clrmodule/clrmodule.15.csproj

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

Original file line number	Diff line number	Diff line change
@@ -38,45 +38,38 @@
38	38	<PlatformTarget>x64</PlatformTarget>
39	39	</PropertyGroup>
40	40
	41	+ <PropertyGroup Condition="$(Configuration.Contains('Debug')) AND '$(TargetFramework)'=='net40'">
	42	+ <Optimize>false</Optimize>
	43	+ <DebugType>full</DebugType>
	44	+ </PropertyGroup>
	45	+ <PropertyGroup Condition="$(Configuration.Contains('Release')) AND '$(TargetFramework)'=='net40'">
	46	+ <Optimize>true</Optimize>
	47	+ <DebugType>pdbonly</DebugType>
	48	+ </PropertyGroup>
	49	+
41	50	<PropertyGroup Condition=" '$(Configuration)' == 'DebugMono'">
42		- <DebugSymbols>true</DebugSymbols>
43	51	<DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);PYTHON2;TRACE;DEBUG</DefineConstants>
44		- <DebugType>full</DebugType>
45	52	</PropertyGroup>
46	53	<PropertyGroup Condition=" '$(Configuration)' == 'ReleaseMono'">
47	54	<DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);PYTHON2</DefineConstants>
48		- <Optimize>true</Optimize>
49		- <DebugType>pdbonly</DebugType>
50	55	</PropertyGroup>
51	56	<PropertyGroup Condition=" '$(Configuration)' == 'DebugWin'">
52		- <DebugSymbols>true</DebugSymbols>
53	57	<DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);PYTHON2;TRACE;DEBUG</DefineConstants>
54		- <DebugType>full</DebugType>
55	58	</PropertyGroup>
56	59	<PropertyGroup Condition=" '$(Configuration)' == 'ReleaseWin'">
57	60	<DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);PYTHON2</DefineConstants>
58		- <Optimize>true</Optimize>
59		- <DebugType>pdbonly</DebugType>
60	61	</PropertyGroup>
61	62	<PropertyGroup Condition=" '$(Configuration)' == 'DebugMonoPY3'">
62		- <DebugSymbols>true</DebugSymbols>
63	63	<DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);PYTHON3;TRACE;DEBUG</DefineConstants>
64		- <DebugType>full</DebugType>
65	64	</PropertyGroup>
66	65	<PropertyGroup Condition=" '$(Configuration)' == 'ReleaseMonoPY3'">
67	66	<DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);PYTHON3</DefineConstants>
68		- <Optimize>true</Optimize>
69		- <DebugType>pdbonly</DebugType>
70	67	</PropertyGroup>
71	68	<PropertyGroup Condition=" '$(Configuration)' == 'DebugWinPY3'">
72		- <DebugSymbols>true</DebugSymbols>
73	69	<DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);PYTHON3;TRACE;DEBUG</DefineConstants>
74		- <DebugType>full</DebugType>
75	70	</PropertyGroup>
76	71	<PropertyGroup Condition=" '$(Configuration)' == 'ReleaseWinPY3'">
77	72	<DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);PYTHON3</DefineConstants>
78		- <Optimize>true</Optimize>
79		- <DebugType>pdbonly</DebugType>
80	73	</PropertyGroup>
81	74
82	75	<ItemGroup>

Collapse file

‎src/console/Console.15.csproj‎

Copy file name to clipboardExpand all lines: src/console/Console.15.csproj

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

Original file line number	Diff line number	Diff line change
@@ -38,46 +38,33 @@
38	38	<PropertyGroup Condition=" '$(Platform)' == 'x64'">
39	39	<PlatformTarget>x64</PlatformTarget>
40	40	</PropertyGroup>
41		- <PropertyGroup Condition=" '$(Configuration)' == 'DebugMono'">
42		- <DebugSymbols>true</DebugSymbols>
43		- <DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);DEBUG;TRACE</DefineConstants>
	41	+
	42	+ <PropertyGroup Condition="$(Configuration.Contains('Debug')) AND '$(TargetFramework)'=='net40'">
	43	+ <Optimize>false</Optimize>
44	44	<DebugType>full</DebugType>
45	45	</PropertyGroup>
46		- <PropertyGroup Condition=" '$(Configuration)' == 'ReleaseMono'">
47		- <DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants)</DefineConstants>
	46	+ <PropertyGroup Condition="$(Configuration.Contains('Release')) AND '$(TargetFramework)'=='net40'">
48	47	<Optimize>true</Optimize>
49	48	<DebugType>pdbonly</DebugType>
50	49	</PropertyGroup>
51		- <PropertyGroup Condition=" '$(Configuration)' == 'DebugWin'">
	50	+ <PropertyGroup Condition="$(Configuration.Contains('Debug')) AND '$(TargetFramework)'=='netstandard2.0'">
52	51	<DebugSymbols>true</DebugSymbols>
53		- <DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);DEBUG;TRACE</DefineConstants>
	52	+ <Optimize>false</Optimize>
54	53	<DebugType>full</DebugType>
55	54	</PropertyGroup>
56		- <PropertyGroup Condition=" '$(Configuration)' == 'ReleaseWin'">
57		- <DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants)</DefineConstants>
58		- <Optimize>true</Optimize>
59		- <DebugType>pdbonly</DebugType>
60		- </PropertyGroup>
61		- <PropertyGroup Condition=" '$(Configuration)' == 'DebugMonoPY3'">
	55	+ <PropertyGroup Condition="$(Configuration.Contains('Release')) AND '$(TargetFramework)'=='netstandard2.0'">
62	56	<DebugSymbols>true</DebugSymbols>
63		- <DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);DEBUG;TRACE</DefineConstants>
64		- <DebugType>full</DebugType>
65		- </PropertyGroup>
66		- <PropertyGroup Condition=" '$(Configuration)' == 'ReleaseMonoPY3'">
67		- <DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants)</DefineConstants>
68	57	<Optimize>true</Optimize>
69		- <DebugType>pdbonly</DebugType>
	58	+ <DebugType>portable</DebugType>
70	59	</PropertyGroup>
71		- <PropertyGroup Condition=" '$(Configuration)' == 'DebugWinPY3'">
72		- <DebugSymbols>true</DebugSymbols>
	60	+
	61	+ <PropertyGroup Condition="$(Configuration.Contains('Debug'))">
73	62	<DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);DEBUG;TRACE</DefineConstants>
74		- <DebugType>full</DebugType>
75	63	</PropertyGroup>
76		- <PropertyGroup Condition=" '$(Configuration)' == 'ReleaseWinPY3'">
	64	+ <PropertyGroup Condition="$(Configuration.Contains('Release'))">
77	65	<DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants)</DefineConstants>
78		- <Optimize>true</Optimize>
79		- <DebugType>pdbonly</DebugType>
80	66	</PropertyGroup>
	67	+
81	68	<PropertyGroup Condition="'$(PythonManifest)' != ''">
82	69	<ApplicationManifest>$(PythonManifest)</ApplicationManifest>
83	70	</PropertyGroup>

Collapse file

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

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

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

Original file line number	Diff line number	Diff line change
@@ -38,45 +38,31 @@
38	38	<PropertyGroup Condition=" '$(Platform)' == 'x64'">
39	39	<PlatformTarget>x64</PlatformTarget>
40	40	</PropertyGroup>
41		- <PropertyGroup Condition=" '$(Configuration)' == 'DebugMono'">
42		- <DebugSymbols>true</DebugSymbols>
43		- <DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);DEBUG;TRACE</DefineConstants>
	41	+
	42	+ <PropertyGroup Condition="$(Configuration.Contains('Debug')) AND '$(TargetFramework)'=='net40'">
	43	+ <Optimize>false</Optimize>
44	44	<DebugType>full</DebugType>
45	45	</PropertyGroup>
46		- <PropertyGroup Condition=" '$(Configuration)' == 'ReleaseMono'">
47		- <DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);</DefineConstants>
	46	+ <PropertyGroup Condition="$(Configuration.Contains('Release')) AND '$(TargetFramework)'=='net40'">
48	47	<Optimize>true</Optimize>
49	48	<DebugType>pdbonly</DebugType>
50	49	</PropertyGroup>
51		- <PropertyGroup Condition=" '$(Configuration)' == 'DebugWin'">
	50	+ <PropertyGroup Condition="$(Configuration.Contains('Debug')) AND '$(TargetFramework)'=='netstandard2.0'">
52	51	<DebugSymbols>true</DebugSymbols>
53		- <DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);DEBUG;TRACE</DefineConstants>
	52	+ <Optimize>false</Optimize>
54	53	<DebugType>full</DebugType>
55	54	</PropertyGroup>
56		- <PropertyGroup Condition=" '$(Configuration)' == 'ReleaseWin'">
57		- <DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);</DefineConstants>
58		- <Optimize>true</Optimize>
59		- <DebugType>pdbonly</DebugType>
60		- </PropertyGroup>
61		- <PropertyGroup Condition=" '$(Configuration)' == 'DebugMonoPY3'">
	55	+ <PropertyGroup Condition="$(Configuration.Contains('Release')) AND '$(TargetFramework)'=='netstandard2.0'">
62	56	<DebugSymbols>true</DebugSymbols>
63		- <DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);DEBUG;TRACE</DefineConstants>
64		- <DebugType>full</DebugType>
65		- </PropertyGroup>
66		- <PropertyGroup Condition=" '$(Configuration)' == 'ReleaseMonoPY3'">
67		- <DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);</DefineConstants>
68	57	<Optimize>true</Optimize>
69		- <DebugType>pdbonly</DebugType>
	58	+ <DebugType>portable</DebugType>
70	59	</PropertyGroup>
71		- <PropertyGroup Condition=" '$(Configuration)' == 'DebugWinPY3'">
72		- <DebugSymbols>true</DebugSymbols>
	60	+
	61	+ <PropertyGroup Condition="$(Configuration.Contains('Debug'))">
73	62	<DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);DEBUG;TRACE</DefineConstants>
74		- <DebugType>full</DebugType>
75	63	</PropertyGroup>
76		- <PropertyGroup Condition=" '$(Configuration)' == 'ReleaseWinPY3'">
77		- <DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);</DefineConstants>
78		- <Optimize>true</Optimize>
79		- <DebugType>pdbonly</DebugType>
	64	+ <PropertyGroup Condition="$(Configuration.Contains('Release'))">
	65	+ <DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants)</DefineConstants>
80	66	</PropertyGroup>
81	67
82	68	<ItemGroup>

Collapse file

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

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

+18-20Lines changed: 18 additions & 20 deletions

Original file line number	Diff line number	Diff line change
@@ -42,50 +42,48 @@
42	42	<PythonMonoDefineConstants Condition="'$(PythonMonoDefineConstants)'==''">UCS4;MONO_LINUX;PYTHON_WITH_PYMALLOC</PythonMonoDefineConstants>
43	43	<PythonInteropFile Condition="'$(PythonInteropFile)'==''">$(PYTHONNET_INTEROP_FILE)</PythonInteropFile>
44	44	</PropertyGroup>
	45	+ <PropertyGroup Condition="$(Configuration.Contains('Debug')) AND '$(TargetFramework)'=='net40'">
	46	+ <Optimize>false</Optimize>
	47	+ <DebugType>full</DebugType>
	48	+ </PropertyGroup>
	49	+ <PropertyGroup Condition="$(Configuration.Contains('Release')) AND '$(TargetFramework)'=='net40'">
	50	+ <Optimize>true</Optimize>
	51	+ <DebugType>pdbonly</DebugType>
	52	+ </PropertyGroup>
	53	+ <PropertyGroup Condition="$(Configuration.Contains('Debug')) AND '$(TargetFramework)'=='netstandard2.0'">
	54	+ <DebugSymbols>true</DebugSymbols>
	55	+ <Optimize>false</Optimize>
	56	+ <DebugType>full</DebugType>
	57	+ </PropertyGroup>
	58	+ <PropertyGroup Condition="$(Configuration.Contains('Release')) AND '$(TargetFramework)'=='netstandard2.0'">
	59	+ <DebugSymbols>true</DebugSymbols>
	60	+ <Optimize>true</Optimize>
	61	+ <DebugType>portable</DebugType>
	62	+ </PropertyGroup>
45	63
46	64	<PropertyGroup Condition=" '$(Configuration)' == 'ReleaseMono'">
47	65	<DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);PYTHON2;$(Python2Version);$(PythonMonoDefineConstants)</DefineConstants>
48		- <Optimize>true</Optimize>
49		- <DebugType>pdbonly</DebugType>
50	66	</PropertyGroup>
51	67	<PropertyGroup Condition=" '$(Configuration)' == 'ReleaseMonoPY3'">
52	68	<DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);PYTHON3;$(Python3Version);$(PythonMonoDefineConstants)</DefineConstants>
53		- <Optimize>true</Optimize>
54		- <DebugType>pdbonly</DebugType>
55	69	</PropertyGroup>
56	70	<PropertyGroup Condition=" '$(Configuration)' == 'DebugMono'">
57		- <DebugSymbols>true</DebugSymbols>
58	71	<DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);PYTHON2;$(Python2Version);$(PythonMonoDefineConstants);TRACE;DEBUG</DefineConstants>
59		- <Optimize>false</Optimize>
60		- <DebugType>full</DebugType>
61	72	</PropertyGroup>
62	73	<PropertyGroup Condition=" '$(Configuration)' == 'DebugMonoPY3'">
63		- <DebugSymbols>true</DebugSymbols>
64	74	<DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);PYTHON3;$(Python3Version);$(PythonMonoDefineConstants);TRACE;DEBUG</DefineConstants>
65		- <Optimize>false</Optimize>
66		- <DebugType>full</DebugType>
67	75	</PropertyGroup>
68	76	<PropertyGroup Condition=" '$(Configuration)' == 'ReleaseWin'">
69	77	<DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);PYTHON2;$(Python2Version);$(PythonWinDefineConstants)</DefineConstants>
70		- <Optimize>true</Optimize>
71		- <DebugType>pdbonly</DebugType>
72	78	</PropertyGroup>
73	79	<PropertyGroup Condition=" '$(Configuration)' == 'ReleaseWinPY3'">
74	80	<DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);PYTHON3;$(Python3Version);$(PythonWinDefineConstants)</DefineConstants>
75		- <Optimize>true</Optimize>
76		- <DebugType>pdbonly</DebugType>
77	81	</PropertyGroup>
78	82	<PropertyGroup Condition=" '$(Configuration)' == 'DebugWin'">
79		- <DebugSymbols>true</DebugSymbols>
80	83	<DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);PYTHON2;$(Python2Version);$(PythonWinDefineConstants);TRACE;DEBUG</DefineConstants>
81		- <Optimize>false</Optimize>
82		- <DebugType>full</DebugType>
83	84	</PropertyGroup>
84	85	<PropertyGroup Condition=" '$(Configuration)' == 'DebugWinPY3'">
85		- <DebugSymbols>true</DebugSymbols>
86	86	<DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);PYTHON3;$(Python3Version);$(PythonWinDefineConstants);TRACE;DEBUG</DefineConstants>
87		- <Optimize>false</Optimize>
88		- <DebugType>full</DebugType>
89	87	</PropertyGroup>
90	88
91	89	<ItemGroup Condition=" '$(PythonInteropFile)' != '' ">

Collapse file

‎src/testing/Python.Test.15.csproj‎

Copy file name to clipboardExpand all lines: src/testing/Python.Test.15.csproj

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

Original file line number	Diff line number	Diff line change
@@ -32,46 +32,33 @@
32	32	<PropertyGroup Condition=" '$(Platform)' == 'x64'">
33	33	<PlatformTarget>x64</PlatformTarget>
34	34	</PropertyGroup>
35		- <PropertyGroup Condition=" '$(Configuration)' == 'DebugMono'">
36		- <DebugSymbols>true</DebugSymbols>
37		- <DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);DEBUG;TRACE</DefineConstants>
	35	+
	36	+ <PropertyGroup Condition="$(Configuration.Contains('Debug')) AND '$(TargetFramework)'=='net40'">
	37	+ <Optimize>false</Optimize>
38	38	<DebugType>full</DebugType>
39	39	</PropertyGroup>
40		- <PropertyGroup Condition=" '$(Configuration)' == 'ReleaseMono'">
41		- <DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants)</DefineConstants>
	40	+ <PropertyGroup Condition="$(Configuration.Contains('Release')) AND '$(TargetFramework)'=='net40'">
42	41	<Optimize>true</Optimize>
43	42	<DebugType>pdbonly</DebugType>
44	43	</PropertyGroup>
45		- <PropertyGroup Condition=" '$(Configuration)' == 'DebugWin'">
	44	+ <PropertyGroup Condition="$(Configuration.Contains('Debug')) AND '$(TargetFramework)'=='netstandard2.0'">
46	45	<DebugSymbols>true</DebugSymbols>
47		- <DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);DEBUG;TRACE</DefineConstants>
	46	+ <Optimize>false</Optimize>
48	47	<DebugType>full</DebugType>
49	48	</PropertyGroup>
50		- <PropertyGroup Condition=" '$(Configuration)' == 'ReleaseWin'">
51		- <DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants)</DefineConstants>
52		- <Optimize>true</Optimize>
53		- <DebugType>pdbonly</DebugType>
54		- </PropertyGroup>
55		- <PropertyGroup Condition=" '$(Configuration)' == 'DebugMonoPY3'">
	49	+ <PropertyGroup Condition="$(Configuration.Contains('Release')) AND '$(TargetFramework)'=='netstandard2.0'">
56	50	<DebugSymbols>true</DebugSymbols>
57		- <DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);DEBUG;TRACE</DefineConstants>
58		- <DebugType>full</DebugType>
59		- </PropertyGroup>
60		- <PropertyGroup Condition=" '$(Configuration)' == 'ReleaseMonoPY3'">
61		- <DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants)</DefineConstants>
62	51	<Optimize>true</Optimize>
63		- <DebugType>pdbonly</DebugType>
	52	+ <DebugType>portable</DebugType>
64	53	</PropertyGroup>
65		- <PropertyGroup Condition=" '$(Configuration)' == 'DebugWinPY3'">
66		- <DebugSymbols>true</DebugSymbols>
	54	+
	55	+ <PropertyGroup Condition="$(Configuration.Contains('Debug'))">
67	56	<DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);DEBUG;TRACE</DefineConstants>
68		- <DebugType>full</DebugType>
69	57	</PropertyGroup>
70		- <PropertyGroup Condition=" '$(Configuration)' == 'ReleaseWinPY3'">
	58	+ <PropertyGroup Condition="$(Configuration.Contains('Release'))">
71	59	<DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants)</DefineConstants>
72		- <Optimize>true</Optimize>
73		- <DebugType>pdbonly</DebugType>
74	60	</PropertyGroup>
	61	+
75	62	<ItemGroup Condition="'$(TargetFramework)' == 'net40'">
76	63	<Reference Include="Microsoft.CSharp" />
77	64	<Reference Include="System" />

0 commit comments

Comments

0 (0)