move files to src\tests\facades

Rx.NET/Source/Playground/Playground.csproj

@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug45</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">Any CPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{8A062C6B-4441-49F3-B618-4238B6AB5290}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Playground</RootNamespace>
-    <AssemblyName>Playground</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <ProductSignAssembly>false</ProductSignAssembly>
-  </PropertyGroup>
-  <Import Project="..\Common.targets" />
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Microsoft.Reactive.Testing\Microsoft.Reactive.Testing.csproj">
-      <Project>{e7b7408b-b039-4f30-b6cf-cc06218ce4ca}</Project>
-      <Name>Microsoft.Reactive.Testing</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\System.Reactive.Core\System.Reactive.Core.csproj">
-      <Project>{4E516F10-DA7A-4D43-963E-A93865ABEA5B}</Project>
-      <Name>System.Reactive.Core</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\System.Reactive.Debugger\System.Reactive.Debugger.csproj">
-      <Project>{FFB7A57C-BC22-4B71-88D4-2489B3FF10B6}</Project>
-      <Name>System.Reactive.Debugger</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\System.Reactive.Experimental\System.Reactive.Experimental.csproj">
-      <Project>{41E65B96-733B-41C4-A1BB-7476359B89EB}</Project>
-      <Name>System.Reactive.Experimental</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\System.Reactive.Interfaces\System.Reactive.Interfaces.csproj">
-      <Project>{9E9B9C60-98B0-40FA-9C2B-1218D417CAA4}</Project>
-      <Name>System.Reactive.Interfaces</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\System.Reactive.Linq\System.Reactive.Linq.csproj">
-      <Project>{63252AE9-5186-45CA-BFCD-FA51C6B66A43}</Project>
-      <Name>System.Reactive.Linq</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\System.Reactive.Observable.Aliases\System.Reactive.Observable.Aliases.csproj">
-      <Project>{9ffac385-10a4-4ddd-b800-de67e8469cc0}</Project>
-      <Name>System.Reactive.Observable.Aliases</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\System.Reactive.PlatformServices\System.Reactive.PlatformServices.csproj">
-      <Project>{0cccf009-763f-40d2-8655-7a94828023bf}</Project>
-      <Name>System.Reactive.PlatformServices</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\System.Reactive.Providers\System.Reactive.Providers.csproj">
-      <Project>{C7B9D7BE-F47F-466B-A6B0-E46F1069B171}</Project>
-      <Name>System.Reactive.Providers</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Tests.System.Reactive\Tests.System.Reactive.csproj">
-      <Project>{2FEFC068-E2DE-43A9-A4E6-E0336A532B7A}</Project>
-      <Name>Tests.System.Reactive</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="app.config" />
-  </ItemGroup>
-  <Import Project="..\Import.targets" />
-</Project>

Rx.NET/Source/Playground/Program.cs

@@ -1,23 +0,0 @@
-// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
-
-using System;
-using System.Reactive;
-using System.Reactive.Concurrency;
-using System.Reactive.Disposables;
-using System.Reactive.Linq;
-using System.Reactive.Subjects;
-using System.Threading;
-
-#if !NO_TPL
-using System.Threading.Tasks;
-#endif
-
-namespace Playground
-{
-    class Program
-    {
-        static void Main()
-        {
-        }
-    }
-}

Rx.NET/Source/Playground/Properties/AssemblyInfo.cs

@@ -1,34 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("Playground")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Microsoft Open Technologies, Inc.")]
-[assembly: AssemblyProduct("Playground")]
-[assembly: AssemblyCopyright("Copyright © Microsoft Open Technologies, Inc.  All rights reserved.")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// 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("fd869f41-0ee3-4c80-892b-aab52098e3f8")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// 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.*")]

Rx.NET/Source/Playground/app.config

@@ -1,6 +0,0 @@
-<?xml version="1.0"?>
-<configuration>
-  <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/>
-  </startup>
-</configuration>

Rx.NET/Source/Rx.NET.sln

@@ -1,323 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "System.Reactive.Core", "System.Reactive.Core\System.Reactive.Core.xproj", "{FDA62C35-4174-44B0-BEBE-61E80B2515BA}"
-EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "System.Reactive.Interfaces", "System.Reactive.Interfaces\System.Reactive.Interfaces.xproj", "{430061B8-8504-483F-A532-CEB69FF04128}"
-EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "System.Reactive.Linq", "System.Reactive.Linq\System.Reactive.Linq.xproj", "{A5508FF0-93B9-4241-B666-07B05189C435}"
-EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "System.Reactive.PlatformServices", "System.Reactive.PlatformServices\System.Reactive.PlatformServices.xproj", "{7DD3DDA0-0B73-4A7F-ACAF-15111AC2EB93}"
-EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "System.Reactive.Observable.Aliases", "System.Reactive.Observable.Aliases\System.Reactive.Observable.Aliases.xproj", "{5965A929-C3E5-42AD-8328-3641F8967E72}"
-EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "System.Reactive.Providers", "System.Reactive.Providers\System.Reactive.Providers.xproj", "{845E4FBF-A6C0-4870-9D1A-C832E262D956}"
-EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "System.Reactive.Experimental", "System.Reactive.Experimental\System.Reactive.Experimental.xproj", "{FB2DB31D-FCFA-45CE-A3A8-7B7C14ECD77A}"
-EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "System.Reactive.Windows.Threading", "System.Reactive.Windows.Threading\System.Reactive.Windows.Threading.xproj", "{C18C6FE5-7408-4F3B-B562-7A563E01701E}"
-EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "System.Reactive.Runtime.Remoting", "System.Reactive.Runtime.Remoting\System.Reactive.Runtime.Remoting.xproj", "{A22F3131-6D20-4D67-9A9F-314FE3691EA1}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core", "Core", "{0410EFCB-757C-46BA-99AA-A82A06A79F64}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Extra", "Extra", "{16A2D2FA-6D59-498E-8160-66518531792E}"
-EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "System.Reactive.Windows.Forms", "System.Reactive.Windows.Forms\System.Reactive.Windows.Forms.xproj", "{C17D3BD1-222F-4DCC-BBF8-44A04399701B}"
-EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "System.Reactive.WindowsRuntime", "System.Reactive.WindowsRuntime\System.Reactive.WindowsRuntime.xproj", "{4B697BE9-1D48-4855-9070-C9C5C3BD341C}"
-EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Reactive.Testing", "Microsoft.Reactive.Testing\Microsoft.Reactive.Testing.xproj", "{A0FA7FB5-BC2B-4E9F-9807-40BC26894AD5}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{8DB69669-2C09-404B-B29A-79641919078B}"
-EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Tests.System.Reactive", "Tests.System.Reactive\Tests.System.Reactive.xproj", "{78C7DAD3-D706-4D0A-A4F9-5C7EA1CB9D6D}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{D561839E-B307-4A56-A64F-BA9DC33B5D71}"
-	ProjectSection(SolutionItems) = preProject
-		build-new.ps1 = build-new.ps1
-		global.json = global.json
-		GlobalAssemblyVersion.cs = GlobalAssemblyVersion.cs
-		NuGet.Config = NuGet.Config
-	EndProjectSection
-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}"
-	ProjectSection(ProjectDependencies) = postProject
-		{FB2DB31D-FCFA-45CE-A3A8-7B7C14ECD77A} = {FB2DB31D-FCFA-45CE-A3A8-7B7C14ECD77A}
-		{5965A929-C3E5-42AD-8328-3641F8967E72} = {5965A929-C3E5-42AD-8328-3641F8967E72}
-		{FDA62C35-4174-44B0-BEBE-61E80B2515BA} = {FDA62C35-4174-44B0-BEBE-61E80B2515BA}
-		{7DD3DDA0-0B73-4A7F-ACAF-15111AC2EB93} = {7DD3DDA0-0B73-4A7F-ACAF-15111AC2EB93}
-		{A0FA7FB5-BC2B-4E9F-9807-40BC26894AD5} = {A0FA7FB5-BC2B-4E9F-9807-40BC26894AD5}
-		{430061B8-8504-483F-A532-CEB69FF04128} = {430061B8-8504-483F-A532-CEB69FF04128}
-		{845E4FBF-A6C0-4870-9D1A-C832E262D956} = {845E4FBF-A6C0-4870-9D1A-C832E262D956}
-		{C18C6FE5-7408-4F3B-B562-7A563E01701E} = {C18C6FE5-7408-4F3B-B562-7A563E01701E}
-		{4B697BE9-1D48-4855-9070-C9C5C3BD341C} = {4B697BE9-1D48-4855-9070-C9C5C3BD341C}
-		{A5508FF0-93B9-4241-B666-07B05189C435} = {A5508FF0-93B9-4241-B666-07B05189C435}
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Debug|ARM = Debug|ARM
-		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
-		Release|Any CPU = Release|Any CPU
-		Release|ARM = Release|ARM
-		Release|x64 = Release|x64
-		Release|x86 = Release|x86
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{FDA62C35-4174-44B0-BEBE-61E80B2515BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FDA62C35-4174-44B0-BEBE-61E80B2515BA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FDA62C35-4174-44B0-BEBE-61E80B2515BA}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{FDA62C35-4174-44B0-BEBE-61E80B2515BA}.Debug|ARM.Build.0 = Debug|Any CPU
-		{FDA62C35-4174-44B0-BEBE-61E80B2515BA}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{FDA62C35-4174-44B0-BEBE-61E80B2515BA}.Debug|x64.Build.0 = Debug|Any CPU
-		{FDA62C35-4174-44B0-BEBE-61E80B2515BA}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{FDA62C35-4174-44B0-BEBE-61E80B2515BA}.Debug|x86.Build.0 = Debug|Any CPU
-		{FDA62C35-4174-44B0-BEBE-61E80B2515BA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FDA62C35-4174-44B0-BEBE-61E80B2515BA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FDA62C35-4174-44B0-BEBE-61E80B2515BA}.Release|ARM.ActiveCfg = Release|Any CPU
-		{FDA62C35-4174-44B0-BEBE-61E80B2515BA}.Release|ARM.Build.0 = Release|Any CPU
-		{FDA62C35-4174-44B0-BEBE-61E80B2515BA}.Release|x64.ActiveCfg = Release|Any CPU
-		{FDA62C35-4174-44B0-BEBE-61E80B2515BA}.Release|x64.Build.0 = Release|Any CPU
-		{FDA62C35-4174-44B0-BEBE-61E80B2515BA}.Release|x86.ActiveCfg = Release|Any CPU
-		{FDA62C35-4174-44B0-BEBE-61E80B2515BA}.Release|x86.Build.0 = Release|Any CPU
-		{430061B8-8504-483F-A532-CEB69FF04128}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{430061B8-8504-483F-A532-CEB69FF04128}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{430061B8-8504-483F-A532-CEB69FF04128}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{430061B8-8504-483F-A532-CEB69FF04128}.Debug|ARM.Build.0 = Debug|Any CPU
-		{430061B8-8504-483F-A532-CEB69FF04128}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{430061B8-8504-483F-A532-CEB69FF04128}.Debug|x64.Build.0 = Debug|Any CPU
-		{430061B8-8504-483F-A532-CEB69FF04128}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{430061B8-8504-483F-A532-CEB69FF04128}.Debug|x86.Build.0 = Debug|Any CPU
-		{430061B8-8504-483F-A532-CEB69FF04128}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{430061B8-8504-483F-A532-CEB69FF04128}.Release|Any CPU.Build.0 = Release|Any CPU
-		{430061B8-8504-483F-A532-CEB69FF04128}.Release|ARM.ActiveCfg = Release|Any CPU
-		{430061B8-8504-483F-A532-CEB69FF04128}.Release|ARM.Build.0 = Release|Any CPU
-		{430061B8-8504-483F-A532-CEB69FF04128}.Release|x64.ActiveCfg = Release|Any CPU
-		{430061B8-8504-483F-A532-CEB69FF04128}.Release|x64.Build.0 = Release|Any CPU
-		{430061B8-8504-483F-A532-CEB69FF04128}.Release|x86.ActiveCfg = Release|Any CPU
-		{430061B8-8504-483F-A532-CEB69FF04128}.Release|x86.Build.0 = Release|Any CPU
-		{A5508FF0-93B9-4241-B666-07B05189C435}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A5508FF0-93B9-4241-B666-07B05189C435}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A5508FF0-93B9-4241-B666-07B05189C435}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{A5508FF0-93B9-4241-B666-07B05189C435}.Debug|ARM.Build.0 = Debug|Any CPU
-		{A5508FF0-93B9-4241-B666-07B05189C435}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A5508FF0-93B9-4241-B666-07B05189C435}.Debug|x64.Build.0 = Debug|Any CPU
-		{A5508FF0-93B9-4241-B666-07B05189C435}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{A5508FF0-93B9-4241-B666-07B05189C435}.Debug|x86.Build.0 = Debug|Any CPU
-		{A5508FF0-93B9-4241-B666-07B05189C435}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A5508FF0-93B9-4241-B666-07B05189C435}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A5508FF0-93B9-4241-B666-07B05189C435}.Release|ARM.ActiveCfg = Release|Any CPU
-		{A5508FF0-93B9-4241-B666-07B05189C435}.Release|ARM.Build.0 = Release|Any CPU
-		{A5508FF0-93B9-4241-B666-07B05189C435}.Release|x64.ActiveCfg = Release|Any CPU
-		{A5508FF0-93B9-4241-B666-07B05189C435}.Release|x64.Build.0 = Release|Any CPU
-		{A5508FF0-93B9-4241-B666-07B05189C435}.Release|x86.ActiveCfg = Release|Any CPU
-		{A5508FF0-93B9-4241-B666-07B05189C435}.Release|x86.Build.0 = Release|Any CPU
-		{7DD3DDA0-0B73-4A7F-ACAF-15111AC2EB93}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7DD3DDA0-0B73-4A7F-ACAF-15111AC2EB93}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7DD3DDA0-0B73-4A7F-ACAF-15111AC2EB93}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{7DD3DDA0-0B73-4A7F-ACAF-15111AC2EB93}.Debug|ARM.Build.0 = Debug|Any CPU
-		{7DD3DDA0-0B73-4A7F-ACAF-15111AC2EB93}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{7DD3DDA0-0B73-4A7F-ACAF-15111AC2EB93}.Debug|x64.Build.0 = Debug|Any CPU
-		{7DD3DDA0-0B73-4A7F-ACAF-15111AC2EB93}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{7DD3DDA0-0B73-4A7F-ACAF-15111AC2EB93}.Debug|x86.Build.0 = Debug|Any CPU
-		{7DD3DDA0-0B73-4A7F-ACAF-15111AC2EB93}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7DD3DDA0-0B73-4A7F-ACAF-15111AC2EB93}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7DD3DDA0-0B73-4A7F-ACAF-15111AC2EB93}.Release|ARM.ActiveCfg = Release|Any CPU
-		{7DD3DDA0-0B73-4A7F-ACAF-15111AC2EB93}.Release|ARM.Build.0 = Release|Any CPU
-		{7DD3DDA0-0B73-4A7F-ACAF-15111AC2EB93}.Release|x64.ActiveCfg = Release|Any CPU
-		{7DD3DDA0-0B73-4A7F-ACAF-15111AC2EB93}.Release|x64.Build.0 = Release|Any CPU
-		{7DD3DDA0-0B73-4A7F-ACAF-15111AC2EB93}.Release|x86.ActiveCfg = Release|Any CPU
-		{7DD3DDA0-0B73-4A7F-ACAF-15111AC2EB93}.Release|x86.Build.0 = Release|Any CPU
-		{5965A929-C3E5-42AD-8328-3641F8967E72}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5965A929-C3E5-42AD-8328-3641F8967E72}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5965A929-C3E5-42AD-8328-3641F8967E72}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{5965A929-C3E5-42AD-8328-3641F8967E72}.Debug|ARM.Build.0 = Debug|Any CPU
-		{5965A929-C3E5-42AD-8328-3641F8967E72}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{5965A929-C3E5-42AD-8328-3641F8967E72}.Debug|x64.Build.0 = Debug|Any CPU
-		{5965A929-C3E5-42AD-8328-3641F8967E72}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{5965A929-C3E5-42AD-8328-3641F8967E72}.Debug|x86.Build.0 = Debug|Any CPU
-		{5965A929-C3E5-42AD-8328-3641F8967E72}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5965A929-C3E5-42AD-8328-3641F8967E72}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5965A929-C3E5-42AD-8328-3641F8967E72}.Release|ARM.ActiveCfg = Release|Any CPU
-		{5965A929-C3E5-42AD-8328-3641F8967E72}.Release|ARM.Build.0 = Release|Any CPU
-		{5965A929-C3E5-42AD-8328-3641F8967E72}.Release|x64.ActiveCfg = Release|Any CPU
-		{5965A929-C3E5-42AD-8328-3641F8967E72}.Release|x64.Build.0 = Release|Any CPU
-		{5965A929-C3E5-42AD-8328-3641F8967E72}.Release|x86.ActiveCfg = Release|Any CPU
-		{5965A929-C3E5-42AD-8328-3641F8967E72}.Release|x86.Build.0 = Release|Any CPU
-		{845E4FBF-A6C0-4870-9D1A-C832E262D956}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{845E4FBF-A6C0-4870-9D1A-C832E262D956}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{845E4FBF-A6C0-4870-9D1A-C832E262D956}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{845E4FBF-A6C0-4870-9D1A-C832E262D956}.Debug|ARM.Build.0 = Debug|Any CPU
-		{845E4FBF-A6C0-4870-9D1A-C832E262D956}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{845E4FBF-A6C0-4870-9D1A-C832E262D956}.Debug|x64.Build.0 = Debug|Any CPU
-		{845E4FBF-A6C0-4870-9D1A-C832E262D956}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{845E4FBF-A6C0-4870-9D1A-C832E262D956}.Debug|x86.Build.0 = Debug|Any CPU
-		{845E4FBF-A6C0-4870-9D1A-C832E262D956}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{845E4FBF-A6C0-4870-9D1A-C832E262D956}.Release|Any CPU.Build.0 = Release|Any CPU
-		{845E4FBF-A6C0-4870-9D1A-C832E262D956}.Release|ARM.ActiveCfg = Release|Any CPU
-		{845E4FBF-A6C0-4870-9D1A-C832E262D956}.Release|ARM.Build.0 = Release|Any CPU
-		{845E4FBF-A6C0-4870-9D1A-C832E262D956}.Release|x64.ActiveCfg = Release|Any CPU
-		{845E4FBF-A6C0-4870-9D1A-C832E262D956}.Release|x64.Build.0 = Release|Any CPU
-		{845E4FBF-A6C0-4870-9D1A-C832E262D956}.Release|x86.ActiveCfg = Release|Any CPU
-		{845E4FBF-A6C0-4870-9D1A-C832E262D956}.Release|x86.Build.0 = Release|Any CPU
-		{FB2DB31D-FCFA-45CE-A3A8-7B7C14ECD77A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FB2DB31D-FCFA-45CE-A3A8-7B7C14ECD77A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FB2DB31D-FCFA-45CE-A3A8-7B7C14ECD77A}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{FB2DB31D-FCFA-45CE-A3A8-7B7C14ECD77A}.Debug|ARM.Build.0 = Debug|Any CPU
-		{FB2DB31D-FCFA-45CE-A3A8-7B7C14ECD77A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{FB2DB31D-FCFA-45CE-A3A8-7B7C14ECD77A}.Debug|x64.Build.0 = Debug|Any CPU
-		{FB2DB31D-FCFA-45CE-A3A8-7B7C14ECD77A}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{FB2DB31D-FCFA-45CE-A3A8-7B7C14ECD77A}.Debug|x86.Build.0 = Debug|Any CPU
-		{FB2DB31D-FCFA-45CE-A3A8-7B7C14ECD77A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FB2DB31D-FCFA-45CE-A3A8-7B7C14ECD77A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FB2DB31D-FCFA-45CE-A3A8-7B7C14ECD77A}.Release|ARM.ActiveCfg = Release|Any CPU
-		{FB2DB31D-FCFA-45CE-A3A8-7B7C14ECD77A}.Release|ARM.Build.0 = Release|Any CPU
-		{FB2DB31D-FCFA-45CE-A3A8-7B7C14ECD77A}.Release|x64.ActiveCfg = Release|Any CPU
-		{FB2DB31D-FCFA-45CE-A3A8-7B7C14ECD77A}.Release|x64.Build.0 = Release|Any CPU
-		{FB2DB31D-FCFA-45CE-A3A8-7B7C14ECD77A}.Release|x86.ActiveCfg = Release|Any CPU
-		{FB2DB31D-FCFA-45CE-A3A8-7B7C14ECD77A}.Release|x86.Build.0 = Release|Any CPU
-		{C18C6FE5-7408-4F3B-B562-7A563E01701E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C18C6FE5-7408-4F3B-B562-7A563E01701E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C18C6FE5-7408-4F3B-B562-7A563E01701E}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{C18C6FE5-7408-4F3B-B562-7A563E01701E}.Debug|ARM.Build.0 = Debug|Any CPU
-		{C18C6FE5-7408-4F3B-B562-7A563E01701E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C18C6FE5-7408-4F3B-B562-7A563E01701E}.Debug|x64.Build.0 = Debug|Any CPU
-		{C18C6FE5-7408-4F3B-B562-7A563E01701E}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{C18C6FE5-7408-4F3B-B562-7A563E01701E}.Debug|x86.Build.0 = Debug|Any CPU
-		{C18C6FE5-7408-4F3B-B562-7A563E01701E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C18C6FE5-7408-4F3B-B562-7A563E01701E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C18C6FE5-7408-4F3B-B562-7A563E01701E}.Release|ARM.ActiveCfg = Release|Any CPU
-		{C18C6FE5-7408-4F3B-B562-7A563E01701E}.Release|ARM.Build.0 = Release|Any CPU
-		{C18C6FE5-7408-4F3B-B562-7A563E01701E}.Release|x64.ActiveCfg = Release|Any CPU
-		{C18C6FE5-7408-4F3B-B562-7A563E01701E}.Release|x64.Build.0 = Release|Any CPU
-		{C18C6FE5-7408-4F3B-B562-7A563E01701E}.Release|x86.ActiveCfg = Release|Any CPU
-		{C18C6FE5-7408-4F3B-B562-7A563E01701E}.Release|x86.Build.0 = Release|Any CPU
-		{A22F3131-6D20-4D67-9A9F-314FE3691EA1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A22F3131-6D20-4D67-9A9F-314FE3691EA1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A22F3131-6D20-4D67-9A9F-314FE3691EA1}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{A22F3131-6D20-4D67-9A9F-314FE3691EA1}.Debug|ARM.Build.0 = Debug|Any CPU
-		{A22F3131-6D20-4D67-9A9F-314FE3691EA1}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A22F3131-6D20-4D67-9A9F-314FE3691EA1}.Debug|x64.Build.0 = Debug|Any CPU
-		{A22F3131-6D20-4D67-9A9F-314FE3691EA1}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{A22F3131-6D20-4D67-9A9F-314FE3691EA1}.Debug|x86.Build.0 = Debug|Any CPU
-		{A22F3131-6D20-4D67-9A9F-314FE3691EA1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A22F3131-6D20-4D67-9A9F-314FE3691EA1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A22F3131-6D20-4D67-9A9F-314FE3691EA1}.Release|ARM.ActiveCfg = Release|Any CPU
-		{A22F3131-6D20-4D67-9A9F-314FE3691EA1}.Release|ARM.Build.0 = Release|Any CPU
-		{A22F3131-6D20-4D67-9A9F-314FE3691EA1}.Release|x64.ActiveCfg = Release|Any CPU
-		{A22F3131-6D20-4D67-9A9F-314FE3691EA1}.Release|x64.Build.0 = Release|Any CPU
-		{A22F3131-6D20-4D67-9A9F-314FE3691EA1}.Release|x86.ActiveCfg = Release|Any CPU
-		{A22F3131-6D20-4D67-9A9F-314FE3691EA1}.Release|x86.Build.0 = Release|Any CPU
-		{C17D3BD1-222F-4DCC-BBF8-44A04399701B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C17D3BD1-222F-4DCC-BBF8-44A04399701B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C17D3BD1-222F-4DCC-BBF8-44A04399701B}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{C17D3BD1-222F-4DCC-BBF8-44A04399701B}.Debug|ARM.Build.0 = Debug|Any CPU
-		{C17D3BD1-222F-4DCC-BBF8-44A04399701B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C17D3BD1-222F-4DCC-BBF8-44A04399701B}.Debug|x64.Build.0 = Debug|Any CPU
-		{C17D3BD1-222F-4DCC-BBF8-44A04399701B}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{C17D3BD1-222F-4DCC-BBF8-44A04399701B}.Debug|x86.Build.0 = Debug|Any CPU
-		{C17D3BD1-222F-4DCC-BBF8-44A04399701B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C17D3BD1-222F-4DCC-BBF8-44A04399701B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C17D3BD1-222F-4DCC-BBF8-44A04399701B}.Release|ARM.ActiveCfg = Release|Any CPU
-		{C17D3BD1-222F-4DCC-BBF8-44A04399701B}.Release|ARM.Build.0 = Release|Any CPU
-		{C17D3BD1-222F-4DCC-BBF8-44A04399701B}.Release|x64.ActiveCfg = Release|Any CPU
-		{C17D3BD1-222F-4DCC-BBF8-44A04399701B}.Release|x64.Build.0 = Release|Any CPU
-		{C17D3BD1-222F-4DCC-BBF8-44A04399701B}.Release|x86.ActiveCfg = Release|Any CPU
-		{C17D3BD1-222F-4DCC-BBF8-44A04399701B}.Release|x86.Build.0 = Release|Any CPU
-		{4B697BE9-1D48-4855-9070-C9C5C3BD341C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4B697BE9-1D48-4855-9070-C9C5C3BD341C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4B697BE9-1D48-4855-9070-C9C5C3BD341C}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{4B697BE9-1D48-4855-9070-C9C5C3BD341C}.Debug|ARM.Build.0 = Debug|Any CPU
-		{4B697BE9-1D48-4855-9070-C9C5C3BD341C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{4B697BE9-1D48-4855-9070-C9C5C3BD341C}.Debug|x64.Build.0 = Debug|Any CPU
-		{4B697BE9-1D48-4855-9070-C9C5C3BD341C}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{4B697BE9-1D48-4855-9070-C9C5C3BD341C}.Debug|x86.Build.0 = Debug|Any CPU
-		{4B697BE9-1D48-4855-9070-C9C5C3BD341C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4B697BE9-1D48-4855-9070-C9C5C3BD341C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4B697BE9-1D48-4855-9070-C9C5C3BD341C}.Release|ARM.ActiveCfg = Release|Any CPU
-		{4B697BE9-1D48-4855-9070-C9C5C3BD341C}.Release|ARM.Build.0 = Release|Any CPU
-		{4B697BE9-1D48-4855-9070-C9C5C3BD341C}.Release|x64.ActiveCfg = Release|Any CPU
-		{4B697BE9-1D48-4855-9070-C9C5C3BD341C}.Release|x64.Build.0 = Release|Any CPU
-		{4B697BE9-1D48-4855-9070-C9C5C3BD341C}.Release|x86.ActiveCfg = Release|Any CPU
-		{4B697BE9-1D48-4855-9070-C9C5C3BD341C}.Release|x86.Build.0 = Release|Any CPU
-		{A0FA7FB5-BC2B-4E9F-9807-40BC26894AD5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A0FA7FB5-BC2B-4E9F-9807-40BC26894AD5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A0FA7FB5-BC2B-4E9F-9807-40BC26894AD5}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{A0FA7FB5-BC2B-4E9F-9807-40BC26894AD5}.Debug|ARM.Build.0 = Debug|Any CPU
-		{A0FA7FB5-BC2B-4E9F-9807-40BC26894AD5}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A0FA7FB5-BC2B-4E9F-9807-40BC26894AD5}.Debug|x64.Build.0 = Debug|Any CPU
-		{A0FA7FB5-BC2B-4E9F-9807-40BC26894AD5}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{A0FA7FB5-BC2B-4E9F-9807-40BC26894AD5}.Debug|x86.Build.0 = Debug|Any CPU
-		{A0FA7FB5-BC2B-4E9F-9807-40BC26894AD5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A0FA7FB5-BC2B-4E9F-9807-40BC26894AD5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A0FA7FB5-BC2B-4E9F-9807-40BC26894AD5}.Release|ARM.ActiveCfg = Release|Any CPU
-		{A0FA7FB5-BC2B-4E9F-9807-40BC26894AD5}.Release|ARM.Build.0 = Release|Any CPU
-		{A0FA7FB5-BC2B-4E9F-9807-40BC26894AD5}.Release|x64.ActiveCfg = Release|Any CPU
-		{A0FA7FB5-BC2B-4E9F-9807-40BC26894AD5}.Release|x64.Build.0 = Release|Any CPU
-		{A0FA7FB5-BC2B-4E9F-9807-40BC26894AD5}.Release|x86.ActiveCfg = Release|Any CPU
-		{A0FA7FB5-BC2B-4E9F-9807-40BC26894AD5}.Release|x86.Build.0 = Release|Any CPU
-		{78C7DAD3-D706-4D0A-A4F9-5C7EA1CB9D6D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{78C7DAD3-D706-4D0A-A4F9-5C7EA1CB9D6D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{78C7DAD3-D706-4D0A-A4F9-5C7EA1CB9D6D}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{78C7DAD3-D706-4D0A-A4F9-5C7EA1CB9D6D}.Debug|ARM.Build.0 = Debug|Any CPU
-		{78C7DAD3-D706-4D0A-A4F9-5C7EA1CB9D6D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{78C7DAD3-D706-4D0A-A4F9-5C7EA1CB9D6D}.Debug|x64.Build.0 = Debug|Any CPU
-		{78C7DAD3-D706-4D0A-A4F9-5C7EA1CB9D6D}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{78C7DAD3-D706-4D0A-A4F9-5C7EA1CB9D6D}.Debug|x86.Build.0 = Debug|Any CPU
-		{78C7DAD3-D706-4D0A-A4F9-5C7EA1CB9D6D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{78C7DAD3-D706-4D0A-A4F9-5C7EA1CB9D6D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{78C7DAD3-D706-4D0A-A4F9-5C7EA1CB9D6D}.Release|ARM.ActiveCfg = Release|Any CPU
-		{78C7DAD3-D706-4D0A-A4F9-5C7EA1CB9D6D}.Release|ARM.Build.0 = Release|Any CPU
-		{78C7DAD3-D706-4D0A-A4F9-5C7EA1CB9D6D}.Release|x64.ActiveCfg = Release|Any CPU
-		{78C7DAD3-D706-4D0A-A4F9-5C7EA1CB9D6D}.Release|x64.Build.0 = Release|Any CPU
-		{78C7DAD3-D706-4D0A-A4F9-5C7EA1CB9D6D}.Release|x86.ActiveCfg = Release|Any CPU
-		{78C7DAD3-D706-4D0A-A4F9-5C7EA1CB9D6D}.Release|x86.Build.0 = Release|Any CPU
-		{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|ARM.ActiveCfg = Debug|ARM
-		{10CC7191-D936-46CA-BA87-0646733571EA}.Debug|ARM.Build.0 = Debug|ARM
-		{10CC7191-D936-46CA-BA87-0646733571EA}.Debug|ARM.Deploy.0 = Debug|ARM
-		{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|ARM.ActiveCfg = Release|ARM
-		{10CC7191-D936-46CA-BA87-0646733571EA}.Release|ARM.Build.0 = Release|ARM
-		{10CC7191-D936-46CA-BA87-0646733571EA}.Release|ARM.Deploy.0 = Release|ARM
-		{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
-	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{FDA62C35-4174-44B0-BEBE-61E80B2515BA} = {0410EFCB-757C-46BA-99AA-A82A06A79F64}
-		{430061B8-8504-483F-A532-CEB69FF04128} = {0410EFCB-757C-46BA-99AA-A82A06A79F64}
-		{A5508FF0-93B9-4241-B666-07B05189C435} = {0410EFCB-757C-46BA-99AA-A82A06A79F64}
-		{7DD3DDA0-0B73-4A7F-ACAF-15111AC2EB93} = {0410EFCB-757C-46BA-99AA-A82A06A79F64}
-		{5965A929-C3E5-42AD-8328-3641F8967E72} = {16A2D2FA-6D59-498E-8160-66518531792E}
-		{845E4FBF-A6C0-4870-9D1A-C832E262D956} = {16A2D2FA-6D59-498E-8160-66518531792E}
-		{FB2DB31D-FCFA-45CE-A3A8-7B7C14ECD77A} = {16A2D2FA-6D59-498E-8160-66518531792E}
-		{C18C6FE5-7408-4F3B-B562-7A563E01701E} = {0410EFCB-757C-46BA-99AA-A82A06A79F64}
-		{A22F3131-6D20-4D67-9A9F-314FE3691EA1} = {16A2D2FA-6D59-498E-8160-66518531792E}
-		{C17D3BD1-222F-4DCC-BBF8-44A04399701B} = {0410EFCB-757C-46BA-99AA-A82A06A79F64}
-		{4B697BE9-1D48-4855-9070-C9C5C3BD341C} = {0410EFCB-757C-46BA-99AA-A82A06A79F64}
-		{A0FA7FB5-BC2B-4E9F-9807-40BC26894AD5} = {0410EFCB-757C-46BA-99AA-A82A06A79F64}
-		{78C7DAD3-D706-4D0A-A4F9-5C7EA1CB9D6D} = {8DB69669-2C09-404B-B29A-79641919078B}
-		{10CC7191-D936-46CA-BA87-0646733571EA} = {8DB69669-2C09-404B-B29A-79641919078B}
-	EndGlobalSection
-EndGlobal

Rx.NET/Source/System.Reactive.sln

@@ -3,15 +3,15 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.26228.4
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reactive", "System.Reactive\System.Reactive.csproj", "{01706A0F-8A63-4FD6-AF45-0BC0BED3C0D9}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reactive", "src\System.Reactive\System.Reactive.csproj", "{01706A0F-8A63-4FD6-AF45-0BC0BED3C0D9}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Reactive.Testing", "Microsoft.Reactive.Testing\Microsoft.Reactive.Testing.csproj", "{73078FB5-6038-4674-B4C4-32FD81B88055}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Reactive.Testing", "src\Microsoft.Reactive.Testing\Microsoft.Reactive.Testing.csproj", "{73078FB5-6038-4674-B4C4-32FD81B88055}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tests.System.Reactive", "Tests.System.Reactive\Tests.System.Reactive.csproj", "{E072D663-A241-4FEC-B888-45640F69D9CE}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tests.System.Reactive", "tests\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}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reactive.Observable.Aliases", "src\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}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests.System.Reactive.Uwp.DeviceRunner", "tests\Tests.System.Reactive.Uwp.DeviceRunner\Tests.System.Reactive.Uwp.DeviceRunner.csproj", "{10CC7191-D936-46CA-BA87-0646733571EA}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{870348D0-C0A0-4352-8A02-E00AB0CCB919}"
 	ProjectSection(SolutionItems) = preProject

Rx.NET/Source/build-new.ps1

@@ -41,9 +41,9 @@ Write-Host "Building $scriptPath\System.Reactive.sln" -Foreground Green
 msbuild "$scriptPath\System.Reactive.sln" /t:build /p:Configuration=$configuration 
 
 Write-Host "Building Packages" -Foreground Green
-msbuild "$scriptPath\System.Reactive\System.Reactive.csproj" /t:pack /p:Configuration=$configuration /p:PackageOutputPath=$artifacts /p:NoPackageAnalysis=true
-msbuild "$scriptPath\Microsoft.Reactive.Testing\Microsoft.Reactive.Testing.csproj" /t:pack /p:Configuration=$configuration /p:PackageOutputPath=$artifacts /p:NoPackageAnalysis=true
-msbuild "$scriptPath\System.Reactive.Observable.Aliases\System.Reactive.Observable.Aliases.csproj" /t:pack /p:Configuration=$configuration /p:PackageOutputPath=$artifacts /p:NoPackageAnalysis=true
+msbuild "$scriptPath\src\System.Reactive\System.Reactive.csproj" /t:pack /p:Configuration=$configuration /p:PackageOutputPath=$artifacts /p:NoPackageAnalysis=true /p:NuGetBuildTasksPackTargets="workaround"
+msbuild "$scriptPath\src\Microsoft.Reactive.Testing\Microsoft.Reactive.Testing.csproj" /t:pack /p:Configuration=$configuration /p:PackageOutputPath=$artifacts /p:NoPackageAnalysis=true
+msbuild "$scriptPath\src\System.Reactive.Observable.Aliases\System.Reactive.Observable.Aliases.csproj" /t:pack /p:Configuration=$configuration /p:PackageOutputPath=$artifacts /p:NoPackageAnalysis=true
 
 
 if($hasSignClientSecret) {
@@ -70,7 +70,7 @@ if($hasSignClientSecret) {
 
 
 Write-Host "Running tests" -Foreground Green
-$testDirectory = Join-Path $scriptPath "Tests.System.Reactive"
+$testDirectory = Join-Path $scriptPath "tests\Tests.System.Reactive"
 
 # OpenCover and Coveralls isn't working currently. So run tests on CI and coverage with JetBrains locally
 

Rx.NET/Source/global.json

@@ -1,6 +0,0 @@
-{
-  "projects": [ ".", "Tests.System.Reactive" ],
-  "sdk": {
-      "version": "1.0.0-preview4-004233"
-  }
-}

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

@@ -12,7 +12,7 @@
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <GenerateDocumentationFile Condition=" '$(Configuration)' == 'Release' ">true</GenerateDocumentationFile>
     <Product>Microsoft.Reactive.Testing ($(TargetFramework))</Product>
-    <AssemblyOriginatorKeyFile>../ReactiveX.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>../../ReactiveX.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>
     <PackageTags>Rx;Reactive;Extensions;Observable;LINQ;Events</PackageTags>
     <PackageIconUrl>http://go.microsoft.com/fwlink/?LinkId=261274</PackageIconUrl>

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

@@ -9,7 +9,7 @@
     <MinClientVersion>2.12</MinClientVersion>
     <GenerateDocumentationFile Condition=" '$(Configuration)' == 'Release' ">true</GenerateDocumentationFile>
     <Authors>.NET Foundation and Contributors</Authors>
-    <AssemblyOriginatorKeyFile>../ReactiveX.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>../../ReactiveX.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <UseFullSemVerForNuGet>true</UseFullSemVerForNuGet>