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

Commit fbb97ce

Browse files
committed
Switch MSBuildBuilder to single configuration
1 parent 89b2425 commit fbb97ce

File tree

2 files changed

+10
-17
lines changed

2 files changed

+10
-17
lines changed

main/Main.sln

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1881,16 +1881,16 @@ Global
18811881
{7F5B649A-3572-4713-83FD-C28A6AA70445}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
18821882
{7F5B649A-3572-4713-83FD-C28A6AA70445}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
18831883
{7F5B649A-3572-4713-83FD-C28A6AA70445}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
1884-
{7F5B649A-3572-4713-83FD-C28A6AA70445}.DebugWin32|Any CPU.ActiveCfg = DebugWin32|x86
1885-
{7F5B649A-3572-4713-83FD-C28A6AA70445}.DebugWin32|Any CPU.Build.0 = DebugWin32|x86
1884+
{7F5B649A-3572-4713-83FD-C28A6AA70445}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
1885+
{7F5B649A-3572-4713-83FD-C28A6AA70445}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
18861886
{7F5B649A-3572-4713-83FD-C28A6AA70445}.Release|Any CPU.ActiveCfg = Release|Any CPU
18871887
{7F5B649A-3572-4713-83FD-C28A6AA70445}.Release|Any CPU.Build.0 = Release|Any CPU
18881888
{7F5B649A-3572-4713-83FD-C28A6AA70445}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
18891889
{7F5B649A-3572-4713-83FD-C28A6AA70445}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
18901890
{7F5B649A-3572-4713-83FD-C28A6AA70445}.ReleaseMac|Any CPU.ActiveCfg = Debug|Any CPU
18911891
{7F5B649A-3572-4713-83FD-C28A6AA70445}.ReleaseMac|Any CPU.Build.0 = Debug|Any CPU
1892-
{7F5B649A-3572-4713-83FD-C28A6AA70445}.ReleaseWin32|Any CPU.ActiveCfg = ReleaseWin32|x86
1893-
{7F5B649A-3572-4713-83FD-C28A6AA70445}.ReleaseWin32|Any CPU.Build.0 = ReleaseWin32|x86
1892+
{7F5B649A-3572-4713-83FD-C28A6AA70445}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
1893+
{7F5B649A-3572-4713-83FD-C28A6AA70445}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
18941894
{DD14AD77-6FBB-4F0D-8083-CEC28A9D0BBD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
18951895
{DD14AD77-6FBB-4F0D-8083-CEC28A9D0BBD}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
18961896
{DD14AD77-6FBB-4F0D-8083-CEC28A9D0BBD}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.MSBuildBuilder.csproj

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,10 @@
99
<TargetFrameworkVersion>$(MDFrameworkVersion)</TargetFrameworkVersion>
1010
<OutputPath>..\..\..\build\bin</OutputPath>
1111
<StartupObject>MonoDevelop.Projects.MSBuild.MainClass</StartupObject>
12+
<PlatformTarget Condition="$(IsWindows)">x86</PlatformTarget>
1213
</PropertyGroup>
13-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
14-
<PlatformTarget>x64</PlatformTarget>
15-
</PropertyGroup>
16-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugWin32|x86' " />
17-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
18-
<PlatformTarget>x64</PlatformTarget>
19-
</PropertyGroup>
20-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseWin32|x86' " />
14+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "/>
15+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "/>
2116
<!-- TODO: Linux -->
2217
<PropertyGroup>
2318
<MSBuild_OSS_BinDir Condition="'$(OS)' == 'Windows_NT'">$(MSBuildToolsPath)\</MSBuild_OSS_BinDir>
@@ -46,14 +41,12 @@
4641
<Private>False</Private>
4742
</Reference>
4843
</ItemGroup>
49-
<ItemGroup Condition=" '$(Configuration)' == 'Debug' OR '$(Configuration)' == 'Release' ">
50-
<None Include="app.config">
44+
<ItemGroup>
45+
<None Include="app.config" Condition="!$(IsWindows)">
5146
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
5247
<Link>MonoDevelop.MSBuildBuilder.exe.config</Link>
5348
</None>
54-
</ItemGroup>
55-
<ItemGroup Condition=" '$(Configuration)' == 'DebugWin32' OR '$(Configuration)' == 'ReleaseWin32' ">
56-
<None Include="app.windows.config">
49+
<None Include="app.windows.config" Condition="$(IsWindows)">
5750
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
5851
<Link>MonoDevelop.MSBuildBuilder.exe.config</Link>
5952
</None>

0 commit comments

Comments
 (0)