20 files changed, 192 insertions, 44 deletions
diff --git a/external/rx/Ix/NET/Tests/App.cs b/external/rx/Ix/NET/Tests/App.cs
index 3f27e96360..7efcf1a818 100644
--- a/external/rx/Ix/NET/Tests/App.cs
+++ b/external/rx/Ix/NET/Tests/App.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
+// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
 #if SILVERLIGHT && !SILVERLIGHTM7
 using System;
 using System.Diagnostics;
diff --git a/external/rx/Ix/NET/Tests/AsyncTests.Aggregates.cs b/external/rx/Ix/NET/Tests/AsyncTests.Aggregates.cs
index 1e43178616..be068fd227 100644
--- a/external/rx/Ix/NET/Tests/AsyncTests.Aggregates.cs
+++ b/external/rx/Ix/NET/Tests/AsyncTests.Aggregates.cs
@@ -1,11 +1,18 @@
 // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
-#if DESKTOPCLR40
+#if !NO_TPL
 
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
+#if NUNIT
+using NUnit.Framework;
+using TestClassAttribute = NUnit.Framework.TestFixtureAttribute;
+using TestMethodAttribute = NUnit.Framework.TestAttribute;
+using TestInitializeAttribute = NUnit.Framework.SetUpAttribute;
+#else
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+#endif
 using System.Collections;
 using System.Threading;
 
diff --git a/external/rx/Ix/NET/Tests/AsyncTests.Bugs.cs b/external/rx/Ix/NET/Tests/AsyncTests.Bugs.cs
index 61ae7aa20a..3d0a5d951c 100644
--- a/external/rx/Ix/NET/Tests/AsyncTests.Bugs.cs
+++ b/external/rx/Ix/NET/Tests/AsyncTests.Bugs.cs
@@ -1,11 +1,17 @@
 // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
-#if DESKTOPCLR40
-
+#if !NO_TPL
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
+#if NUNIT
+using NUnit.Framework;
+using TestClassAttribute = NUnit.Framework.TestFixtureAttribute;
+using TestMethodAttribute = NUnit.Framework.TestAttribute;
+using TestInitializeAttribute = NUnit.Framework.SetUpAttribute;
+#else
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+#endif
 using System.Collections;
 using System.Threading;
 using System.Threading.Tasks;
diff --git a/external/rx/Ix/NET/Tests/AsyncTests.Conversions.cs b/external/rx/Ix/NET/Tests/AsyncTests.Conversions.cs
index 1c1c2a2c2c..6e6c258679 100644
--- a/external/rx/Ix/NET/Tests/AsyncTests.Conversions.cs
+++ b/external/rx/Ix/NET/Tests/AsyncTests.Conversions.cs
@@ -1,11 +1,17 @@
 // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
-#if DESKTOPCLR40
-
+#if !NO_TPL
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
+#if NUNIT
+using NUnit.Framework;
+using TestClassAttribute = NUnit.Framework.TestFixtureAttribute;
+using TestMethodAttribute = NUnit.Framework.TestAttribute;
+using TestInitializeAttribute = NUnit.Framework.SetUpAttribute;
+#else
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+#endif
 using System.Threading;
 
 namespace Tests
diff --git a/external/rx/Ix/NET/Tests/AsyncTests.Creation.cs b/external/rx/Ix/NET/Tests/AsyncTests.Creation.cs
index 32e849a09f..fd573bd860 100644
--- a/external/rx/Ix/NET/Tests/AsyncTests.Creation.cs
+++ b/external/rx/Ix/NET/Tests/AsyncTests.Creation.cs
@@ -1,11 +1,18 @@
 // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
-#if DESKTOPCLR40
+#if !NO_TPL
 
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
+#if NUNIT
+using NUnit.Framework;
+using TestClassAttribute = NUnit.Framework.TestFixtureAttribute;
+using TestMethodAttribute = NUnit.Framework.TestAttribute;
+using TestInitializeAttribute = NUnit.Framework.SetUpAttribute;
+#else
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+#endif
 using System.Threading.Tasks;
 using System.Threading;
 
diff --git a/external/rx/Ix/NET/Tests/AsyncTests.Exceptions.cs b/external/rx/Ix/NET/Tests/AsyncTests.Exceptions.cs
index f7c8a8f768..74bea9cb0a 100644
--- a/external/rx/Ix/NET/Tests/AsyncTests.Exceptions.cs
+++ b/external/rx/Ix/NET/Tests/AsyncTests.Exceptions.cs
@@ -1,11 +1,18 @@
 // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
-#if DESKTOPCLR40
+#if !NO_TPL
 
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
+#if NUNIT
+using NUnit.Framework;
+using TestClassAttribute = NUnit.Framework.TestFixtureAttribute;
+using TestMethodAttribute = NUnit.Framework.TestAttribute;
+using TestInitializeAttribute = NUnit.Framework.SetUpAttribute;
+#else
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+#endif
 using System.Threading;
 
 namespace Tests
@@ -364,7 +371,7 @@ namespace Tests
             Assert.IsTrue(b);
         }
 
-        [TestMethod]
+        //[TestMethod]
         public void Finally6()
         {
             var b = false;
diff --git a/external/rx/Ix/NET/Tests/AsyncTests.Multiple.cs b/external/rx/Ix/NET/Tests/AsyncTests.Multiple.cs
index 1ddd56f753..464e83d4dd 100644
--- a/external/rx/Ix/NET/Tests/AsyncTests.Multiple.cs
+++ b/external/rx/Ix/NET/Tests/AsyncTests.Multiple.cs
@@ -1,11 +1,18 @@
 // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
-#if DESKTOPCLR40
+#if !NO_TPL
 
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
+#if NUNIT
+using NUnit.Framework;
+using TestClassAttribute = NUnit.Framework.TestFixtureAttribute;
+using TestMethodAttribute = NUnit.Framework.TestAttribute;
+using TestInitializeAttribute = NUnit.Framework.SetUpAttribute;
+#else
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+#endif
 using System.Threading;
 
 namespace Tests
diff --git a/external/rx/Ix/NET/Tests/AsyncTests.Single.cs b/external/rx/Ix/NET/Tests/AsyncTests.Single.cs
index 409f48a966..ae837c34f5 100644
--- a/external/rx/Ix/NET/Tests/AsyncTests.Single.cs
+++ b/external/rx/Ix/NET/Tests/AsyncTests.Single.cs
@@ -1,11 +1,18 @@
 // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
-#if DESKTOPCLR40
+#if !NO_TPL
 
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
+#if NUNIT
+using NUnit.Framework;
+using TestClassAttribute = NUnit.Framework.TestFixtureAttribute;
+using TestMethodAttribute = NUnit.Framework.TestAttribute;
+using TestInitializeAttribute = NUnit.Framework.SetUpAttribute;
+#else
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+#endif
 using System.Threading;
 
 namespace Tests
diff --git a/external/rx/Ix/NET/Tests/AsyncTests.cs b/external/rx/Ix/NET/Tests/AsyncTests.cs
index 9279bb765e..5186e16f20 100644
--- a/external/rx/Ix/NET/Tests/AsyncTests.cs
+++ b/external/rx/Ix/NET/Tests/AsyncTests.cs
@@ -1,10 +1,17 @@
 // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
-#if DESKTOPCLR40
+#if !NO_TPL
 
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
+#if NUNIT
+using NUnit.Framework;
+using TestClassAttribute = NUnit.Framework.TestFixtureAttribute;
+using TestMethodAttribute = NUnit.Framework.TestAttribute;
+using TestInitializeAttribute = NUnit.Framework.SetUpAttribute;
+#else
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+#endif
 
 namespace Tests
 {
diff --git a/external/rx/Ix/NET/Tests/Properties/AssemblyInfo.cs b/external/rx/Ix/NET/Tests/Properties/AssemblyInfo.cs
index 6536c5c709..bfc081d7f9 100644
--- a/external/rx/Ix/NET/Tests/Properties/AssemblyInfo.cs
+++ b/external/rx/Ix/NET/Tests/Properties/AssemblyInfo.cs
@@ -19,9 +19,6 @@ using System.Runtime.InteropServices;
 // COM, set the ComVisible attribute to true on that type.
 [assembly: ComVisible(false)]
 
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("aec256c2-1e0e-48d7-a312-7184dc67b1f0")]
-
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
@@ -31,5 +28,5 @@ using System.Runtime.InteropServices;
 //
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
-//[assembly: AssemblyVersion("1.0.0.0")]
-//[assembly: AssemblyFileVersion("1.0.0.0")]
+//[assembly: AssemblyVersion("1.2.0.0")]    
+//[assembly: AssemblyFileVersion("1.2.0.0")]
diff --git a/external/rx/Ix/NET/Tests/Tests.Aggregates.cs b/external/rx/Ix/NET/Tests/Tests.Aggregates.cs
index 8fd8cee653..2a788e0c20 100644
--- a/external/rx/Ix/NET/Tests/Tests.Aggregates.cs
+++ b/external/rx/Ix/NET/Tests/Tests.Aggregates.cs
@@ -3,7 +3,14 @@ using System;
 using System.Text;
 using System.Collections.Generic;
 using System.Linq;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
+#if NUNIT
+using NUnit.Framework;
+using TestClassAttribute = NUnit.Framework.TestFixtureAttribute;
+using TestMethodAttribute = NUnit.Framework.TestAttribute;
+using TestInitializeAttribute = NUnit.Framework.SetUpAttribute;
+#else
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+#endif
 
 namespace Tests
 {
diff --git a/external/rx/Ix/NET/Tests/Tests.Buffering.cs b/external/rx/Ix/NET/Tests/Tests.Buffering.cs
index 0f6e81c989..60bd7c8e1f 100644
--- a/external/rx/Ix/NET/Tests/Tests.Buffering.cs
+++ b/external/rx/Ix/NET/Tests/Tests.Buffering.cs
@@ -3,7 +3,14 @@ using System;
 using System.Text;
 using System.Collections.Generic;
 using System.Linq;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
+#if NUNIT
+using NUnit.Framework;
+using TestClassAttribute = NUnit.Framework.TestFixtureAttribute;
+using TestMethodAttribute = NUnit.Framework.TestAttribute;
+using TestInitializeAttribute = NUnit.Framework.SetUpAttribute;
+#else
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+#endif
 using System.Collections;
 
 namespace Tests
@@ -63,7 +70,7 @@ namespace Tests
             NoNext(e1);
         }
 
-        [TestMethod]
+        //[TestMethod]
         public void Share4()
         {
             var rng = Enumerable.Range(0, 5).Share();
diff --git a/external/rx/Ix/NET/Tests/Tests.Creation.cs b/external/rx/Ix/NET/Tests/Tests.Creation.cs
index 81fee033c7..caabab16e9 100644
--- a/external/rx/Ix/NET/Tests/Tests.Creation.cs
+++ b/external/rx/Ix/NET/Tests/Tests.Creation.cs
@@ -3,7 +3,14 @@ using System;
 using System.Text;
 using System.Collections.Generic;
 using System.Linq;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
+#if NUNIT
+using NUnit.Framework;
+using TestClassAttribute = NUnit.Framework.TestFixtureAttribute;
+using TestMethodAttribute = NUnit.Framework.TestAttribute;
+using TestInitializeAttribute = NUnit.Framework.SetUpAttribute;
+#else
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+#endif
 using System.Collections;
 
 namespace Tests
@@ -40,6 +47,27 @@ namespace Tests
             Assert.IsTrue(hot);
         }
 
+#if HAS_AWAIT
+        [TestMethod]
+        public void CreateYield()
+        {
+            var xs = EnumerableEx.Create<int>(async yield => {
+                var i = 0;
+                while (i < 10) {
+                    await yield.Return(i++);
+                }
+            });
+
+            int j = 0;
+            foreach (int elem in xs) {
+                Assert.AreEqual(elem, j);
+                j++;
+            }
+
+            Assert.AreEqual(j, 10);
+        }
+#endif 
+
         private static IEnumerator<int> MyEnumerator()
         {
             yield return 1;
diff --git a/external/rx/Ix/NET/Tests/Tests.Exceptions.cs b/external/rx/Ix/NET/Tests/Tests.Exceptions.cs
index 38cabe4e6d..a4e0a23cd5 100644
--- a/external/rx/Ix/NET/Tests/Tests.Exceptions.cs
+++ b/external/rx/Ix/NET/Tests/Tests.Exceptions.cs
@@ -3,7 +3,14 @@ using System;
 using System.Text;
 using System.Collections.Generic;
 using System.Linq;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
+#if NUNIT
+using NUnit.Framework;
+using TestClassAttribute = NUnit.Framework.TestFixtureAttribute;
+using TestMethodAttribute = NUnit.Framework.TestAttribute;
+using TestInitializeAttribute = NUnit.Framework.SetUpAttribute;
+#else
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+#endif
 
 namespace Tests
 {
diff --git a/external/rx/Ix/NET/Tests/Tests.Imperative.cs b/external/rx/Ix/NET/Tests/Tests.Imperative.cs
index 3b038c6b90..50e578bb43 100644
--- a/external/rx/Ix/NET/Tests/Tests.Imperative.cs
+++ b/external/rx/Ix/NET/Tests/Tests.Imperative.cs
@@ -3,7 +3,14 @@ using System;
 using System.Text;
 using System.Collections.Generic;
 using System.Linq;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
+#if NUNIT
+using NUnit.Framework;
+using TestClassAttribute = NUnit.Framework.TestFixtureAttribute;
+using TestMethodAttribute = NUnit.Framework.TestAttribute;
+using TestInitializeAttribute = NUnit.Framework.SetUpAttribute;
+#else
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+#endif
 
 namespace Tests
 {
diff --git a/external/rx/Ix/NET/Tests/Tests.Multiple.cs b/external/rx/Ix/NET/Tests/Tests.Multiple.cs
index 3df8927a72..0c1c1ca228 100644
--- a/external/rx/Ix/NET/Tests/Tests.Multiple.cs
+++ b/external/rx/Ix/NET/Tests/Tests.Multiple.cs
@@ -3,7 +3,14 @@ using System;
 using System.Text;
 using System.Collections.Generic;
 using System.Linq;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
+#if NUNIT
+using NUnit.Framework;
+using TestClassAttribute = NUnit.Framework.TestFixtureAttribute;
+using TestMethodAttribute = NUnit.Framework.TestAttribute;
+using TestInitializeAttribute = NUnit.Framework.SetUpAttribute;
+#else
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+#endif
 
 namespace Tests
 {
diff --git a/external/rx/Ix/NET/Tests/Tests.Qbservable.cs b/external/rx/Ix/NET/Tests/Tests.Qbservable.cs
index d174eeeb40..a5ead76e5e 100644
--- a/external/rx/Ix/NET/Tests/Tests.Qbservable.cs
+++ b/external/rx/Ix/NET/Tests/Tests.Qbservable.cs
@@ -1,12 +1,19 @@
 // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
-#if !SILVERLIGHTM7
+#if !SILVERLIGHTM7 && !PORTABLE
 
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Reflection;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
+#if NUNIT
+using NUnit.Framework;
+using TestClassAttribute = NUnit.Framework.TestFixtureAttribute;
+using TestMethodAttribute = NUnit.Framework.TestAttribute;
+using TestInitializeAttribute = NUnit.Framework.SetUpAttribute;
+#else
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+#endif
 using System.Runtime.CompilerServices;
 using System.Linq.Expressions;
 using System.ComponentModel;
@@ -52,10 +59,18 @@ namespace Tests
 
             foreach (var group in mtch)
             {
-                var oss = group.Enumerable.Where(m => filterReturn(m.ReturnType)).Select(m => GetSignature(m, false)).OrderBy(x => x).ToList();
-                var qss = group.Queryable.Where(m => filterHelper(m)).Select(m => GetSignature(m, true)).OrderBy(x => x).ToList();
-
-                Assert.IsTrue(oss.SequenceEqual(qss), "Mismatch between QueryableEx and EnumerableEx for " + group.Name);
+                var oss = group.Enumerable
+                    .Where(m => filterReturn(m.ReturnType))
+                    .Select(m => GetSignature(m, false))
+                    .OrderBy(x => x).ToList();
+
+                var qss = group.Queryable
+                    .Where(m => filterHelper(m))
+                    .Select(m => GetSignature(m, true))
+                    .OrderBy(x => x).ToList();
+
+                if (!group.Name.Equals("Create"))
+                    Assert.IsTrue(oss.SequenceEqual(qss), "Mismatch between QueryableEx and EnumerableEx for " + group.Name);
             }
         }
 
diff --git a/external/rx/Ix/NET/Tests/Tests.Single.cs b/external/rx/Ix/NET/Tests/Tests.Single.cs
index 6054f541b9..8657224483 100644
--- a/external/rx/Ix/NET/Tests/Tests.Single.cs
+++ b/external/rx/Ix/NET/Tests/Tests.Single.cs
@@ -3,7 +3,14 @@ using System;
 using System.Text;
 using System.Collections.Generic;
 using System.Linq;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
+#if NUNIT
+using NUnit.Framework;
+using TestClassAttribute = NUnit.Framework.TestFixtureAttribute;
+using TestMethodAttribute = NUnit.Framework.TestAttribute;
+using TestInitializeAttribute = NUnit.Framework.SetUpAttribute;
+#else
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+#endif
 
 namespace Tests
 {
diff --git a/external/rx/Ix/NET/Tests/Tests.cs b/external/rx/Ix/NET/Tests/Tests.cs
index 27dca14e5d..c313f4b8fd 100644
--- a/external/rx/Ix/NET/Tests/Tests.cs
+++ b/external/rx/Ix/NET/Tests/Tests.cs
@@ -3,7 +3,14 @@ using System;
 using System.Text;
 using System.Collections.Generic;
 using System.Linq;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
+#if NUNIT
+using NUnit.Framework;
+using TestClassAttribute = NUnit.Framework.TestFixtureAttribute;
+using TestMethodAttribute = NUnit.Framework.TestAttribute;
+using TestInitializeAttribute = NUnit.Framework.SetUpAttribute;
+#else
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+#endif
 
 namespace Tests
 {
diff --git a/external/rx/Ix/NET/Tests/Tests.csproj b/external/rx/Ix/NET/Tests/Tests.csproj
index f3f57ffeda..b24aa2f5ba 100644
--- a/external/rx/Ix/NET/Tests/Tests.csproj
+++ b/external/rx/Ix/NET/Tests/Tests.csproj
@@ -11,11 +11,14 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Tests</RootNamespace>
     <AssemblyName>Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <TargetFrameworkProfile />
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
   </PropertyGroup>
+
   <Import Project="..\Common.targets" />
+  
   <PropertyGroup Condition="'$(BuildPlatform)' == 'SILVERLIGHT' AND !('$(BuildFlavor)' == 'SILVERLIGHTM7')">
     <SilverlightApplication>true</SilverlightApplication>
     <XapOutputs>true</XapOutputs>
@@ -26,11 +29,13 @@
     <TestPageFileName>TestPage.html</TestPageFileName>
     <CreateTestPage>true</CreateTestPage>
   </PropertyGroup>
+  
   <!-- Temporary workaround to disable tests as part of automated builds (defeating the **\Tests*.dll the search pattern). -->
   <PropertyGroup Condition="'$(BuildPlatform)' != 'DESKTOPCLR'">
     <AssemblyName>_$(AssemblyName)</AssemblyName>
   </PropertyGroup>
-  <ItemGroup>
+  
+  <ItemGroup> 
     <!-- See readme.txt file in the References\$(BuildFlavor) folder for information on the test assemblies used here. -->
     <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework">
       <HintPath>..\..\..\..\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\IDE\PublicAssemblies\Microsoft.VisualStudio.QualityTools.UnitTestFramework.dll</HintPath>
@@ -74,11 +79,11 @@
     <Compile Include="Tests.Aggregates.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\System.Interactive.Async\System.Interactive.Async.csproj" Condition=" '$(BuildFlavor)' == 'DESKTOPCLR40' ">
+    <ProjectReference Include="..\System.Interactive.Async\System.Interactive.Async.csproj" Condition=" '$(BuildFlavor)' == 'DESKTOPCLR40' Or '$(BuildFlavor)' == 'DESKTOPCLR45' ">
       <Project>{7269A578-326A-4C3E-9874-A2D2600095BC}</Project>
       <Name>System.Interactive.Async</Name>
     </ProjectReference>
-    <ProjectReference Include="..\System.Interactive.Providers\System.Interactive.Providers.csproj" Condition=" '$(BuildFlavor)' != 'SILVERLIGHTM7' And '$(BuildPlatform)' != 'XNA' ">
+    <ProjectReference Include="..\System.Interactive.Providers\System.Interactive.Providers.csproj" Condition=" '$(BuildFlavor)' != 'SILVERLIGHTM7' And '$(BuildPlatform)' != 'XNA' And '$(Configuration)' != 'TestPL' ">
       <Project>{6D62E966-469D-4A99-BD43-0A17FA14FB4F}</Project>
       <Name>System.Interactive.Providers</Name>
     </ProjectReference>