From ba2cd7a6aa2544b320ef1c6e1f651d83b8e248a2 Mon Sep 17 00:00:00 2001 From: Siegfried Pammer <siegfriedpammer@gmail.com> Date: Tue, 5 Nov 2013 20:50:48 +0100 Subject: [PATCH] make some projects with x86 dependencies compile as x86 (fixes MSB3270) --- SharpDevelop.sln | 32 +++++++++---------- .../Analysis/CodeQuality/CodeQuality.csproj | 14 ++++---- .../Project/PackageManagement.Cmdlets.csproj | 16 +++++----- .../ICSharpCode.Reports.Addin.csproj | 14 ++++---- .../ICSharpCode.Reports.Core.csproj | 14 ++++---- 5 files changed, 47 insertions(+), 43 deletions(-) diff --git a/SharpDevelop.sln b/SharpDevelop.sln index 94a3c972de..21fc3a5300 100644 --- a/SharpDevelop.sln +++ b/SharpDevelop.sln @@ -355,22 +355,22 @@ Global {752BD058-5517-48A1-BB27-5ED186FA052B}.Debug|Any CPU.Build.0 = Debug|Any CPU {752BD058-5517-48A1-BB27-5ED186FA052B}.Release|Any CPU.ActiveCfg = Release|Any CPU {752BD058-5517-48A1-BB27-5ED186FA052B}.Release|Any CPU.Build.0 = Release|Any CPU - {E0A5E80A-003B-4335-A9DC-A76E2E46D38D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E0A5E80A-003B-4335-A9DC-A76E2E46D38D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E0A5E80A-003B-4335-A9DC-A76E2E46D38D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E0A5E80A-003B-4335-A9DC-A76E2E46D38D}.Release|Any CPU.Build.0 = Release|Any CPU + {E0A5E80A-003B-4335-A9DC-A76E2E46D38D}.Debug|Any CPU.ActiveCfg = Debug|x86 + {E0A5E80A-003B-4335-A9DC-A76E2E46D38D}.Debug|Any CPU.Build.0 = Debug|x86 + {E0A5E80A-003B-4335-A9DC-A76E2E46D38D}.Release|Any CPU.ActiveCfg = Release|x86 + {E0A5E80A-003B-4335-A9DC-A76E2E46D38D}.Release|Any CPU.Build.0 = Release|x86 {60480C2F-F228-4D86-B98F-AF75A7DCEC34}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {60480C2F-F228-4D86-B98F-AF75A7DCEC34}.Debug|Any CPU.Build.0 = Debug|Any CPU {60480C2F-F228-4D86-B98F-AF75A7DCEC34}.Release|Any CPU.ActiveCfg = Release|Any CPU {60480C2F-F228-4D86-B98F-AF75A7DCEC34}.Release|Any CPU.Build.0 = Release|Any CPU - {6FB2FE2F-4E8C-4403-99AE-0474721FFD2E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6FB2FE2F-4E8C-4403-99AE-0474721FFD2E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6FB2FE2F-4E8C-4403-99AE-0474721FFD2E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6FB2FE2F-4E8C-4403-99AE-0474721FFD2E}.Release|Any CPU.Build.0 = Release|Any CPU - {7C3579BC-2A64-4108-82B5-3D07ADA079E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7C3579BC-2A64-4108-82B5-3D07ADA079E7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7C3579BC-2A64-4108-82B5-3D07ADA079E7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7C3579BC-2A64-4108-82B5-3D07ADA079E7}.Release|Any CPU.Build.0 = Release|Any CPU + {6FB2FE2F-4E8C-4403-99AE-0474721FFD2E}.Debug|Any CPU.ActiveCfg = Debug|x86 + {6FB2FE2F-4E8C-4403-99AE-0474721FFD2E}.Debug|Any CPU.Build.0 = Debug|x86 + {6FB2FE2F-4E8C-4403-99AE-0474721FFD2E}.Release|Any CPU.ActiveCfg = Release|x86 + {6FB2FE2F-4E8C-4403-99AE-0474721FFD2E}.Release|Any CPU.Build.0 = Release|x86 + {7C3579BC-2A64-4108-82B5-3D07ADA079E7}.Debug|Any CPU.ActiveCfg = Debug|x86 + {7C3579BC-2A64-4108-82B5-3D07ADA079E7}.Debug|Any CPU.Build.0 = Debug|x86 + {7C3579BC-2A64-4108-82B5-3D07ADA079E7}.Release|Any CPU.ActiveCfg = Release|x86 + {7C3579BC-2A64-4108-82B5-3D07ADA079E7}.Release|Any CPU.Build.0 = Release|x86 {9F0355DD-A394-4626-A2D9-112EBD1D36A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {9F0355DD-A394-4626-A2D9-112EBD1D36A9}.Debug|Any CPU.Build.0 = Debug|Any CPU {9F0355DD-A394-4626-A2D9-112EBD1D36A9}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -467,10 +467,10 @@ Global {D1DA3B8F-7313-4BDA-8880-461C5F007751}.Debug|Any CPU.Build.0 = Debug|Any CPU {D1DA3B8F-7313-4BDA-8880-461C5F007751}.Release|Any CPU.ActiveCfg = Release|Any CPU {D1DA3B8F-7313-4BDA-8880-461C5F007751}.Release|Any CPU.Build.0 = Release|Any CPU - {D1DF9C2D-3A5E-4985-ACA4-648C604DB562}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D1DF9C2D-3A5E-4985-ACA4-648C604DB562}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D1DF9C2D-3A5E-4985-ACA4-648C604DB562}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D1DF9C2D-3A5E-4985-ACA4-648C604DB562}.Release|Any CPU.Build.0 = Release|Any CPU + {D1DF9C2D-3A5E-4985-ACA4-648C604DB562}.Debug|Any CPU.ActiveCfg = Debug|x86 + {D1DF9C2D-3A5E-4985-ACA4-648C604DB562}.Debug|Any CPU.Build.0 = Debug|x86 + {D1DF9C2D-3A5E-4985-ACA4-648C604DB562}.Release|Any CPU.ActiveCfg = Release|x86 + {D1DF9C2D-3A5E-4985-ACA4-648C604DB562}.Release|Any CPU.Build.0 = Release|x86 {D788789A-4D43-42B9-B0F7-CB2CA761372B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D788789A-4D43-42B9-B0F7-CB2CA761372B}.Debug|Any CPU.Build.0 = Debug|Any CPU {D788789A-4D43-42B9-B0F7-CB2CA761372B}.Release|Any CPU.ActiveCfg = Release|Any CPU diff --git a/src/AddIns/Analysis/CodeQuality/CodeQuality.csproj b/src/AddIns/Analysis/CodeQuality/CodeQuality.csproj index c091214503..32d9d66e4b 100644 --- a/src/AddIns/Analysis/CodeQuality/CodeQuality.csproj +++ b/src/AddIns/Analysis/CodeQuality/CodeQuality.csproj @@ -16,13 +16,6 @@ <TreatWarningsAsErrors>false</TreatWarningsAsErrors> <TargetFrameworkProfile /> </PropertyGroup> - <PropertyGroup Condition=" '$(Platform)' == 'x86' "> - <PlatformTarget>x86</PlatformTarget> - <RegisterForComInterop>False</RegisterForComInterop> - <GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies> - <BaseAddress>4194304</BaseAddress> - <FileAlignment>4096</FileAlignment> - </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)' == 'Debug' "> <DebugSymbols>true</DebugSymbols> <DebugType>Full</DebugType> @@ -37,6 +30,13 @@ <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow> <DefineConstants>TRACE</DefineConstants> </PropertyGroup> + <PropertyGroup Condition=" '$(Platform)' == 'x86' "> + <PlatformTarget>x86</PlatformTarget> + <RegisterForComInterop>False</RegisterForComInterop> + <GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies> + <BaseAddress>4194304</BaseAddress> + <FileAlignment>4096</FileAlignment> + </PropertyGroup> <ItemGroup> <Reference Include="PresentationCore" /> <Reference Include="PresentationFramework" /> diff --git a/src/AddIns/Misc/PackageManagement/Cmdlets/Project/PackageManagement.Cmdlets.csproj b/src/AddIns/Misc/PackageManagement/Cmdlets/Project/PackageManagement.Cmdlets.csproj index c8e552283f..751e9f54e6 100644 --- a/src/AddIns/Misc/PackageManagement/Cmdlets/Project/PackageManagement.Cmdlets.csproj +++ b/src/AddIns/Misc/PackageManagement/Cmdlets/Project/PackageManagement.Cmdlets.csproj @@ -3,7 +3,7 @@ <PropertyGroup> <ProjectGuid>{E0A5E80A-003B-4335-A9DC-A76E2E46D38D}</ProjectGuid> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> + <Platform Condition=" '$(Platform)' == '' ">x86</Platform> <OutputType>Library</OutputType> <RootNamespace>ICSharpCode.PackageManagement.Cmdlets</RootNamespace> <AssemblyName>PackageManagement.Cmdlets</AssemblyName> @@ -17,13 +17,6 @@ <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath> <WarningLevel>4</WarningLevel> </PropertyGroup> - <PropertyGroup Condition=" '$(Platform)' == 'AnyCPU' "> - <PlatformTarget>AnyCPU</PlatformTarget> - <BaseAddress>4194304</BaseAddress> - <RegisterForComInterop>False</RegisterForComInterop> - <GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies> - <FileAlignment>4096</FileAlignment> - </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)' == 'Debug' "> <DebugSymbols>True</DebugSymbols> <DebugType>Full</DebugType> @@ -39,6 +32,13 @@ <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow> <DefineConstants>TRACE</DefineConstants> </PropertyGroup> + <PropertyGroup Condition=" '$(Platform)' == 'x86' "> + <PlatformTarget>x86</PlatformTarget> + <BaseAddress>4194304</BaseAddress> + <RegisterForComInterop>False</RegisterForComInterop> + <GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies> + <FileAlignment>4096</FileAlignment> + </PropertyGroup> <ItemGroup> <Reference Include="NuGet.Core"> <HintPath>..\..\RequiredLibraries\NuGet.Core.dll</HintPath> diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/ICSharpCode.Reports.Addin.csproj b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/ICSharpCode.Reports.Addin.csproj index 3117289d01..9a7f744bf8 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/ICSharpCode.Reports.Addin.csproj +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/ICSharpCode.Reports.Addin.csproj @@ -5,15 +5,10 @@ <RootNamespace>ICSharpCode.Reports.Addin</RootNamespace> <AssemblyName>ICSharpCode.Reports.Addin</AssemblyName> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> + <Platform Condition=" '$(Platform)' == '' ">x86</Platform> <ProjectGuid>{35D002D7-C78B-44FB-92AA-104BEB431678}</ProjectGuid> <AllowUnsafeBlocks>False</AllowUnsafeBlocks> <NoStdLib>False</NoStdLib> - <RegisterForComInterop>False</RegisterForComInterop> - <GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies> - <BaseAddress>125829120</BaseAddress> - <PlatformTarget>x86</PlatformTarget> - <FileAlignment>4096</FileAlignment> <WarningLevel>4</WarningLevel> <TreatWarningsAsErrors>False</TreatWarningsAsErrors> <OutputPath>..\..\..\..\..\AddIns\Misc\SharpDevelopReports\</OutputPath> @@ -58,6 +53,13 @@ <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow> <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> </PropertyGroup> + <PropertyGroup Condition=" '$(Platform)' == 'x86' "> + <BaseAddress>125829120</BaseAddress> + <PlatformTarget>x86</PlatformTarget> + <RegisterForComInterop>False</RegisterForComInterop> + <GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies> + <FileAlignment>4096</FileAlignment> + </PropertyGroup> <ItemGroup> <Reference Include="itextsharp"> <HintPath>..\Libraries\itextsharp.dll</HintPath> diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/ICSharpCode.Reports.Core.csproj b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/ICSharpCode.Reports.Core.csproj index 31e3a9ef76..2322b26690 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/ICSharpCode.Reports.Core.csproj +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/ICSharpCode.Reports.Core.csproj @@ -5,15 +5,10 @@ <RootNamespace>ICSharpCode.Reports.Core</RootNamespace> <AssemblyName>ICSharpCode.Reports.Core</AssemblyName> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> + <Platform Condition=" '$(Platform)' == '' ">x86</Platform> <ProjectGuid>{4B2239FF-8FD6-431D-9D22-1B8049BA6917}</ProjectGuid> <AllowUnsafeBlocks>False</AllowUnsafeBlocks> <NoStdLib>False</NoStdLib> - <RegisterForComInterop>False</RegisterForComInterop> - <GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies> - <BaseAddress>123731968</BaseAddress> - <PlatformTarget>x86</PlatformTarget> - <FileAlignment>4096</FileAlignment> <WarningLevel>4</WarningLevel> <TreatWarningsAsErrors>False</TreatWarningsAsErrors> <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent> @@ -55,6 +50,13 @@ <DebugType>None</DebugType> <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow> </PropertyGroup> + <PropertyGroup Condition=" '$(Platform)' == 'x86' "> + <BaseAddress>123731968</BaseAddress> + <PlatformTarget>x86</PlatformTarget> + <RegisterForComInterop>False</RegisterForComInterop> + <GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies> + <FileAlignment>4096</FileAlignment> + </PropertyGroup> <ItemGroup> <Reference Include="Irony"> <HintPath>..\Libraries\Irony.dll</HintPath>