Add test projects

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

@@ -41,7 +41,7 @@
     </PackageReference>
     <!-- https://github.com/NuGet/Home/issues/4143 
      <PackageReference Include="xunit.assert.source" Version="2.2.0-beta4-build3444" /> -->
-     <PackageReference Include="xunit.assert" Version="2.2.0-beta4-build3444" />
+    <PackageReference Include="xunit.assert" Version="2.2.0-beta4-build3444" />
     <ProjectReference Include="..\System.Reactive\System.Reactive.csproj" />
   </ItemGroup>
 </Project>

Rx.NET/Source/System.Reactive.Observable.Aliases/Properties/AssemblyInfo.cs

@@ -4,33 +4,6 @@ using System.Resources;
 using System.Runtime.InteropServices;
 using System.Security;
 
-[assembly: AssemblyTitle("System.Reactive.Observable.Aliases")]
-// Notice: same description as in the .nuspec files; see Source/Rx/Setup/NuGet
-[assembly: AssemblyDescription("Reactive Extensions provides the aliases Map, FlatMap, and Filter.")]
-#if DEBUG
-[assembly: AssemblyConfiguration("Debug")]
-#else
-[assembly: AssemblyConfiguration("Retail")]
-#endif
-[assembly: AssemblyCompany(".NET Foundation and Contributors.")]
-[assembly: AssemblyProduct("Reactive Extensions")]
-[assembly: AssemblyCopyright("\x00a9 .NET Foundation and Contributors.  All rights reserved.")]
-[assembly: NeutralResourcesLanguage("en-US")]
-
-#if !PLIB
 [assembly: ComVisible(false)]
-#endif
-
 [assembly: CLSCompliant(true)]
-
-#if HAS_APTCA && NO_CODECOVERAGE
-[assembly: AllowPartiallyTrustedCallers]
-#endif
-
-// ===========================================================================
-//  DO NOT EDIT OR REMOVE ANYTHING BELOW THIS COMMENT.
-//  Version numbers are automatically generated in the msbuild files based on regular expressions 
-// ===========================================================================
-
-[assembly: AssemblyFileVersion("2.2.0.0")]
-[assembly: AssemblyInformationalVersion("2.2.0.0")]
+[assembly: AllowPartiallyTrustedCallers]

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

@@ -0,0 +1,41 @@
+<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
+  <PropertyGroup>
+    <TargetFrameworks>netstandard1.3;net45</TargetFrameworks>
+    <Product>System.Reactive.Observable.Aliases ($(TargetFramework))</Product>
+    <Title>Reactive Extensions - Aliases</Title>
+    <Copyright>Copyright (c) .NET Foundation and Contributors.</Copyright>
+    <CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
+    <DefaultLanguage>en-US</DefaultLanguage>
+    <MinClientVersion>2.12</MinClientVersion>
+    <GenerateDocumentationFile Condition=" '$(Configuration)' == 'Release' ">true</GenerateDocumentationFile>
+    <Authors>.NET Foundation and Contributors</Authors>
+    <AssemblyOriginatorKeyFile>../ReactiveX.snk</AssemblyOriginatorKeyFile>
+    <SignAssembly>true</SignAssembly>
+    <NoWarn>$(NoWarn);CS1591</NoWarn>
+    <IncludeSymbols>true</IncludeSymbols>
+    <UseFullSemVerForNuGet>true</UseFullSemVerForNuGet>
+    <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
+    <PackageTags>Rx;Reactive;Extensions;Observable;LINQ;Events</PackageTags>
+    <PackageIconUrl>http://go.microsoft.com/fwlink/?LinkId=261274</PackageIconUrl>
+    <PackageProjectUrl>http://go.microsoft.com/fwlink/?LinkId=261273</PackageProjectUrl>
+    <PackageLicenseUrl>http://go.microsoft.com/fwlink/?LinkID=261272</PackageLicenseUrl>
+    <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
+    <Description>Reactive Extensions (Rx) provides the aliases Map, FlatMap, and Filter</Description>
+  </PropertyGroup>  
+  <PropertyGroup Condition="'$(TargetFramework)' == 'netstandard1.3'">
+    <DefineConstants>$(DefineConstants);NO_EVENTARGS_CONSTRAINT;HAS_WINRT;PREFER_ASYNC;USE_TIMER_SELF_ROOT;HAS_TPL46;NO_REMOTING;NO_SERIALIZABLE;CRIPPLED_REFLECTION</DefineConstants>
+    <AssemblyVersion>4.0.3000.0</AssemblyVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(TargetFramework)' == 'net45'">
+    <DefineConstants>$(DefineConstants);NO_EVENTARGS_CONSTRAINT;HAS_WINRT;PREFER_ASYNC;USE_TIMER_SELF_ROOT</DefineConstants>
+    <AssemblyVersion>4.0.1000.0</AssemblyVersion>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="**\*.cs" />
+    <EmbeddedResource Include="**\*.resx" />
+    <PackageReference Include="GitVersionTask" Version="4.0.0-pullrequest1119-1208">
+      <PrivateAssets>All</PrivateAssets>
+    </PackageReference>
+    <ProjectReference Include="..\System.Reactive\System.Reactive.csproj" />
+  </ItemGroup>
+</Project>

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

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>5965a929-c3e5-42ad-8328-3641f8967e72</ProjectGuid>
-    <RootNamespace>System.Reactive.Observable.Aliases</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>

Rx.NET/Source/System.Reactive.Observable.Aliases/project.json

@@ -1,109 +0,0 @@
-{
-  "version": "3.0.0-*",
-  "title": "Reactive Extensions - Core Library",
-  "description": "Reactive Extensions Core Library containing base classes and scheduler infrastructure.",
-  "authors": ["Microsoft"],
-  "copyright": "Copyright (C) Microsoft Corporation",
-
-  "packOptions": {
-    "tags": ["Rx", "Reactive", "Extensions", "Observable", "LINQ", "Events"],
-    "iconUrl": "http://go.microsoft.com/fwlink/?LinkId=261274",
-    "projectUrl": "http://go.microsoft.com/fwlink/?LinkId=261273",
-    "licenseUrl": "http://go.microsoft.com/fwlink/?LinkID=261272",
-    "requireLicenseAcceptance": true
-  },
-
-  "buildOptions": {
-    "keyFile": "../ReactiveX.snk",
-    "define": [ "SIGNED" ],
-    "nowarn": [ "CS1591" ],
-    "xmlDoc": true,
-    "compile": {
-      "includeFiles": [ "../GlobalAssemblyVersion.cs" ]
-    }
-  },
-  
-  "dependencies": {
-    "System.Reactive.Providers": { "target": "project" }
-  },
-  
-  "frameworks": {
-    "net45": {
-      "buildOptions": {
-        "define": [
-          "NO_EVENTARGS_CONSTRAINT",
-          "HAS_EDI",
-          "HAS_WINRT",
-          "HAS_PROGRESS",
-          "PREFER_ASYNC",
-          "HAS_AWAIT",
-          "HAS_APTCA",
-          "HAS_DISPATCHER_PRIORITY",
-          "HAS_WINFORMS",
-          "USE_TIMER_SELF_ROOT",
-          "DESKTOPCLR",
-          "DESKTOPCLR45"
-        ]
-      }
-    },
-    "net46": {
-      "buildOptions": {
-        "define": [
-          "NO_EVENTARGS_CONSTRAINT",
-          "HAS_EDI",
-          "HAS_WINRT",
-          "HAS_PROGRESS",
-          "PREFER_ASYNC",
-          "HAS_AWAIT",
-          "HAS_APTCA",
-          "HAS_DISPATCHER_PRIORITY",
-          "HAS_TPL46",
-          "HAS_WINFORMS",
-          "USE_TIMER_SELF_ROOT",
-          "DESKTOPCLR",
-          "DESKTOPCLR46"
-        ]
-      }
-    },
-    "netstandard1.0": {
-      "buildOptions": {
-        "define": [
-          "NO_EVENTARGS_CONSTRAINT",
-          "HAS_EDI",
-          "HAS_WINRT",
-          "HAS_PROGRESS",
-          "PREFER_ASYNC",
-          "HAS_AWAIT",
-          "HAS_APTCA",
-          "NO_REMOTING",
-          "NO_SERIALIZABLE",
-          "NO_THREAD",
-          "CRIPPLED_REFLECTION",
-          "NO_CDS_COLLECTIONS",
-          "USE_TIMER_SELF_ROOT",
-          "PLIB"
-        ]
-      }
-    },
-    "netstandard1.3": {
-      "buildOptions": {
-        "define": [
-          "NO_EVENTARGS_CONSTRAINT",
-          "HAS_EDI",
-          "HAS_WINRT",
-          "HAS_PROGRESS",
-          "PREFER_ASYNC",
-          "HAS_AWAIT",
-          "HAS_APTCA",
-          "HAS_TPL46",
-          "NO_REMOTING",
-          "NO_SERIALIZABLE",
-          "NO_THREAD",
-          "CRIPPLED_REFLECTION",
-          "PLIB",
-          "USE_TIMER_SELF_ROOT"
-        ]
-      }
-    }
-  }
-}

Rx.NET/Source/System.Reactive.sln

@@ -7,6 +7,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Reactive", "System.R
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Reactive.Testing", "Microsoft.Reactive.Testing\Microsoft.Reactive.Testing.csproj", "{73078FB5-6038-4674-B4C4-32FD81B88055}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests.System.Reactive", "Tests.System.Reactive\Tests.System.Reactive.csproj", "{E072D663-A241-4FEC-B888-45640F69D9CE}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reactive.Observable.Aliases", "System.Reactive.Observable.Aliases\System.Reactive.Observable.Aliases.csproj", "{CB5E4FFA-F510-43F1-B378-B3D7BA7C8396}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests.System.Reactive.Uwp.DeviceRunner", "Tests.System.Reactive.Uwp.DeviceRunner\Tests.System.Reactive.Uwp.DeviceRunner.csproj", "{10CC7191-D936-46CA-BA87-0646733571EA}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -41,6 +47,48 @@ Global
 		{73078FB5-6038-4674-B4C4-32FD81B88055}.Release|x64.Build.0 = Release|x64
 		{73078FB5-6038-4674-B4C4-32FD81B88055}.Release|x86.ActiveCfg = Release|x86
 		{73078FB5-6038-4674-B4C4-32FD81B88055}.Release|x86.Build.0 = Release|x86
+		{E072D663-A241-4FEC-B888-45640F69D9CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E072D663-A241-4FEC-B888-45640F69D9CE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E072D663-A241-4FEC-B888-45640F69D9CE}.Debug|x64.ActiveCfg = Debug|x64
+		{E072D663-A241-4FEC-B888-45640F69D9CE}.Debug|x64.Build.0 = Debug|x64
+		{E072D663-A241-4FEC-B888-45640F69D9CE}.Debug|x86.ActiveCfg = Debug|x86
+		{E072D663-A241-4FEC-B888-45640F69D9CE}.Debug|x86.Build.0 = Debug|x86
+		{E072D663-A241-4FEC-B888-45640F69D9CE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E072D663-A241-4FEC-B888-45640F69D9CE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E072D663-A241-4FEC-B888-45640F69D9CE}.Release|x64.ActiveCfg = Release|x64
+		{E072D663-A241-4FEC-B888-45640F69D9CE}.Release|x64.Build.0 = Release|x64
+		{E072D663-A241-4FEC-B888-45640F69D9CE}.Release|x86.ActiveCfg = Release|x86
+		{E072D663-A241-4FEC-B888-45640F69D9CE}.Release|x86.Build.0 = Release|x86
+		{CB5E4FFA-F510-43F1-B378-B3D7BA7C8396}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CB5E4FFA-F510-43F1-B378-B3D7BA7C8396}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CB5E4FFA-F510-43F1-B378-B3D7BA7C8396}.Debug|x64.ActiveCfg = Debug|x64
+		{CB5E4FFA-F510-43F1-B378-B3D7BA7C8396}.Debug|x64.Build.0 = Debug|x64
+		{CB5E4FFA-F510-43F1-B378-B3D7BA7C8396}.Debug|x86.ActiveCfg = Debug|x86
+		{CB5E4FFA-F510-43F1-B378-B3D7BA7C8396}.Debug|x86.Build.0 = Debug|x86
+		{CB5E4FFA-F510-43F1-B378-B3D7BA7C8396}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CB5E4FFA-F510-43F1-B378-B3D7BA7C8396}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CB5E4FFA-F510-43F1-B378-B3D7BA7C8396}.Release|x64.ActiveCfg = Release|x64
+		{CB5E4FFA-F510-43F1-B378-B3D7BA7C8396}.Release|x64.Build.0 = Release|x64
+		{CB5E4FFA-F510-43F1-B378-B3D7BA7C8396}.Release|x86.ActiveCfg = Release|x86
+		{CB5E4FFA-F510-43F1-B378-B3D7BA7C8396}.Release|x86.Build.0 = Release|x86
+		{10CC7191-D936-46CA-BA87-0646733571EA}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{10CC7191-D936-46CA-BA87-0646733571EA}.Debug|Any CPU.Build.0 = Debug|x86
+		{10CC7191-D936-46CA-BA87-0646733571EA}.Debug|Any CPU.Deploy.0 = Debug|x86
+		{10CC7191-D936-46CA-BA87-0646733571EA}.Debug|x64.ActiveCfg = Debug|x64
+		{10CC7191-D936-46CA-BA87-0646733571EA}.Debug|x64.Build.0 = Debug|x64
+		{10CC7191-D936-46CA-BA87-0646733571EA}.Debug|x64.Deploy.0 = Debug|x64
+		{10CC7191-D936-46CA-BA87-0646733571EA}.Debug|x86.ActiveCfg = Debug|x86
+		{10CC7191-D936-46CA-BA87-0646733571EA}.Debug|x86.Build.0 = Debug|x86
+		{10CC7191-D936-46CA-BA87-0646733571EA}.Debug|x86.Deploy.0 = Debug|x86
+		{10CC7191-D936-46CA-BA87-0646733571EA}.Release|Any CPU.ActiveCfg = Release|x86
+		{10CC7191-D936-46CA-BA87-0646733571EA}.Release|Any CPU.Build.0 = Release|x86
+		{10CC7191-D936-46CA-BA87-0646733571EA}.Release|Any CPU.Deploy.0 = Release|x86
+		{10CC7191-D936-46CA-BA87-0646733571EA}.Release|x64.ActiveCfg = Release|x64
+		{10CC7191-D936-46CA-BA87-0646733571EA}.Release|x64.Build.0 = Release|x64
+		{10CC7191-D936-46CA-BA87-0646733571EA}.Release|x64.Deploy.0 = Release|x64
+		{10CC7191-D936-46CA-BA87-0646733571EA}.Release|x86.ActiveCfg = Release|x86
+		{10CC7191-D936-46CA-BA87-0646733571EA}.Release|x86.Build.0 = Release|x86
+		{10CC7191-D936-46CA-BA87-0646733571EA}.Release|x86.Deploy.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Rx.NET/Source/System.Reactive/Properties/InternalsVisibleTo.cs

@@ -0,0 +1,9 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the Apache 2.0 License.
+// See the LICENSE file in the project root for more information. 
+
+using System;
+
+
+[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("Tests.System.Reactive, PublicKey=00240000048000009400000006020000002400005253413100040000010001008f5cff058631087031f8350f30a36fa078027e5df2316b564352dc9eb7af7ce856016d3c5e9d058036fe73bb5c83987bd3fc0793fbe25d633cc4f37c2bd5f1d717cd2a81661bec08f0971dc6078e17bde372b89005e7738a0ebd501b896ca3e8315270ff64df7809dd912c372df61785a5085b3553b7872e39b1b1cc0ff5a6bc")]
+[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("Tests.System.Reactive.Uwp.DeviceRunner, PublicKey=00240000048000009400000006020000002400005253413100040000010001008f5cff058631087031f8350f30a36fa078027e5df2316b564352dc9eb7af7ce856016d3c5e9d058036fe73bb5c83987bd3fc0793fbe25d633cc4f37c2bd5f1d717cd2a81661bec08f0971dc6078e17bde372b89005e7738a0ebd501b896ca3e8315270ff64df7809dd912c372df61785a5085b3553b7872e39b1b1cc0ff5a6bc")]

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

@@ -110,4 +110,10 @@
     <Compile Include="..\System.Reactive.Windows.Threading\Strings_WindowsThreading.Generated.cs" />
     <EmbeddedResource Include="..\System.Reactive.Windows.Threading\**\*.resx" />
   </ItemGroup>
+  <!-- Workaround for https://github.com/Microsoft/msbuild/issues/1474 -->
+  <Target Name="AdjustReferringTargetFrameworkForUAP" BeforeTargets="GetTargetFrameworkProperties">
+    <PropertyGroup Condition="'$(ReferringTargetFramework)' == '.NETCore,Version=v5.0'">
+      <ReferringTargetFramework>UAP,Version=v10.0</ReferringTargetFramework>
+    </PropertyGroup>
+  </Target>
 </Project>

Rx.NET/Source/Tests.System.Reactive.Uwp.DeviceRunner/Tests.System.Reactive.Uwp.DeviceRunner.csproj

@@ -390,38 +390,19 @@
     </ApplicationDefinition>
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="Microsoft.Reactive.Testing">
-      <HintPath>..\Microsoft.Reactive.Testing\bin\$(Configuration)\uap10.0\Microsoft.Reactive.Testing.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Reactive.Core">
-      <HintPath>..\System.Reactive.Core\bin\$(Configuration)\uap10.0\System.Reactive.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Reactive.Experimental">
-      <HintPath>..\System.Reactive.Experimental\bin\$(Configuration)\netstandard1.3\System.Reactive.Experimental.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Reactive.Interfaces">
-      <HintPath>..\System.Reactive.Interfaces\bin\$(Configuration)\netstandard1.0\System.Reactive.Interfaces.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Reactive.Linq">
-      <HintPath>..\System.Reactive.Linq\bin\$(Configuration)\netstandard1.3\System.Reactive.Linq.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Reactive.Observable.Aliases">
-      <HintPath>..\System.Reactive.Observable.Aliases\bin\$(Configuration)\netstandard1.3\System.Reactive.Observable.Aliases.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Reactive.PlatformServices">
-      <HintPath>..\System.Reactive.PlatformServices\bin\$(Configuration)\uap10.0\System.Reactive.PlatformServices.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Reactive.Providers">
-      <HintPath>..\System.Reactive.Providers\bin\$(Configuration)\netstandard1.3\System.Reactive.Providers.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Reactive.Windows.Threading">
-      <HintPath>..\System.Reactive.Windows.Threading\bin\$(Configuration)\uap10.0\System.Reactive.Windows.Threading.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Reactive.WindowsRuntime">
-      <HintPath>..\System.Reactive.WindowsRuntime\bin\$(Configuration)\uap10.0\System.Reactive.WindowsRuntime.dll</HintPath>
-    </Reference>
+    <ProjectReference Include="..\System.Reactive.Observable.Aliases\System.Reactive.Observable.Aliases.csproj">
+      <Project>{cb5e4ffa-f510-43f1-b378-b3d7ba7c8396}</Project>
+      <Name>System.Reactive.Observable.Aliases</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\System.Reactive\System.Reactive.csproj">
+      <Project>{01706a0f-8a63-4fd6-af45-0bc0bed3c0d9}</Project>
+      <Name>System.Reactive</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Microsoft.Reactive.Testing\Microsoft.Reactive.Testing.csproj">
+      <Project>{73078FB5-6038-4674-B4C4-32FD81B88055}</Project>
+      <Name>Microsoft.Reactive.Testing</Name>
+    </ProjectReference>
   </ItemGroup>
-  <ItemGroup />
   <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
     <VisualStudioVersion>14.0</VisualStudioVersion>
   </PropertyGroup>

Rx.NET/Source/Tests.System.Reactive.Uwp.DeviceRunner/project.json

@@ -1,15 +1,15 @@
 {
   "dependencies": {
-    "Microsoft.NETCore.UniversalWindowsPlatform": "5.2.0-rc3-3004432-00",
-    "xunit": "2.2.0-beta2-build3300",
+    "Microsoft.NETCore.UniversalWindowsPlatform": "5.2.2",
+    "xunit": "2.2.0-beta4-build3444",
     "xunit.runner.devices": "2.1.0"
   },
   "frameworks": {
     "uap10.0": {}
   },
   "runtimes": {
-    //"win10-arm": {},
-    //"win10-arm-aot": {},
+    "win10-arm": {},
+    "win10-arm-aot": {},
     "win10-x86": {},
     "win10-x86-aot": {},
     "win10-x64": {},

Rx.NET/Source/Tests.System.Reactive/Properties/AssemblyInfo.cs

@@ -1,18 +0,0 @@
-using System;
-using System.Reflection;
-using System.Resources;
-using System.Runtime.InteropServices;
-
-[assembly: AssemblyTitle("Tests.System.Reactive")]
-[assembly: AssemblyDescription("Unit tests for Reactive Extensions product assemblies.")]
-#if DEBUG
-[assembly: AssemblyConfiguration("Debug")]
-#else
-[assembly: AssemblyConfiguration("Retail")]
-#endif
-[assembly: AssemblyCompany(".NET Foundation and Contributors.")]
-[assembly: AssemblyProduct("Reactive Extensions")]
-[assembly: AssemblyCopyright("\x00a9 .NET Foundation and Contributors.  All rights reserved.")]
-[assembly: NeutralResourcesLanguage("en-US")]
-
-[assembly: ComVisible(false)]

Rx.NET/Source/Tests.System.Reactive/Tests.System.Reactive.csproj

@@ -0,0 +1,44 @@
+<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
+  <PropertyGroup>
+    <TargetFrameworks>netcoreapp1.0;net46</TargetFrameworks>
+    <AssemblyOriginatorKeyFile>../ReactiveX.snk</AssemblyOriginatorKeyFile>
+    <SignAssembly>true</SignAssembly>
+    <NoWarn>$(NoWarn);CS0618</NoWarn>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp1.0'">
+    <DefineConstants>$(DefineConstants);NO_EVENTARGS_CONSTRAINT;HAS_WINRT;PREFER_ASYNC;USE_TIMER_SELF_ROOT;HAS_TPL46;NO_REMOTING;NO_SERIALIZABLE;CRIPPLED_REFLECTION</DefineConstants>
+    <AssemblyVersion>4.0.3000.0</AssemblyVersion>
+    <OutputType>Exe</OutputType>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(TargetFramework)' == 'net45'">
+    <DefineConstants>$(DefineConstants);NO_EVENTARGS_CONSTRAINT;HAS_WINRT;PREFER_ASYNC;USE_TIMER_SELF_ROOT</DefineConstants>
+    <AssemblyVersion>4.0.1000.0</AssemblyVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(TargetFramework)' == 'net46'">
+    <DefineConstants>$(DefineConstants);NO_EVENTARGS_CONSTRAINT;HAS_WINRT;PREFER_ASYNC;USE_TIMER_SELF_ROOT;HAS_TPL46</DefineConstants>
+    <AssemblyVersion>4.0.3000.0</AssemblyVersion>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="**\*.cs" />
+    <Content Include="xunit.runner.json" />
+    <EmbeddedResource Include="**\*.resx" />
+  </ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp1.0'">
+    <PackageReference Include="Microsoft.NETCore.App" Version="1.1.0" />
+  </ItemGroup>
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net45' or '$(TargetFramework)' == 'net46'">
+    <Reference Include="System" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Windows" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="WindowsBase" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-preview-20161123-03" />
+    <PackageReference Include="xunit" Version="2.2.0-beta4-build3444" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0-beta4-build1194" />
+    <ProjectReference Include="..\System.Reactive\System.Reactive.csproj" />
+    <ProjectReference Include="..\System.Reactive.Observable.Aliases\System.Reactive.Observable.Aliases.csproj" />
+    <ProjectReference Include="..\Microsoft.Reactive.Testing\Microsoft.Reactive.Testing.csproj" />
+  </ItemGroup>
+</Project>

Rx.NET/Source/Tests.System.Reactive/Tests.System.Reactive.xproj

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>78c7dad3-d706-4d0a-a4f9-5c7ea1cb9d6d</ProjectGuid>
-    <RootNamespace>System.Reactive</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <ItemGroup>
-    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
-  </ItemGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>

Rx.NET/Source/Tests.System.Reactive/project.json

@@ -1,93 +0,0 @@
-{
-  "version": "3.0.0-*",
-  "title": "Reactive Extensions - Tests",
-  "description": "Reactive Extensions test project.",
-  "authors": ["Microsoft"],
-  "copyright": "Copyright (C) Microsoft Corporation",
-  
-  "packOptions": {
-    "tags": [],
-    "iconUrl": "http://go.microsoft.com/fwlink/?LinkId=261274",
-    "projectUrl": "http://go.microsoft.com/fwlink/?LinkId=261273",
-    "licenseUrl": "http://go.microsoft.com/fwlink/?LinkID=261272",
-    "requireLicenseAcceptance": true
-  },
-
-  "buildOptions": {
-    "nowarn": [ "CS0618" ],
-    "keyFile": "../ReactiveX.snk",
-    "define": [ "SIGNED" ],
-    "copyToOutput": {
-      "include": [ "xunit.runner.json" ]
-    }
-  },
-
-  "dependencies": {
-    "System.Reactive.Interfaces": { "target": "project" },
-    "System.Reactive.Linq": { "target": "project" },
-    "System.Reactive.PlatformServices": { "target": "project" },
-    "Microsoft.Reactive.Testing": { "target": "project" },
-    "System.Reactive.Experimental": { "target": "project" },
-    "System.Reactive.Providers": { "target": "project" },
-    "System.Reactive.Observable.Aliases": { "target": "project" },
-    "xunit": "2.2.0-beta3-build3342",
-    "dotnet-test-xunit": "2.2.0-preview3-build1039",
-    "System.Reflection.TypeExtensions": "4.1.0",
-    "System.Diagnostics.StackTrace": "4.0.1"
-  },
-  
-  "testRunner": "xunit",
-  
-  "frameworks": {
-    "netcoreapp1.0": {
-      "buildOptions": {
-        "define": [
-          "NO_EVENTARGS_CONSTRAINT",
-          "HAS_EDI",
-          "HAS_WINRT",
-          "HAS_PROGRESS",
-          "PREFER_ASYNC",
-          "HAS_AWAIT",
-          "HAS_APTCA",
-          "NO_REMOTING",
-          "NO_SERIALIZABLE",
-          "CRIPPLED_REFLECTION",
-          "PLIB",
-          "USE_TIMER_SELF_ROOT",
-          "XUNIT"
-        ]
-      },
-      "dependencies": {
-        "Microsoft.NETCore.App": {
-          "version": "1.0.0",
-          "type": "platform"
-        }
-      }
-    },
-    "net461": {
-      "buildOptions": {
-        "define": [
-          "NO_EVENTARGS_CONSTRAINT",
-          "HAS_EDI",
-          "HAS_WINRT",
-          "HAS_PROGRESS",
-          "PREFER_ASYNC",
-          "HAS_AWAIT",
-          "HAS_APTCA",
-          "USE_TIMER_SELF_ROOT",
-          "DESKTOPCLR",
-          "DESKTOPCLR46",
-          "XUNIT"
-        ]
-      },
-      "dependencies": {
-        "System.Reactive.Windows.Threading": { "target": "project" },
-        "System.Reactive.Windows.Forms": { "target": "project" },
-        "System.Reactive.Runtime.Remoting": { "target": "project" }
-      },
-      "frameworkAssemblies": {
-        "System.Threading.Tasks": ""
-      }
-    }
-  }
-}