update to rtw

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

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFrameworks>net45;netstandard1.3</TargetFrameworks>
     <CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
@@ -14,15 +14,14 @@
     <Product>Microsoft.Reactive.Testing ($(TargetFramework))</Product>
     <AssemblyOriginatorKeyFile>../ReactiveX.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>
-    <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>
-    <IncludeSymbols>true</IncludeSymbols>
     <UseFullSemVerForNuGet>true</UseFullSemVerForNuGet>
     <Description>Reactive Extensions (Rx) for .NET - Testing Library</Description>
+    <DebugType>embedded</DebugType>
   </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>
@@ -31,15 +30,9 @@
     <DefineConstants>$(DefineConstants);NO_EVENTARGS_CONSTRAINT;HAS_WINRT;PREFER_ASYNC;USE_TIMER_SELF_ROOT</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="**\*.cs" />
-    <EmbeddedResource Include="**\*.resx" />
     <EmbeddedResource Include="Properties\*.xml" />
-    <PackageReference Include="GitVersionTask" Version="4.0.0-pullrequest1119-1208">
-      <PrivateAssets>All</PrivateAssets>
-    </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-build3466" />
+    <PackageReference Include="GitVersionTask" Version="4.0.0-beta0011" PrivateAssets="all" />
+    <PackageReference Include="xunit.assert.source" Version="2.2.0" /> 
     <ProjectReference Include="..\System.Reactive\System.Reactive.csproj" />
   </ItemGroup>
 </Project>

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

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFrameworks>netstandard1.3;net45</TargetFrameworks>
     <Product>System.Reactive.Observable.Aliases ($(TargetFramework))</Product>
@@ -12,15 +12,14 @@
     <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>
+    <DebugType>embedded</DebugType>
   </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>
@@ -29,11 +28,7 @@
     <DefineConstants>$(DefineConstants);NO_EVENTARGS_CONSTRAINT;HAS_WINRT;PREFER_ASYNC;USE_TIMER_SELF_ROOT</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="**\*.cs" />
-    <EmbeddedResource Include="**\*.resx" />
-    <PackageReference Include="GitVersionTask" Version="4.0.0-pullrequest1119-1208">
-      <PrivateAssets>All</PrivateAssets>
-    </PackageReference>
+    <PackageReference Include="GitVersionTask" Version="4.0.0-beta0011" PrivateAssets="all" />
     <ProjectReference Include="..\System.Reactive\System.Reactive.csproj" />
   </ItemGroup>
 </Project>

Rx.NET/Source/System.Reactive.sln

@@ -1,13 +1,13 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.26014.0
+VisualStudioVersion = 15.0.26228.4
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Reactive", "System.Reactive\System.Reactive.csproj", "{01706A0F-8A63-4FD6-AF45-0BC0BED3C0D9}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Reactive", "System.Reactive\System.Reactive.csproj", "{01706A0F-8A63-4FD6-AF45-0BC0BED3C0D9}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Reactive.Testing", "Microsoft.Reactive.Testing\Microsoft.Reactive.Testing.csproj", "{73078FB5-6038-4674-B4C4-32FD81B88055}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "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}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "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
@@ -30,52 +30,52 @@ Global
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{01706A0F-8A63-4FD6-AF45-0BC0BED3C0D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{01706A0F-8A63-4FD6-AF45-0BC0BED3C0D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{01706A0F-8A63-4FD6-AF45-0BC0BED3C0D9}.Debug|x64.ActiveCfg = Debug|x64
-		{01706A0F-8A63-4FD6-AF45-0BC0BED3C0D9}.Debug|x64.Build.0 = Debug|x64
-		{01706A0F-8A63-4FD6-AF45-0BC0BED3C0D9}.Debug|x86.ActiveCfg = Debug|x86
-		{01706A0F-8A63-4FD6-AF45-0BC0BED3C0D9}.Debug|x86.Build.0 = Debug|x86
+		{01706A0F-8A63-4FD6-AF45-0BC0BED3C0D9}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{01706A0F-8A63-4FD6-AF45-0BC0BED3C0D9}.Debug|x64.Build.0 = Debug|Any CPU
+		{01706A0F-8A63-4FD6-AF45-0BC0BED3C0D9}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{01706A0F-8A63-4FD6-AF45-0BC0BED3C0D9}.Debug|x86.Build.0 = Debug|Any CPU
 		{01706A0F-8A63-4FD6-AF45-0BC0BED3C0D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{01706A0F-8A63-4FD6-AF45-0BC0BED3C0D9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{01706A0F-8A63-4FD6-AF45-0BC0BED3C0D9}.Release|x64.ActiveCfg = Release|x64
-		{01706A0F-8A63-4FD6-AF45-0BC0BED3C0D9}.Release|x64.Build.0 = Release|x64
-		{01706A0F-8A63-4FD6-AF45-0BC0BED3C0D9}.Release|x86.ActiveCfg = Release|x86
-		{01706A0F-8A63-4FD6-AF45-0BC0BED3C0D9}.Release|x86.Build.0 = Release|x86
+		{01706A0F-8A63-4FD6-AF45-0BC0BED3C0D9}.Release|x64.ActiveCfg = Release|Any CPU
+		{01706A0F-8A63-4FD6-AF45-0BC0BED3C0D9}.Release|x64.Build.0 = Release|Any CPU
+		{01706A0F-8A63-4FD6-AF45-0BC0BED3C0D9}.Release|x86.ActiveCfg = Release|Any CPU
+		{01706A0F-8A63-4FD6-AF45-0BC0BED3C0D9}.Release|x86.Build.0 = Release|Any CPU
 		{73078FB5-6038-4674-B4C4-32FD81B88055}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{73078FB5-6038-4674-B4C4-32FD81B88055}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{73078FB5-6038-4674-B4C4-32FD81B88055}.Debug|x64.ActiveCfg = Debug|x64
-		{73078FB5-6038-4674-B4C4-32FD81B88055}.Debug|x64.Build.0 = Debug|x64
-		{73078FB5-6038-4674-B4C4-32FD81B88055}.Debug|x86.ActiveCfg = Debug|x86
-		{73078FB5-6038-4674-B4C4-32FD81B88055}.Debug|x86.Build.0 = Debug|x86
+		{73078FB5-6038-4674-B4C4-32FD81B88055}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{73078FB5-6038-4674-B4C4-32FD81B88055}.Debug|x64.Build.0 = Debug|Any CPU
+		{73078FB5-6038-4674-B4C4-32FD81B88055}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{73078FB5-6038-4674-B4C4-32FD81B88055}.Debug|x86.Build.0 = Debug|Any CPU
 		{73078FB5-6038-4674-B4C4-32FD81B88055}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{73078FB5-6038-4674-B4C4-32FD81B88055}.Release|Any CPU.Build.0 = Release|Any CPU
-		{73078FB5-6038-4674-B4C4-32FD81B88055}.Release|x64.ActiveCfg = Release|x64
-		{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
+		{73078FB5-6038-4674-B4C4-32FD81B88055}.Release|x64.ActiveCfg = Release|Any CPU
+		{73078FB5-6038-4674-B4C4-32FD81B88055}.Release|x64.Build.0 = Release|Any CPU
+		{73078FB5-6038-4674-B4C4-32FD81B88055}.Release|x86.ActiveCfg = Release|Any CPU
+		{73078FB5-6038-4674-B4C4-32FD81B88055}.Release|x86.Build.0 = Release|Any CPU
 		{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}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E072D663-A241-4FEC-B888-45640F69D9CE}.Debug|x64.Build.0 = Debug|Any CPU
+		{E072D663-A241-4FEC-B888-45640F69D9CE}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E072D663-A241-4FEC-B888-45640F69D9CE}.Debug|x86.Build.0 = Debug|Any CPU
 		{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
+		{E072D663-A241-4FEC-B888-45640F69D9CE}.Release|x64.ActiveCfg = Release|Any CPU
+		{E072D663-A241-4FEC-B888-45640F69D9CE}.Release|x64.Build.0 = Release|Any CPU
+		{E072D663-A241-4FEC-B888-45640F69D9CE}.Release|x86.ActiveCfg = Release|Any CPU
+		{E072D663-A241-4FEC-B888-45640F69D9CE}.Release|x86.Build.0 = Release|Any CPU
 		{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}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CB5E4FFA-F510-43F1-B378-B3D7BA7C8396}.Debug|x64.Build.0 = Debug|Any CPU
+		{CB5E4FFA-F510-43F1-B378-B3D7BA7C8396}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{CB5E4FFA-F510-43F1-B378-B3D7BA7C8396}.Debug|x86.Build.0 = Debug|Any CPU
 		{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
+		{CB5E4FFA-F510-43F1-B378-B3D7BA7C8396}.Release|x64.ActiveCfg = Release|Any CPU
+		{CB5E4FFA-F510-43F1-B378-B3D7BA7C8396}.Release|x64.Build.0 = Release|Any CPU
+		{CB5E4FFA-F510-43F1-B378-B3D7BA7C8396}.Release|x86.ActiveCfg = Release|Any CPU
+		{CB5E4FFA-F510-43F1-B378-B3D7BA7C8396}.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

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

@@ -1,25 +1,23 @@
-<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFrameworks>netstandard1.3;net45;net46;uap10.0</TargetFrameworks>
     <Product>System.Reactive ($(TargetFramework))</Product>
     <Copyright>Copyright (c) .NET Foundation and Contributors.</Copyright>
-    <CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
-    <DefaultLanguage>en-US</DefaultLanguage>
+    <CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>    
     <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) for .NET</Description>
+    <DebugType>embedded</DebugType>
   </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>
@@ -31,23 +29,14 @@
     <DefineConstants>$(DefineConstants);NO_EVENTARGS_CONSTRAINT;HAS_WINRT;PREFER_ASYNC;USE_TIMER_SELF_ROOT;HAS_TPL46</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition="'$(TargetFramework)' == 'uap10.0'">
-    <NugetTargetMoniker>UAP,Version=v10.0</NugetTargetMoniker>
-    <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion>10.0.14393.0</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.10240.0</TargetPlatformMinVersion>
-    <TargetFrameworkIdentifier>.NETCore</TargetFrameworkIdentifier>
-    <TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
-    <LanguageTargets>$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets</LanguageTargets>
     <DefineConstants>$(DefineConstants);NO_EVENTARGS_CONSTRAINT;HAS_WINRT;PREFER_ASYNC;USE_TIMER_SELF_ROOT;HAS_TPL46;NO_REMOTING;NO_SERIALIZABLE;CRIPPLED_REFLECTION;NO_THREAD;WINDOWS</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="**\*.cs" />
-    <EmbeddedResource Include="**\*.resx" />
-    <PackageReference Include="GitVersionTask" Version="4.0.0-pullrequest1119-1208">
-      <PrivateAssets>All</PrivateAssets>
-    </PackageReference>
+    <PackageReference Include="GitVersionTask" Version="4.0.0-beta0011" PrivateAssets="all" />
+    <PackageReference Include="MSBuild.Sdk.Extras" Version="1.0.0" PrivateAssets="All" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectCapability Include="ShowFilesOutsideOfProject" />
     <Compile Include="..\System.Reactive.Interfaces\Reactive\**\*.cs" />
     <Compile Include="..\System.Reactive.Core\Reactive\**\*.cs" />
     <Compile Include="..\System.Reactive.Core\Strings_Core.Generated.cs" />
@@ -75,8 +64,7 @@
     <None Include="..\System.Reactive.Windows.Threading\**\*.resx" />
     <None Include="..\System.Reactive.WindowsRuntime\*.cs;..\System.Reactive.WindowsRuntime\Foundation\**\*.cs;..\System.Reactive.WindowsRuntime\Linq\**\*.cs" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' or '$(TargetFramework)' == 'uap10.0' ">
-    <PackageReference Include="NETStandard.Library" Version="1.6.1" />
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' or '$(TargetFramework)' == 'uap10.0' ">    
     <PackageReference Include="System.ComponentModel" Version="4.3.0" />
     <PackageReference Include="System.Dynamic.Runtime" Version="4.3.0" />
     <PackageReference Include="System.Linq.Queryable" Version="4.3.0" />
@@ -95,8 +83,6 @@
     <Compile Include="..\System.Reactive.WindowsRuntime\*.cs;..\System.Reactive.WindowsRuntime\Foundation\**\*.cs;..\System.Reactive.WindowsRuntime\Linq\**\*.cs" />
   </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" />
@@ -106,10 +92,5 @@
     <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>
+  <Import Project="$(MSBuildSDKExtrasTargets)" Condition="Exists('$(MSBuildSDKExtrasTargets)')" />
 </Project>

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

@@ -1,7 +1,7 @@
 {
   "dependencies": {
-    "Microsoft.NETCore.UniversalWindowsPlatform": "5.2.2",
-    "xunit": "2.2.0-beta4-build3465",
+    "Microsoft.NETCore.UniversalWindowsPlatform": "5.3.0",
+    "xunit": "2.2.0",
     "xunit.runner.devices": "2.1.0"
   },
   "frameworks": {

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

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFrameworks>netcoreapp1.0;net46</TargetFrameworks>
     <AssemblyOriginatorKeyFile>../ReactiveX.snk</AssemblyOriginatorKeyFile>
@@ -16,28 +16,24 @@
     <DefineConstants>$(DefineConstants);NO_EVENTARGS_CONSTRAINT;HAS_WINRT;PREFER_ASYNC;USE_TIMER_SELF_ROOT;HAS_TPL46;DESKTOPCLR;HAS_WINFORMS;HAS_DISPATCHER</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="**\*.cs" />
     <Content Include="xunit.runner.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <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-20161216-01" />
-    <PackageReference Include="xunit" Version="2.2.0-beta4-build3466" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0-beta4-build1209" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
+    <PackageReference Include="xunit" Version="2.2.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
     <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>
+  <ItemGroup>
+    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
+  </ItemGroup>
 </Project>

Rx.NET/Source/build-new.ps1

@@ -26,7 +26,7 @@ if (!(Test-Path .\nuget.exe)) {
 
 # get tools
 .\nuget.exe install -excludeversion SignClient -Version 0.5.0-beta4 -pre -outputdirectory packages
-.\nuget.exe install -excludeversion OpenCover -Version 4.6.589 -outputdirectory packages
+#.\nuget.exe install -excludeversion OpenCover -Version 4.6.519 -outputdirectory packages
 .\nuget.exe install -excludeversion ReportGenerator -outputdirectory packages
 .\nuget.exe install -excludeversion coveralls.io -outputdirectory packages
 .\nuget.exe install -excludeversion xunit.runner.console -pre -outputdirectory packages
@@ -34,19 +34,19 @@ if (!(Test-Path .\nuget.exe)) {
 New-Item -ItemType Directory -Force -Path $artifacts
 
 Write-Host "Restoring packages for $scriptPath\System.Reactive.sln" -Foreground Green
-# msbuild "$scriptPath\System.Reactive.sln" /t:restore /p:Configuration=$configuration 
-msbuild "$scriptPath\System.Reactive\System.Reactive.csproj" /t:restore /p:Configuration=$configuration 
-msbuild "$scriptPath\Microsoft.Reactive.Testing\Microsoft.Reactive.Testing.csproj" /t:restore /p:Configuration=$configuration 
-msbuild "$scriptPath\System.Reactive.Observable.Aliases\System.Reactive.Observable.Aliases.csproj" /t:restore /p:Configuration=$configuration 
-msbuild "$scriptPath\Tests.System.Reactive\Tests.System.Reactive.csproj" /t:restore /p:Configuration=$configuration 
+msbuild "$scriptPath\System.Reactive.sln" /t:restore /p:Configuration=$configuration 
+# msbuild "$scriptPath\System.Reactive\System.Reactive.csproj" /t:restore /p:Configuration=$configuration 
+# msbuild "$scriptPath\Microsoft.Reactive.Testing\Microsoft.Reactive.Testing.csproj" /t:restore /p:Configuration=$configuration 
+# msbuild "$scriptPath\System.Reactive.Observable.Aliases\System.Reactive.Observable.Aliases.csproj" /t:restore /p:Configuration=$configuration 
+# msbuild "$scriptPath\Tests.System.Reactive\Tests.System.Reactive.csproj" /t:restore /p:Configuration=$configuration 
 
 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
-msbuild "$scriptPath\Microsoft.Reactive.Testing\Microsoft.Reactive.Testing.csproj" /t:pack /p:Configuration=$configuration /p:PackageOutputPath=$artifacts
-msbuild "$scriptPath\System.Reactive.Observable.Aliases\System.Reactive.Observable.Aliases.csproj" /t:pack /p:Configuration=$configuration /p:PackageOutputPath=$artifacts
+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
 
 
 if($hasSignClientSecret) {
@@ -79,12 +79,12 @@ Write-Host "Running .NET Core App 1.0 Tests" -Foreground Green
 dotnet vstest "$testDirectory\bin\$configuration\netcoreapp1.0\Tests.System.Reactive.dll" 
 
 Write-Host "Running .NET 4.6 Tests" -Foreground Green
-#.\packages\xunit.runner.console\tools\xunit.console.exe "$testDirectory\bin\$configuration\net46\Tests.System.Reactive.dll" 
+.\packages\xunit.runner.console\tools\xunit.console.exe "$testDirectory\bin\$configuration\net46\Tests.System.Reactive.dll" 
 
 exit
 
 # Execute OpenCover with a target of "dotnet test"
-#& $openCoverPath -register:user -oldStyle -mergeoutput -target:dotnet.exe -targetdir:"$testDirectory" -targetargs:"vstest $testDirectory\bin\$configuration\netcoreapp1.0\Tests.System.Reactive.dll --TestCaseFilter:SkipCI!=true" -output:"$outputFile" -skipautoprops -returntargetcode -excludebyattribute:"System.Diagnostics.DebuggerNonUserCodeAttribute;System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverageAttribute" -nodefaultfilters  -hideskipped:All -filter:"+[*]* -[*.Tests]* -[Tests.*]* -[xunit.*]* -[*]Xunit.*" 
+& $openCoverPath -register:user -oldStyle -mergeoutput -target:dotnet.exe -targetdir:"$testDirectory" -targetargs:"vstest $testDirectory\bin\$configuration\netcoreapp1.0\Tests.System.Reactive.dll --TestCaseFilter:SkipCI!=true" -output:"$outputFile" -skipautoprops -returntargetcode -excludebyattribute:"System.Diagnostics.DebuggerNonUserCodeAttribute;System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverageAttribute" -nodefaultfilters  -hideskipped:All -filter:"+[*]* -[*.Tests]* -[Tests.*]* -[xunit.*]* -[*]Xunit.*" 
 & $openCoverPath -register:user -oldStyle -mergeoutput -target:$xUnitConsolePath -targetdir:"$testDirectory" -targetargs:"$testDirectory\bin\$configuration\net46\Tests.System.Reactive.dll -notrait SkipCI=true" -output:"$outputFile" -skipautoprops -returntargetcode -excludebyattribute:"System.Diagnostics.DebuggerNonUserCodeAttribute;System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverageAttribute" -nodefaultfilters  -hideskipped:All -filter:"+[*]* -[*.Tests]* -[Tests.*]* -[xunit.*]* -[*]Xunit.*" 
 
 if ($LastExitCode -ne 0) {