Skip to content

Commit 24c61e6

Browse files
vmuriartvmuriart
committed
Order Runtime.csproj configuration
To make it easier to verify everything is setup correctly Simplified the Mono.Unix include condition
1 parent 15cd373 commit 24c61e6

File tree

5 files changed

+20
-60
lines changed

5 files changed

+20
-60
lines changed

‎src/clrmodule/clrmodule.csproj‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
<PythonBuildDir Condition=" '$(PythonBuildDir)' == '' ">$(SolutionDir)</PythonBuildDir>
1717
<!--If need to freeze language version: <LangVersion>5</LangVersion> !-->
1818
<RestorePackages>true</RestorePackages>
19+
<ErrorReport>prompt</ErrorReport>
1920
</PropertyGroup>
2021
<PropertyGroup Condition=" '$(Platform)' == 'x86'">
2122
<PlatformTarget>x86</PlatformTarget>
@@ -27,49 +28,41 @@
2728
<DebugSymbols>true</DebugSymbols>
2829
<DefineConstants Condition="'$(DefineConstants)' == ''">PYTHON2;TRACE;DEBUG</DefineConstants>
2930
<DebugType>full</DebugType>
30-
<ErrorReport>prompt</ErrorReport>
3131
</PropertyGroup>
3232
<PropertyGroup Condition=" '$(Configuration)' == 'ReleaseMono'">
3333
<DefineConstants Condition="'$(DefineConstants)' == ''">PYTHON2</DefineConstants>
3434
<Optimize>true</Optimize>
3535
<DebugType>pdbonly</DebugType>
36-
<ErrorReport>prompt</ErrorReport>
3736
</PropertyGroup>
3837
<PropertyGroup Condition=" '$(Configuration)' == 'DebugWin'">
3938
<DebugSymbols>true</DebugSymbols>
4039
<DefineConstants Condition="'$(DefineConstants)' == ''">PYTHON2;TRACE;DEBUG</DefineConstants>
4140
<DebugType>full</DebugType>
42-
<ErrorReport>prompt</ErrorReport>
4341
</PropertyGroup>
4442
<PropertyGroup Condition=" '$(Configuration)' == 'ReleaseWin'">
4543
<DefineConstants Condition="'$(DefineConstants)' == ''">PYTHON2</DefineConstants>
4644
<Optimize>true</Optimize>
4745
<DebugType>pdbonly</DebugType>
48-
<ErrorReport>prompt</ErrorReport>
4946
</PropertyGroup>
5047
<PropertyGroup Condition=" '$(Configuration)' == 'DebugMonoPY3'">
5148
<DebugSymbols>true</DebugSymbols>
5249
<DefineConstants Condition="'$(DefineConstants)' == ''">PYTHON3;TRACE;DEBUG</DefineConstants>
5350
<DebugType>full</DebugType>
54-
<ErrorReport>prompt</ErrorReport>
5551
</PropertyGroup>
5652
<PropertyGroup Condition=" '$(Configuration)' == 'ReleaseMonoPY3'">
5753
<DefineConstants Condition="'$(DefineConstants)' == ''">PYTHON3</DefineConstants>
5854
<Optimize>true</Optimize>
5955
<DebugType>pdbonly</DebugType>
60-
<ErrorReport>prompt</ErrorReport>
6156
</PropertyGroup>
6257
<PropertyGroup Condition=" '$(Configuration)' == 'DebugWinPY3'">
6358
<DebugSymbols>true</DebugSymbols>
6459
<DefineConstants Condition="'$(DefineConstants)' == ''">PYTHON3;TRACE;DEBUG</DefineConstants>
6560
<DebugType>full</DebugType>
66-
<ErrorReport>prompt</ErrorReport>
6761
</PropertyGroup>
6862
<PropertyGroup Condition=" '$(Configuration)' == 'ReleaseWinPY3'">
6963
<DefineConstants Condition="'$(DefineConstants)' == ''">PYTHON3</DefineConstants>
7064
<Optimize>true</Optimize>
7165
<DebugType>pdbonly</DebugType>
72-
<ErrorReport>prompt</ErrorReport>
7366
</PropertyGroup>
7467
<ItemGroup>
7568
<Reference Include="RGiesecke.DllExport.Metadata">

‎src/console/Console.csproj‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
<PythonBuildDir Condition=" '$(PythonBuildDir)' == '' ">$(SolutionDir)</PythonBuildDir>
1717
<!--If need to freeze language version: <LangVersion>5</LangVersion> !-->
1818
<ApplicationIcon>python-clear.ico</ApplicationIcon>
19+
<ErrorReport>prompt</ErrorReport>
1920
</PropertyGroup>
2021
<PropertyGroup Condition=" '$(Platform)' == 'x86'">
2122
<PlatformTarget>x86</PlatformTarget>
@@ -27,49 +28,41 @@
2728
<DebugSymbols>true</DebugSymbols>
2829
<DefineConstants Condition="'$(DefineConstants)' == ''">DEBUG;TRACE</DefineConstants>
2930
<DebugType>full</DebugType>
30-
<ErrorReport>prompt</ErrorReport>
3131
</PropertyGroup>
3232
<PropertyGroup Condition=" '$(Configuration)' == 'ReleaseMono'">
3333
<DefineConstants Condition="'$(DefineConstants)' == ''"></DefineConstants>
3434
<Optimize>true</Optimize>
3535
<DebugType>pdbonly</DebugType>
36-
<ErrorReport>prompt</ErrorReport>
3736
</PropertyGroup>
3837
<PropertyGroup Condition=" '$(Configuration)' == 'DebugWin'">
3938
<DebugSymbols>true</DebugSymbols>
4039
<DefineConstants Condition="'$(DefineConstants)' == ''">DEBUG;TRACE</DefineConstants>
4140
<DebugType>full</DebugType>
42-
<ErrorReport>prompt</ErrorReport>
4341
</PropertyGroup>
4442
<PropertyGroup Condition=" '$(Configuration)' == 'ReleaseWin'">
4543
<DefineConstants Condition="'$(DefineConstants)' == ''"></DefineConstants>
4644
<Optimize>true</Optimize>
4745
<DebugType>pdbonly</DebugType>
48-
<ErrorReport>prompt</ErrorReport>
4946
</PropertyGroup>
5047
<PropertyGroup Condition=" '$(Configuration)' == 'DebugMonoPY3'">
5148
<DebugSymbols>true</DebugSymbols>
5249
<DefineConstants Condition="'$(DefineConstants)' == ''">DEBUG;TRACE</DefineConstants>
5350
<DebugType>full</DebugType>
54-
<ErrorReport>prompt</ErrorReport>
5551
</PropertyGroup>
5652
<PropertyGroup Condition=" '$(Configuration)' == 'ReleaseMonoPY3'">
5753
<DefineConstants Condition="'$(DefineConstants)' == ''"></DefineConstants>
5854
<Optimize>true</Optimize>
5955
<DebugType>pdbonly</DebugType>
60-
<ErrorReport>prompt</ErrorReport>
6156
</PropertyGroup>
6257
<PropertyGroup Condition=" '$(Configuration)' == 'DebugWinPY3'">
6358
<DebugSymbols>true</DebugSymbols>
6459
<DefineConstants Condition="'$(DefineConstants)' == ''">DEBUG;TRACE</DefineConstants>
6560
<DebugType>full</DebugType>
66-
<ErrorReport>prompt</ErrorReport>
6761
</PropertyGroup>
6862
<PropertyGroup Condition=" '$(Configuration)' == 'ReleaseWinPY3'">
6963
<DefineConstants Condition="'$(DefineConstants)' == ''"></DefineConstants>
7064
<Optimize>true</Optimize>
7165
<DebugType>pdbonly</DebugType>
72-
<ErrorReport>prompt</ErrorReport>
7366
</PropertyGroup>
7467
<PropertyGroup Condition="'$(PythonManifest)' != ''">
7568
<ApplicationManifest>$(PythonManifest)</ApplicationManifest>

‎src/embed_tests/Python.EmbeddingTest.csproj‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
<PythonBuildDir Condition=" '$(PythonBuildDir)' == '' ">$(SolutionDir)</PythonBuildDir>
1717
<!--If need to freeze language version: <LangVersion>5</LangVersion> !-->
1818
<RestorePackages>true</RestorePackages>
19+
<ErrorReport>prompt</ErrorReport>
1920
</PropertyGroup>
2021
<PropertyGroup Condition=" '$(Platform)' == 'x86'">
2122
<PlatformTarget>x86</PlatformTarget>
@@ -27,49 +28,41 @@
2728
<DebugSymbols>true</DebugSymbols>
2829
<DefineConstants Condition="'$(DefineConstants)' == ''">DEBUG;TRACE</DefineConstants>
2930
<DebugType>full</DebugType>
30-
<ErrorReport>prompt</ErrorReport>
3131
</PropertyGroup>
3232
<PropertyGroup Condition=" '$(Configuration)' == 'ReleaseMono'">
3333
<DefineConstants Condition="'$(DefineConstants)' == ''"></DefineConstants>
3434
<Optimize>true</Optimize>
3535
<DebugType>pdbonly</DebugType>
36-
<ErrorReport>prompt</ErrorReport>
3736
</PropertyGroup>
3837
<PropertyGroup Condition=" '$(Configuration)' == 'DebugWin'">
3938
<DebugSymbols>true</DebugSymbols>
4039
<DefineConstants Condition="'$(DefineConstants)' == ''">DEBUG;TRACE</DefineConstants>
4140
<DebugType>full</DebugType>
42-
<ErrorReport>prompt</ErrorReport>
4341
</PropertyGroup>
4442
<PropertyGroup Condition=" '$(Configuration)' == 'ReleaseWin'">
4543
<DefineConstants Condition="'$(DefineConstants)' == ''"></DefineConstants>
4644
<Optimize>true</Optimize>
4745
<DebugType>pdbonly</DebugType>
48-
<ErrorReport>prompt</ErrorReport>
4946
</PropertyGroup>
5047
<PropertyGroup Condition=" '$(Configuration)' == 'DebugMonoPY3'">
5148
<DebugSymbols>true</DebugSymbols>
5249
<DefineConstants Condition="'$(DefineConstants)' == ''">DEBUG;TRACE</DefineConstants>
5350
<DebugType>full</DebugType>
54-
<ErrorReport>prompt</ErrorReport>
5551
</PropertyGroup>
5652
<PropertyGroup Condition=" '$(Configuration)' == 'ReleaseMonoPY3'">
5753
<DefineConstants Condition="'$(DefineConstants)' == ''"></DefineConstants>
5854
<Optimize>true</Optimize>
5955
<DebugType>pdbonly</DebugType>
60-
<ErrorReport>prompt</ErrorReport>
6156
</PropertyGroup>
6257
<PropertyGroup Condition=" '$(Configuration)' == 'DebugWinPY3'">
6358
<DebugSymbols>true</DebugSymbols>
6459
<DefineConstants Condition="'$(DefineConstants)' == ''">DEBUG;TRACE</DefineConstants>
6560
<DebugType>full</DebugType>
66-
<ErrorReport>prompt</ErrorReport>
6761
</PropertyGroup>
6862
<PropertyGroup Condition=" '$(Configuration)' == 'ReleaseWinPY3'">
6963
<DefineConstants Condition="'$(DefineConstants)' == ''"></DefineConstants>
7064
<Optimize>true</Optimize>
7165
<DebugType>pdbonly</DebugType>
72-
<ErrorReport>prompt</ErrorReport>
7366
</PropertyGroup>
7467
<ItemGroup>
7568
<Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">

‎src/runtime/Python.Runtime.csproj‎

Lines changed: 16 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -29,25 +29,25 @@
2929
<Optimize>true</Optimize>
3030
<DebugType>pdbonly</DebugType>
3131
</PropertyGroup>
32-
<PropertyGroup Condition=" '$(Configuration)' == 'ReleaseWin'">
33-
<DefineConstants Condition="'$(DefineConstants)' == ''">PYTHON2;PYTHON27;UCS2</DefineConstants>
32+
<PropertyGroup Condition=" '$(Configuration)' == 'ReleaseMonoPY3'">
33+
<DefineConstants Condition="'$(DefineConstants)' == ''">PYTHON3;PYTHON36;UCS4</DefineConstants>
3434
<Optimize>true</Optimize>
3535
<DebugType>pdbonly</DebugType>
3636
</PropertyGroup>
3737
<PropertyGroup Condition=" '$(Configuration)' == 'DebugMono'">
3838
<DebugSymbols>true</DebugSymbols>
39-
<DefineConstants Condition="'$(DefineConstants)' == ''">TRACE;DEBUG;PYTHON2;PYTHON27;UCS4</DefineConstants>
39+
<DefineConstants Condition="'$(DefineConstants)' == ''">PYTHON2;PYTHON27;UCS4;TRACE;DEBUG</DefineConstants>
4040
<Optimize>false</Optimize>
4141
<DebugType>full</DebugType>
4242
</PropertyGroup>
43-
<PropertyGroup Condition=" '$(Configuration)' == 'DebugWin'">
43+
<PropertyGroup Condition=" '$(Configuration)' == 'DebugMonoPY3'">
4444
<DebugSymbols>true</DebugSymbols>
45-
<DefineConstants Condition="'$(DefineConstants)' == ''">TRACE;DEBUG;PYTHON2;PYTHON27;UCS2</DefineConstants>
45+
<DefineConstants Condition="'$(DefineConstants)' == ''">PYTHON3;PYTHON36;UCS4;TRACE;DEBUG</DefineConstants>
4646
<Optimize>false</Optimize>
4747
<DebugType>full</DebugType>
4848
</PropertyGroup>
49-
<PropertyGroup Condition=" '$(Configuration)' == 'ReleaseMonoPY3'">
50-
<DefineConstants Condition="'$(DefineConstants)' == ''">PYTHON3;PYTHON36;UCS4</DefineConstants>
49+
<PropertyGroup Condition=" '$(Configuration)' == 'ReleaseWin'">
50+
<DefineConstants Condition="'$(DefineConstants)' == ''">PYTHON2;PYTHON27;UCS2</DefineConstants>
5151
<Optimize>true</Optimize>
5252
<DebugType>pdbonly</DebugType>
5353
</PropertyGroup>
@@ -56,36 +56,24 @@
5656
<Optimize>true</Optimize>
5757
<DebugType>pdbonly</DebugType>
5858
</PropertyGroup>
59-
<PropertyGroup Condition=" '$(Configuration)' == 'DebugMonoPY3'">
59+
<PropertyGroup Condition=" '$(Configuration)' == 'DebugWin'">
6060
<DebugSymbols>true</DebugSymbols>
61-
<DefineConstants Condition="'$(DefineConstants)' == ''">TRACE;DEBUG;PYTHON3;PYTHON36;UCS4</DefineConstants>
61+
<DefineConstants Condition="'$(DefineConstants)' == ''">PYTHON2;PYTHON27;UCS2;TRACE;DEBUG</DefineConstants>
6262
<Optimize>false</Optimize>
6363
<DebugType>full</DebugType>
6464
</PropertyGroup>
6565
<PropertyGroup Condition=" '$(Configuration)' == 'DebugWinPY3'">
6666
<DebugSymbols>true</DebugSymbols>
67-
<DefineConstants Condition="'$(DefineConstants)' == ''">TRACE;DEBUG;PYTHON3;PYTHON36;UCS2</DefineConstants>
67+
<DefineConstants Condition="'$(DefineConstants)' == ''">PYTHON3;PYTHON36;UCS2;TRACE;DEBUG</DefineConstants>
6868
<Optimize>false</Optimize>
6969
<DebugType>full</DebugType>
7070
</PropertyGroup>
71-
<Choose>
72-
<When Condition=" '$(Configuration)'=='DebugMono' ">
73-
<ItemGroup>
74-
<Reference Include="Mono.Posix, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
75-
<SpecificVersion>False</SpecificVersion>
76-
<HintPath>..\..\packages\MonoGAC\Mono.Posix\4.0.0.0__0738eb9f132ed756\Mono.Posix.dll</HintPath>
77-
</Reference>
78-
</ItemGroup>
79-
</When>
80-
<When Condition=" '$(Configuration)'=='ReleaseMono' ">
81-
<ItemGroup>
82-
<Reference Include="Mono.Posix, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
83-
<SpecificVersion>False</SpecificVersion>
84-
<HintPath>..\..\packages\MonoGAC\Mono.Posix\4.0.0.0__0738eb9f132ed756\Mono.Posix.dll</HintPath>
85-
</Reference>
86-
</ItemGroup>
87-
</When>
88-
</Choose>
71+
<ItemGroup Condition=" '$(Configuration)'=='DebugMono' Or '$(Configuration)'=='ReleaseMono' ">
72+
<Reference Include="Mono.Posix, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
73+
<SpecificVersion>False</SpecificVersion>
74+
<HintPath>..\..\packages\MonoGAC\Mono.Posix\4.0.0.0__0738eb9f132ed756\Mono.Posix.dll</HintPath>
75+
</Reference>
76+
</ItemGroup>
8977
<ItemGroup>
9078
<Reference Include="System" />
9179
</ItemGroup>

‎src/testing/Python.Test.csproj‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
<PythonBuildDir Condition=" '$(PythonBuildDir)' == '' ">$(SolutionDir)</PythonBuildDir>
1717
<!--If need to freeze language version: <LangVersion>5</LangVersion> !-->
1818
<SignAssembly>true</SignAssembly>
19+
<ErrorReport>prompt</ErrorReport>
1920
</PropertyGroup>
2021
<PropertyGroup Condition=" '$(Platform)' == 'x86'">
2122
<PlatformTarget>x86</PlatformTarget>
@@ -27,49 +28,41 @@
2728
<DebugSymbols>true</DebugSymbols>
2829
<DefineConstants Condition="'$(DefineConstants)' == ''">DEBUG;TRACE</DefineConstants>
2930
<DebugType>full</DebugType>
30-
<ErrorReport>prompt</ErrorReport>
3131
</PropertyGroup>
3232
<PropertyGroup Condition=" '$(Configuration)' == 'ReleaseMono'">
3333
<DefineConstants Condition="'$(DefineConstants)' == ''"></DefineConstants>
3434
<Optimize>true</Optimize>
3535
<DebugType>pdbonly</DebugType>
36-
<ErrorReport>prompt</ErrorReport>
3736
</PropertyGroup>
3837
<PropertyGroup Condition=" '$(Configuration)' == 'DebugWin'">
3938
<DebugSymbols>true</DebugSymbols>
4039
<DefineConstants Condition="'$(DefineConstants)' == ''">DEBUG;TRACE</DefineConstants>
4140
<DebugType>full</DebugType>
42-
<ErrorReport>prompt</ErrorReport>
4341
</PropertyGroup>
4442
<PropertyGroup Condition=" '$(Configuration)' == 'ReleaseWin'">
4543
<DefineConstants Condition="'$(DefineConstants)' == ''"></DefineConstants>
4644
<Optimize>true</Optimize>
4745
<DebugType>pdbonly</DebugType>
48-
<ErrorReport>prompt</ErrorReport>
4946
</PropertyGroup>
5047
<PropertyGroup Condition=" '$(Configuration)' == 'DebugMonoPY3'">
5148
<DebugSymbols>true</DebugSymbols>
5249
<DefineConstants Condition="'$(DefineConstants)' == ''">DEBUG;TRACE</DefineConstants>
5350
<DebugType>full</DebugType>
54-
<ErrorReport>prompt</ErrorReport>
5551
</PropertyGroup>
5652
<PropertyGroup Condition=" '$(Configuration)' == 'ReleaseMonoPY3'">
5753
<DefineConstants Condition="'$(DefineConstants)' == ''"></DefineConstants>
5854
<Optimize>true</Optimize>
5955
<DebugType>pdbonly</DebugType>
60-
<ErrorReport>prompt</ErrorReport>
6156
</PropertyGroup>
6257
<PropertyGroup Condition=" '$(Configuration)' == 'DebugWinPY3'">
6358
<DebugSymbols>true</DebugSymbols>
6459
<DefineConstants Condition="'$(DefineConstants)' == ''">DEBUG;TRACE</DefineConstants>
6560
<DebugType>full</DebugType>
66-
<ErrorReport>prompt</ErrorReport>
6761
</PropertyGroup>
6862
<PropertyGroup Condition=" '$(Configuration)' == 'ReleaseWinPY3'">
6963
<DefineConstants Condition="'$(DefineConstants)' == ''"></DefineConstants>
7064
<Optimize>true</Optimize>
7165
<DebugType>pdbonly</DebugType>
72-
<ErrorReport>prompt</ErrorReport>
7366
</PropertyGroup>
7467
<ItemGroup>
7568
<Compile Include="arraytest.cs" />

0 commit comments

Comments
 (0)