X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fclass%2FSystem.Drawing.Design%2FSystem.Drawing.Design-net_4_5.csproj;h=d8e443b21026c0d8dc56dcedda1fa189a2046594;hb=d0c24d73e54472274711fa814dfd8082d8a924ec;hp=714f53dd00e597ae0ce7cf93bce1c50a4a7597ea;hpb=8f59998c4f744c7b78cf6cdd7f5849f99902c4b8;p=mono.git

diff --git a/mcs/class/System.Drawing.Design/System.Drawing.Design-net_4_5.csproj b/mcs/class/System.Drawing.Design/System.Drawing.Design-net_4_5.csproj
index 714f53dd00e..d8e443b2102 100644
--- a/mcs/class/System.Drawing.Design/System.Drawing.Design-net_4_5.csproj
+++ b/mcs/class/System.Drawing.Design/System.Drawing.Design-net_4_5.csproj
@@ -5,22 +5,21 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>9.0.30729</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{155AEF28-C81F-405D-9072-9D52780E3E70}</ProjectGuid>
+    <ProjectGuid>{8B8B57E4-285A-409A-BA4A-290DE0055301}</ProjectGuid>
     <OutputType>Library</OutputType>
     <NoWarn>1699</NoWarn>
-    <OutputPath>./../../class/lib/net_4_5</OutputPath>
-    <NoStdLib>true</NoStdLib>
+    <OutputPath>bin\Debug\System.Drawing.Design-net_4_5</OutputPath>
+    <NoStdLib>True</NoStdLib>
+    <NoConfig>True</NoConfig>
     
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace></RootNamespace>
+    <RootNamespace>
+    </RootNamespace>
     <AssemblyName>System.Drawing.Design</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <!-- Filter out System.Core added by: Microsoft.NETFramework.props  -->
-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <NoWarn>1699</NoWarn>
@@ -28,38 +27,39 @@
     <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <AdditionalLibPaths>./../../class/lib/net_4_5</AdditionalLibPaths>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>  
     <DebugType>pdbonly</DebugType>
     <NoWarn>1699</NoWarn>
     <Optimize>true</Optimize>
     <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <AdditionalLibPaths>./../../class/lib/net_4_5</AdditionalLibPaths>
+  </PropertyGroup>
+  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, 
+  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This
+  is a problem to compile the Mono mscorlib.dll -->
+  <PropertyGroup>
+    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
   </PropertyGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
-   <Compile Include="Assembly\AssemblyInfo.cs" />
-   <Compile Include="..\..\build\common\Consts.cs" />
-   <Compile Include="..\..\build\common\Locale.cs" />
-   <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
-   <Compile Include="System.Drawing.Design\BitmapEditor.cs" />
-   <Compile Include="System.Drawing.Design\ColorEditor.cs" />
-   <Compile Include="System.Drawing.Design\ContentAlignmentEditor.cs" />
-   <Compile Include="System.Drawing.Design\CursorEditor.cs" />
-   <Compile Include="System.Drawing.Design\FontEditor.cs" />
-   <Compile Include="System.Drawing.Design\FontNameEditor.cs" />
-   <Compile Include="System.Drawing.Design\IconEditor.cs" />
-   <Compile Include="System.Drawing.Design\ImageEditor.cs" />
-   <Compile Include="System.Drawing.Design\MetafileEditor.cs" />
-   <Compile Include="System.Drawing.Design\ToolboxItemCreator.cs" />
-   <Compile Include="System.Drawing.Design\ToolboxItemContainer.cs" />
-   <Compile Include="System.Drawing.Design\ToolboxService.cs" />
-
-  </ItemGroup>
+    <Compile Include="..\..\build\common\Consts.cs" />
+    <Compile Include="..\..\build\common\Locale.cs" />
+    <Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
+    <Compile Include="Assembly\AssemblyInfo.cs" />
+    <Compile Include="System.Drawing.Design\BitmapEditor.cs" />
+    <Compile Include="System.Drawing.Design\ColorEditor.cs" />
+    <Compile Include="System.Drawing.Design\ContentAlignmentEditor.cs" />
+    <Compile Include="System.Drawing.Design\CursorEditor.cs" />
+    <Compile Include="System.Drawing.Design\FontEditor.cs" />
+    <Compile Include="System.Drawing.Design\FontNameEditor.cs" />
+    <Compile Include="System.Drawing.Design\IconEditor.cs" />
+    <Compile Include="System.Drawing.Design\ImageEditor.cs" />
+    <Compile Include="System.Drawing.Design\MetafileEditor.cs" />
+    <Compile Include="System.Drawing.Design\ToolboxItemContainer.cs" />
+    <Compile Include="System.Drawing.Design\ToolboxItemCreator.cs" />
+    <Compile Include="System.Drawing.Design\ToolboxService.cs" />
  </ItemGroup>
   <!-- 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">
@@ -68,34 +68,32 @@
   </Target>
   -->
   <PropertyGroup>
-    <PreBuildEvent></PreBuildEvent>
+    <PreBuildEvent>
+
+    </PreBuildEvent>
+    <PostBuildEvent>
+      xcopy $(TargetName).* $(ProjectDir)..\lib\net_4_5\ /Y /R /D
+  </PostBuildEvent>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="mscorlib.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>mscorlib.dll</HintPath>
-    </Reference>
-    <Reference Include="mscorlib.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>mscorlib.dll</HintPath>
-    </Reference>
-    <Reference Include="System.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>System.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Drawing.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>System.Drawing.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Windows.Forms.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>System.Windows.Forms.dll</HintPath>
-    </Reference>
-
+    <ProjectReference Include="..\corlib\corlib-net_4_5.csproj">
+      <Project>{07C1F58B-9E99-47F8-A847-79EDA5157DA8}</Project>
+      <Name>corlib\corlib-net_4_5</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\System\System-net_4_5-2.csproj">
+      <Project>{38FCD731-0E11-46F7-A31B-DCBE853AD8D7}</Project>
+      <Name>System\System-net_4_5-2</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\System.Drawing\System.Drawing-net_4_5.csproj">
+      <Project>{945A4FD5-2184-44CC-9519-13AFC37ED81A}</Project>
+      <Name>System.Drawing\System.Drawing-net_4_5</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Managed.Windows.Forms\System.Windows.Forms-net_4_5.csproj">
+      <Project>{409FF748-B765-4AB3-BCB1-72199B9E341C}</Project>
+      <Name>Managed.Windows.Forms\System.Windows.Forms-net_4_5</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Properties\" />
   </ItemGroup>
-  
-</Project>
-
+</Project>