X Tutup
Skip to content

Commit 5844bee

Browse files
vmuriartvmuriart
committed
Remove extra properties/Organize properties
1 parent b9815e4 commit 5844bee

File tree

6 files changed

+35
-144
lines changed

6 files changed

+35
-144
lines changed

‎src/clrmodule/clrmodule.csproj‎

Lines changed: 8 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,44 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
33
<PropertyGroup>
44
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5-
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
6-
<ProductVersion>8.0.30703</ProductVersion>
7-
<SchemaVersion>2.0</SchemaVersion>
5+
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
86
<ProjectGuid>{86E834DE-1139-4511-96CC-69636A56E7AC}</ProjectGuid>
97
<OutputType>Library</OutputType>
10-
<RootNamespace>clrmodule</RootNamespace>
118
<AssemblyName>clrmodule</AssemblyName>
9+
<RootNamespace>clrmodule</RootNamespace>
10+
<DocumentationFile>bin\clrmodule.xml</DocumentationFile>
11+
<OutputPath>bin\</OutputPath>
1212
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
13-
<FileAlignment>512</FileAlignment>
13+
<TargetFrameworkProfile />
14+
<NoWarn>1591</NoWarn>
1415
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
1516
<PythonBuildDir Condition=" '$(PythonBuildDir)' == '' ">$(SolutionDir)</PythonBuildDir>
17+
<!--If need to freeze language version: <LangVersion>5</LangVersion> !-->
1618
<RestorePackages>true</RestorePackages>
1719
</PropertyGroup>
1820
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugMono|x86'">
1921
<DebugSymbols>true</DebugSymbols>
20-
<OutputPath>bin\</OutputPath>
2122
<DefineConstants Condition="'$(DefineConstants)' == ''">TRACE;DEBUG;PYTHON2</DefineConstants>
2223
<DebugType>full</DebugType>
2324
<PlatformTarget>x86</PlatformTarget>
2425
<ErrorReport>prompt</ErrorReport>
2526
</PropertyGroup>
2627
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugMono|x64'">
2728
<DebugSymbols>true</DebugSymbols>
28-
<OutputPath>bin\</OutputPath>
2929
<DefineConstants Condition="'$(DefineConstants)' == ''">TRACE;DEBUG;PYTHON2</DefineConstants>
3030
<DebugType>full</DebugType>
3131
<PlatformTarget>x64</PlatformTarget>
3232
<ErrorReport>prompt</ErrorReport>
3333
</PropertyGroup>
3434
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseMono|x86'">
35-
<OutputPath>bin\</OutputPath>
3635
<DefineConstants Condition="'$(DefineConstants)' == ''">PYTHON2</DefineConstants>
3736
<Optimize>true</Optimize>
3837
<DebugType>pdbonly</DebugType>
3938
<PlatformTarget>x86</PlatformTarget>
4039
<ErrorReport>prompt</ErrorReport>
4140
</PropertyGroup>
4241
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseMono|x64'">
43-
<OutputPath>bin\</OutputPath>
4442
<DefineConstants Condition="'$(DefineConstants)' == ''">PYTHON2</DefineConstants>
4543
<Optimize>true</Optimize>
4644
<DebugType>pdbonly</DebugType>
@@ -49,30 +47,26 @@
4947
</PropertyGroup>
5048
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugWin|x86'">
5149
<DebugSymbols>true</DebugSymbols>
52-
<OutputPath>bin\</OutputPath>
5350
<DefineConstants Condition="'$(DefineConstants)' == ''">TRACE;DEBUG;PYTHON2</DefineConstants>
5451
<DebugType>full</DebugType>
5552
<PlatformTarget>x86</PlatformTarget>
5653
<ErrorReport>prompt</ErrorReport>
5754
</PropertyGroup>
5855
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugWin|x64'">
5956
<DebugSymbols>true</DebugSymbols>
60-
<OutputPath>bin\</OutputPath>
6157
<DefineConstants Condition="'$(DefineConstants)' == ''">TRACE;DEBUG;PYTHON2</DefineConstants>
6258
<DebugType>full</DebugType>
6359
<PlatformTarget>x64</PlatformTarget>
6460
<ErrorReport>prompt</ErrorReport>
6561
</PropertyGroup>
6662
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseWin|x86'">
67-
<OutputPath>bin\</OutputPath>
6863
<DefineConstants Condition="'$(DefineConstants)' == ''">PYTHON2</DefineConstants>
6964
<Optimize>true</Optimize>
7065
<DebugType>pdbonly</DebugType>
7166
<PlatformTarget>x86</PlatformTarget>
7267
<ErrorReport>prompt</ErrorReport>
7368
</PropertyGroup>
7469
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseWin|x64'">
75-
<OutputPath>bin\</OutputPath>
7670
<DefineConstants Condition="'$(DefineConstants)' == ''">PYTHON2</DefineConstants>
7771
<Optimize>true</Optimize>
7872
<DebugType>pdbonly</DebugType>
@@ -81,30 +75,26 @@
8175
</PropertyGroup>
8276
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugMonoPY3|x86'">
8377
<DebugSymbols>true</DebugSymbols>
84-
<OutputPath>bin\</OutputPath>
8578
<DefineConstants Condition="'$(DefineConstants)' == ''">TRACE;DEBUG;PYTHON3</DefineConstants>
8679
<DebugType>full</DebugType>
8780
<PlatformTarget>x86</PlatformTarget>
8881
<ErrorReport>prompt</ErrorReport>
8982
</PropertyGroup>
9083
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugMonoPY3|x64'">
9184
<DebugSymbols>true</DebugSymbols>
92-
<OutputPath>bin\</OutputPath>
9385
<DefineConstants Condition="'$(DefineConstants)' == ''">TRACE;DEBUG;PYTHON3</DefineConstants>
9486
<DebugType>full</DebugType>
9587
<PlatformTarget>x64</PlatformTarget>
9688
<ErrorReport>prompt</ErrorReport>
9789
</PropertyGroup>
9890
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseMonoPY3|x86'">
99-
<OutputPath>bin\</OutputPath>
10091
<DefineConstants Condition="'$(DefineConstants)' == ''">PYTHON3</DefineConstants>
10192
<Optimize>true</Optimize>
10293
<DebugType>pdbonly</DebugType>
10394
<PlatformTarget>x86</PlatformTarget>
10495
<ErrorReport>prompt</ErrorReport>
10596
</PropertyGroup>
10697
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseMonoPY3|x64'">
107-
<OutputPath>bin\</OutputPath>
10898
<DefineConstants Condition="'$(DefineConstants)' == ''">PYTHON3</DefineConstants>
10999
<Optimize>true</Optimize>
110100
<DebugType>pdbonly</DebugType>
@@ -113,30 +103,26 @@
113103
</PropertyGroup>
114104
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugWinPY3|x86'">
115105
<DebugSymbols>true</DebugSymbols>
116-
<OutputPath>bin\</OutputPath>
117106
<DefineConstants Condition="'$(DefineConstants)' == ''">TRACE;DEBUG;PYTHON3</DefineConstants>
118107
<DebugType>full</DebugType>
119108
<PlatformTarget>x86</PlatformTarget>
120109
<ErrorReport>prompt</ErrorReport>
121110
</PropertyGroup>
122111
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugWinPY3|x64'">
123112
<DebugSymbols>true</DebugSymbols>
124-
<OutputPath>bin\</OutputPath>
125113
<DefineConstants Condition="'$(DefineConstants)' == ''">TRACE;DEBUG;PYTHON3</DefineConstants>
126114
<DebugType>full</DebugType>
127115
<PlatformTarget>x64</PlatformTarget>
128116
<ErrorReport>prompt</ErrorReport>
129117
</PropertyGroup>
130118
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseWinPY3|x86'">
131-
<OutputPath>bin\</OutputPath>
132119
<DefineConstants Condition="'$(DefineConstants)' == ''">PYTHON3</DefineConstants>
133120
<Optimize>true</Optimize>
134121
<DebugType>pdbonly</DebugType>
135122
<PlatformTarget>x86</PlatformTarget>
136123
<ErrorReport>prompt</ErrorReport>
137124
</PropertyGroup>
138125
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseWinPY3|x64'">
139-
<OutputPath>bin\</OutputPath>
140126
<DefineConstants Condition="'$(DefineConstants)' == ''">PYTHON3</DefineConstants>
141127
<Optimize>true</Optimize>
142128
<DebugType>pdbonly</DebugType>

‎src/console/Console.csproj‎

Lines changed: 7 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -5,34 +5,33 @@
55
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
66
<ProjectGuid>{E29DCF0A-5114-4A98-B1DD-71264B6EA349}</ProjectGuid>
77
<OutputType>Exe</OutputType>
8-
<NoStandardLibraries>false</NoStandardLibraries>
98
<AssemblyName>nPython</AssemblyName>
109
<RootNamespace>Python.Runtime</RootNamespace>
11-
<RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
12-
<ApplicationIcon>python-clear.ico</ApplicationIcon>
13-
<ProductVersion>10.0.0</ProductVersion>
14-
<SchemaVersion>2.0</SchemaVersion>
10+
<DocumentationFile>bin\nPython.xml</DocumentationFile>
11+
<OutputPath>bin\</OutputPath>
12+
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
13+
<TargetFrameworkProfile />
14+
<NoWarn>1591</NoWarn>
1515
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
1616
<PythonBuildDir Condition=" '$(PythonBuildDir)' == '' ">$(SolutionDir)</PythonBuildDir>
17+
<!--If need to freeze language version: <LangVersion>5</LangVersion> !-->
18+
<ApplicationIcon>python-clear.ico</ApplicationIcon>
1719
</PropertyGroup>
1820
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugMono|x86'">
1921
<DebugSymbols>true</DebugSymbols>
20-
<OutputPath>bin\</OutputPath>
2122
<DefineConstants Condition="'$(DefineConstants)' == ''">DEBUG;TRACE</DefineConstants>
2223
<DebugType>full</DebugType>
2324
<PlatformTarget>x86</PlatformTarget>
2425
<ErrorReport>prompt</ErrorReport>
2526
</PropertyGroup>
2627
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugMono|x64'">
2728
<DebugSymbols>true</DebugSymbols>
28-
<OutputPath>bin\</OutputPath>
2929
<DefineConstants Condition="'$(DefineConstants)' == ''">DEBUG;TRACE</DefineConstants>
3030
<DebugType>full</DebugType>
3131
<PlatformTarget>x64</PlatformTarget>
3232
<ErrorReport>prompt</ErrorReport>
3333
</PropertyGroup>
3434
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseMono|x86'">
35-
<OutputPath>bin\</OutputPath>
3635
<DefineConstants Condition="'$(DefineConstants)' == ''">
3736
</DefineConstants>
3837
<Optimize>true</Optimize>
@@ -41,7 +40,6 @@
4140
<ErrorReport>prompt</ErrorReport>
4241
</PropertyGroup>
4342
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseMono|x64'">
44-
<OutputPath>bin\</OutputPath>
4543
<DefineConstants Condition="'$(DefineConstants)' == ''">
4644
</DefineConstants>
4745
<Optimize>true</Optimize>
@@ -51,22 +49,19 @@
5149
</PropertyGroup>
5250
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugWin|x86'">
5351
<DebugSymbols>true</DebugSymbols>
54-
<OutputPath>bin\</OutputPath>
5552
<DefineConstants Condition="'$(DefineConstants)' == ''">DEBUG;TRACE</DefineConstants>
5653
<DebugType>full</DebugType>
5754
<PlatformTarget>x86</PlatformTarget>
5855
<ErrorReport>prompt</ErrorReport>
5956
</PropertyGroup>
6057
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugWin|x64'">
6158
<DebugSymbols>true</DebugSymbols>
62-
<OutputPath>bin\</OutputPath>
6359
<DefineConstants Condition="'$(DefineConstants)' == ''">DEBUG;TRACE</DefineConstants>
6460
<DebugType>full</DebugType>
6561
<PlatformTarget>x64</PlatformTarget>
6662
<ErrorReport>prompt</ErrorReport>
6763
</PropertyGroup>
6864
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseWin|x86'">
69-
<OutputPath>bin\</OutputPath>
7065
<DefineConstants Condition="'$(DefineConstants)' == ''">
7166
</DefineConstants>
7267
<Optimize>true</Optimize>
@@ -75,7 +70,6 @@
7570
<ErrorReport>prompt</ErrorReport>
7671
</PropertyGroup>
7772
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseWin|x64'">
78-
<OutputPath>bin\</OutputPath>
7973
<DefineConstants Condition="'$(DefineConstants)' == ''">
8074
</DefineConstants>
8175
<Optimize>true</Optimize>
@@ -85,22 +79,19 @@
8579
</PropertyGroup>
8680
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugMonoPY3|x86'">
8781
<DebugSymbols>true</DebugSymbols>
88-
<OutputPath>bin\</OutputPath>
8982
<DefineConstants Condition="'$(DefineConstants)' == ''">DEBUG;TRACE</DefineConstants>
9083
<DebugType>full</DebugType>
9184
<PlatformTarget>x86</PlatformTarget>
9285
<ErrorReport>prompt</ErrorReport>
9386
</PropertyGroup>
9487
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugMonoPY3|x64'">
9588
<DebugSymbols>true</DebugSymbols>
96-
<OutputPath>bin\</OutputPath>
9789
<DefineConstants Condition="'$(DefineConstants)' == ''">DEBUG;TRACE</DefineConstants>
9890
<DebugType>full</DebugType>
9991
<PlatformTarget>x64</PlatformTarget>
10092
<ErrorReport>prompt</ErrorReport>
10193
</PropertyGroup>
10294
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseMonoPY3|x86'">
103-
<OutputPath>bin\</OutputPath>
10495
<DefineConstants Condition="'$(DefineConstants)' == ''">
10596
</DefineConstants>
10697
<Optimize>true</Optimize>
@@ -109,7 +100,6 @@
109100
<ErrorReport>prompt</ErrorReport>
110101
</PropertyGroup>
111102
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseMonoPY3|x64'">
112-
<OutputPath>bin\</OutputPath>
113103
<DefineConstants Condition="'$(DefineConstants)' == ''">
114104
</DefineConstants>
115105
<Optimize>true</Optimize>
@@ -119,22 +109,19 @@
119109
</PropertyGroup>
120110
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugWinPY3|x86'">
121111
<DebugSymbols>true</DebugSymbols>
122-
<OutputPath>bin\</OutputPath>
123112
<DefineConstants Condition="'$(DefineConstants)' == ''">DEBUG;TRACE</DefineConstants>
124113
<DebugType>full</DebugType>
125114
<PlatformTarget>x86</PlatformTarget>
126115
<ErrorReport>prompt</ErrorReport>
127116
</PropertyGroup>
128117
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugWinPY3|x64'">
129118
<DebugSymbols>true</DebugSymbols>
130-
<OutputPath>bin\</OutputPath>
131119
<DefineConstants Condition="'$(DefineConstants)' == ''">DEBUG;TRACE</DefineConstants>
132120
<DebugType>full</DebugType>
133121
<PlatformTarget>x64</PlatformTarget>
134122
<ErrorReport>prompt</ErrorReport>
135123
</PropertyGroup>
136124
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseWinPY3|x86'">
137-
<OutputPath>bin\</OutputPath>
138125
<DefineConstants Condition="'$(DefineConstants)' == ''">
139126
</DefineConstants>
140127
<Optimize>true</Optimize>
@@ -143,7 +130,6 @@
143130
<ErrorReport>prompt</ErrorReport>
144131
</PropertyGroup>
145132
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseWinPY3|x64'">
146-
<OutputPath>bin\</OutputPath>
147133
<DefineConstants Condition="'$(DefineConstants)' == ''">
148134
</DefineConstants>
149135
<Optimize>true</Optimize>
@@ -156,9 +142,6 @@
156142
</PropertyGroup>
157143
<ItemGroup>
158144
<Reference Include="System" />
159-
<Reference Include="System.Core">
160-
<RequiredTargetFramework>3.5</RequiredTargetFramework>
161-
</Reference>
162145
</ItemGroup>
163146
<ItemGroup>
164147
<Compile Include="AssemblyInfo.cs" />
@@ -170,19 +153,13 @@
170153
<LogicalName>Python.Runtime.dll</LogicalName>
171154
</EmbeddedResource>
172155
</ItemGroup>
173-
<ItemGroup>
174-
<None Include="app.config" />
175-
</ItemGroup>
176156
<ItemGroup>
177157
<ProjectReference Include="..\runtime\Python.Runtime.csproj">
178158
<Project>{097b4ac0-74e9-4c58-bcf8-c69746ec8271}</Project>
179159
<Name>Python.Runtime</Name>
180160
</ProjectReference>
181161
</ItemGroup>
182162
<Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
183-
<ProjectExtensions>
184-
<VisualStudio AllowExistingFolder="true" />
185-
</ProjectExtensions>
186163
<Target Name="AfterBuild">
187164
<Copy SourceFiles="$(TargetPath)" DestinationFolder="$(PythonBuildDir)" />
188165
</Target>

‎src/console/app.config‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)
X Tutup