From 9972bf87b4f27d9c8f358ef8414ac1ab957a2f0f Mon Sep 17 00:00:00 2001
From: Jo Shields <directhex@apebox.org>
Date: Wed, 19 Feb 2014 22:12:43 +0000
Subject: Imported Upstream version 3.2.8+dfsg

---
 external/rx/Rx/NET/Source/Import.targets | 53 +++++++++++++++++++++++++++-----
 1 file changed, 45 insertions(+), 8 deletions(-)

(limited to 'external/rx/Rx/NET/Source/Import.targets')

diff --git a/external/rx/Rx/NET/Source/Import.targets b/external/rx/Rx/NET/Source/Import.targets
index b5f5c1eeda..c6403e46db 100644
--- a/external/rx/Rx/NET/Source/Import.targets
+++ b/external/rx/Rx/NET/Source/Import.targets
@@ -1,29 +1,66 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
   <!-- Non-Portable Library build -->
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v11.0\Microsoft.Windows.UI.Xaml.CSharp.targets" Condition=" '$(TargetFrameworkIdentifier)' == '.NETCore' " />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" Condition=" '$(TargetFrameworkIdentifier)' != '.NETPortable' And ('$(BuildPlatform)' == 'DESKTOPCLR' Or '$(BuildPlatform)' == 'XNA') " />
+  
+  <!-- Silverlight ONLY (i.e., not phone) -->
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Silverlight\$(SilverlightVersion)\Microsoft.Silverlight.CSharp.targets" Condition=" '$(TargetFrameworkIdentifier)' != '.NETPortable' And '$(BuildPlatform)' == 'SILVERLIGHT' AND !('$(BuildFlavor)' == 'SILVERLIGHTM7') " />
+  
+  <!-- Windows Phone 7.1 (Silverlight for Phone) -->
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\Silverlight for Phone\$(TargetFrameworkVersion)\Microsoft.Silverlight.$(TargetFrameworkProfile).Overrides.targets" Condition=" '$(TargetFrameworkIdentifier)' != '.NETPortable' And '$(BuildFlavor)' == 'SILVERLIGHTM7' " />
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\Silverlight for Phone\$(TargetFrameworkVersion)\Microsoft.Silverlight.CSharp.targets" Condition=" '$(TargetFrameworkIdentifier)' != '.NETPortable' And '$(BuildFlavor)' == 'SILVERLIGHTM7' " />
+  
+  <!-- Windows Phone 8 -->
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\$(TargetFrameworkIdentifier)\$(TargetFrameworkVersion)\Microsoft.$(TargetFrameworkIdentifier).$(TargetFrameworkVersion).Overrides.targets" Condition=" '$(TargetFrameworkIdentifier)' != '.NETPortable' And '$(BuildFlavor)' == 'WINDOWS_PHONE8' "/>
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\$(TargetFrameworkIdentifier)\$(TargetFrameworkVersion)\Microsoft.$(TargetFrameworkIdentifier).CSharp.targets" Condition=" '$(TargetFrameworkIdentifier)' != '.NETPortable' And '$(BuildFlavor)' == 'WINDOWS_PHONE8' "/>
-  <Import Project="$(MSBuildExtensionsPath)\Microsoft\XNA Game Studio\Microsoft.Xna.GameStudio.targets" Condition=" '$(TargetFrameworkIdentifier)' != '.NETPortable' And '$(BuildPlatform)' == 'XNA' "/>
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Compact\Microsoft.CompactFramework.CSharp.targets" Condition=" '$(BuildPlatform)' == 'NETCF' " />
-  <Import Project="$(MSBuildExtensionsPath)\Microsoft\Xbox 360 ADK\Microsoft.Xbox360.Adk.App.targets" Condition=" '$(BuildPlatform)' == 'XBOX' " />
-
+ 
   <!-- Portable Library Build -->
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" Condition=" '$(TargetFrameworkIdentifier)' == '.NETPortable' " />
 
+
+  <!-- If "Sign" is set and assembly should be signed, generate a .sign file-->  
   <Target Name="AfterBuild">
-    <WriteLinesToFile Condition=" '$(ProductSignAssembly)' == 'true' AND '$(SignedBuild)' == '1' "
-                      File="$(OutDir)\$(TargetFileName).sign" Overwrite="true"
-                      Lines="[$(SignKeyId)] Auto-generated file. Indicates the corresponding binary file needs to be signed." />
+    
+    <WriteLinesToFile Condition=" '$(ProductSignAssembly)' == 'true' AND '$(Sign)' == 'Sign' "
+        File="$(OutDir)\$(TargetFileName).sign"
+        Overwrite="true"
+        Lines="Auto-generated file, indicates the corresponding binary file needs to be signed.">
+    </WriteLinesToFile>
 
     <!-- Hack for Metro; for some reason the XAML build creates intermediary folders, so we flatten the hierarchy for consumption by the setup build at a later stage -->
+ 
+    <!-- For some reason, using a plain <ItemGroup> does not fill in the list correctly, so we must use <CreateItem> -->
+    <CreateItem Include="$(OutDir)\*.sign;$(OutDir)\*.xml" Condition=" '$(TargetFrameworkIdentifier)' == '.NETCore' ">
+      <Output TaskParameter="Include" ItemName="CanaryFiles" />
+    </CreateItem>
+
+    <Message Text="-- Canary files: @(CanaryFiles)" Importance="high"/>
+    <Move
+        SourceFiles="@(CanaryFiles)"
+        DestinationFolder="$(OutDir)\.."
+        Condition=" '$(TargetFrameworkIdentifier)' == '.NETCore' " />
+
+    <!-- For some reason, using a plain <ItemGroup> does not fill in the list correctly, so we must use <CreateItem> -->
     <CreateItem Include="$(OutDir)\*.*" Condition=" '$(TargetFrameworkIdentifier)' == '.NETCore' ">
       <Output TaskParameter="Include" ItemName="BuiltFilesInOutDir" />
     </CreateItem>
-    <Copy SourceFiles="@(BuiltFilesInOutDir)" DestinationFolder="$(OutDir)\.." Condition=" '$(TargetFrameworkIdentifier)' == '.NETCore' " />
+
+    <Message Text="-- Built files: @(BuiltFilesInOutDir)" Importance="high"/>
+    <Copy
+        SourceFiles="@(BuiltFilesInOutDir)"
+        DestinationFolder="$(OutDir)\.."
+        Condition=" '$(TargetFrameworkIdentifier)' == '.NETCore' " />
   </Target>
+  
+	<!--  MICROSOFT BCL ASYNC CONFIGURATION -->
+	<!-- TODO: Add acondition to only load it when required? -->
+	
+	 <!-- Skip validation of packages.config since we are manageing the packages manuallt  --> 
+	 <PropertyGroup>
+			<SkipValidatePackageReferences>true</SkipValidatePackageReferences>
+	 </PropertyGroup>
+	<Import Project="packages\Microsoft.Bcl.Build.1.0.4\tools\Microsoft.Bcl.Build.targets"   Condition=" '$(BuildTarget)' == 'PLLITE' Or '$(BuildTarget)' == '40' " />
+  
 </Project>
-- 
cgit v1.2.3