Skip to content

Commit 319dfe4

Browse files
author
dse
committed
pdb generation improved for all conditions Net 4.0/NetStandard 2.0 x Debug/Release.
1 parent d25696f commit 319dfe4

File tree

5 files changed

+63
-112
lines changed

5 files changed

+63
-112
lines changed

‎src/clrmodule/clrmodule.15.csproj

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -38,45 +38,38 @@
3838
<PlatformTarget>x64</PlatformTarget>
3939
</PropertyGroup>
4040

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+
4150
<PropertyGroup Condition=" '$(Configuration)' == 'DebugMono'">
42-
<DebugSymbols>true</DebugSymbols>
4351
<DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);PYTHON2;TRACE;DEBUG</DefineConstants>
44-
<DebugType>full</DebugType>
4552
</PropertyGroup>
4653
<PropertyGroup Condition=" '$(Configuration)' == 'ReleaseMono'">
4754
<DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);PYTHON2</DefineConstants>
48-
<Optimize>true</Optimize>
49-
<DebugType>pdbonly</DebugType>
5055
</PropertyGroup>
5156
<PropertyGroup Condition=" '$(Configuration)' == 'DebugWin'">
52-
<DebugSymbols>true</DebugSymbols>
5357
<DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);PYTHON2;TRACE;DEBUG</DefineConstants>
54-
<DebugType>full</DebugType>
5558
</PropertyGroup>
5659
<PropertyGroup Condition=" '$(Configuration)' == 'ReleaseWin'">
5760
<DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);PYTHON2</DefineConstants>
58-
<Optimize>true</Optimize>
59-
<DebugType>pdbonly</DebugType>
6061
</PropertyGroup>
6162
<PropertyGroup Condition=" '$(Configuration)' == 'DebugMonoPY3'">
62-
<DebugSymbols>true</DebugSymbols>
6363
<DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);PYTHON3;TRACE;DEBUG</DefineConstants>
64-
<DebugType>full</DebugType>
6564
</PropertyGroup>
6665
<PropertyGroup Condition=" '$(Configuration)' == 'ReleaseMonoPY3'">
6766
<DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);PYTHON3</DefineConstants>
68-
<Optimize>true</Optimize>
69-
<DebugType>pdbonly</DebugType>
7067
</PropertyGroup>
7168
<PropertyGroup Condition=" '$(Configuration)' == 'DebugWinPY3'">
72-
<DebugSymbols>true</DebugSymbols>
7369
<DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);PYTHON3;TRACE;DEBUG</DefineConstants>
74-
<DebugType>full</DebugType>
7570
</PropertyGroup>
7671
<PropertyGroup Condition=" '$(Configuration)' == 'ReleaseWinPY3'">
7772
<DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);PYTHON3</DefineConstants>
78-
<Optimize>true</Optimize>
79-
<DebugType>pdbonly</DebugType>
8073
</PropertyGroup>
8174

8275
<ItemGroup>

‎src/console/Console.15.csproj

Lines changed: 12 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -38,46 +38,33 @@
3838
<PropertyGroup Condition=" '$(Platform)' == 'x64'">
3939
<PlatformTarget>x64</PlatformTarget>
4040
</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>
4444
<DebugType>full</DebugType>
4545
</PropertyGroup>
46-
<PropertyGroup Condition=" '$(Configuration)' == 'ReleaseMono'">
47-
<DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants)</DefineConstants>
46+
<PropertyGroup Condition="$(Configuration.Contains('Release')) AND '$(TargetFramework)'=='net40'">
4847
<Optimize>true</Optimize>
4948
<DebugType>pdbonly</DebugType>
5049
</PropertyGroup>
51-
<PropertyGroup Condition=" '$(Configuration)' == 'DebugWin'">
50+
<PropertyGroup Condition="$(Configuration.Contains('Debug')) AND '$(TargetFramework)'=='netstandard2.0'">
5251
<DebugSymbols>true</DebugSymbols>
53-
<DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);DEBUG;TRACE</DefineConstants>
52+
<Optimize>false</Optimize>
5453
<DebugType>full</DebugType>
5554
</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'">
6256
<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>
6857
<Optimize>true</Optimize>
69-
<DebugType>pdbonly</DebugType>
58+
<DebugType>portable</DebugType>
7059
</PropertyGroup>
71-
<PropertyGroup Condition=" '$(Configuration)' == 'DebugWinPY3'">
72-
<DebugSymbols>true</DebugSymbols>
60+
61+
<PropertyGroup Condition="$(Configuration.Contains('Debug'))">
7362
<DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);DEBUG;TRACE</DefineConstants>
74-
<DebugType>full</DebugType>
7563
</PropertyGroup>
76-
<PropertyGroup Condition=" '$(Configuration)' == 'ReleaseWinPY3'">
64+
<PropertyGroup Condition="$(Configuration.Contains('Release'))">
7765
<DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants)</DefineConstants>
78-
<Optimize>true</Optimize>
79-
<DebugType>pdbonly</DebugType>
8066
</PropertyGroup>
67+
8168
<PropertyGroup Condition="'$(PythonManifest)' != ''">
8269
<ApplicationManifest>$(PythonManifest)</ApplicationManifest>
8370
</PropertyGroup>

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

Lines changed: 12 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -38,45 +38,31 @@
3838
<PropertyGroup Condition=" '$(Platform)' == 'x64'">
3939
<PlatformTarget>x64</PlatformTarget>
4040
</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>
4444
<DebugType>full</DebugType>
4545
</PropertyGroup>
46-
<PropertyGroup Condition=" '$(Configuration)' == 'ReleaseMono'">
47-
<DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);</DefineConstants>
46+
<PropertyGroup Condition="$(Configuration.Contains('Release')) AND '$(TargetFramework)'=='net40'">
4847
<Optimize>true</Optimize>
4948
<DebugType>pdbonly</DebugType>
5049
</PropertyGroup>
51-
<PropertyGroup Condition=" '$(Configuration)' == 'DebugWin'">
50+
<PropertyGroup Condition="$(Configuration.Contains('Debug')) AND '$(TargetFramework)'=='netstandard2.0'">
5251
<DebugSymbols>true</DebugSymbols>
53-
<DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);DEBUG;TRACE</DefineConstants>
52+
<Optimize>false</Optimize>
5453
<DebugType>full</DebugType>
5554
</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'">
6256
<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>
6857
<Optimize>true</Optimize>
69-
<DebugType>pdbonly</DebugType>
58+
<DebugType>portable</DebugType>
7059
</PropertyGroup>
71-
<PropertyGroup Condition=" '$(Configuration)' == 'DebugWinPY3'">
72-
<DebugSymbols>true</DebugSymbols>
60+
61+
<PropertyGroup Condition="$(Configuration.Contains('Debug'))">
7362
<DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);DEBUG;TRACE</DefineConstants>
74-
<DebugType>full</DebugType>
7563
</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>
8066
</PropertyGroup>
8167

8268
<ItemGroup>

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

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -34,50 +34,48 @@
3434
<FrameworkPathOverride Condition="'$(TargetFramework)'=='net40' AND $(Configuration.Contains('Mono'))">$(NuGetPackageRoot)\microsoft.targetingpack.netframework.v4.5\1.0.1\lib\net45\</FrameworkPathOverride>
3535
<PythonInteropFile Condition="'$(PythonInteropFile)'==''">$(PYTHONNET_INTEROP_FILE)</PythonInteropFile>
3636
</PropertyGroup>
37+
<PropertyGroup Condition="$(Configuration.Contains('Debug')) AND '$(TargetFramework)'=='net40'">
38+
<Optimize>false</Optimize>
39+
<DebugType>full</DebugType>
40+
</PropertyGroup>
41+
<PropertyGroup Condition="$(Configuration.Contains('Release')) AND '$(TargetFramework)'=='net40'">
42+
<Optimize>true</Optimize>
43+
<DebugType>pdbonly</DebugType>
44+
</PropertyGroup>
45+
<PropertyGroup Condition="$(Configuration.Contains('Debug')) AND '$(TargetFramework)'=='netstandard2.0'">
46+
<DebugSymbols>true</DebugSymbols>
47+
<Optimize>false</Optimize>
48+
<DebugType>full</DebugType>
49+
</PropertyGroup>
50+
<PropertyGroup Condition="$(Configuration.Contains('Release')) AND '$(TargetFramework)'=='netstandard2.0'">
51+
<DebugSymbols>true</DebugSymbols>
52+
<Optimize>true</Optimize>
53+
<DebugType>portable</DebugType>
54+
</PropertyGroup>
3755

3856
<PropertyGroup Condition=" '$(Configuration)' == 'ReleaseMono'">
3957
<DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);PYTHON2;PYTHON27;UCS4</DefineConstants>
40-
<Optimize>true</Optimize>
41-
<DebugType>pdbonly</DebugType>
4258
</PropertyGroup>
4359
<PropertyGroup Condition=" '$(Configuration)' == 'ReleaseMonoPY3'">
4460
<DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);PYTHON3;PYTHON36;UCS4</DefineConstants>
45-
<Optimize>true</Optimize>
46-
<DebugType>pdbonly</DebugType>
4761
</PropertyGroup>
4862
<PropertyGroup Condition=" '$(Configuration)' == 'DebugMono'">
49-
<DebugSymbols>true</DebugSymbols>
5063
<DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);PYTHON2;PYTHON27;UCS4;TRACE;DEBUG</DefineConstants>
51-
<Optimize>false</Optimize>
52-
<DebugType>full</DebugType>
5364
</PropertyGroup>
5465
<PropertyGroup Condition=" '$(Configuration)' == 'DebugMonoPY3'">
55-
<DebugSymbols>true</DebugSymbols>
5666
<DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);PYTHON3;PYTHON36;UCS4;TRACE;DEBUG</DefineConstants>
57-
<Optimize>false</Optimize>
58-
<DebugType>full</DebugType>
5967
</PropertyGroup>
6068
<PropertyGroup Condition=" '$(Configuration)' == 'ReleaseWin'">
6169
<DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);PYTHON2;PYTHON27;UCS2</DefineConstants>
62-
<Optimize>true</Optimize>
63-
<DebugType>pdbonly</DebugType>
6470
</PropertyGroup>
6571
<PropertyGroup Condition=" '$(Configuration)' == 'ReleaseWinPY3'">
6672
<DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);PYTHON3;PYTHON36;UCS2</DefineConstants>
67-
<Optimize>true</Optimize>
68-
<DebugType>pdbonly</DebugType>
6973
</PropertyGroup>
7074
<PropertyGroup Condition=" '$(Configuration)' == 'DebugWin'">
71-
<DebugSymbols>true</DebugSymbols>
7275
<DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);PYTHON2;PYTHON27;UCS2;TRACE;DEBUG</DefineConstants>
73-
<Optimize>false</Optimize>
74-
<DebugType>full</DebugType>
7576
</PropertyGroup>
7677
<PropertyGroup Condition=" '$(Configuration)' == 'DebugWinPY3'">
77-
<DebugSymbols>true</DebugSymbols>
7878
<DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);PYTHON3;PYTHON36;UCS2;TRACE;DEBUG</DefineConstants>
79-
<Optimize>false</Optimize>
80-
<DebugType>full</DebugType>
8179
</PropertyGroup>
8280

8381
<ItemGroup Condition=" '$(PythonInteropFile)' != '' ">

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

Lines changed: 12 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -32,46 +32,33 @@
3232
<PropertyGroup Condition=" '$(Platform)' == 'x64'">
3333
<PlatformTarget>x64</PlatformTarget>
3434
</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>
3838
<DebugType>full</DebugType>
3939
</PropertyGroup>
40-
<PropertyGroup Condition=" '$(Configuration)' == 'ReleaseMono'">
41-
<DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants)</DefineConstants>
40+
<PropertyGroup Condition="$(Configuration.Contains('Release')) AND '$(TargetFramework)'=='net40'">
4241
<Optimize>true</Optimize>
4342
<DebugType>pdbonly</DebugType>
4443
</PropertyGroup>
45-
<PropertyGroup Condition=" '$(Configuration)' == 'DebugWin'">
44+
<PropertyGroup Condition="$(Configuration.Contains('Debug')) AND '$(TargetFramework)'=='netstandard2.0'">
4645
<DebugSymbols>true</DebugSymbols>
47-
<DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);DEBUG;TRACE</DefineConstants>
46+
<Optimize>false</Optimize>
4847
<DebugType>full</DebugType>
4948
</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'">
5650
<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>
6251
<Optimize>true</Optimize>
63-
<DebugType>pdbonly</DebugType>
52+
<DebugType>portable</DebugType>
6453
</PropertyGroup>
65-
<PropertyGroup Condition=" '$(Configuration)' == 'DebugWinPY3'">
66-
<DebugSymbols>true</DebugSymbols>
54+
55+
<PropertyGroup Condition="$(Configuration.Contains('Debug'))">
6756
<DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);DEBUG;TRACE</DefineConstants>
68-
<DebugType>full</DebugType>
6957
</PropertyGroup>
70-
<PropertyGroup Condition=" '$(Configuration)' == 'ReleaseWinPY3'">
58+
<PropertyGroup Condition="$(Configuration.Contains('Release'))">
7159
<DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants)</DefineConstants>
72-
<Optimize>true</Optimize>
73-
<DebugType>pdbonly</DebugType>
7460
</PropertyGroup>
61+
7562
<ItemGroup Condition="'$(TargetFramework)' == 'net40'">
7663
<Reference Include="Microsoft.CSharp" />
7764
<Reference Include="System" />

0 commit comments

Comments
 (0)