Refreshed the CSProj files to use the new output build directory

2 files changed, 129 insertions, 12 deletions

diff --git a/mcs/class/System.Reactive.Providers/System.Reactive.Providers-net_4_0.csproj b/mcs/class/System.Reactive.Providers/System.Reactive.Providers-net_4_0.csproj
new file mode 100644
index 00000000000..2c3d8831a6f
--- /dev/null
+++ b/mcs/class/System.Reactive.Providers/System.Reactive.Providers-net_4_0.csproj
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <PropertyGroup>

+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

+    <ProductVersion>9.0.30729</ProductVersion>

+    <SchemaVersion>2.0</SchemaVersion>

+    <ProjectGuid>{71582426-D334-4886-99B0-E947026EFDE3}</ProjectGuid>

+    <OutputType>Library</OutputType>

+    <NoWarn>1699</NoWarn>

+    <OutputPath>./../../class/lib/net_4_0</OutputPath>

+    <NoStdLib>True</NoStdLib>

+    <NoConfig>True</NoConfig>

+    

+    <AppDesignerFolder>Properties</AppDesignerFolder>

+    <RootNamespace>

+    </RootNamespace>

+    <AssemblyName>System.Reactive.Providers</AssemblyName>

+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>

+    <FileAlignment>512</FileAlignment>

+  </PropertyGroup>

+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

+    <DebugSymbols>true</DebugSymbols>

+    <DebugType>full</DebugType>

+    <NoWarn>1699</NoWarn>

+    <Optimize>false</Optimize>

+    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;SIGNED</DefineConstants>

+    <ErrorReport>prompt</ErrorReport>

+    <WarningLevel>4</WarningLevel>

+  </PropertyGroup>

+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

+    <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;SIGNED</DefineConstants>

+    <ErrorReport>prompt</ErrorReport>

+    <WarningLevel>4</WarningLevel>

+  </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="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Providers\GlobalSuppressions.cs" />

+    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Providers\Properties\AssemblyInfo.cs" />

+    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Providers\Reactive\Internal\Constants.cs" />

+    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Providers\Reactive\Joins\QueryablePattern.cs" />

+    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Providers\Reactive\Joins\QueryablePlan.cs" />

+    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Providers\Reactive\Linq\ExpressionVisitor.cs" />

+    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Providers\Reactive\Linq\Observable.Queryable.cs" />

+    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Providers\Reactive\Linq\Qbservable.cs" />

+    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Providers\Reactive\Linq\Qbservable.Generated.cs" />

+    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Providers\Reactive\Linq\Qbservable.Joins.cs" />

+    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Providers\Reactive\ObservableQuery.cs" />

+    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Providers\Strings_Providers.Generated.cs" />

+    <Compile Include="Assembly\AssemblyInfo.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">

+  </Target>

+  <Target Name="AfterBuild">

+  </Target>

+  -->

+  <PropertyGroup>

+    <PreBuildEvent>

+

+    </PreBuildEvent>

+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>

+  </PropertyGroup>

+  <ItemGroup>

+    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">

+      <Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>

+      <Name>corlib\corlib-net_4_0</Name>

+    </ProjectReference>

+    <ProjectReference Include="..\System\System-net_4_0-2.csproj">

+      <Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>

+      <Name>System\System-net_4_0-2</Name>

+    </ProjectReference>

+    <ProjectReference Include="..\System.Core\System.Core-net_4_0.csproj">

+      <Project>{8B53B0E9-E0CA-4378-8C57-F85D518871D3}</Project>

+      <Name>System.Core\System.Core-net_4_0</Name>

+    </ProjectReference>

+    <ProjectReference Include="..\System.Reactive.Interfaces\System.Reactive.Interfaces-net_4_0.csproj">

+      <Project>{0B4F919D-8F01-4CDC-86AF-84D085CEDE00}</Project>

+      <Name>System.Reactive.Interfaces\System.Reactive.Interfaces-net_4_0</Name>

+    </ProjectReference>

+    <ProjectReference Include="..\System.Reactive.Core\System.Reactive.Core-net_4_0.csproj">

+      <Project>{A86E0D79-7283-4D2B-80CE-0E6394F5F0A8}</Project>

+      <Name>System.Reactive.Core\System.Reactive.Core-net_4_0</Name>

+    </ProjectReference>

+    <ProjectReference Include="..\System.Reactive.Linq\System.Reactive.Linq-net_4_0.csproj">

+      <Project>{0BE9F44D-B9AD-4D46-B44D-2008E14E364E}</Project>

+      <Name>System.Reactive.Linq\System.Reactive.Linq-net_4_0</Name>

+    </ProjectReference>

+  </ItemGroup>

+  <ItemGroup>

+    <Folder Include="Properties\" />

+  </ItemGroup>

+  <ItemGroup>

+    <EmbeddedResource Include="Strings_Providers.resources">

+      <LogicalName>System.Reactive.Strings_Providers.resources</LogicalName>

+    </EmbeddedResource>

+  </ItemGroup>

+</Project>

+
diff --git a/mcs/class/System.Reactive.Providers/System.Reactive.Providers-net_4_5.csproj b/mcs/class/System.Reactive.Providers/System.Reactive.Providers-net_4_5.csproj
index 2ebe682dded..8212985b527 100644
--- a/mcs/class/System.Reactive.Providers/System.Reactive.Providers-net_4_5.csproj
+++ b/mcs/class/System.Reactive.Providers/System.Reactive.Providers-net_4_5.csproj
@@ -5,10 +5,10 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

     <ProductVersion>9.0.30729</ProductVersion>

     <SchemaVersion>2.0</SchemaVersion>

-    <ProjectGuid>{03DD638D-4D60-42BB-94D6-3C7112C62C20}</ProjectGuid>

+    <ProjectGuid>{8D27108A-3DD4-46D7-917E-7833A3C4D479}</ProjectGuid>

     <OutputType>Library</OutputType>

     <NoWarn>1699</NoWarn>

-    <OutputPath>bin\Debug\System.Reactive.Providers-net_4_5</OutputPath>

+    <OutputPath>./../../class/lib/net_4_5</OutputPath>

     <NoStdLib>True</NoStdLib>

     <NoConfig>True</NoConfig>

     

@@ -68,33 +68,36 @@
     <PreBuildEvent>

 

     </PreBuildEvent>

-    <PostBuildEvent>

-      xcopy $(TargetName).* $(ProjectDir)..\lib\net_4_5\ /Y /R /D

-  </PostBuildEvent>

+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>

   </PropertyGroup>

   <ItemGroup>

     <ProjectReference Include="..\corlib\corlib-net_4_5.csproj">

-      <Project>{07C1F58B-9E99-47F8-A847-79EDA5157DA8}</Project>

+      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</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>

+      <Project>{5C605B73-19DA-4FB7-AB39-C7EF9A8B19FE}</Project>

       <Name>System\System-net_4_5-2</Name>

     </ProjectReference>

     <ProjectReference Include="..\System.Core\System.Core-net_4_5.csproj">

-      <Project>{D8260595-C32F-4AC3-9C01-2CD2528CFA1D}</Project>

+      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>

       <Name>System.Core\System.Core-net_4_5</Name>

     </ProjectReference>

     <ProjectReference Include="..\System.Reactive.Interfaces\System.Reactive.Interfaces-net_4_5.csproj">

-      <Project>{D80FD091-3F53-4879-B0BB-08897139CF97}</Project>

+      <Project>{EFA38650-CE13-4BF3-993D-70B238DB1C9E}</Project>

       <Name>System.Reactive.Interfaces\System.Reactive.Interfaces-net_4_5</Name>

     </ProjectReference>

     <ProjectReference Include="..\System.Reactive.Core\System.Reactive.Core-net_4_5.csproj">

-      <Project>{CC4B4666-F6F2-4E54-8AF9-656A76A3F0DF}</Project>

+      <Project>{4EF3C775-C516-4897-AB1D-DC9F8862A4D9}</Project>

       <Name>System.Reactive.Core\System.Reactive.Core-net_4_5</Name>

     </ProjectReference>

     <ProjectReference Include="..\System.Reactive.Linq\System.Reactive.Linq-net_4_5.csproj">

-      <Project>{83E7D015-CA2B-4B3D-A764-DB8C3A9B3EEE}</Project>

+      <Project>{EE831E49-3F84-4A05-9417-A9C8BD36E164}</Project>

       <Name>System.Reactive.Linq\System.Reactive.Linq-net_4_5</Name>

     </ProjectReference>

   </ItemGroup>

@@ -106,4 +109,5 @@
       <LogicalName>System.Reactive.Strings_Providers.resources</LogicalName>

     </EmbeddedResource>

   </ItemGroup>

-</Project>
+</Project>

+