Skip to content
This repository was archived by the owner on Oct 4, 2021. It is now read-only.

Commit 152bf08

Browse files
TherzokTherzok
authored
Merge pull request #8999 from mono/csproj-cleanups
This PR is the first step in the series that tries to simplify our solution build setup
2 parents dac8bfc + 40420af commit 152bf08

File tree

18 files changed

+157
-219
lines changed

18 files changed

+157
-219
lines changed

‎main/Main.sln‎

Lines changed: 78 additions & 78 deletions
Large diffs are not rendered by default.

‎main/msbuild/MonoDevelop.BeforeCommon.targets‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@
1919
<DebugType>portable</DebugType>
2020
<WarningLevel>4</WarningLevel>
2121
<Deterministic>True</Deterministic>
22+
<IsMac>$([MSBuild]::IsOsPlatform('OSX'))</IsMac>
23+
<IsWindows>$([MSBuild]::IsOsPlatform('Windows'))</IsWindows>
24+
<IsLinux>$([MSBuild]::IsOsPlatform('Linux'))</IsLinux>
2225
</PropertyGroup>
2326

2427
<!-- AddinBuildDir is shorthand for which subdir of build\Addins to build into -->
@@ -56,16 +59,10 @@
5659
<PlatformTarget>x64</PlatformTarget>
5760
</PropertyGroup>
5861

59-
<PropertyGroup Condition="$(Configuration.Contains('Mac'))">
60-
<DefineConstants>$(DefineConstants);MAC</DefineConstants>
61-
</PropertyGroup>
62-
63-
<PropertyGroup Condition="$(Configuration.Contains('Win32'))">
64-
<DefineConstants>$(DefineConstants);WIN32;WINDOWS</DefineConstants>
65-
</PropertyGroup>
66-
67-
<PropertyGroup Condition="$(Configuration.Contains('Gnome'))">
68-
<DefineConstants>$(DefineConstants);GNOME;LINUX</DefineConstants>
62+
<PropertyGroup>
63+
<DefineConstants Condition="$(IsMac)">$(DefineConstants);MAC</DefineConstants>
64+
<DefineConstants Condition="$(IsWindows)">$(DefineConstants);WIN32;WINDOWS</DefineConstants>
65+
<DefineConstants Condition="$(IsLinux)">$(DefineConstants);GNOME;LINUX</DefineConstants>
6966
</PropertyGroup>
7067

7168
<Target Name="RemoveNoisyAnalyzers" BeforeTargets="CoreCompile">

‎main/src/addins/Deployment/MonoDevelop.Deployment.Linux/MonoDevelop.Deployment.Linux.csproj‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010
</PropertyGroup>
1111
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
1212
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
13-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugGnome|AnyCPU' " />
14-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseGnome|AnyCPU' " />
1513
<ItemGroup>
1614
<ProjectReference Include="..\..\..\core\MonoDevelop.Core\MonoDevelop.Core.csproj">
1715
<Project>{7525BB88-6142-4A26-93B9-A30C6983390A}</Project>

‎main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.csproj‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,6 @@
1010
</PropertyGroup>
1111
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
1212
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
13-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugGnome|AnyCPU' " />
14-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseGnome|AnyCPU' " />
15-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugWin32|AnyCPU' " />
16-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseWin32|AnyCPU' " />
1713
<ItemGroup>
1814
<Reference Include="System" />
1915
<Reference Include="System.Xml" />

‎main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.csproj‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,9 @@
88
<ProjectGuid>{2357AABD-08C7-4808-A495-8FF2D3CDFDB0}</ProjectGuid>
99
<TargetFrameworkVersion>$(MDFrameworkVersion)</TargetFrameworkVersion>
1010
<OutputPath>..\..\..\build\AddIns\MonoDevelop.Debugger</OutputPath>
11-
<DefineConstants Condition="$(OS) == 'Windows_NT'">$(DefineConstants);WINDOWS</DefineConstants>
1211
</PropertyGroup>
1312
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
1413
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
15-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugMac|AnyCPU' " />
16-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseMac|AnyCPU' " />
1714
<PropertyGroup Condition=" '$(RunConfiguration)' == 'Default' ">
1815
<StartAction>Program</StartAction>
1916
<StartProgram>..\..\..\build\bin\MonoDevelop.exe</StartProgram>
@@ -25,12 +22,12 @@
2522
<Reference Include="System.Core" />
2623
<Reference Include="System.Drawing" />
2724
<Reference Include="System.ComponentModel.Composition" />
28-
<Reference Include="Xamarin.Mac" Condition="$(HaveXamarinMac) == 'true'">
25+
<Reference Include="Xamarin.Mac" Condition="$(IsMac)">
2926
<HintPath>..\..\..\external\Xamarin.Mac.dll</HintPath>
3027
<Private>False</Private>
3128
</Reference>
3229
</ItemGroup>
33-
<ItemGroup Condition="$(OS) == 'Windows_NT'">
30+
<ItemGroup Condition="$(IsWindows)">
3431
<Reference Include="PresentationCore" />
3532
<Reference Include="PresentationFramework" />
3633
<Reference Include="WindowsBase" />
@@ -66,7 +63,7 @@
6663
<Name>Mono.Debugging</Name>
6764
<Private>False</Private>
6865
</ProjectReference>
69-
<ProjectReference Include="..\MacPlatform\MacPlatform.csproj" Condition="$(HaveXamarinMac) == 'true'">
66+
<ProjectReference Include="..\MacPlatform\MacPlatform.csproj" Condition="$(IsMac)">
7067
<Project>{50D6768C-C072-4E79-AFC5-C1C40767EF45}</Project>
7168
<Name>MacPlatform</Name>
7269
<Private>False</Private>
@@ -334,7 +331,7 @@
334331
<EmbeddedResource Include="icons\stack-pointer-16~dark~disabled.png" />
335332
<EmbeddedResource Include="icons\stack-pointer-16~dark~disabled%402x.png" />
336333
</ItemGroup>
337-
<ItemGroup Condition=" '$(Configuration)' != 'DebugMac' AND '$(Configuration)' != 'ReleaseMac' ">
334+
<ItemGroup Condition="!$(IsMac)">
338335
<EmbeddedResource Include="icons\pause-16.png" />
339336
<EmbeddedResource Include="icons\pause-16%402x.png" />
340337
<EmbeddedResource Include="icons\pause-16~dark.png" />
@@ -356,7 +353,7 @@
356353
<EmbeddedResource Include="icons\continue-16~dark.png" />
357354
<EmbeddedResource Include="icons\continue-16~dark%402x.png" />
358355
</ItemGroup>
359-
<ItemGroup Condition=" '$(Configuration)' == 'DebugMac' OR '$(Configuration)' == 'ReleaseMac' ">
356+
<ItemGroup Condition="$(IsMac)">
360357
<EmbeddedResource Include="icons\mac\pause-16.png" />
361358
<EmbeddedResource Include="icons\mac\pause-16%402x.png" />
362359
<EmbeddedResource Include="icons\mac\pause-16~dark.png" />

‎main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.csproj‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,9 @@
99
<TargetFrameworkVersion>$(MDFrameworkVersion)</TargetFrameworkVersion>
1010
<OutputPath>..\..\..\build\AddIns\MonoDevelop.DesignerSupport</OutputPath>
1111
</PropertyGroup>
12-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugMac|AnyCPU' " />
13-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseMac|AnyCPU' " />
1412
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
1513
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
16-
<ItemGroup Condition=" '$(Configuration)' == 'ReleaseMac' OR '$(Configuration)' == 'DebugMac' ">
14+
<ItemGroup Condition="$(IsMac)">
1715
<Reference Include="Xamarin.Mac">
1816
<HintPath>..\..\..\external\Xamarin.Mac.dll</HintPath>
1917
<Private>False</Private>

‎main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.csproj‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@
1414
</PropertyGroup>
1515
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
1616
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
17-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugGnome|AnyCPU' " />
18-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseGnome|AnyCPU' " />
1917
<ItemGroup>
2018
<Reference Include="System" />
2119
<Reference Include="System.Xml" />

‎main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.csproj‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,14 @@
1111
</PropertyGroup>
1212
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
1313
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
14-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugMac|AnyCPU' " />
15-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseMac|AnyCPU' " />
16-
<PropertyGroup Condition=" $(OS) == 'Windows_NT'">
17-
<DefineConstants>WIN32</DefineConstants>
18-
</PropertyGroup>
1914
<ItemGroup>
2015
<Reference Include="System" />
2116
<Reference Include="System.Core" />
2217
<Reference Include="System.Xml" />
2318
<Reference Include="System.ComponentModel.Composition" />
24-
<Reference Include="Xamarin.Mac" Condition=" '$(Configuration)' == 'DebugMac' Or '$(Configuration)' == 'ReleaseMac' ">
19+
</ItemGroup>
20+
<ItemGroup Condition="$(IsMac)">
21+
<Reference Include="Xamarin.Mac">
2522
<HintPath>..\..\..\external\Xamarin.Mac.dll</HintPath>
2623
<Private>False</Private>
2724
</Reference>

‎main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.csproj‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,14 @@
99
<TargetFrameworkVersion>$(MDFrameworkVersion)</TargetFrameworkVersion>
1010
<OutputPath>..\..\..\build\AddIns\DisplayBindings\SourceEditor</OutputPath>
1111
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
12-
<DefineConstants Condition="$(OS) == 'Windows_NT'">$(DefineConstants);WINDOWS</DefineConstants>
1312
<!--
1413
This entire assembly is obsolete, and uses many obsoleted APIs from Core/Ide
1514
so disable deprecation warnings.
1615
-->
1716
<NoWarn>$(NoWarn);618;612</NoWarn>
1817
</PropertyGroup>
1918
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
20-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugMac|AnyCPU' " />
2119
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
22-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseMac|AnyCPU' " />
2320
<PropertyGroup Condition=" '$(RunConfiguration)' == 'Default' ">
2421
<StartAction>Program</StartAction>
2522
<StartProgram>mono</StartProgram>
@@ -69,20 +66,22 @@
6966
</ProjectReference>
7067
</ItemGroup>
7168
<ItemGroup>
72-
<Reference Include="PresentationCore" Condition=" '$(OS)' == 'Windows_NT' " />
73-
<Reference Include="PresentationFramework" Condition=" '$(OS)' == 'Windows_NT' " />
7469
<Reference Include="WindowsBase" />
7570
<Reference Include="System" />
7671
<Reference Include="System.Xml" />
7772
<Reference Include="System.ComponentModel.Composition" />
7873
<Reference Include="System.Core" />
7974
<Reference Include="System.Xml.Linq" />
8075
<Reference Include="System.Runtime.Serialization" />
81-
<Reference Include="Xamarin.Mac" Condition=" '$(Configuration)' == 'DebugMac' Or '$(Configuration)' == 'ReleaseMac' ">
76+
<Reference Include="Xamarin.Mac" Condition="$(IsMac)">
8277
<HintPath>..\..\..\external\Xamarin.Mac.dll</HintPath>
8378
<Private>False</Private>
8479
</Reference>
8580
</ItemGroup>
81+
<ItemGroup Condition="$(IsWindows)">
82+
<Reference Include="PresentationCore" />
83+
<Reference Include="PresentationFramework" />
84+
</ItemGroup>
8685
<ItemGroup>
8786
<Compile Include="$(VSEditorApiDirectory)src\Editor\Text\Util\TextUIUtil\VacuousTextDataModel.cs" Link="Util\VacuousTextDataModel.cs" />
8887
<Compile Include="$(VSEditorApiDirectory)src\Editor\Text\Util\TextUIUtil\VacuousTextViewModel.cs" Link="Util\VacuousTextViewModel.cs" />

‎main/src/addins/VersionControl/MonoDevelop.VersionControl.Git.Tests/MonoDevelop.VersionControl.Git.Tests.csproj‎

Lines changed: 5 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,6 @@
1313
</PropertyGroup>
1414
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
1515
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
16-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugMac|AnyCPU' " />
17-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugWin32|AnyCPU' " />
18-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugGnome|AnyCPU' " />
19-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseWin32|AnyCPU' " />
20-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseMac|AnyCPU' " />
21-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseGnome|AnyCPU' " />
2216
<ItemGroup>
2317
<Reference Include="System" />
2418
</ItemGroup>
@@ -61,23 +55,11 @@
6155
<ItemGroup>
6256
<IncludeCopyLocal Include="LibGit2Sharp.dll" />
6357
</ItemGroup>
64-
<Choose>
65-
<When Condition=" '$(Configuration)' == 'DebugMac' OR '$(Configuration)' == 'ReleaseMac' ">
66-
<ItemGroup>
67-
<NativeBinaries Include="..\..\..\..\external\libgit-binary\mac\*.dylib" />
68-
</ItemGroup>
69-
</When>
70-
<When Condition=" '$(Configuration)' == 'DebugWin32' OR '$(Configuration)' == 'ReleaseWin32' ">
71-
<ItemGroup>
72-
<NativeBinaries Include="..\..\..\..\external\libgit-binary\windows\*.*" />
73-
</ItemGroup>
74-
</When>
75-
<When Condition=" '$(Configuration)' == 'DebugGnome' OR '$(Configuration)' == 'ReleaseGnome' ">
76-
<ItemGroup>
77-
<NativeBinaries Include="..\..\..\..\external\libgit2\build\*.so*" />
78-
</ItemGroup>
79-
</When>
80-
</Choose>
58+
<ItemGroup>
59+
<NativeBinaries Include="..\..\..\..\external\libgit-binary\mac\*.dylib" Condition="$(IsMac)" />
60+
<NativeBinaries Include="..\..\..\..\external\libgit-binary\windows\*.*" Condition="$(IsWindows)" />
61+
<NativeBinaries Include="..\..\..\..\external\libgit2\build\*.so*" Condition="$(IsLinux)" />
62+
</ItemGroup>
8163
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
8264
<Target Name="AfterBuild">
8365
<Copy SourceFiles="@(NativeBinaries)" DestinationFolder="$(OutputPath)\" SkipUnchangedFiles="true" />

0 commit comments

Comments
 (0)