Merge pull request #1066 from esdrubal/bug19313

[mono.git] / mcs / class / System.Reactive.Interfaces / System.Reactive.Interfaces-net_4_5.csproj

diff --git a/mcs/class/System.Reactive.Interfaces/System.Reactive.Interfaces-net_4_5.csproj b/mcs/class/System.Reactive.Interfaces/System.Reactive.Interfaces-net_4_5.csproj
index 7e85fa8136ebeb3be200d13e889634e7f308cc3d..c7590b4de86e4a47edcc7a31ea38744e29b20fa1 100644 (file)
--- a/mcs/class/System.Reactive.Interfaces/System.Reactive.Interfaces-net_4_5.csproj
+++ b/mcs/class/System.Reactive.Interfaces/System.Reactive.Interfaces-net_4_5.csproj
@@ -5,10 +5,10 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
     <ProductVersion>9.0.30729</ProductVersion>\r
     <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{1CA793F9-A71D-4534-B684-D77AF04AB96F}</ProjectGuid>\r
+    <ProjectGuid>{EFA38650-CE13-4BF3-993D-70B238DB1C9E}</ProjectGuid>\r
     <OutputType>Library</OutputType>\r
     <NoWarn>1699</NoWarn>\r
-    <OutputPath>bin\Debug\System.Reactive.Interfaces-net_4_5</OutputPath>\r
+    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
     <NoStdLib>True</NoStdLib>\r
     <NoConfig>True</NoConfig>\r
     \r
@@ -18,13 +18,20 @@
     <AssemblyName>System.Reactive.Interfaces</AssemblyName>\r
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
+  </PropertyGroup>\r
+    <PropertyGroup>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>true</DelaySign>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../reactive.pub</AssemblyOriginatorKeyFile>
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
     <NoWarn>1699</NoWarn>\r
     <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5;HAS_EDI;PREFERASYNC;PREFER_ASYNC;SIGNED</DefineConstants>\r
+    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5;HAS_EDI;PREFERASYNC;PREFER_ASYNC;HAS_AWAIT;SIGNED</DefineConstants>\r
     <ErrorReport>prompt</ErrorReport>\r
     <WarningLevel>4</WarningLevel>\r
   </PropertyGroup>\r
@@ -32,7 +39,7 @@
     <DebugType>pdbonly</DebugType>\r
     <NoWarn>1699</NoWarn>\r
     <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5;HAS_EDI;PREFERASYNC;PREFER_ASYNC;SIGNED</DefineConstants>\r
+    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5;HAS_EDI;PREFERASYNC;PREFER_ASYNC;HAS_AWAIT;SIGNED</DefineConstants>\r
     <ErrorReport>prompt</ErrorReport>\r
     <WarningLevel>4</WarningLevel>\r
   </PropertyGroup>\r
@@ -67,7 +74,8 @@
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Interfaces\Reactive\Linq\IQbservableProvider.cs" />\r
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Interfaces\Reactive\Subjects\IConnectableObservable.cs" />\r
     <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Interfaces\Reactive\Subjects\ISubject.cs" />\r
-    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Interfaces\Reactive\Subjects\ISubject.Multi.cs" />\r  </ItemGroup>\r
+    <Compile Include="..\..\..\external\rx\Rx\NET\Source\System.Reactive.Interfaces\Reactive\Subjects\ISubject.Multi.cs" />\r
+    <Compile Include="Assembly\AssemblyInfo.cs" />\r  </ItemGroup>\r
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
        Other similar extension points exist, see Microsoft.Common.targets.\r
   <Target Name="BeforeBuild">\r
@@ -76,28 +84,36 @@
   </Target>\r
   -->\r
   <PropertyGroup>\r
-    <PreBuildEvent>\r
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
 \r
-    </PreBuildEvent>\r
-    <PostBuildEvent>\r
-      xcopy $(TargetName).* $(ProjectDir)..\lib\net_4_5\ /Y /R /D\r
-  </PostBuildEvent>\r
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>\r
   </PropertyGroup>\r
   <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_5.csproj">\r
-      <Project>{05A7A0C2-6946-4CF5-9ED3-44AB0B428C4E}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
+      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_5-2.csproj">\r
-      <Project>{34966210-D64D-419C-94A4-9A6093CE5882}</Project>\r
-      <Name>System\System-net_4_5-2</Name>\r
+    <ProjectReference Include="../System/System-net_4_5.csproj">\r
+      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_5.csproj">\r
-      <Project>{E77D8877-AEAD-4FDF-8A44-36AAA0B20653}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
+    <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
+      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
+      <Name>System.Core-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <Folder Include="Properties\" />\r
   </ItemGroup>\r
-</Project>
+</Project>\r
+