Migrate to VS 2017

Ix.NET/Source/Directory.build.props

@@ -0,0 +1,33 @@
+<Project>  
+  
+  <PropertyGroup>
+    <Product>$(AssemblyName) ($(TargetFramework))</Product>
+    <Copyright>Copyright (c) .NET Foundation and Contributors.</Copyright>
+    <MinClientVersion>2.12</MinClientVersion>
+    <GenerateDocumentationFile Condition=" '$(Configuration)' == 'Release' ">true</GenerateDocumentationFile>
+    <Authors>.NET Foundation and Contributors</Authors>
+    <UseFullSemVerForNuGet>true</UseFullSemVerForNuGet>
+    <PackageIconUrl>http://go.microsoft.com/fwlink/?LinkId=261274</PackageIconUrl>
+    <PackageProjectUrl>http://go.microsoft.com/fwlink/?LinkId=261273</PackageProjectUrl>
+    <PackageLicenseUrl>https://raw.githubusercontent.com/Reactive-Extensions/Rx.NET/master/Ix.NET/Source/license.txt</PackageLicenseUrl>
+    <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>    
+    <DebugType>embedded</DebugType>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)ReactiveX.snk</AssemblyOriginatorKeyFile>
+    <NoWarn>$(NoWarn);CS1591</NoWarn>
+    <DefaultLanguage>en-US</DefaultLanguage>
+    <WriteVersionInfoToBuildLog>false</WriteVersionInfoToBuildLog>
+    <IncludeSymbols>false</IncludeSymbols>
+    <IsTestProject>$(MSBuildProjectName.Contains('Test'))</IsTestProject>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <PackageReference Include="GitVersionTask" Version="4.0.0-beta0011" PrivateAssets="All" /> 
+  </ItemGroup>
+  
+  <ItemGroup Condition="'$(IsTestProject)' != 'true'">
+    <PackageReference Include="SourceLink.Create.GitHub" Version="2.0.2" PrivateAssets="All" /> 
+    <DotNetCliToolReference Include="dotnet-sourcelink-git" Version="2.0.2" />
+  </ItemGroup>
+  
+</Project>

Ix.NET/Source/Directory.build.targets

@@ -0,0 +1,21 @@
+<Project>  
+  <!-- This has to be set in targets as the default props will overwrite -->
+  <PropertyGroup>
+    <DebugType Condition="'$(IsTestProject)' != 'true'">embedded</DebugType>
+  </PropertyGroup>
+  
+  <!-- This props all need to be set in targets as they depend on the values set earlier -->
+  <PropertyGroup Condition="'$(TargetFramework)' == 'netstandard1.0'">
+    <DefineConstants>$(DefineConstants);NO_CODE_COVERAGE_ATTRIBUTE;CRIPPLED_REFLECTION;PLIB;SIGNED</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(TargetFramework)' == 'netstandard1.3'">
+    <DefineConstants>$(DefineConstants);CRIPPLED_REFLECTION;PLIB;SIGNED</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(TargetFramework)' == 'net45'">
+    <DefineConstants>$(DefineConstants);HAS_APTCA;NO_ARRAY_EMPTY;DESKTOPCLR;DESKTOPCLR45;SIGNED</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(TargetFramework)' == 'net46'">
+    <DefineConstants>$(DefineConstants);HAS_APTCA;DESKTOPCLR;DESKTOPCLR46;SIGNED</DefineConstants>
+  </PropertyGroup>
+  
+</Project>

Ix.NET/Source/Ix.NET.sln

@@ -1,28 +1,28 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio 15
+VisualStudioVersion = 15.0.26228.9
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "System.Interactive", "System.Interactive\System.Interactive.xproj", "{FF97CD0F-8108-4B66-8A34-42190B459180}"
-EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "System.Interactive.Async", "System.Interactive.Async\System.Interactive.Async.xproj", "{A9F6D09B-15B9-4CE8-867F-6F3383C5F247}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{87534290-A7A6-47A4-9A3A-D0D21A9AD1D4}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "System.Interactive.Providers", "System.Interactive.Providers\System.Interactive.Providers.xproj", "{CA7B7136-13EE-4F01-BC22-722875EE8569}"
-EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "System.Interactive.Async.Providers", "System.Interactive.Async.Providers\System.Interactive.Async.Providers.xproj", "{33691BB5-DD5B-4FED-8EE3-52CEE0DE2550}"
-EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "System.Interactive.Tests", "Tests\System.Interactive.Tests.xproj", "{592E774E-D5BE-44C5-9E4D-E096BEC01552}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{B733D97A-F1ED-4FC3-BF8E-9AC47A89DE96}"
 	ProjectSection(SolutionItems) = preProject
-		GlobalAssemblyVersion.cs = GlobalAssemblyVersion.cs
 		build-new.ps1 = build-new.ps1
-		global.json = global.json
+		Directory.build.props = Directory.build.props
+		Directory.build.targets = Directory.build.targets
 		NuGet.Config = NuGet.Config
 	EndProjectSection
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Interactive", "System.Interactive\System.Interactive.csproj", "{FF97CD0F-8108-4B66-8A34-42190B459180}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Interactive.Async", "System.Interactive.Async\System.Interactive.Async.csproj", "{A9F6D09B-15B9-4CE8-867F-6F3383C5F247}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Interactive.Providers", "System.Interactive.Providers\System.Interactive.Providers.csproj", "{CA7B7136-13EE-4F01-BC22-722875EE8569}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Interactive.Async.Providers", "System.Interactive.Async.Providers\System.Interactive.Async.Providers.csproj", "{33691BB5-DD5B-4FED-8EE3-52CEE0DE2550}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tests", "Tests\Tests.csproj", "{592E774E-D5BE-44C5-9E4D-E096BEC01552}"
+EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Interactive.Tests.Uwp.DeviceRunner", "System.Interactive.Tests.Uwp.DeviceRunner\System.Interactive.Tests.Uwp.DeviceRunner.csproj", "{ED118703-9773-4193-BC2A-966C29BC1A46}"
 	ProjectSection(ProjectDependencies) = postProject
 		{FF97CD0F-8108-4B66-8A34-42190B459180} = {FF97CD0F-8108-4B66-8A34-42190B459180}

Ix.NET/Source/System.Interactive.Async.Providers/Properties/AssemblyInfo.cs

@@ -4,17 +4,6 @@ using System.Resources;
 using System.Runtime.InteropServices;
 using System.Security;
 
-[assembly: AssemblyTitle("System.Interactive.Async.Providers")]
-// Notice: same description as in the .nuspec files; see Source/Interactive Extensions/Setup/NuGet
-[assembly: AssemblyDescription("Interactive Extensions Async Library used to build query providers and express queries over asynchronous enumerable sequences.")]
-#if DEBUG
-[assembly: AssemblyConfiguration("Debug")]
-#else
-[assembly: AssemblyConfiguration("Retail")]
-#endif
-[assembly: AssemblyCompany(".NET Foundation and Contributors.")]
-[assembly: AssemblyProduct("Interactive Extensions")]
-[assembly: AssemblyCopyright("\x00a9 .NET Foundation and Contributors.  All rights reserved.")]
 [assembly: NeutralResourcesLanguage("en-US")]
 
 #if !PLIB
@@ -25,12 +14,4 @@ using System.Security;
 
 #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("1.2.0.0")]
-[assembly: AssemblyInformationalVersion("1.2.0.0")]
+#endif

Ix.NET/Source/System.Interactive.Async.Providers/System.Interactive.Async.Providers.csproj

@@ -0,0 +1,22 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <Description>Interactive Extensions Async Providers Library used to build query providers and express queries over async enumerable sequences.</Description>
+    <AssemblyTitle>Interactive Extensions - Async Providers Library</AssemblyTitle>
+    <TargetFrameworks>net45;netstandard1.0</TargetFrameworks>
+    <PackageTags>Ix;Interactive;Extensions;Enumerable;Asynchronous</PackageTags>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="Properties\System.Interactive.Async.Providers.rd.xml" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\System.Interactive.Async\System.Interactive.Async.csproj" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.0'">
+    <PackageReference Include="System.Linq.Queryable" Version="4.3.0" />
+  </ItemGroup>
+
+</Project>

Ix.NET/Source/System.Interactive.Async.Providers/System.Interactive.Async.Providers.xproj

@@ -1,15 +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>33691bb5-dd5b-4fed-8ee3-52cee0de2550</ProjectGuid>
-    <RootNamespace>System.Linq</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>

Ix.NET/Source/System.Interactive.Async.Providers/project.json

@@ -1,53 +0,0 @@
-{
-  "version": "3.0.0-*",
-  "title": "Interactive Extensions - Async Providers Library",
-  "description": "Interactive Extensions Async Providers Library used to build query providers and express queries over async enumerable sequences.",
-  "authors": ["Microsoft"],
-  "copyright": "Copyright (C) Microsoft Corporation",
-  
-  "packOptions": {
-    "tags": ["Ix", "Interactive", "Extensions", "Enumerable", "Asynchronous"],
-    "iconUrl": "http://go.microsoft.com/fwlink/?LinkId=261274",
-    "projectUrl": "https://github.com/Reactive-Extensions/Rx.NET",
-    "licenseUrl": "https://raw.githubusercontent.com/Reactive-Extensions/Rx.NET/master/Ix.NET/Source/license.txt",
-    "requireLicenseAcceptance": true
-  },
-
-  "buildOptions": {
-    "keyFile": "../ReactiveX.snk",
-    "define": [ "SIGNED" ],
-    "nowarn": [ "CS1591" ],
-    "xmlDoc": true,
-    "embed": {
-      "includeFiles": "Properties/System.Interactive.Async.Providers.rd.xml"
-    },
-    "compile": {
-      "includeFiles": [ "../GlobalAssemblyVersion.cs" ]
-    }
-  },
-
-  "dependencies": {
-    "System.Interactive.Async": { "target": "project" },
-    "System.Linq.Queryable": "4.0.1"
-  },
-  
-  "frameworks": {
-    "net45": {
-      "buildOptions": {
-        "define": [
-          "HAS_APTCA",
-          "DESKTOPCLR",
-          "DESKTOPCLR45"
-        ]
-      }
-    },
-    "netstandard1.0": {
-      "buildOptions": {
-        "define": [
-          "CRIPPLED_REFLECTION",
-          "PLIB"
-        ]
-      }
-    }
-  }
-}

Ix.NET/Source/System.Interactive.Async/Properties/AssemblyInfo.cs

@@ -4,17 +4,6 @@ using System.Resources;
 using System.Runtime.InteropServices;
 using System.Security;
 
-[assembly: AssemblyTitle("System.Interactive.Async")]
-// Notice: same description as in the .nuspec files; see Source/Interactive Extensions/Setup/NuGet
-[assembly: AssemblyDescription("Interactive Extensions Async Library used to express queries over asynchronous enumerable sequences.")]
-#if DEBUG
-[assembly: AssemblyConfiguration("Debug")]
-#else
-[assembly: AssemblyConfiguration("Retail")]
-#endif
-[assembly: AssemblyCompany(".NET Foundation and Contributors.")]
-[assembly: AssemblyProduct("Interactive Extensions")]
-[assembly: AssemblyCopyright("\x00a9 .NET Foundation and Contributors.  All rights reserved.")]
 [assembly: NeutralResourcesLanguage("en-US")]
 
 #if !PLIB
@@ -27,10 +16,3 @@ using System.Security;
 [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("1.2.0.0")]
-[assembly: AssemblyInformationalVersion("1.2.0.0")]

Ix.NET/Source/System.Interactive.Async/System.Interactive.Async.csproj

@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <Description>Interactive Extensions Async Library used to express queries over asynchronous enumerable sequences.</Description>
+    <AssemblyTitle>Interactive Extensions - Async Library</AssemblyTitle>
+    <TargetFrameworks>net45;net46;netstandard1.0;netstandard1.3</TargetFrameworks>
+    <PackageTags>Ix;Interactive;Extensions;Enumerable;Asynchronous</PackageTags>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="Properties\System.Interactive.Async.rd.xml" />
+  </ItemGroup>
+
+</Project>

Ix.NET/Source/System.Interactive.Async/System.Interactive.Async.xproj

@@ -1,15 +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>a9f6d09b-15b9-4ce8-867f-6f3383c5f247</ProjectGuid>
-    <RootNamespace>System.Linq</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>

Ix.NET/Source/System.Interactive.Async/project.json

@@ -1,75 +0,0 @@
-{
-  "version": "3.0.0-*",
-  "title": "Interactive Extensions - Async Library",
-  "description": "Interactive Extensions Async Library used to express queries over asynchronous enumerable sequences.",
-  "authors": [ "Microsoft" ],
-  "copyright": "Copyright (C) Microsoft Corporation",
-
-  "packOptions": {
-    "tags": [ "Ix", "Interactive", "Extensions", "Enumerable", "Asynchronous" ],
-    "iconUrl": "http://go.microsoft.com/fwlink/?LinkId=261274",
-    "projectUrl": "https://github.com/Reactive-Extensions/Rx.NET",
-    "licenseUrl": "https://raw.githubusercontent.com/Reactive-Extensions/Rx.NET/master/Ix.NET/Source/license.txt",
-    "requireLicenseAcceptance": true
-  },
-
-  "buildOptions": {
-    "keyFile": "../ReactiveX.snk",
-    "define": [ "SIGNED" ],
-    "nowarn": [ "CS1591" ],
-    "xmlDoc": true,
-    "embed": {
-      "includeFiles": "Properties/System.Interactive.Async.rd.xml"
-    },
-    "compile": {
-      "includeFiles": [ "../GlobalAssemblyVersion.cs" ]
-    }
-  },
-
-  "frameworks": {
-    "net45": {
-      "buildOptions": {
-        "define": [
-          "HAS_APTCA",
-          "NO_ARRAY_EMPTY",
-          "DESKTOPCLR",
-          "DESKTOPCLR45"
-        ]
-      }
-    },
-    "net46": {
-      "buildOptions": {
-        "define": [
-          "HAS_APTCA",
-          "DESKTOPCLR",
-          "DESKTOPCLR46"
-        ]
-      }
-    },
-    "netstandard1.0": {
-      "buildOptions": {
-        "define": [
-          "NO_ARRAY_EMPTY",
-          "NO_CODE_COVERAGE_ATTRIBUTE",
-          "CRIPPLED_REFLECTION",
-          "PLIB"
-        ]
-      },
-      "dependencies": {
-        "NETStandard.Library": "1.6.0"
-      }
-    },
-    "netstandard1.3": {
-      "buildOptions": {
-        "define": [
-          "CRIPPLED_REFLECTION",
-          "NO_CODE_COVERAGE_ATTRIBUTE",
-          "PLIB"
-        ]
-      },
-      "dependencies": {
-        "NETStandard.Library": "1.6.0"
-      }
-    }
-  }
-}

Ix.NET/Source/System.Interactive.Providers/Properties/AssemblyInfo.cs

@@ -4,17 +4,7 @@ using System.Resources;
 using System.Runtime.InteropServices;
 using System.Security;
 
-[assembly: AssemblyTitle("System.Interactive.Providers")]
-// Notice: same description as in the .nuspec files; see Source/Interactive Extensions/Setup/NuGet
-[assembly: AssemblyDescription("Interactive Extensions Providers Library used to build query providers and express queries over enumerable sequences.")]
-#if DEBUG
-[assembly: AssemblyConfiguration("Debug")]
-#else
-[assembly: AssemblyConfiguration("Retail")]
-#endif
-[assembly: AssemblyCompany(".NET Foundation and Contributors.")]
-[assembly: AssemblyProduct("Interactive Extensions")]
-[assembly: AssemblyCopyright("\x00a9 .NET Foundation and Contributors.  All rights reserved.")]
+
 [assembly: NeutralResourcesLanguage("en-US")]
 
 #if !PLIB
@@ -26,12 +16,3 @@ using System.Security;
 #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("1.2.0.0")]
-[assembly: AssemblyInformationalVersion("1.2.0.0")]

Ix.NET/Source/System.Interactive.Providers/System.Interactive.Providers.csproj

@@ -0,0 +1,23 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <Description>Interactive Extensions Providers Library used to build query providers and express queries over enumerable sequences.</Description>
+    <AssemblyTitle>Interactive Extensions - Providers Library</AssemblyTitle>
+    <TargetFrameworks>net45;netstandard1.0</TargetFrameworks>
+    <PackageTags>Ix;Interactive;Extensions;Enumerable</PackageTags>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="Properties\System.Interactive.Providers.rd.xml" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\System.Interactive\System.Interactive.csproj" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.0'">
+    <PackageReference Include="System.Linq.Queryable" Version="4.3.0" />
+  </ItemGroup>
+
+
+</Project>

Ix.NET/Source/System.Interactive.Providers/System.Interactive.Providers.xproj

@@ -1,15 +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>ca7b7136-13ee-4f01-bc22-722875ee8569</ProjectGuid>
-    <RootNamespace>System.Linq</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>

Ix.NET/Source/System.Interactive.Providers/project.json

@@ -1,53 +0,0 @@
-{
-  "version": "3.0.0-*",
-  "title": "Interactive Extensions - Providers Library",
-  "description": "Interactive Extensions Providers Library used to build query providers and express queries over enumerable sequences.",
-  "authors": ["Microsoft"],
-  "copyright": "Copyright (C) Microsoft Corporation",
-  
-  "packOptions": {
-    "tags": ["Ix", "Interactive", "Extensions", "Enumerable"],
-    "iconUrl": "http://go.microsoft.com/fwlink/?LinkId=261274",
-    "projectUrl": "https://github.com/Reactive-Extensions/Rx.NET",
-    "licenseUrl": "https://raw.githubusercontent.com/Reactive-Extensions/Rx.NET/master/Ix.NET/Source/license.txt",
-    "requireLicenseAcceptance": true
-  },
-
-  "buildOptions": {
-    "keyFile": "../ReactiveX.snk",
-    "define": [ "SIGNED" ],
-    "nowarn": [ "CS1591" ],
-    "xmlDoc": true,
-    "embed": {
-      "includeFiles": "Properties/System.Interactive.Providers.rd.xml"
-    },
-    "compile": {
-      "includeFiles": [ "../GlobalAssemblyVersion.cs" ]
-    }
-  },
-  
-  "dependencies": {
-    "System.Interactive": { "target": "project" },
-    "System.Linq.Queryable": "4.0.1"
-  },
-  
-  "frameworks": {
-    "net45": {
-      "buildOptions": {
-        "define": [
-          "HAS_APTCA",
-          "DESKTOPCLR",
-          "DESKTOPCLR45"
-        ]
-      }
-    },
-    "netstandard1.0": {
-      "buildOptions": {
-        "define": [
-          "CRIPPLED_REFLECTION",
-          "PLIB"
-        ]
-      }
-    }
-  }
-}

Ix.NET/Source/System.Interactive.Tests.Uwp.DeviceRunner/System.Interactive.Tests.Uwp.DeviceRunner.csproj

@@ -87,12 +87,17 @@
     <Prefer32Bit>true</Prefer32Bit>
     <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
   </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="5.3.0" />
+    <PackageReference Include="xunit" Version="2.2.0" />
+    <PackageReference Include="xunit.runner.devices" Version="2.2.0-rc1" />
+    <PackageReference Include="FluentAssertions" Version="4.19.2" />
+  </ItemGroup>
   <ItemGroup>
     <!-- A reference to the entire .Net Framework and Windows SDK are automatically included -->
     <None Include="..\ReactiveX.snk">
       <Link>ReactiveX.snk</Link>
     </None>
-    <None Include="project.json" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\Tests\AssertEx.cs">

Ix.NET/Source/System.Interactive.Tests.Uwp.DeviceRunner/project.json

@@ -1,19 +0,0 @@
-{
-  "dependencies": {
-    "Microsoft.NETCore.UniversalWindowsPlatform": "5.2.2",
-    "xunit": "2.2.0-beta2-build3300",
-    "FluentAssertions": "4.13.0",
-    "xunit.runner.devices": "2.1.0"
-  },
-  "frameworks": {
-    "uap10.0": {}
-  },
-  "runtimes": {
-    "win10-arm": {},
-    "win10-arm-aot": {},
-    "win10-x86": {},
-    "win10-x86-aot": {},
-    "win10-x64": {},
-    "win10-x64-aot": {}
-  }
-}

Ix.NET/Source/System.Interactive/Properties/AssemblyInfo.cs

@@ -4,17 +4,7 @@ using System.Resources;
 using System.Runtime.InteropServices;
 using System.Security;
 
-[assembly: AssemblyTitle("System.Interactive")]
-// Notice: same description as in the .nuspec files; see Source/Interactive Extensions/Setup/NuGet
-[assembly: AssemblyDescription("Interactive Extensions Main Library used to express queries over enumerable sequences.")]
-#if DEBUG
-[assembly: AssemblyConfiguration("Debug")]
-#else
-[assembly: AssemblyConfiguration("Retail")]
-#endif
-[assembly: AssemblyCompany(".NET Foundation and Contributors.")]
-[assembly: AssemblyProduct("Interactive Extensions")]
-[assembly: AssemblyCopyright("\x00a9 .NET Foundation and Contributors.  All rights reserved.")]
+
 [assembly: NeutralResourcesLanguage("en-US")]
 
 #if !PLIB
@@ -27,10 +17,3 @@ using System.Security;
 [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("1.2.0.0")]
-[assembly: AssemblyInformationalVersion("1.2.0.0")]

Ix.NET/Source/System.Interactive/System.Interactive.csproj

@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <Description>Interactive Extensions Main Library used to express queries over enumerable sequences.</Description>
+    <AssemblyTitle>Interactive Extensions - Main Library</AssemblyTitle>
+    <Authors>Microsoft</Authors>
+    <TargetFrameworks>net45;netstandard1.0</TargetFrameworks>
+    <PackageTags>Ix;Interactive;Extensions;Enumerable</PackageTags>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="Properties\System.Interactive.rd.xml" />
+  </ItemGroup>
+
+</Project>

Ix.NET/Source/System.Interactive/System.Interactive.xproj

@@ -1,15 +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>ff97cd0f-8108-4b66-8a34-42190b459180</ProjectGuid>
-    <RootNamespace>System.Linq</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>

Ix.NET/Source/System.Interactive/project.json

@@ -1,51 +0,0 @@
-{
-  "version": "3.0.0-*",
-  "title": "Interactive Extensions - Main Library",
-  "description": "Interactive Extensions Main Library used to express queries over enumerable sequences.",
-  "authors": ["Microsoft"],
-  "copyright": "Copyright (C) Microsoft Corporation",
-  
-  "packOptions": {
-    "tags": ["Ix", "Interactive", "Extensions", "Enumerable"],
-    "iconUrl": "http://go.microsoft.com/fwlink/?LinkId=261274",
-    "projectUrl": "https://github.com/Reactive-Extensions/Rx.NET",
-    "licenseUrl": "https://raw.githubusercontent.com/Reactive-Extensions/Rx.NET/master/Ix.NET/Source/license.txt",
-    "requireLicenseAcceptance": true
-  },
-
-  "buildOptions": {
-    "keyFile": "../ReactiveX.snk",
-    "define": [ "SIGNED" ],
-    "nowarn": [ "CS1591" ],
-    "xmlDoc": true,
-    "embed": {
-      "includeFiles": "Properties/System.Interactive.rd.xml"
-    },
-    "compile": {
-      "includeFiles": [ "../GlobalAssemblyVersion.cs" ]
-    }
-  },
-
-  "frameworks": {
-    "net45": {
-      "buildOptions": {
-        "define": [
-          "HAS_APTCA",
-          "DESKTOPCLR",
-          "DESKTOPCLR45"
-        ]
-      }
-    },
-    "netstandard1.0": {
-      "buildOptions": {
-        "define": [
-          "CRIPPLED_REFLECTION",
-          "PLIB"
-        ]
-      },
-      "dependencies": {
-        "NETStandard.Library": "1.6.0"
-      }
-    }
-  }
-}

Ix.NET/Source/Tests/Properties/AppManifest.xml

@@ -1,7 +0,0 @@
-<Deployment xmlns="http://schemas.microsoft.com/client/2007/deployment"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
->
-    <Deployment.Parts>
-    </Deployment.Parts>
-    
-</Deployment>

Ix.NET/Source/Tests/Properties/AssemblyInfo.cs

@@ -1,32 +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("Tests")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany(".NET Foundation and Contributors.")]
-[assembly: AssemblyProduct("Tests")]
-[assembly: AssemblyCopyright("\x00a9 .NET Foundation and Contributors.  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)]
-
-// 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.2.0.0")]    
-//[assembly: AssemblyFileVersion("1.2.0.0")]

Ix.NET/Source/Tests/System.Interactive.Tests.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>592e774e-d5be-44c5-9e4d-e096bec01552</ProjectGuid>
-    <RootNamespace>System.Linq</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
-  </ItemGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>

Ix.NET/Source/Tests/Tests.csproj

@@ -0,0 +1,26 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>netcoreapp1.0;net461</TargetFrameworks>
+    <NoWarn>$(NoWarn);CS0618</NoWarn>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Content Include="xunit.runner.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\System.Interactive.Providers\System.Interactive.Providers.csproj" />
+    <ProjectReference Include="..\System.Interactive.Async.Providers\System.Interactive.Async.Providers.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.0-beta1-build1279" />
+    <PackageReference Include="xunit" Version="2.3.0-beta1-build3561" />
+    <PackageReference Include="FluentAssertions" Version="4.19.2 " />
+  </ItemGroup>
+
+</Project>

Ix.NET/Source/Tests/project.json

@@ -1,47 +0,0 @@
-{
-  "version": "3.0.0-*",
-  "title": "Interactive Extensions - Tests",
-  "description": "Interactive Extensions test project.",
-  "authors": ["Microsoft"],
-  "copyright": "Copyright (C) Microsoft Corporation",
-  
-  "packOptions": {
-    "tags": [],
-    "iconUrl": "http://go.microsoft.com/fwlink/?LinkId=261274",
-    "projectUrl": "https://github.com/Reactive-Extensions/Rx.NET",
-    "licenseUrl": "https://raw.githubusercontent.com/Reactive-Extensions/Rx.NET/master/Ix.NET/Source/license.txt",
-    "requireLicenseAcceptance": true
-  },
-
-  "buildOptions": {
-    "nowarn": [ "CS0618" ],
-    "keyFile": "../ReactiveX.snk",
-    "define": [ "SIGNED" ],
-    "copyToOutput": {
-      "include": [ "xunit.runner.json" ]
-    }
-  },
-
-  "dependencies": {
-    "System.Interactive.Providers": { "target": "project" },
-    "System.Interactive.Async.Providers": { "target": "project" },
-    "xunit": "2.2.0-beta3-build3342",
-    "dotnet-test-xunit": "2.2.0-preview3-build1039",
-    "FluentAssertions": "4.13.0"
-  },
-
-  "testRunner": "xunit",
-  
-  "frameworks": {
-    "netcoreapp1.0": {
-      "dependencies": {
-        "Microsoft.NETCore.App": {
-            "version": "1.0.0",
-            "type": "platform"
-        }
-      }
-    },
-    "net461": {
-    }
-  }
-}

Ix.NET/Source/global.json

@@ -1,6 +0,0 @@
-{
-  "projects": [ ".", "tests" ],
-  "sdk": {
-      "version": "1.0.0-preview2-003131"
-  }
-}