浏览代码

Adding .NET 4.6 build support.

Bart De Smet 10 年之前
父节点
当前提交
1f9bc06fd7

+ 18 - 1
Rx.NET/Source/Common.targets

@@ -42,6 +42,15 @@
     <BuildTarget>45</BuildTarget>
   </PropertyGroup>
 
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug46|AnyCPU' ">
+    <BuildConfig>Debug</BuildConfig>
+    <BuildTarget>46</BuildTarget>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release46|AnyCPU' ">
+    <BuildConfig>Release</BuildConfig>
+    <BuildTarget>46</BuildTarget>
+  </PropertyGroup>
+
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug8|AnyCPU' ">
     <BuildConfig>Debug</BuildConfig>
     <BuildTarget>8</BuildTarget>
@@ -128,6 +137,14 @@
     <BuildFlavor>DESKTOPCLR45</BuildFlavor>
   </PropertyGroup>
 
+  <PropertyGroup Condition=" '$(BuildTarget)' == '46' ">
+    <DefineConstants>$(DefineConstants);NO_EVENTARGS_CONSTRAINT;HAS_EDI;HAS_WINRT;HAS_PROGRESS;PREFER_ASYNC;HAS_AWAIT;HAS_APTCA;HAS_DISPATCHER_PRIORITY;HAS_WINFORMS;USE_TIMER_SELF_ROOT</DefineConstants>
+    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <NoStdLib>true</NoStdLib>
+    <BuildPlatform>DESKTOPCLR</BuildPlatform>
+    <BuildFlavor>DESKTOPCLR46</BuildFlavor>
+  </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>
     <TargetFrameworkIdentifier>.NETCore</TargetFrameworkIdentifier>
@@ -338,7 +355,7 @@
   </ItemGroup>
 
   <!-- Temporary flag to enable stress test builds. Should be refactored into a separate project and be written in a more platform-neutral manner. (TFS 484720) -->
-  <PropertyGroup Condition=" '$(BuildFlavor)' == 'DESKTOPCLR40' OR '$(BuildFlavor)' == 'DESKTOPCLR45' ">
+  <PropertyGroup Condition=" '$(BuildFlavor)' == 'DESKTOPCLR40' OR '$(BuildFlavor)' == 'DESKTOPCLR45' OR '$(BuildFlavor)' == 'DESKTOPCLR46' ">
     <DefineConstants>$(DefineConstants);STRESS</DefineConstants>
   </PropertyGroup>
   

+ 62 - 1
Rx.NET/Source/Rx.sln

@@ -1,4 +1,5 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
+
+Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
 VisualStudioVersion = 14.0.22609.0
 MinimumVisualStudioVersion = 10.0.40219.1
@@ -56,6 +57,7 @@ Global
 		Debug35|Any CPU = Debug35|Any CPU
 		Debug40|Any CPU = Debug40|Any CPU
 		Debug45|Any CPU = Debug45|Any CPU
+		Debug46|Any CPU = Debug46|Any CPU
 		Debug8|Any CPU = Debug8|Any CPU
 		Debug81|Any CPU = Debug81|Any CPU
 		DebugPL|Any CPU = DebugPL|Any CPU
@@ -67,6 +69,7 @@ Global
 		Release35|Any CPU = Release35|Any CPU
 		Release40|Any CPU = Release40|Any CPU
 		Release45|Any CPU = Release45|Any CPU
+		Release46|Any CPU = Release46|Any CPU
 		Release8|Any CPU = Release8|Any CPU
 		Release81|Any CPU = Release81|Any CPU
 		ReleasePL|Any CPU = ReleasePL|Any CPU
@@ -83,6 +86,8 @@ Global
 		{63252AE9-5186-45CA-BFCD-FA51C6B66A43}.Debug40|Any CPU.Build.0 = Debug40|Any CPU
 		{63252AE9-5186-45CA-BFCD-FA51C6B66A43}.Debug45|Any CPU.ActiveCfg = Debug45|Any CPU
 		{63252AE9-5186-45CA-BFCD-FA51C6B66A43}.Debug45|Any CPU.Build.0 = Debug45|Any CPU
+		{63252AE9-5186-45CA-BFCD-FA51C6B66A43}.Debug46|Any CPU.ActiveCfg = Debug46|Any CPU
+		{63252AE9-5186-45CA-BFCD-FA51C6B66A43}.Debug46|Any CPU.Build.0 = Debug46|Any CPU
 		{63252AE9-5186-45CA-BFCD-FA51C6B66A43}.Debug8|Any CPU.ActiveCfg = Debug8|Any CPU
 		{63252AE9-5186-45CA-BFCD-FA51C6B66A43}.Debug8|Any CPU.Build.0 = Debug8|Any CPU
 		{63252AE9-5186-45CA-BFCD-FA51C6B66A43}.Debug81|Any CPU.ActiveCfg = Debug81|Any CPU
@@ -105,6 +110,8 @@ Global
 		{63252AE9-5186-45CA-BFCD-FA51C6B66A43}.Release40|Any CPU.Build.0 = Release40|Any CPU
 		{63252AE9-5186-45CA-BFCD-FA51C6B66A43}.Release45|Any CPU.ActiveCfg = Release45|Any CPU
 		{63252AE9-5186-45CA-BFCD-FA51C6B66A43}.Release45|Any CPU.Build.0 = Release45|Any CPU
+		{63252AE9-5186-45CA-BFCD-FA51C6B66A43}.Release46|Any CPU.ActiveCfg = Release46|Any CPU
+		{63252AE9-5186-45CA-BFCD-FA51C6B66A43}.Release46|Any CPU.Build.0 = Release46|Any CPU
 		{63252AE9-5186-45CA-BFCD-FA51C6B66A43}.Release8|Any CPU.ActiveCfg = Release8|Any CPU
 		{63252AE9-5186-45CA-BFCD-FA51C6B66A43}.Release8|Any CPU.Build.0 = Release8|Any CPU
 		{63252AE9-5186-45CA-BFCD-FA51C6B66A43}.Release81|Any CPU.ActiveCfg = Release81|Any CPU
@@ -127,6 +134,8 @@ Global
 		{E7B7408B-B039-4F30-B6CF-CC06218CE4CA}.Debug40|Any CPU.Build.0 = Debug40|Any CPU
 		{E7B7408B-B039-4F30-B6CF-CC06218CE4CA}.Debug45|Any CPU.ActiveCfg = Debug45|Any CPU
 		{E7B7408B-B039-4F30-B6CF-CC06218CE4CA}.Debug45|Any CPU.Build.0 = Debug45|Any CPU
+		{E7B7408B-B039-4F30-B6CF-CC06218CE4CA}.Debug46|Any CPU.ActiveCfg = Debug46|Any CPU
+		{E7B7408B-B039-4F30-B6CF-CC06218CE4CA}.Debug46|Any CPU.Build.0 = Debug46|Any CPU
 		{E7B7408B-B039-4F30-B6CF-CC06218CE4CA}.Debug8|Any CPU.ActiveCfg = Debug8|Any CPU
 		{E7B7408B-B039-4F30-B6CF-CC06218CE4CA}.Debug8|Any CPU.Build.0 = Debug8|Any CPU
 		{E7B7408B-B039-4F30-B6CF-CC06218CE4CA}.Debug81|Any CPU.ActiveCfg = Debug81|Any CPU
@@ -146,6 +155,8 @@ Global
 		{E7B7408B-B039-4F30-B6CF-CC06218CE4CA}.Release40|Any CPU.Build.0 = Release40|Any CPU
 		{E7B7408B-B039-4F30-B6CF-CC06218CE4CA}.Release45|Any CPU.ActiveCfg = Release45|Any CPU
 		{E7B7408B-B039-4F30-B6CF-CC06218CE4CA}.Release45|Any CPU.Build.0 = Release45|Any CPU
+		{E7B7408B-B039-4F30-B6CF-CC06218CE4CA}.Release46|Any CPU.ActiveCfg = Release46|Any CPU
+		{E7B7408B-B039-4F30-B6CF-CC06218CE4CA}.Release46|Any CPU.Build.0 = Release46|Any CPU
 		{E7B7408B-B039-4F30-B6CF-CC06218CE4CA}.Release8|Any CPU.ActiveCfg = Release8|Any CPU
 		{E7B7408B-B039-4F30-B6CF-CC06218CE4CA}.Release8|Any CPU.Build.0 = Release8|Any CPU
 		{E7B7408B-B039-4F30-B6CF-CC06218CE4CA}.Release81|Any CPU.ActiveCfg = Release81|Any CPU
@@ -165,6 +176,8 @@ Global
 		{2FEFC068-E2DE-43A9-A4E6-E0336A532B7A}.Debug40|Any CPU.Build.0 = Debug40|Any CPU
 		{2FEFC068-E2DE-43A9-A4E6-E0336A532B7A}.Debug45|Any CPU.ActiveCfg = Debug45|Any CPU
 		{2FEFC068-E2DE-43A9-A4E6-E0336A532B7A}.Debug45|Any CPU.Build.0 = Debug45|Any CPU
+		{2FEFC068-E2DE-43A9-A4E6-E0336A532B7A}.Debug46|Any CPU.ActiveCfg = Debug46|Any CPU
+		{2FEFC068-E2DE-43A9-A4E6-E0336A532B7A}.Debug46|Any CPU.Build.0 = Debug46|Any CPU
 		{2FEFC068-E2DE-43A9-A4E6-E0336A532B7A}.Debug8|Any CPU.ActiveCfg = Debug8|Any CPU
 		{2FEFC068-E2DE-43A9-A4E6-E0336A532B7A}.Debug81|Any CPU.ActiveCfg = Debug81|Any CPU
 		{2FEFC068-E2DE-43A9-A4E6-E0336A532B7A}.DebugPL|Any CPU.ActiveCfg = DebugPL|Any CPU
@@ -179,6 +192,8 @@ Global
 		{2FEFC068-E2DE-43A9-A4E6-E0336A532B7A}.Release40|Any CPU.Build.0 = Release40|Any CPU
 		{2FEFC068-E2DE-43A9-A4E6-E0336A532B7A}.Release45|Any CPU.ActiveCfg = Release45|Any CPU
 		{2FEFC068-E2DE-43A9-A4E6-E0336A532B7A}.Release45|Any CPU.Build.0 = Release45|Any CPU
+		{2FEFC068-E2DE-43A9-A4E6-E0336A532B7A}.Release46|Any CPU.ActiveCfg = Release46|Any CPU
+		{2FEFC068-E2DE-43A9-A4E6-E0336A532B7A}.Release46|Any CPU.Build.0 = Release46|Any CPU
 		{2FEFC068-E2DE-43A9-A4E6-E0336A532B7A}.Release8|Any CPU.ActiveCfg = Release8|Any CPU
 		{2FEFC068-E2DE-43A9-A4E6-E0336A532B7A}.Release81|Any CPU.ActiveCfg = Release81|Any CPU
 		{2FEFC068-E2DE-43A9-A4E6-E0336A532B7A}.ReleasePL|Any CPU.ActiveCfg = ReleasePL|Any CPU
@@ -193,6 +208,8 @@ Global
 		{E32328A1-1F5B-45F9-B005-02EF5CC2CF0D}.Debug40|Any CPU.Build.0 = Debug40|Any CPU
 		{E32328A1-1F5B-45F9-B005-02EF5CC2CF0D}.Debug45|Any CPU.ActiveCfg = Debug45|Any CPU
 		{E32328A1-1F5B-45F9-B005-02EF5CC2CF0D}.Debug45|Any CPU.Build.0 = Debug45|Any CPU
+		{E32328A1-1F5B-45F9-B005-02EF5CC2CF0D}.Debug46|Any CPU.ActiveCfg = Debug46|Any CPU
+		{E32328A1-1F5B-45F9-B005-02EF5CC2CF0D}.Debug46|Any CPU.Build.0 = Debug46|Any CPU
 		{E32328A1-1F5B-45F9-B005-02EF5CC2CF0D}.Debug8|Any CPU.ActiveCfg = Debug8|Any CPU
 		{E32328A1-1F5B-45F9-B005-02EF5CC2CF0D}.Debug81|Any CPU.ActiveCfg = Debug81|Any CPU
 		{E32328A1-1F5B-45F9-B005-02EF5CC2CF0D}.DebugPL|Any CPU.ActiveCfg = DebugPL|Any CPU
@@ -207,6 +224,8 @@ Global
 		{E32328A1-1F5B-45F9-B005-02EF5CC2CF0D}.Release40|Any CPU.Build.0 = Release40|Any CPU
 		{E32328A1-1F5B-45F9-B005-02EF5CC2CF0D}.Release45|Any CPU.ActiveCfg = Release45|Any CPU
 		{E32328A1-1F5B-45F9-B005-02EF5CC2CF0D}.Release45|Any CPU.Build.0 = Release45|Any CPU
+		{E32328A1-1F5B-45F9-B005-02EF5CC2CF0D}.Release46|Any CPU.ActiveCfg = Release46|Any CPU
+		{E32328A1-1F5B-45F9-B005-02EF5CC2CF0D}.Release46|Any CPU.Build.0 = Release46|Any CPU
 		{E32328A1-1F5B-45F9-B005-02EF5CC2CF0D}.Release8|Any CPU.ActiveCfg = Release8|Any CPU
 		{E32328A1-1F5B-45F9-B005-02EF5CC2CF0D}.Release81|Any CPU.ActiveCfg = Release81|Any CPU
 		{E32328A1-1F5B-45F9-B005-02EF5CC2CF0D}.ReleasePL|Any CPU.ActiveCfg = ReleasePL|Any CPU
@@ -221,6 +240,8 @@ Global
 		{2F7D32BD-5BFC-45D4-9899-F1A76DB32FCB}.Debug40|Any CPU.Build.0 = Debug40|Any CPU
 		{2F7D32BD-5BFC-45D4-9899-F1A76DB32FCB}.Debug45|Any CPU.ActiveCfg = Debug45|Any CPU
 		{2F7D32BD-5BFC-45D4-9899-F1A76DB32FCB}.Debug45|Any CPU.Build.0 = Debug45|Any CPU
+		{2F7D32BD-5BFC-45D4-9899-F1A76DB32FCB}.Debug46|Any CPU.ActiveCfg = Debug46|Any CPU
+		{2F7D32BD-5BFC-45D4-9899-F1A76DB32FCB}.Debug46|Any CPU.Build.0 = Debug46|Any CPU
 		{2F7D32BD-5BFC-45D4-9899-F1A76DB32FCB}.Debug8|Any CPU.ActiveCfg = Debug8|Any CPU
 		{2F7D32BD-5BFC-45D4-9899-F1A76DB32FCB}.Debug8|Any CPU.Build.0 = Debug8|Any CPU
 		{2F7D32BD-5BFC-45D4-9899-F1A76DB32FCB}.Debug81|Any CPU.ActiveCfg = Debug81|Any CPU
@@ -241,6 +262,8 @@ Global
 		{2F7D32BD-5BFC-45D4-9899-F1A76DB32FCB}.Release40|Any CPU.Build.0 = Release40|Any CPU
 		{2F7D32BD-5BFC-45D4-9899-F1A76DB32FCB}.Release45|Any CPU.ActiveCfg = Release45|Any CPU
 		{2F7D32BD-5BFC-45D4-9899-F1A76DB32FCB}.Release45|Any CPU.Build.0 = Release45|Any CPU
+		{2F7D32BD-5BFC-45D4-9899-F1A76DB32FCB}.Release46|Any CPU.ActiveCfg = Release46|Any CPU
+		{2F7D32BD-5BFC-45D4-9899-F1A76DB32FCB}.Release46|Any CPU.Build.0 = Release46|Any CPU
 		{2F7D32BD-5BFC-45D4-9899-F1A76DB32FCB}.Release8|Any CPU.ActiveCfg = Release8|Any CPU
 		{2F7D32BD-5BFC-45D4-9899-F1A76DB32FCB}.Release8|Any CPU.Build.0 = Release8|Any CPU
 		{2F7D32BD-5BFC-45D4-9899-F1A76DB32FCB}.Release81|Any CPU.ActiveCfg = Release81|Any CPU
@@ -261,6 +284,8 @@ Global
 		{C7B9D7BE-F47F-466B-A6B0-E46F1069B171}.Debug40|Any CPU.Build.0 = Debug40|Any CPU
 		{C7B9D7BE-F47F-466B-A6B0-E46F1069B171}.Debug45|Any CPU.ActiveCfg = Debug45|Any CPU
 		{C7B9D7BE-F47F-466B-A6B0-E46F1069B171}.Debug45|Any CPU.Build.0 = Debug45|Any CPU
+		{C7B9D7BE-F47F-466B-A6B0-E46F1069B171}.Debug46|Any CPU.ActiveCfg = Debug46|Any CPU
+		{C7B9D7BE-F47F-466B-A6B0-E46F1069B171}.Debug46|Any CPU.Build.0 = Debug46|Any CPU
 		{C7B9D7BE-F47F-466B-A6B0-E46F1069B171}.Debug8|Any CPU.ActiveCfg = Debug8|Any CPU
 		{C7B9D7BE-F47F-466B-A6B0-E46F1069B171}.Debug8|Any CPU.Build.0 = Debug8|Any CPU
 		{C7B9D7BE-F47F-466B-A6B0-E46F1069B171}.Debug81|Any CPU.ActiveCfg = Debug81|Any CPU
@@ -283,6 +308,8 @@ Global
 		{C7B9D7BE-F47F-466B-A6B0-E46F1069B171}.Release40|Any CPU.Build.0 = Release40|Any CPU
 		{C7B9D7BE-F47F-466B-A6B0-E46F1069B171}.Release45|Any CPU.ActiveCfg = Release45|Any CPU
 		{C7B9D7BE-F47F-466B-A6B0-E46F1069B171}.Release45|Any CPU.Build.0 = Release45|Any CPU
+		{C7B9D7BE-F47F-466B-A6B0-E46F1069B171}.Release46|Any CPU.ActiveCfg = Release46|Any CPU
+		{C7B9D7BE-F47F-466B-A6B0-E46F1069B171}.Release46|Any CPU.Build.0 = Release46|Any CPU
 		{C7B9D7BE-F47F-466B-A6B0-E46F1069B171}.Release8|Any CPU.ActiveCfg = Release8|Any CPU
 		{C7B9D7BE-F47F-466B-A6B0-E46F1069B171}.Release8|Any CPU.Build.0 = Release8|Any CPU
 		{C7B9D7BE-F47F-466B-A6B0-E46F1069B171}.Release81|Any CPU.ActiveCfg = Release81|Any CPU
@@ -305,6 +332,8 @@ Global
 		{8A062C6B-4441-49F3-B618-4238B6AB5290}.Debug40|Any CPU.Build.0 = Debug40|Any CPU
 		{8A062C6B-4441-49F3-B618-4238B6AB5290}.Debug45|Any CPU.ActiveCfg = Debug45|Any CPU
 		{8A062C6B-4441-49F3-B618-4238B6AB5290}.Debug45|Any CPU.Build.0 = Debug45|Any CPU
+		{8A062C6B-4441-49F3-B618-4238B6AB5290}.Debug46|Any CPU.ActiveCfg = Debug46|Any CPU
+		{8A062C6B-4441-49F3-B618-4238B6AB5290}.Debug46|Any CPU.Build.0 = Debug46|Any CPU
 		{8A062C6B-4441-49F3-B618-4238B6AB5290}.Debug8|Any CPU.ActiveCfg = Debug8|Any CPU
 		{8A062C6B-4441-49F3-B618-4238B6AB5290}.Debug81|Any CPU.ActiveCfg = Debug81|Any CPU
 		{8A062C6B-4441-49F3-B618-4238B6AB5290}.DebugPL|Any CPU.ActiveCfg = Debug45|Any CPU
@@ -321,6 +350,8 @@ Global
 		{8A062C6B-4441-49F3-B618-4238B6AB5290}.Release40|Any CPU.Build.0 = Release40|Any CPU
 		{8A062C6B-4441-49F3-B618-4238B6AB5290}.Release45|Any CPU.ActiveCfg = Release45|Any CPU
 		{8A062C6B-4441-49F3-B618-4238B6AB5290}.Release45|Any CPU.Build.0 = Release45|Any CPU
+		{8A062C6B-4441-49F3-B618-4238B6AB5290}.Release46|Any CPU.ActiveCfg = Release46|Any CPU
+		{8A062C6B-4441-49F3-B618-4238B6AB5290}.Release46|Any CPU.Build.0 = Release46|Any CPU
 		{8A062C6B-4441-49F3-B618-4238B6AB5290}.Release8|Any CPU.ActiveCfg = Release8|Any CPU
 		{8A062C6B-4441-49F3-B618-4238B6AB5290}.Release81|Any CPU.ActiveCfg = Release81|Any CPU
 		{8A062C6B-4441-49F3-B618-4238B6AB5290}.ReleasePL|Any CPU.ActiveCfg = Release45|Any CPU
@@ -334,6 +365,7 @@ Global
 		{EE655A70-A899-4B38-84D3-FB9F63A8C661}.Debug35|Any CPU.ActiveCfg = Debug35|Any CPU
 		{EE655A70-A899-4B38-84D3-FB9F63A8C661}.Debug40|Any CPU.ActiveCfg = Debug40|Any CPU
 		{EE655A70-A899-4B38-84D3-FB9F63A8C661}.Debug45|Any CPU.ActiveCfg = Debug45|Any CPU
+		{EE655A70-A899-4B38-84D3-FB9F63A8C661}.Debug46|Any CPU.ActiveCfg = Debug46|Any CPU
 		{EE655A70-A899-4B38-84D3-FB9F63A8C661}.Debug8|Any CPU.ActiveCfg = Debug8|Any CPU
 		{EE655A70-A899-4B38-84D3-FB9F63A8C661}.Debug8|Any CPU.Build.0 = Debug8|Any CPU
 		{EE655A70-A899-4B38-84D3-FB9F63A8C661}.Debug81|Any CPU.ActiveCfg = Debug81|Any CPU
@@ -348,6 +380,7 @@ Global
 		{EE655A70-A899-4B38-84D3-FB9F63A8C661}.Release35|Any CPU.ActiveCfg = Release35|Any CPU
 		{EE655A70-A899-4B38-84D3-FB9F63A8C661}.Release40|Any CPU.ActiveCfg = Release40|Any CPU
 		{EE655A70-A899-4B38-84D3-FB9F63A8C661}.Release45|Any CPU.ActiveCfg = Release45|Any CPU
+		{EE655A70-A899-4B38-84D3-FB9F63A8C661}.Release46|Any CPU.ActiveCfg = Release46|Any CPU
 		{EE655A70-A899-4B38-84D3-FB9F63A8C661}.Release8|Any CPU.ActiveCfg = Release8|Any CPU
 		{EE655A70-A899-4B38-84D3-FB9F63A8C661}.Release8|Any CPU.Build.0 = Release8|Any CPU
 		{EE655A70-A899-4B38-84D3-FB9F63A8C661}.Release81|Any CPU.ActiveCfg = Release81|Any CPU
@@ -365,6 +398,8 @@ Global
 		{9E9B9C60-98B0-40FA-9C2B-1218D417CAA4}.Debug40|Any CPU.Build.0 = Debug40|Any CPU
 		{9E9B9C60-98B0-40FA-9C2B-1218D417CAA4}.Debug45|Any CPU.ActiveCfg = Debug45|Any CPU
 		{9E9B9C60-98B0-40FA-9C2B-1218D417CAA4}.Debug45|Any CPU.Build.0 = Debug45|Any CPU
+		{9E9B9C60-98B0-40FA-9C2B-1218D417CAA4}.Debug46|Any CPU.ActiveCfg = Debug46|Any CPU
+		{9E9B9C60-98B0-40FA-9C2B-1218D417CAA4}.Debug46|Any CPU.Build.0 = Debug46|Any CPU
 		{9E9B9C60-98B0-40FA-9C2B-1218D417CAA4}.Debug8|Any CPU.ActiveCfg = Debug8|Any CPU
 		{9E9B9C60-98B0-40FA-9C2B-1218D417CAA4}.Debug8|Any CPU.Build.0 = Debug8|Any CPU
 		{9E9B9C60-98B0-40FA-9C2B-1218D417CAA4}.Debug81|Any CPU.ActiveCfg = Debug81|Any CPU
@@ -387,6 +422,8 @@ Global
 		{9E9B9C60-98B0-40FA-9C2B-1218D417CAA4}.Release40|Any CPU.Build.0 = Release40|Any CPU
 		{9E9B9C60-98B0-40FA-9C2B-1218D417CAA4}.Release45|Any CPU.ActiveCfg = Release45|Any CPU
 		{9E9B9C60-98B0-40FA-9C2B-1218D417CAA4}.Release45|Any CPU.Build.0 = Release45|Any CPU
+		{9E9B9C60-98B0-40FA-9C2B-1218D417CAA4}.Release46|Any CPU.ActiveCfg = Release46|Any CPU
+		{9E9B9C60-98B0-40FA-9C2B-1218D417CAA4}.Release46|Any CPU.Build.0 = Release46|Any CPU
 		{9E9B9C60-98B0-40FA-9C2B-1218D417CAA4}.Release8|Any CPU.ActiveCfg = Release8|Any CPU
 		{9E9B9C60-98B0-40FA-9C2B-1218D417CAA4}.Release8|Any CPU.Build.0 = Release8|Any CPU
 		{9E9B9C60-98B0-40FA-9C2B-1218D417CAA4}.Release81|Any CPU.ActiveCfg = Release81|Any CPU
@@ -409,6 +446,8 @@ Global
 		{4E516F10-DA7A-4D43-963E-A93865ABEA5B}.Debug40|Any CPU.Build.0 = Debug40|Any CPU
 		{4E516F10-DA7A-4D43-963E-A93865ABEA5B}.Debug45|Any CPU.ActiveCfg = Debug45|Any CPU
 		{4E516F10-DA7A-4D43-963E-A93865ABEA5B}.Debug45|Any CPU.Build.0 = Debug45|Any CPU
+		{4E516F10-DA7A-4D43-963E-A93865ABEA5B}.Debug46|Any CPU.ActiveCfg = Debug46|Any CPU
+		{4E516F10-DA7A-4D43-963E-A93865ABEA5B}.Debug46|Any CPU.Build.0 = Debug46|Any CPU
 		{4E516F10-DA7A-4D43-963E-A93865ABEA5B}.Debug8|Any CPU.ActiveCfg = Debug8|Any CPU
 		{4E516F10-DA7A-4D43-963E-A93865ABEA5B}.Debug8|Any CPU.Build.0 = Debug8|Any CPU
 		{4E516F10-DA7A-4D43-963E-A93865ABEA5B}.Debug81|Any CPU.ActiveCfg = Debug81|Any CPU
@@ -431,6 +470,8 @@ Global
 		{4E516F10-DA7A-4D43-963E-A93865ABEA5B}.Release40|Any CPU.Build.0 = Release40|Any CPU
 		{4E516F10-DA7A-4D43-963E-A93865ABEA5B}.Release45|Any CPU.ActiveCfg = Release45|Any CPU
 		{4E516F10-DA7A-4D43-963E-A93865ABEA5B}.Release45|Any CPU.Build.0 = Release45|Any CPU
+		{4E516F10-DA7A-4D43-963E-A93865ABEA5B}.Release46|Any CPU.ActiveCfg = Release46|Any CPU
+		{4E516F10-DA7A-4D43-963E-A93865ABEA5B}.Release46|Any CPU.Build.0 = Release46|Any CPU
 		{4E516F10-DA7A-4D43-963E-A93865ABEA5B}.Release8|Any CPU.ActiveCfg = Release8|Any CPU
 		{4E516F10-DA7A-4D43-963E-A93865ABEA5B}.Release8|Any CPU.Build.0 = Release8|Any CPU
 		{4E516F10-DA7A-4D43-963E-A93865ABEA5B}.Release81|Any CPU.ActiveCfg = Release81|Any CPU
@@ -453,6 +494,8 @@ Global
 		{0CCCF009-763F-40D2-8655-7A94828023BF}.Debug40|Any CPU.Build.0 = Debug40|Any CPU
 		{0CCCF009-763F-40D2-8655-7A94828023BF}.Debug45|Any CPU.ActiveCfg = Debug45|Any CPU
 		{0CCCF009-763F-40D2-8655-7A94828023BF}.Debug45|Any CPU.Build.0 = Debug45|Any CPU
+		{0CCCF009-763F-40D2-8655-7A94828023BF}.Debug46|Any CPU.ActiveCfg = Debug46|Any CPU
+		{0CCCF009-763F-40D2-8655-7A94828023BF}.Debug46|Any CPU.Build.0 = Debug46|Any CPU
 		{0CCCF009-763F-40D2-8655-7A94828023BF}.Debug8|Any CPU.ActiveCfg = Debug8|Any CPU
 		{0CCCF009-763F-40D2-8655-7A94828023BF}.Debug8|Any CPU.Build.0 = Debug8|Any CPU
 		{0CCCF009-763F-40D2-8655-7A94828023BF}.Debug81|Any CPU.ActiveCfg = Debug81|Any CPU
@@ -475,6 +518,8 @@ Global
 		{0CCCF009-763F-40D2-8655-7A94828023BF}.Release40|Any CPU.Build.0 = Release40|Any CPU
 		{0CCCF009-763F-40D2-8655-7A94828023BF}.Release45|Any CPU.ActiveCfg = Release45|Any CPU
 		{0CCCF009-763F-40D2-8655-7A94828023BF}.Release45|Any CPU.Build.0 = Release45|Any CPU
+		{0CCCF009-763F-40D2-8655-7A94828023BF}.Release46|Any CPU.ActiveCfg = Release46|Any CPU
+		{0CCCF009-763F-40D2-8655-7A94828023BF}.Release46|Any CPU.Build.0 = Release46|Any CPU
 		{0CCCF009-763F-40D2-8655-7A94828023BF}.Release8|Any CPU.ActiveCfg = Release8|Any CPU
 		{0CCCF009-763F-40D2-8655-7A94828023BF}.Release8|Any CPU.Build.0 = Release8|Any CPU
 		{0CCCF009-763F-40D2-8655-7A94828023BF}.Release81|Any CPU.ActiveCfg = Release81|Any CPU
@@ -497,6 +542,8 @@ Global
 		{7A6EF49E-7946-4101-9C89-407B9C53A173}.Debug40|Any CPU.Build.0 = Debug40|Any CPU
 		{7A6EF49E-7946-4101-9C89-407B9C53A173}.Debug45|Any CPU.ActiveCfg = Debug45|Any CPU
 		{7A6EF49E-7946-4101-9C89-407B9C53A173}.Debug45|Any CPU.Build.0 = Debug45|Any CPU
+		{7A6EF49E-7946-4101-9C89-407B9C53A173}.Debug46|Any CPU.ActiveCfg = Debug46|Any CPU
+		{7A6EF49E-7946-4101-9C89-407B9C53A173}.Debug46|Any CPU.Build.0 = Debug46|Any CPU
 		{7A6EF49E-7946-4101-9C89-407B9C53A173}.Debug8|Any CPU.ActiveCfg = Debug8|Any CPU
 		{7A6EF49E-7946-4101-9C89-407B9C53A173}.Debug81|Any CPU.ActiveCfg = Debug81|Any CPU
 		{7A6EF49E-7946-4101-9C89-407B9C53A173}.DebugPL|Any CPU.ActiveCfg = DebugPL|Any CPU
@@ -512,6 +559,8 @@ Global
 		{7A6EF49E-7946-4101-9C89-407B9C53A173}.Release40|Any CPU.Build.0 = Release40|Any CPU
 		{7A6EF49E-7946-4101-9C89-407B9C53A173}.Release45|Any CPU.ActiveCfg = Release45|Any CPU
 		{7A6EF49E-7946-4101-9C89-407B9C53A173}.Release45|Any CPU.Build.0 = Release45|Any CPU
+		{7A6EF49E-7946-4101-9C89-407B9C53A173}.Release46|Any CPU.ActiveCfg = Release46|Any CPU
+		{7A6EF49E-7946-4101-9C89-407B9C53A173}.Release46|Any CPU.Build.0 = Release46|Any CPU
 		{7A6EF49E-7946-4101-9C89-407B9C53A173}.Release8|Any CPU.ActiveCfg = Release8|Any CPU
 		{7A6EF49E-7946-4101-9C89-407B9C53A173}.Release81|Any CPU.ActiveCfg = Release81|Any CPU
 		{7A6EF49E-7946-4101-9C89-407B9C53A173}.ReleasePL|Any CPU.ActiveCfg = ReleasePL|Any CPU
@@ -526,6 +575,8 @@ Global
 		{41E65B96-733B-41C4-A1BB-7476359B89EB}.Debug40|Any CPU.Build.0 = Debug40|Any CPU
 		{41E65B96-733B-41C4-A1BB-7476359B89EB}.Debug45|Any CPU.ActiveCfg = Debug45|Any CPU
 		{41E65B96-733B-41C4-A1BB-7476359B89EB}.Debug45|Any CPU.Build.0 = Debug45|Any CPU
+		{41E65B96-733B-41C4-A1BB-7476359B89EB}.Debug46|Any CPU.ActiveCfg = Debug46|Any CPU
+		{41E65B96-733B-41C4-A1BB-7476359B89EB}.Debug46|Any CPU.Build.0 = Debug46|Any CPU
 		{41E65B96-733B-41C4-A1BB-7476359B89EB}.Debug8|Any CPU.ActiveCfg = Debug8|Any CPU
 		{41E65B96-733B-41C4-A1BB-7476359B89EB}.Debug8|Any CPU.Build.0 = Debug8|Any CPU
 		{41E65B96-733B-41C4-A1BB-7476359B89EB}.Debug81|Any CPU.ActiveCfg = Debug81|Any CPU
@@ -548,6 +599,8 @@ Global
 		{41E65B96-733B-41C4-A1BB-7476359B89EB}.Release40|Any CPU.Build.0 = Release40|Any CPU
 		{41E65B96-733B-41C4-A1BB-7476359B89EB}.Release45|Any CPU.ActiveCfg = Release45|Any CPU
 		{41E65B96-733B-41C4-A1BB-7476359B89EB}.Release45|Any CPU.Build.0 = Release45|Any CPU
+		{41E65B96-733B-41C4-A1BB-7476359B89EB}.Release46|Any CPU.ActiveCfg = Release46|Any CPU
+		{41E65B96-733B-41C4-A1BB-7476359B89EB}.Release46|Any CPU.Build.0 = Release46|Any CPU
 		{41E65B96-733B-41C4-A1BB-7476359B89EB}.Release8|Any CPU.ActiveCfg = Release8|Any CPU
 		{41E65B96-733B-41C4-A1BB-7476359B89EB}.Release8|Any CPU.Build.0 = Release8|Any CPU
 		{41E65B96-733B-41C4-A1BB-7476359B89EB}.Release81|Any CPU.ActiveCfg = Release81|Any CPU
@@ -570,6 +623,8 @@ Global
 		{FFB7A57C-BC22-4B71-88D4-2489B3FF10B6}.Debug40|Any CPU.Build.0 = Debug40|Any CPU
 		{FFB7A57C-BC22-4B71-88D4-2489B3FF10B6}.Debug45|Any CPU.ActiveCfg = Debug45|Any CPU
 		{FFB7A57C-BC22-4B71-88D4-2489B3FF10B6}.Debug45|Any CPU.Build.0 = Debug45|Any CPU
+		{FFB7A57C-BC22-4B71-88D4-2489B3FF10B6}.Debug46|Any CPU.ActiveCfg = Debug46|Any CPU
+		{FFB7A57C-BC22-4B71-88D4-2489B3FF10B6}.Debug46|Any CPU.Build.0 = Debug46|Any CPU
 		{FFB7A57C-BC22-4B71-88D4-2489B3FF10B6}.Debug8|Any CPU.ActiveCfg = Debug8|Any CPU
 		{FFB7A57C-BC22-4B71-88D4-2489B3FF10B6}.Debug8|Any CPU.Build.0 = Debug8|Any CPU
 		{FFB7A57C-BC22-4B71-88D4-2489B3FF10B6}.Debug81|Any CPU.ActiveCfg = Debug81|Any CPU
@@ -592,6 +647,8 @@ Global
 		{FFB7A57C-BC22-4B71-88D4-2489B3FF10B6}.Release40|Any CPU.Build.0 = Release40|Any CPU
 		{FFB7A57C-BC22-4B71-88D4-2489B3FF10B6}.Release45|Any CPU.ActiveCfg = Release45|Any CPU
 		{FFB7A57C-BC22-4B71-88D4-2489B3FF10B6}.Release45|Any CPU.Build.0 = Release45|Any CPU
+		{FFB7A57C-BC22-4B71-88D4-2489B3FF10B6}.Release46|Any CPU.ActiveCfg = Release46|Any CPU
+		{FFB7A57C-BC22-4B71-88D4-2489B3FF10B6}.Release46|Any CPU.Build.0 = Release46|Any CPU
 		{FFB7A57C-BC22-4B71-88D4-2489B3FF10B6}.Release8|Any CPU.ActiveCfg = Release8|Any CPU
 		{FFB7A57C-BC22-4B71-88D4-2489B3FF10B6}.Release8|Any CPU.Build.0 = Release8|Any CPU
 		{FFB7A57C-BC22-4B71-88D4-2489B3FF10B6}.Release81|Any CPU.ActiveCfg = Release81|Any CPU
@@ -614,6 +671,8 @@ Global
 		{9FFAC385-10A4-4DDD-B800-DE67E8469CC0}.Debug40|Any CPU.Build.0 = Debug40|Any CPU
 		{9FFAC385-10A4-4DDD-B800-DE67E8469CC0}.Debug45|Any CPU.ActiveCfg = Debug45|Any CPU
 		{9FFAC385-10A4-4DDD-B800-DE67E8469CC0}.Debug45|Any CPU.Build.0 = Debug45|Any CPU
+		{9FFAC385-10A4-4DDD-B800-DE67E8469CC0}.Debug46|Any CPU.ActiveCfg = Debug46|Any CPU
+		{9FFAC385-10A4-4DDD-B800-DE67E8469CC0}.Debug46|Any CPU.Build.0 = Debug46|Any CPU
 		{9FFAC385-10A4-4DDD-B800-DE67E8469CC0}.Debug8|Any CPU.ActiveCfg = Debug8|Any CPU
 		{9FFAC385-10A4-4DDD-B800-DE67E8469CC0}.Debug8|Any CPU.Build.0 = Debug8|Any CPU
 		{9FFAC385-10A4-4DDD-B800-DE67E8469CC0}.Debug81|Any CPU.ActiveCfg = Debug81|Any CPU
@@ -635,6 +694,8 @@ Global
 		{9FFAC385-10A4-4DDD-B800-DE67E8469CC0}.Release40|Any CPU.Build.0 = Release40|Any CPU
 		{9FFAC385-10A4-4DDD-B800-DE67E8469CC0}.Release45|Any CPU.ActiveCfg = Release45|Any CPU
 		{9FFAC385-10A4-4DDD-B800-DE67E8469CC0}.Release45|Any CPU.Build.0 = Release45|Any CPU
+		{9FFAC385-10A4-4DDD-B800-DE67E8469CC0}.Release46|Any CPU.ActiveCfg = Release46|Any CPU
+		{9FFAC385-10A4-4DDD-B800-DE67E8469CC0}.Release46|Any CPU.Build.0 = Release46|Any CPU
 		{9FFAC385-10A4-4DDD-B800-DE67E8469CC0}.Release8|Any CPU.ActiveCfg = Release8|Any CPU
 		{9FFAC385-10A4-4DDD-B800-DE67E8469CC0}.Release81|Any CPU.ActiveCfg = Release81|Any CPU
 		{9FFAC385-10A4-4DDD-B800-DE67E8469CC0}.ReleasePL|Any CPU.ActiveCfg = ReleasePL|Any CPU

+ 1 - 1
Rx.NET/Source/Tests.System.Reactive/Tests/Concurrency/DispatcherSchedulerTest.cs

@@ -121,7 +121,7 @@ namespace ReactiveTests.Tests
             var evt = new ManualResetEvent(false);
             disp.UnhandledException += (o, e) =>
             {
-#if DESKTOPCLR40 || DESKTOPCLR45
+#if DESKTOPCLR40 || DESKTOPCLR45 || DESKTOPCLR46
                 Assert.AreSame(ex, e.Exception); // CHECK
 #else
                 Assert.AreSame(ex, e.Exception.InnerException); // CHECK

+ 1 - 1
Rx.NET/Source/Tests.System.Reactive/Tests/Disposables/DisposableTests.cs

@@ -378,7 +378,7 @@ namespace ReactiveTests.Tests
             new CompositeDisposable().Remove(null);
         }
 
-#if DESKTOPCLR40 || DESKTOPCLR45
+#if DESKTOPCLR40 || DESKTOPCLR45 || DESKTOPCLR46
         [TestMethod, ExpectedException(typeof(ArgumentNullException))]
         public void CancellationDisposable_Ctor_Null()
         {

+ 2 - 1
Rx.NET/Source/Tests.System.Reactive/Tests/RegressionTest.cs

@@ -16,7 +16,7 @@ namespace ReactiveTests.Tests
     [TestClass]
     public class RegressionTest : ReactiveTest
     {
-#if DESKTOPCLR40 || DESKTOPCLR45
+#if DESKTOPCLR40 || DESKTOPCLR45 || DESKTOPCLR46
         [TestMethod]
         public void Bug_ConcurrentMerge()
         {
@@ -156,6 +156,7 @@ namespace ReactiveTests.Tests
             sema.WaitOne();
         }
 #endif
+
         [TestMethod]
         public void Bug_1295_Completed()
         {