Fix build for various flavor profiles

This set of changes is intended to fix the apparently broken build for the following flavors: Debug40, Release40, Debug45, Release45, DebugPL, ReleasePL, DebugPLLITE, ReleasePLLITE, Debug81, Release81.

Rx.NET/Source/Common.targets

@@ -23,7 +23,7 @@
     <BuildTarget>PL</BuildTarget>
   </PropertyGroup>
 
-    <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugPLLITE|AnyCPU' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugPLLITE|AnyCPU' ">
     <BuildConfig>Debug</BuildConfig>
     <BuildTarget>PLLITE</BuildTarget>
   </PropertyGroup>
@@ -113,7 +113,7 @@
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(BuildTarget)' == '8' ">
-    <DefineConstants>$(DefineConstants);NO_EVENTARGS_CONSTRAINT;HAS_EDI;HAS_WINRT;HAS_PROGRESS;PREFER_ASYNC;HAS_AWAIT;          NO_REMOTING;NO_SERIALIZABLE;NO_THREAD;CRIPPLED_REFLECTION;USE_TIMER_SELF_ROOT</DefineConstants>
+    <DefineConstants>$(DefineConstants);NO_EVENTARGS_CONSTRAINT;HAS_EDI;HAS_WINRT;HAS_PROGRESS;PREFER_ASYNC;HAS_AWAIT;NO_REMOTING;NO_SERIALIZABLE;NO_THREAD;CRIPPLED_REFLECTION;USE_TIMER_SELF_ROOT</DefineConstants>
     <TargetFrameworkIdentifier>.NETCore</TargetFrameworkIdentifier>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <NoStdLib>true</NoStdLib>
@@ -123,13 +123,14 @@
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(BuildTarget)' == '81' ">
-    <DefineConstants>$(DefineConstants);NO_EVENTARGS_CONSTRAINT;HAS_EDI;HAS_WINRT;HAS_PROGRESS;PREFER_ASYNC;HAS_AWAIT;          NO_REMOTING;NO_SERIALIZABLE;NO_THREAD;CRIPPLED_REFLECTION;USE_TIMER_SELF_ROOT</DefineConstants>
-    <TargetFrameworkIdentifier>.NETPortable</TargetFrameworkIdentifier>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <DefineConstants>$(DefineConstants);NO_EVENTARGS_CONSTRAINT;HAS_EDI;HAS_WINRT;HAS_PROGRESS;PREFER_ASYNC;HAS_AWAIT;NO_REMOTING;NO_SERIALIZABLE;NO_THREAD;CRIPPLED_REFLECTION;USE_TIMER_SELF_ROOT</DefineConstants>
+    <TargetFrameworkIdentifier>.NETCore</TargetFrameworkIdentifier>
+    <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
+    <TargetPlatformVersion>8.1</TargetPlatformVersion>
     <NoStdLib>true</NoStdLib>
     <BuildPlatform>WINDOWS</BuildPlatform>
     <BuildFlavor>WINDOWS81</BuildFlavor>
-    <TargetFrameworkProfile>Profile32</TargetFrameworkProfile>
+    <!--<TargetFrameworkProfile>Profile32</TargetFrameworkProfile>-->
     <DefaultLanguage>en-US</DefaultLanguage>
   </PropertyGroup>
 

Rx.NET/Source/Import.targets

@@ -2,7 +2,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="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v11.0\Microsoft.Windows.UI.Xaml.CSharp.targets" Condition=" '$(TargetFrameworkIdentifier)' == '.NETCore' And '$(BuildFlavor)' == 'WINDOWS8' " />
+  <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v12.0\Microsoft.Windows.UI.Xaml.CSharp.targets" Condition=" '$(TargetFrameworkIdentifier)' == '.NETCore' And '$(BuildFlavor)' == 'WINDOWS81' " />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" Condition=" '$(TargetFrameworkIdentifier)' != '.NETPortable' And ('$(BuildPlatform)' == 'DESKTOPCLR' Or '$(BuildPlatform)' == 'XNA') " />
   
   <!-- Silverlight ONLY (i.e., not phone) -->

Rx.NET/Source/Microsoft.Reactive.Testing/Microsoft.Reactive.Testing.csproj

@@ -32,7 +32,7 @@
     <Reference Include="System.Core" />
     <Reference Include="System.Observable" Condition=" '$(BuildFlavor)' == 'SILVERLIGHTM7' " />
   </ItemGroup>
-  <ItemGroup Condition=" '$(BuildFlavor)' == 'WINDOWS8' ">
+  <ItemGroup Condition=" '$(BuildFlavor)' == 'WINDOWS8' Or '$(BuildFlavor)' == 'WINDOWS81' ">
     <SDKReference Include="MSTestFramework, Version=11.0" />
     <SDKReference Include="TestPlatform, Version=11.0" />
   </ItemGroup>

Rx.NET/Source/Microsoft.Reactive.Testing/ReactiveAssert.cs

@@ -8,7 +8,7 @@ using System.Text;
 using System.Reactive.Disposables;
 using System.Reactive.Linq;
 
-#if WINDOWS8
+#if WINDOWS8 || WINDOWS81
 using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
 #else
 using Microsoft.VisualStudio.TestTools.UnitTesting;

Rx.NET/Source/Rx.sln

@@ -383,7 +383,6 @@ Global
 		{2FEFC068-E2DE-43A9-A4E6-E0336A532B7A}.Debug8|x86.ActiveCfg = Debug45|Any CPU
 		{2FEFC068-E2DE-43A9-A4E6-E0336A532B7A}.Debug81|Any CPU.ActiveCfg = Debug81|Any CPU
 		{2FEFC068-E2DE-43A9-A4E6-E0336A532B7A}.Debug81|Mixed Platforms.ActiveCfg = Debug81|Any CPU
-		{2FEFC068-E2DE-43A9-A4E6-E0336A532B7A}.Debug81|Mixed Platforms.Build.0 = Debug81|Any CPU
 		{2FEFC068-E2DE-43A9-A4E6-E0336A532B7A}.Debug81|x86.ActiveCfg = Debug81|Any CPU
 		{2FEFC068-E2DE-43A9-A4E6-E0336A532B7A}.DebugPL|Any CPU.ActiveCfg = DebugPL|Any CPU
 		{2FEFC068-E2DE-43A9-A4E6-E0336A532B7A}.DebugPL|Mixed Platforms.ActiveCfg = DebugPL|Any CPU
@@ -434,7 +433,6 @@ Global
 		{2FEFC068-E2DE-43A9-A4E6-E0336A532B7A}.Release8|x86.ActiveCfg = Release45|Any CPU
 		{2FEFC068-E2DE-43A9-A4E6-E0336A532B7A}.Release81|Any CPU.ActiveCfg = Release81|Any CPU
 		{2FEFC068-E2DE-43A9-A4E6-E0336A532B7A}.Release81|Mixed Platforms.ActiveCfg = Release81|Any CPU
-		{2FEFC068-E2DE-43A9-A4E6-E0336A532B7A}.Release81|Mixed Platforms.Build.0 = Release81|Any CPU
 		{2FEFC068-E2DE-43A9-A4E6-E0336A532B7A}.Release81|x86.ActiveCfg = Release81|Any CPU
 		{2FEFC068-E2DE-43A9-A4E6-E0336A532B7A}.ReleasePL|Any CPU.ActiveCfg = ReleasePL|Any CPU
 		{2FEFC068-E2DE-43A9-A4E6-E0336A532B7A}.ReleasePL|Mixed Platforms.ActiveCfg = ReleasePL|Any CPU
@@ -484,7 +482,6 @@ Global
 		{E32328A1-1F5B-45F9-B005-02EF5CC2CF0D}.Debug8|x86.ActiveCfg = Debug45|Any CPU
 		{E32328A1-1F5B-45F9-B005-02EF5CC2CF0D}.Debug81|Any CPU.ActiveCfg = Debug81|Any CPU
 		{E32328A1-1F5B-45F9-B005-02EF5CC2CF0D}.Debug81|Mixed Platforms.ActiveCfg = Debug81|Any CPU
-		{E32328A1-1F5B-45F9-B005-02EF5CC2CF0D}.Debug81|Mixed Platforms.Build.0 = Debug81|Any CPU
 		{E32328A1-1F5B-45F9-B005-02EF5CC2CF0D}.Debug81|x86.ActiveCfg = Debug81|Any CPU
 		{E32328A1-1F5B-45F9-B005-02EF5CC2CF0D}.DebugPL|Any CPU.ActiveCfg = DebugPL|Any CPU
 		{E32328A1-1F5B-45F9-B005-02EF5CC2CF0D}.DebugPL|Mixed Platforms.ActiveCfg = DebugPL|Any CPU
@@ -529,7 +526,6 @@ Global
 		{E32328A1-1F5B-45F9-B005-02EF5CC2CF0D}.Release8|x86.ActiveCfg = Release45|Any CPU
 		{E32328A1-1F5B-45F9-B005-02EF5CC2CF0D}.Release81|Any CPU.ActiveCfg = Release81|Any CPU
 		{E32328A1-1F5B-45F9-B005-02EF5CC2CF0D}.Release81|Mixed Platforms.ActiveCfg = Release81|Any CPU
-		{E32328A1-1F5B-45F9-B005-02EF5CC2CF0D}.Release81|Mixed Platforms.Build.0 = Release81|Any CPU
 		{E32328A1-1F5B-45F9-B005-02EF5CC2CF0D}.Release81|x86.ActiveCfg = Release81|Any CPU
 		{E32328A1-1F5B-45F9-B005-02EF5CC2CF0D}.ReleasePL|Any CPU.ActiveCfg = ReleasePL|Any CPU
 		{E32328A1-1F5B-45F9-B005-02EF5CC2CF0D}.ReleasePL|Mixed Platforms.ActiveCfg = ReleasePL|Any CPU
@@ -806,7 +802,6 @@ Global
 		{8A062C6B-4441-49F3-B618-4238B6AB5290}.Debug8|x86.Build.0 = Debug|x86
 		{8A062C6B-4441-49F3-B618-4238B6AB5290}.Debug81|Any CPU.ActiveCfg = Debug81|x86
 		{8A062C6B-4441-49F3-B618-4238B6AB5290}.Debug81|Mixed Platforms.ActiveCfg = Debug81|x86
-		{8A062C6B-4441-49F3-B618-4238B6AB5290}.Debug81|Mixed Platforms.Build.0 = Debug81|x86
 		{8A062C6B-4441-49F3-B618-4238B6AB5290}.Debug81|x86.ActiveCfg = Debug81|x86
 		{8A062C6B-4441-49F3-B618-4238B6AB5290}.DebugPL|Any CPU.ActiveCfg = Debug|x86
 		{8A062C6B-4441-49F3-B618-4238B6AB5290}.DebugPL|Mixed Platforms.ActiveCfg = Debug|x86
@@ -856,7 +851,6 @@ Global
 		{8A062C6B-4441-49F3-B618-4238B6AB5290}.Release8|x86.Build.0 = Release|x86
 		{8A062C6B-4441-49F3-B618-4238B6AB5290}.Release81|Any CPU.ActiveCfg = Release81|x86
 		{8A062C6B-4441-49F3-B618-4238B6AB5290}.Release81|Mixed Platforms.ActiveCfg = Release81|x86
-		{8A062C6B-4441-49F3-B618-4238B6AB5290}.Release81|Mixed Platforms.Build.0 = Release81|x86
 		{8A062C6B-4441-49F3-B618-4238B6AB5290}.Release81|x86.ActiveCfg = Release81|x86
 		{8A062C6B-4441-49F3-B618-4238B6AB5290}.ReleasePL|Any CPU.ActiveCfg = Release|x86
 		{8A062C6B-4441-49F3-B618-4238B6AB5290}.ReleasePL|Mixed Platforms.ActiveCfg = Release|x86
@@ -1352,7 +1346,6 @@ Global
 		{7A6EF49E-7946-4101-9C89-407B9C53A173}.Debug8|x86.ActiveCfg = Debug8|Any CPU
 		{7A6EF49E-7946-4101-9C89-407B9C53A173}.Debug81|Any CPU.ActiveCfg = Debug81|Any CPU
 		{7A6EF49E-7946-4101-9C89-407B9C53A173}.Debug81|Mixed Platforms.ActiveCfg = Debug81|Any CPU
-		{7A6EF49E-7946-4101-9C89-407B9C53A173}.Debug81|Mixed Platforms.Build.0 = Debug81|Any CPU
 		{7A6EF49E-7946-4101-9C89-407B9C53A173}.Debug81|x86.ActiveCfg = Debug81|Any CPU
 		{7A6EF49E-7946-4101-9C89-407B9C53A173}.DebugPL|Any CPU.ActiveCfg = DebugPL|Any CPU
 		{7A6EF49E-7946-4101-9C89-407B9C53A173}.DebugPL|Mixed Platforms.ActiveCfg = DebugPL|Any CPU
@@ -1399,7 +1392,6 @@ Global
 		{7A6EF49E-7946-4101-9C89-407B9C53A173}.Release8|x86.ActiveCfg = Release8|Any CPU
 		{7A6EF49E-7946-4101-9C89-407B9C53A173}.Release81|Any CPU.ActiveCfg = Release81|Any CPU
 		{7A6EF49E-7946-4101-9C89-407B9C53A173}.Release81|Mixed Platforms.ActiveCfg = Release81|Any CPU
-		{7A6EF49E-7946-4101-9C89-407B9C53A173}.Release81|Mixed Platforms.Build.0 = Release81|Any CPU
 		{7A6EF49E-7946-4101-9C89-407B9C53A173}.Release81|x86.ActiveCfg = Release81|Any CPU
 		{7A6EF49E-7946-4101-9C89-407B9C53A173}.ReleasePL|Any CPU.ActiveCfg = ReleasePL|Any CPU
 		{7A6EF49E-7946-4101-9C89-407B9C53A173}.ReleasePL|Mixed Platforms.ActiveCfg = ReleasePL|Any CPU

Rx.NET/Source/System.Reactive.Core/Reactive/Concurrency/LocalScheduler.TimerQueue.cs

@@ -94,7 +94,7 @@ namespace System.Reactive.Concurrency
         private static readonly TimeSpan RETRYSHORT = TimeSpan.FromMilliseconds(50);
 
         /// <summary>
-        /// Longest interval supported by <see cref="System.Threading.Timer"/>.
+        /// Longest interval supported by timers in the BCL.
         /// </summary>
         private static readonly TimeSpan MAXSUPPORTEDTIMER = TimeSpan.FromMilliseconds((1L << 32) - 2);
 

Rx.NET/Source/System.Reactive.Observable.Aliases/System.Reactive.Observable.Aliases.csproj

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -13,9 +12,6 @@
     <FileAlignment>512</FileAlignment>
     <ProductSignAssembly>false</ProductSignAssembly>
   </PropertyGroup>
-  <PropertyGroup>
-    <StartupObject />
-  </PropertyGroup>
   <Import Project="..\Common.targets" />
   <PropertyGroup>
     <DocumentationFile>$(OutputPath)\$(AssemblyName).XML</DocumentationFile>
@@ -23,11 +19,6 @@
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Observable.Aliases.cs" />