Merge pull request #10 from shiftkey/windows-runtime

Windows runtime support

Rx.NET/NuGet.Config

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <packageSources>
+    <clear />
+    <add key="myget.org dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
+    <add key="NuGet.org" value="https://api.nuget.org/v3/index.json" />
+  </packageSources>
+  <disabledPackageSources>
+     <clear />
+  </disabledPackageSources>
+</configuration>

Rx.NET/Source/Rx-New.sln

@@ -26,6 +26,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Extra", "Extra", "{16A2D2FA
 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
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -72,6 +74,10 @@ Global
 		{C17D3BD1-222F-4DCC-BBF8-44A04399701B}.Debug|Any CPU.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
+		{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}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4B697BE9-1D48-4855-9070-C9C5C3BD341C}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -87,5 +93,6 @@ Global
 		{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}
 	EndGlobalSection
 EndGlobal

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

@@ -13,6 +13,10 @@
   </PropertyGroup>
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
+    <TypeScriptCompileBlocked>True</TypeScriptCompileBlocked>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <ProduceOutputsOnBuild>True</ProduceOutputsOnBuild>
   </PropertyGroup>
   <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
   <ProjectExtensions>

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

@@ -42,6 +42,36 @@
                 ]
             }
         },
+        "dotnet5.1": {
+            "compilationOptions": {
+                "define": [
+                    "NO_EVENTARGS_CONSTRAINT",
+                    "HAS_EDI",
+                    "HAS_WINRT",
+                    "HAS_PROGRESS",
+                    "PREFER_ASYNC",
+                    "HAS_AWAIT",
+                    "HAS_APTCA",
+                    "NO_REMOTING",
+                    "NO_SERIALIZABLE",
+                    "NO_THREAD",
+                    "NO_WEAKTABLE",
+                    "CRIPPLED_REFLECTION",
+                    "PLIB",
+                    "USE_TIMER_SELF_ROOT"
+                ]
+            },
+            "dependencies": {
+                "System.Linq": "4.0.0",
+                "System.Collections.Concurrent": "4.0.0",
+                "System.ComponentModel": "4.0.0",
+                "System.Threading": "4.0.0",
+                "System.Threading.Timer": "4.0.0",
+                "System.Runtime": "4.0.0",
+                "System.Runtime.Extensions": "4.0.0"
+            }
+            
+        },
         "dotnet5.4": {
             "compilationOptions": {
                 "define": [

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

@@ -8,8 +8,8 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>430061b8-8504-483f-a532-ceb69ff04128</ProjectGuid>
     <RootNamespace>System.Reactive</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
+    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
+    <OutputPath Condition="'$(OutputPath)'=='' ">..\..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
   </PropertyGroup>
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>

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

@@ -38,6 +38,33 @@
                 ]
             }
         },
+        "dotnet5.1": {
+            "compilationOptions": {
+                "define": [
+                    "NO_EVENTARGS_CONSTRAINT",
+                    "HAS_EDI",
+                    "HAS_WINRT",
+                    "HAS_PROGRESS",
+                    "PREFER_ASYNC",
+                    "HAS_AWAIT",
+                    "HAS_APTCA",
+                    "NO_REMOTING",
+                    "NO_SERIALIZABLE",
+                    "NO_THREAD",
+                    "CRIPPLED_REFLECTION",
+                    "PLIB",
+                    "USE_TIMER_SELF_ROOT"
+                ]
+            },
+            "dependencies": {
+                "System.Diagnostics.Tools": "4.0.0",
+                "System.Linq": "4.0.0",
+                "System.Linq.Expressions": "4.0.0",
+                "System.Resources.ResourceManager": "4.0.0",
+                "System.Threading": "4.0.0",
+                "System.Runtime": "4.0.0"
+            }
+        },
         "dotnet5.2": {
             "compilationOptions": {
                 "define": [

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

@@ -8,11 +8,12 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>a5508ff0-93b9-4241-b666-07b05189c435</ProjectGuid>
     <RootNamespace>System.Reactive</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
+    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
+    <OutputPath Condition="'$(OutputPath)'=='' ">..\..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
   </PropertyGroup>
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
+    <TypeScriptCompileBlocked>True</TypeScriptCompileBlocked>
   </PropertyGroup>
   <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
   <ProjectExtensions>

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

@@ -49,6 +49,32 @@
                 ]
             }
         },
+        "dotnet5.1": {
+            "compilationOptions": {
+                "define": [
+                    "NO_EVENTARGS_CONSTRAINT",
+                    "HAS_EDI",
+                    "HAS_WINRT",
+                    "HAS_PROGRESS",
+                    "PREFER_ASYNC",
+                    "HAS_AWAIT",
+                    "HAS_APTCA",
+                    "NO_REMOTING",
+                    "NO_SERIALIZABLE",
+                    "NO_THREAD",
+                    "CRIPPLED_REFLECTION",
+                    "PLIB",
+                    "USE_TIMER_SELF_ROOT"
+                ]
+            },
+            "dependencies": {
+                "System.Collections.Concurrent": "4.0.0",
+                "System.Reflection.TypeExtensions": "4.0.0",
+                "System.Runtime.InteropServices.WindowsRuntime": "4.0.0",
+                "System.Runtime": "4.0.0",
+                "System.Runtime.Extensions": "4.0.0"
+            }
+        },
         "dotnet5.4": {
             "compilationOptions": {
                 "define": [

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

@@ -9,8 +9,8 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>7dd3dda0-0b73-4a7f-acaf-15111ac2eb93</ProjectGuid>
     <RootNamespace>System.Reactive.PlatformServices</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
+    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
+    <OutputPath Condition="'$(OutputPath)'=='' ">..\..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
   </PropertyGroup>
 
   <PropertyGroup>

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

@@ -44,6 +44,29 @@
                 ]
             }
         },
+        "dotnet5.1": {
+            "compilationOptions": {
+                "define": [
+                    "NO_EVENTARGS_CONSTRAINT",
+                    "HAS_EDI",
+                    "HAS_WINRT",
+                    "HAS_PROGRESS",
+                    "PREFER_ASYNC",
+                    "HAS_AWAIT",
+                    "HAS_APTCA",
+                    "NO_REMOTING",
+                    "NO_SERIALIZABLE",
+                    "NO_THREAD",
+                    "CRIPPLED_REFLECTION",
+                    "PLIB",
+                    "USE_TIMER_SELF_ROOT"
+                ]
+            },
+            "dependencies": {
+                "System.Diagnostics.Tools": "4.0.0",
+                "System.Diagnostics.Debug": "4.0.10"
+            }
+        },
         "dotnet5.4": {
             "compilationOptions": {
                 "define": [

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

@@ -0,0 +1,27 @@
+<?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)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>4b697be9-1d48-4855-9070-c9c5c3bd341c</ProjectGuid>
+    <RootNamespace>System.Reactive</RootNamespace>
+    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
+    <OutputPath Condition="'$(OutputPath)'=='' ">..\..\..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
+  </PropertyGroup>
+  <PropertyGroup>
+    <SchemaVersion>2.0</SchemaVersion>
+    <TypeScriptCompileBlocked>True</TypeScriptCompileBlocked>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <ProduceOutputsOnBuild>True</ProduceOutputsOnBuild>
+  </PropertyGroup>
+  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties project_1json__JSONSchema="http://json.schemastore.org/project-1.0.0-beta8" />
+    </VisualStudio>
+  </ProjectExtensions>
+</Project>

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

@@ -0,0 +1,50 @@
+{
+  "version": "3.0.0-*",
+  "title": "Reactive Extensions - Windows Forms Helpers",
+  "description": "Windows Forms extensions library for Rx. Contains scheduler functionality for the Windows Forms UI loop.",
+  "authors": [ "Microsoft" ],
+  "copyright": "Copyright (C) Microsoft Corporation",
+  "tags": [ "Rx", "Reactive", "Extensions", "Observable", "LINQ", "Events" ],
+  "iconUrl": "http://go.microsoft.com/fwlink/?LinkId=261274",
+  "projectUrl": "http://go.microsoft.com/fwlink/?LinkId=261273",
+  "licenseUrl": "http://go.microsoft.com/fwlink/?LinkID=261272",
+  "requireLicenseAcceptance": true,
+
+  "dependencies": {
+    "System.Reactive.Linq": { "target": "project" }
+  },
+
+  "frameworks": {
+    "dotnet5.1": {
+        "compilationOptions": {
+            "define": [
+                "NO_EVENTARGS_CONSTRAINT",
+                "HAS_EDI",
+                "HAS_WINRT",
+                "HAS_PROGRESS",
+                "PREFER_ASYNC",
+                "HAS_AWAIT",
+                "NO_REMOTING",
+                "NO_SERIALIZABLE",
+                "NO_THREAD",
+                "CRIPPLED_REFLECTION",
+                "USE_TIMER_SELF_ROOT"
+            ]
+        },
+        "dependencies": {
+            "Microsoft.NETCore.Portable.Compatibility": {
+                "version": "1.0.0",
+                "type": "build"
+            },
+            "Microsoft.TargetingPack.Private.WinRT": {
+                "version": "1.0.1",
+                "type": "build"
+            },
+            "System.Runtime": "4.0.0",
+            "System.Threading.Tasks": "4.0.0",
+            "System.Runtime.WindowsRuntime": "4.0.10"
+        }
+
+    }
+  }
+}