diff options
author | therzok <marius.ungureanu@xamarin.com> | 2019-10-25 23:54:54 +0300 |
---|---|---|
committer | therzok <marius.ungureanu@xamarin.com> | 2019-10-25 23:54:54 +0300 |
commit | 846240c66c6ae362ab2827ac23f8d18b72cf4c34 (patch) | |
tree | 9aaa0ee17067f88670883dc0feb0d130b13e2495 /main/src/addins | |
parent | b715e44129f5b8fe097042572b28a31b7ab9f2d5 (diff) |
Revert "Merge pull request #8999 from mono/csproj-cleanups"
This reverts commit 152bf0867f774e2fdaa10adac063ccb1bbd31ca2, reversing
changes made to dac8bfc938917ab62c43b7fa4d705a550facc814.
Diffstat (limited to 'main/src/addins')
10 files changed, 80 insertions, 27 deletions
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/MonoDevelop.Deployment.Linux.csproj b/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/MonoDevelop.Deployment.Linux.csproj index 020981dde8..776ae71ea9 100644 --- a/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/MonoDevelop.Deployment.Linux.csproj +++ b/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/MonoDevelop.Deployment.Linux.csproj @@ -10,6 +10,8 @@ </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " /> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " /> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugGnome|AnyCPU' " /> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseGnome|AnyCPU' " /> <ItemGroup> <ProjectReference Include="..\..\..\core\MonoDevelop.Core\MonoDevelop.Core.csproj"> <Project>{7525BB88-6142-4A26-93B9-A30C6983390A}</Project> diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.csproj b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.csproj index 183cf794e4..d5165719dc 100644 --- a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.csproj +++ b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.csproj @@ -10,6 +10,10 @@ </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " /> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " /> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugGnome|AnyCPU' " /> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseGnome|AnyCPU' " /> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugWin32|AnyCPU' " /> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseWin32|AnyCPU' " /> <ItemGroup> <Reference Include="System" /> <Reference Include="System.Xml" /> diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.csproj b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.csproj index 80e854197b..f13f296302 100644 --- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.csproj +++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.csproj @@ -8,9 +8,12 @@ <ProjectGuid>{2357AABD-08C7-4808-A495-8FF2D3CDFDB0}</ProjectGuid> <TargetFrameworkVersion>$(MDFrameworkVersion)</TargetFrameworkVersion> <OutputPath>..\..\..\build\AddIns\MonoDevelop.Debugger</OutputPath> + <DefineConstants Condition="$(OS) == 'Windows_NT'">$(DefineConstants);WINDOWS</DefineConstants> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " /> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " /> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugMac|AnyCPU' " /> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseMac|AnyCPU' " /> <PropertyGroup Condition=" '$(RunConfiguration)' == 'Default' "> <StartAction>Program</StartAction> <StartProgram>..\..\..\build\bin\MonoDevelop.exe</StartProgram> @@ -22,12 +25,12 @@ <Reference Include="System.Core" /> <Reference Include="System.Drawing" /> <Reference Include="System.ComponentModel.Composition" /> - <Reference Include="Xamarin.Mac" Condition="$(IsMac)"> + <Reference Include="Xamarin.Mac" Condition="$(HaveXamarinMac) == 'true'"> <HintPath>..\..\..\external\Xamarin.Mac.dll</HintPath> <Private>False</Private> </Reference> </ItemGroup> - <ItemGroup Condition="$(IsWindows)"> + <ItemGroup Condition="$(OS) == 'Windows_NT'"> <Reference Include="PresentationCore" /> <Reference Include="PresentationFramework" /> <Reference Include="WindowsBase" /> @@ -63,7 +66,7 @@ <Name>Mono.Debugging</Name> <Private>False</Private> </ProjectReference> - <ProjectReference Include="..\MacPlatform\MacPlatform.csproj" Condition="$(IsMac)"> + <ProjectReference Include="..\MacPlatform\MacPlatform.csproj" Condition="$(HaveXamarinMac) == 'true'"> <Project>{50D6768C-C072-4E79-AFC5-C1C40767EF45}</Project> <Name>MacPlatform</Name> <Private>False</Private> @@ -331,7 +334,7 @@ <EmbeddedResource Include="icons\stack-pointer-16~dark~disabled.png" /> <EmbeddedResource Include="icons\stack-pointer-16~dark~disabled%402x.png" /> </ItemGroup> - <ItemGroup Condition="!$(IsMac)"> + <ItemGroup Condition=" '$(Configuration)' != 'DebugMac' AND '$(Configuration)' != 'ReleaseMac' "> <EmbeddedResource Include="icons\pause-16.png" /> <EmbeddedResource Include="icons\pause-16%402x.png" /> <EmbeddedResource Include="icons\pause-16~dark.png" /> @@ -353,7 +356,7 @@ <EmbeddedResource Include="icons\continue-16~dark.png" /> <EmbeddedResource Include="icons\continue-16~dark%402x.png" /> </ItemGroup> - <ItemGroup Condition="$(IsMac)"> + <ItemGroup Condition=" '$(Configuration)' == 'DebugMac' OR '$(Configuration)' == 'ReleaseMac' "> <EmbeddedResource Include="icons\mac\pause-16.png" /> <EmbeddedResource Include="icons\mac\pause-16%402x.png" /> <EmbeddedResource Include="icons\mac\pause-16~dark.png" /> diff --git a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.csproj b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.csproj index 283265285b..24a02a42a4 100644 --- a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.csproj +++ b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.csproj @@ -9,9 +9,11 @@ <TargetFrameworkVersion>$(MDFrameworkVersion)</TargetFrameworkVersion> <OutputPath>..\..\..\build\AddIns\MonoDevelop.DesignerSupport</OutputPath> </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugMac|AnyCPU' " /> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseMac|AnyCPU' " /> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " /> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " /> - <ItemGroup Condition="$(IsMac)"> + <ItemGroup Condition=" '$(Configuration)' == 'ReleaseMac' OR '$(Configuration)' == 'DebugMac' "> <Reference Include="Xamarin.Mac"> <HintPath>..\..\..\external\Xamarin.Mac.dll</HintPath> <Private>False</Private> diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.csproj b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.csproj index b714c513ba..2e73602ef8 100644 --- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.csproj +++ b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.csproj @@ -14,6 +14,8 @@ </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " /> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " /> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugGnome|AnyCPU' " /> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseGnome|AnyCPU' " /> <ItemGroup> <Reference Include="System" /> <Reference Include="System.Xml" /> diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.csproj b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.csproj index 97b51fb6bb..8981eb193d 100644 --- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.csproj +++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.csproj @@ -11,14 +11,17 @@ </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " /> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " /> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugMac|AnyCPU' " /> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseMac|AnyCPU' " /> + <PropertyGroup Condition=" $(OS) == 'Windows_NT'"> + <DefineConstants>WIN32</DefineConstants> + </PropertyGroup> <ItemGroup> <Reference Include="System" /> <Reference Include="System.Core" /> <Reference Include="System.Xml" /> <Reference Include="System.ComponentModel.Composition" /> - </ItemGroup> - <ItemGroup Condition="$(IsMac)"> - <Reference Include="Xamarin.Mac"> + <Reference Include="Xamarin.Mac" Condition=" '$(Configuration)' == 'DebugMac' Or '$(Configuration)' == 'ReleaseMac' "> <HintPath>..\..\..\external\Xamarin.Mac.dll</HintPath> <Private>False</Private> </Reference> diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.csproj b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.csproj index ccba0d5757..45bdc1bcf6 100644 --- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.csproj +++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.csproj @@ -9,6 +9,7 @@ <TargetFrameworkVersion>$(MDFrameworkVersion)</TargetFrameworkVersion> <OutputPath>..\..\..\build\AddIns\DisplayBindings\SourceEditor</OutputPath> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> + <DefineConstants Condition="$(OS) == 'Windows_NT'">$(DefineConstants);WINDOWS</DefineConstants> <!-- This entire assembly is obsolete, and uses many obsoleted APIs from Core/Ide so disable deprecation warnings. @@ -16,7 +17,9 @@ <NoWarn>$(NoWarn);618;612</NoWarn> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " /> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugMac|AnyCPU' " /> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " /> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseMac|AnyCPU' " /> <PropertyGroup Condition=" '$(RunConfiguration)' == 'Default' "> <StartAction>Program</StartAction> <StartProgram>mono</StartProgram> @@ -66,6 +69,8 @@ </ProjectReference> </ItemGroup> <ItemGroup> + <Reference Include="PresentationCore" Condition=" '$(OS)' == 'Windows_NT' " /> + <Reference Include="PresentationFramework" Condition=" '$(OS)' == 'Windows_NT' " /> <Reference Include="WindowsBase" /> <Reference Include="System" /> <Reference Include="System.Xml" /> @@ -73,15 +78,11 @@ <Reference Include="System.Core" /> <Reference Include="System.Xml.Linq" /> <Reference Include="System.Runtime.Serialization" /> - <Reference Include="Xamarin.Mac" Condition="$(IsMac)"> + <Reference Include="Xamarin.Mac" Condition=" '$(Configuration)' == 'DebugMac' Or '$(Configuration)' == 'ReleaseMac' "> <HintPath>..\..\..\external\Xamarin.Mac.dll</HintPath> <Private>False</Private> </Reference> </ItemGroup> - <ItemGroup Condition="$(IsWindows)"> - <Reference Include="PresentationCore" /> - <Reference Include="PresentationFramework" /> - </ItemGroup> <ItemGroup> <Compile Include="$(VSEditorApiDirectory)src\Editor\Text\Util\TextUIUtil\VacuousTextDataModel.cs" Link="Util\VacuousTextDataModel.cs" /> <Compile Include="$(VSEditorApiDirectory)src\Editor\Text\Util\TextUIUtil\VacuousTextViewModel.cs" Link="Util\VacuousTextViewModel.cs" /> diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git.Tests/MonoDevelop.VersionControl.Git.Tests.csproj b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git.Tests/MonoDevelop.VersionControl.Git.Tests.csproj index 60d02f483d..683ac2c4b6 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git.Tests/MonoDevelop.VersionControl.Git.Tests.csproj +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git.Tests/MonoDevelop.VersionControl.Git.Tests.csproj @@ -13,6 +13,12 @@ </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " /> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " /> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugMac|AnyCPU' " /> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugWin32|AnyCPU' " /> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugGnome|AnyCPU' " /> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseWin32|AnyCPU' " /> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseMac|AnyCPU' " /> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseGnome|AnyCPU' " /> <ItemGroup> <Reference Include="System" /> </ItemGroup> @@ -55,11 +61,23 @@ <ItemGroup> <IncludeCopyLocal Include="LibGit2Sharp.dll" /> </ItemGroup> - <ItemGroup> - <NativeBinaries Include="..\..\..\..\external\libgit-binary\mac\*.dylib" Condition="$(IsMac)" /> - <NativeBinaries Include="..\..\..\..\external\libgit-binary\windows\*.*" Condition="$(IsWindows)" /> - <NativeBinaries Include="..\..\..\..\external\libgit2\build\*.so*" Condition="$(IsLinux)" /> - </ItemGroup> + <Choose> + <When Condition=" '$(Configuration)' == 'DebugMac' OR '$(Configuration)' == 'ReleaseMac' "> + <ItemGroup> + <NativeBinaries Include="..\..\..\..\external\libgit-binary\mac\*.dylib" /> + </ItemGroup> + </When> + <When Condition=" '$(Configuration)' == 'DebugWin32' OR '$(Configuration)' == 'ReleaseWin32' "> + <ItemGroup> + <NativeBinaries Include="..\..\..\..\external\libgit-binary\windows\*.*" /> + </ItemGroup> + </When> + <When Condition=" '$(Configuration)' == 'DebugGnome' OR '$(Configuration)' == 'ReleaseGnome' "> + <ItemGroup> + <NativeBinaries Include="..\..\..\..\external\libgit2\build\*.so*" /> + </ItemGroup> + </When> + </Choose> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> <Target Name="AfterBuild"> <Copy SourceFiles="@(NativeBinaries)" DestinationFolder="$(OutputPath)\" SkipUnchangedFiles="true" /> diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git.csproj b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git.csproj index dbde2019e9..5b156373db 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git.csproj +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git.csproj @@ -10,6 +10,12 @@ </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " /> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " /> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugMac|AnyCPU' " /> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugGnome|AnyCPU' " /> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugWin32|AnyCPU' " /> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseWin32|AnyCPU' " /> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseMac|AnyCPU' " /> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseGnome|AnyCPU' " /> <ItemGroup> <Reference Include="System" /> <Reference Include="System.Core" /> @@ -104,7 +110,9 @@ </ItemGroup> <ItemGroup> <EmbeddedResource Include="MonoDevelop.VersionControl.Git.addin.xml" /> - <EmbeddedResource Include="MonoDevelop.VersionControl.Git.Win32.addin.xml" Condition="$(IsWindows)" /> + </ItemGroup> + <ItemGroup Condition=" '$(Configuration)' == 'DebugWin32' OR '$(Configuration)' == 'ReleaseWin32' "> + <EmbeddedResource Include="MonoDevelop.VersionControl.Git.Win32.addin.xml" /> </ItemGroup> <ItemGroup> <None Include="GitIgnore.txt"> @@ -125,15 +133,23 @@ <InternalsVisibleTo Include="MonoDevelop.VersionControl.Git.Tests" /> </ItemGroup> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> - <ItemGroup> - <NativeBinaries Include="..\..\..\..\external\libgit-binary\mac\*.dylib" Configuration="$(IsMac)" /> - <NativeBinaries Include="..\..\..\..\external\libgit-binary\windows\*.*" Configuration="$(IsWindows)" /> - </ItemGroup> + <Choose> + <When Condition=" '$(Configuration)' == 'DebugMac' OR '$(Configuration)' == 'ReleaseMac' "> + <ItemGroup> + <NativeBinaries Include="..\..\..\..\external\libgit-binary\mac\*.dylib" /> + </ItemGroup> + </When> + <When Condition=" '$(Configuration)' == 'DebugWin32' OR '$(Configuration)' == 'ReleaseWin32' "> + <ItemGroup> + <NativeBinaries Include="..\..\..\..\external\libgit-binary\windows\*.*" /> + </ItemGroup> + </When> + </Choose> <Target Name="BeforeBuild"> - <Exec Command="bash build_libgit2.sh" Condition="$(IsLinux)" /> + <Exec Command="bash build_libgit2.sh" Condition=" '$(Configuration)' == 'DebugGnome' OR '$(Configuration)' == 'ReleaseGnome' " /> </Target> <Target Name="AfterBuild"> - <ItemGroup Condition="$(IsLinux)"> + <ItemGroup Condition=" '$(Configuration)' == 'DebugGnome' OR '$(Configuration)' == 'ReleaseGnome' "> <NativeBinaries Include="..\..\..\..\external\libgit2\build\*.so*" /> </ItemGroup> <Copy SourceFiles="@(NativeBinaries)" DestinationFolder="$(OutputPath)\" SkipUnchangedFiles="true" /> diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix.csproj b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix.csproj index be57538af4..51c018831d 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix.csproj +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix.csproj @@ -10,6 +10,8 @@ </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " /> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " /> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugMac|AnyCPU' " /> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseMac|AnyCPU' " /> <ItemGroup> <Reference Include="System" /> </ItemGroup> @@ -58,7 +60,7 @@ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </Content> </ItemGroup> - <ItemGroup Condition="$(IsMac)"> + <ItemGroup Condition=" '$(Configuration)' == 'DebugMac' Or '$(Configuration)' == 'ReleaseMac' "> <NativeBinaries Include="..\..\..\..\external\sharpsvn-binary\mac\*.dylib" /> </ItemGroup> <ItemGroup> |