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

Commit 846240c

Browse files
TherzokTherzok
committed
Revert "Merge pull request #8999 from mono/csproj-cleanups"
This reverts commit 152bf08, reversing changes made to dac8bfc.
1 parent b715e44 commit 846240c

File tree

18 files changed

+219
-157
lines changed

18 files changed

+219
-157
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: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@
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>
2522
</PropertyGroup>
2623

2724
<!-- AddinBuildDir is shorthand for which subdir of build\Addins to build into -->
@@ -59,10 +56,16 @@
5956
<PlatformTarget>x64</PlatformTarget>
6057
</PropertyGroup>
6158

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>
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>
6669
</PropertyGroup>
6770

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

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
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' " />
1315
<ItemGroup>
1416
<ProjectReference Include="..\..\..\core\MonoDevelop.Core\MonoDevelop.Core.csproj">
1517
<Project>{7525BB88-6142-4A26-93B9-A30C6983390A}</Project>

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@
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' " />
1317
<ItemGroup>
1418
<Reference Include="System" />
1519
<Reference Include="System.Xml" />

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

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,12 @@
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>
1112
</PropertyGroup>
1213
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
1314
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
15+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugMac|AnyCPU' " />
16+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseMac|AnyCPU' " />
1417
<PropertyGroup Condition=" '$(RunConfiguration)' == 'Default' ">
1518
<StartAction>Program</StartAction>
1619
<StartProgram>..\..\..\build\bin\MonoDevelop.exe</StartProgram>
@@ -22,12 +25,12 @@
2225
<Reference Include="System.Core" />
2326
<Reference Include="System.Drawing" />
2427
<Reference Include="System.ComponentModel.Composition" />
25-
<Reference Include="Xamarin.Mac" Condition="$(IsMac)">
28+
<Reference Include="Xamarin.Mac" Condition="$(HaveXamarinMac) == 'true'">
2629
<HintPath>..\..\..\external\Xamarin.Mac.dll</HintPath>
2730
<Private>False</Private>
2831
</Reference>
2932
</ItemGroup>
30-
<ItemGroup Condition="$(IsWindows)">
33+
<ItemGroup Condition="$(OS) == 'Windows_NT'">
3134
<Reference Include="PresentationCore" />
3235
<Reference Include="PresentationFramework" />
3336
<Reference Include="WindowsBase" />
@@ -63,7 +66,7 @@
6366
<Name>Mono.Debugging</Name>
6467
<Private>False</Private>
6568
</ProjectReference>
66-
<ProjectReference Include="..\MacPlatform\MacPlatform.csproj" Condition="$(IsMac)">
69+
<ProjectReference Include="..\MacPlatform\MacPlatform.csproj" Condition="$(HaveXamarinMac) == 'true'">
6770
<Project>{50D6768C-C072-4E79-AFC5-C1C40767EF45}</Project>
6871
<Name>MacPlatform</Name>
6972
<Private>False</Private>
@@ -331,7 +334,7 @@
331334
<EmbeddedResource Include="icons\stack-pointer-16~dark~disabled.png" />
332335
<EmbeddedResource Include="icons\stack-pointer-16~dark~disabled%402x.png" />
333336
</ItemGroup>
334-
<ItemGroup Condition="!$(IsMac)">
337+
<ItemGroup Condition=" '$(Configuration)' != 'DebugMac' AND '$(Configuration)' != 'ReleaseMac' ">
335338
<EmbeddedResource Include="icons\pause-16.png" />
336339
<EmbeddedResource Include="icons\pause-16%402x.png" />
337340
<EmbeddedResource Include="icons\pause-16~dark.png" />
@@ -353,7 +356,7 @@
353356
<EmbeddedResource Include="icons\continue-16~dark.png" />
354357
<EmbeddedResource Include="icons\continue-16~dark%402x.png" />
355358
</ItemGroup>
356-
<ItemGroup Condition="$(IsMac)">
359+
<ItemGroup Condition=" '$(Configuration)' == 'DebugMac' OR '$(Configuration)' == 'ReleaseMac' ">
357360
<EmbeddedResource Include="icons\mac\pause-16.png" />
358361
<EmbeddedResource Include="icons\mac\pause-16%402x.png" />
359362
<EmbeddedResource Include="icons\mac\pause-16~dark.png" />

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,11 @@
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' " />
1214
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
1315
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
14-
<ItemGroup Condition="$(IsMac)">
16+
<ItemGroup Condition=" '$(Configuration)' == 'ReleaseMac' OR '$(Configuration)' == 'DebugMac' ">
1517
<Reference Include="Xamarin.Mac">
1618
<HintPath>..\..\..\external\Xamarin.Mac.dll</HintPath>
1719
<Private>False</Private>

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
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' " />
1719
<ItemGroup>
1820
<Reference Include="System" />
1921
<Reference Include="System.Xml" />

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,17 @@
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>
1419
<ItemGroup>
1520
<Reference Include="System" />
1621
<Reference Include="System.Core" />
1722
<Reference Include="System.Xml" />
1823
<Reference Include="System.ComponentModel.Composition" />
19-
</ItemGroup>
20-
<ItemGroup Condition="$(IsMac)">
21-
<Reference Include="Xamarin.Mac">
24+
<Reference Include="Xamarin.Mac" Condition=" '$(Configuration)' == 'DebugMac' Or '$(Configuration)' == 'ReleaseMac' ">
2225
<HintPath>..\..\..\external\Xamarin.Mac.dll</HintPath>
2326
<Private>False</Private>
2427
</Reference>

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,17 @@
99
<TargetFrameworkVersion>$(MDFrameworkVersion)</TargetFrameworkVersion>
1010
<OutputPath>..\..\..\build\AddIns\DisplayBindings\SourceEditor</OutputPath>
1111
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
12+
<DefineConstants Condition="$(OS) == 'Windows_NT'">$(DefineConstants);WINDOWS</DefineConstants>
1213
<!--
1314
This entire assembly is obsolete, and uses many obsoleted APIs from Core/Ide
1415
so disable deprecation warnings.
1516
-->
1617
<NoWarn>$(NoWarn);618;612</NoWarn>
1718
</PropertyGroup>
1819
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
20+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugMac|AnyCPU' " />
1921
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
22+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseMac|AnyCPU' " />
2023
<PropertyGroup Condition=" '$(RunConfiguration)' == 'Default' ">
2124
<StartAction>Program</StartAction>
2225
<StartProgram>mono</StartProgram>
@@ -66,22 +69,20 @@
6669
</ProjectReference>
6770
</ItemGroup>
6871
<ItemGroup>
72+
<Reference Include="PresentationCore" Condition=" '$(OS)' == 'Windows_NT' " />
73+
<Reference Include="PresentationFramework" Condition=" '$(OS)' == 'Windows_NT' " />
6974
<Reference Include="WindowsBase" />
7075
<Reference Include="System" />
7176
<Reference Include="System.Xml" />
7277
<Reference Include="System.ComponentModel.Composition" />
7378
<Reference Include="System.Core" />
7479
<Reference Include="System.Xml.Linq" />
7580
<Reference Include="System.Runtime.Serialization" />
76-
<Reference Include="Xamarin.Mac" Condition="$(IsMac)">
81+
<Reference Include="Xamarin.Mac" Condition=" '$(Configuration)' == 'DebugMac' Or '$(Configuration)' == 'ReleaseMac' ">
7782
<HintPath>..\..\..\external\Xamarin.Mac.dll</HintPath>
7883
<Private>False</Private>
7984
</Reference>
8085
</ItemGroup>
81-
<ItemGroup Condition="$(IsWindows)">
82-
<Reference Include="PresentationCore" />
83-
<Reference Include="PresentationFramework" />
84-
</ItemGroup>
8586
<ItemGroup>
8687
<Compile Include="$(VSEditorApiDirectory)src\Editor\Text\Util\TextUIUtil\VacuousTextDataModel.cs" Link="Util\VacuousTextDataModel.cs" />
8788
<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: 23 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,12 @@
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' " />
1622
<ItemGroup>
1723
<Reference Include="System" />
1824
</ItemGroup>
@@ -55,11 +61,23 @@
5561
<ItemGroup>
5662
<IncludeCopyLocal Include="LibGit2Sharp.dll" />
5763
</ItemGroup>
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>
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>
6381
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
6482
<Target Name="AfterBuild">
6583
<Copy SourceFiles="@(NativeBinaries)" DestinationFolder="$(OutputPath)\" SkipUnchangedFiles="true" />

0 commit comments

Comments
 (0)