Skip to content

Commit

Permalink
Attempt to solve the Mono.Posix issues.
Browse files Browse the repository at this point in the history 
- Did some general cleanup to remove cruft from the .csproj files.

- Added an environment variable, PINTA_MONO_POSIX_2, which will force
Pinta to explicitly compile against Mono.Posix 2.0.0.0

Bug: #1523739
  • Loading branch information
@cameronwhite
cameronwhite committed May 7, 2016
1 parent 7c34b07 commit 2e33aad
Show file tree
Hide file tree
Showing 8 changed files with 396 additions and 596 deletions.
293 changes: 125 additions & 168 deletions Pinta.Core/Pinta.Core.csproj
View file

Large diffs are not rendered by default.

65 changes: 34 additions & 31 deletions Pinta.Docking/Pinta.Docking.csproj
View file
@@ -1,49 +1,55 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<!-- Common configuration -->
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{8467329A-1BDC-4F21-8349-3E484C185D14}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Pinta.Docking</RootNamespace>
<AssemblyName>Pinta.Docking</AssemblyName>
<RootNamespace>Pinta.Docking</RootNamespace>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>

<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<ErrorReport>prompt</ErrorReport>
<GenerateDocumentation>true</GenerateDocumentation>
<NoWarn>1591</NoWarn>
<OutputPath>..\bin</OutputPath>
<Platform>AnyCPU</Platform>
<WarningLevel>4</WarningLevel>
</PropertyGroup>

<!-- Debug configuration -->
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<DefineConstants>DEBUG</DefineConstants>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>

<!-- Release configuration -->
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugSymbols>false</DebugSymbols>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>

<!-- References -->
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Xml" />
<Reference Condition=" '$(PINTA_MONO_POSIX_2)' == '' " Include="Mono.Posix" />
<Reference Condition=" '$(PINTA_MONO_POSIX_2)' != '' " Include="Mono.Posix, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL" />

<Reference Include="atk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
<Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
<Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
<Reference Include="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
<Reference Include="pango-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
<Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="Mono.Cairo" />
<Reference Include="Mono.Posix, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL" />
<Reference Include="pango-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml" />
</ItemGroup>

<!-- Source files -->
<ItemGroup>
<Compile Include="Classes\MouseTracker.cs" />
<Compile Include="Classes\Platform.cs" />
Expand Down Expand Up @@ -92,9 +98,9 @@
<Compile Include="DockToolbars\FloatingPosition.cs" />
<Compile Include="DockToolbars\IDockBar.cs" />
<Compile Include="DockToolbars\PlaceholderWindow.cs" />
<Compile Include="Extensions\CairoExtensions.cs" />
<Compile Include="Extensions\GdkExtensions.cs" />
<Compile Include="Extensions\GtkExtensions.cs" />
<Compile Include="Extensions\CairoExtensions.cs" />
<Compile Include="Extensions\GtkWorkarounds.cs" />
<Compile Include="Extensions\PangoUtil.cs" />
<Compile Include="MonoDevelop.Components\ExtendedLabel.cs" />
Expand Down Expand Up @@ -123,6 +129,8 @@
<Compile Include="Xwt\Rectangle.cs" />
<Compile Include="Xwt\Size.cs" />
</ItemGroup>

<!-- Resources -->
<ItemGroup>
<EmbeddedResource Include="DockLibrary\icons\pad-close-9%402x.png">
<LogicalName>pad-close-9%402x.png</LogicalName>
Expand Down Expand Up @@ -161,12 +169,7 @@
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>

<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->

</Project>
116 changes: 37 additions & 79 deletions Pinta.Effects/Pinta.Effects.csproj
View file
@@ -1,88 +1,69 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<!-- Common configuration -->
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{71A1C3E0-7343-48FE-BD9A-508929136E92}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Pinta.Effects</RootNamespace>
<AssemblyName>Pinta.Effects</AssemblyName>
<RootNamespace>Pinta.Effects</RootNamespace>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<FileUpgradeFlags>
</FileUpgradeFlags>
<OldToolsVersion>3.5</OldToolsVersion>
<UpgradeBackupLocation />
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
<InstallFrom>Disk</InstallFrom>
<UpdateEnabled>false</UpdateEnabled>
<UpdateMode>Foreground</UpdateMode>
<UpdateInterval>7</UpdateInterval>
<UpdateIntervalUnits>Days</UpdateIntervalUnits>
<UpdatePeriodically>false</UpdatePeriodically>
<UpdateRequired>false</UpdateRequired>
<MapFileExtensions>true</MapFileExtensions>
<ApplicationRevision>0</ApplicationRevision>
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
<IsWebBootstrapper>false</IsWebBootstrapper>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>

<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<ErrorReport>prompt</ErrorReport>
<GenerateDocumentation>true</GenerateDocumentation>
<NoWarn>1591</NoWarn>
<OutputPath>..\bin</OutputPath>
<Platform>AnyCPU</Platform>
<WarningLevel>4</WarningLevel>
</PropertyGroup>

<!-- Debug configuration -->
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<DefineConstants>DEBUG</DefineConstants>
<Optimize>false</Optimize>
<OutputPath>..\bin\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>

<!-- Release configuration -->
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugSymbols>false</DebugSymbols>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>..\bin\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>

<!-- References -->
<ItemGroup>
<Reference Condition=" '$(PINTA_MONO_POSIX_2)' == '' " Include="Mono.Posix" />
<Reference Condition=" '$(PINTA_MONO_POSIX_2)' != '' " Include="Mono.Posix, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL" />

<Reference Include="atk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
<Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
<Reference Include="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
<Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
<Reference Include="Mono.Posix, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL" />
<Reference Include="System" />
<Reference Include="System.Core">
</Reference>
<Reference Include="Mono.Addins, Culture=neutral, PublicKeyToken=0738eb9f132ed756">
<HintPath>..\lib\Mono.Addins.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Mono.Cairo" />
<Reference Include="System" />
<Reference Include="System.Core" />
</ItemGroup>

<!-- Source files -->
<ItemGroup>
<Compile Include="CoreEffectsExtension.cs" />
<Compile Include="Dialogs\Effects.LevelsDialog.cs" />
<Compile Include="Dialogs\Effects.PosterizeDialog.cs" />
<Compile Include="Adjustments\AutoLevelEffect.cs" />
<Compile Include="Adjustments\BlackAndWhiteEffect.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Adjustments\BlackAndWhiteEffect.cs" />
<Compile Include="Adjustments\BrightnessContrastEffect.cs" />
<Compile Include="Adjustments\CurvesEffect.cs" />
<Compile Include="Adjustments\HueSaturationEffect.cs" />
<Compile Include="Adjustments\InvertColorsEffect.cs" />
<Compile Include="Adjustments\LevelsEffect.cs" />
<Compile Include="Adjustments\PosterizeEffect.cs" />
<Compile Include="Adjustments\SepiaEffect.cs" />
<Compile Include="CoreEffectsExtension.cs" />
<Compile Include="Dialogs\Effects.CurvesDialog.cs" />
<Compile Include="Dialogs\Effects.LevelsDialog.cs" />
<Compile Include="Dialogs\Effects.PosterizeDialog.cs" />
<Compile Include="Effects\AddNoiseEffect.cs" />
<Compile Include="Effects\BulgeEffect.cs" />
<Compile Include="Effects\CloudsEffect.cs" />
Expand Down Expand Up @@ -115,52 +96,29 @@
<Compile Include="Effects\WarpEffect.cs" />
<Compile Include="Effects\ZoomBlurEffect.cs" />
<Compile Include="gtk-gui\generated.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Utilities\EffectHelper.cs" />
<Compile Include="gtk-gui\Pinta.Effects.CurvesDialog.cs" />
<Compile Include="Dialogs\Effects.CurvesDialog.cs" />
<Compile Include="gtk-gui\Pinta.Effects.LevelsDialog.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Utilities\EffectHelper.cs" />
</ItemGroup>

<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

<ItemGroup>
<ProjectReference Include="..\Pinta.Core\Pinta.Core.csproj">
<Project>{30091528-6EC1-40F8-B4BF-8EB41CBE8A8B}</Project>
<Name>Pinta.Core</Name>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\Pinta.Gui.Widgets\Pinta.Gui.Widgets.csproj">
<Project>{83F0C0AD-D587-457C-B72A-1A184D6D76B3}</Project>
<Name>Pinta.Gui.Widgets</Name>
<Private>False</Private>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->

<!-- Generated GUI -->
<ItemGroup>
<EmbeddedResource Include="gtk-gui\gui.stetic">
<LogicalName>gui.stetic</LogicalName>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<BootstrapperPackage Include="Microsoft.Net.Client.3.5">
<Visible>False</Visible>
<ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
<Install>false</Install>
</BootstrapperPackage>
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
<Visible>False</Visible>
<ProductName>.NET Framework 3.5 SP1</ProductName>
<Install>true</Install>
</BootstrapperPackage>
<BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
<Visible>False</Visible>
<ProductName>Windows Installer 3.1</ProductName>
<Install>true</Install>
</BootstrapperPackage>
</ItemGroup>
</Project>

0 comments on commit 2e33aad

Please sign in to comment.