Fix up defines based on common.targets

Ix.NET/Source/NuGet.Config

@@ -2,6 +2,7 @@
 <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>

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

@@ -16,83 +16,36 @@
         "net40": {
             "compilationOptions": {
                 "define": [
-                    "NO_TASK_DELAY",
                     "HAS_APTCA",
-                    "HAS_WINFORMS",
-                    "USE_TIMER_SELF_ROOT",
-                    "NO_WEAKREFOFT"
+                    "DESKTOPCLR",
+                    "DESKTOPCLR40"
                 ]
             }
         },
         "net45": {
             "compilationOptions": {
                 "define": [
-                    "NO_EVENTARGS_CONSTRAINT",
-                    "HAS_EDI",
-                    "HAS_WINRT",
-                    "HAS_PROGRESS",
-                    "PREFER_ASYNC",
                     "HAS_AWAIT",
                     "HAS_APTCA",
-                    "HAS_DISPATCHER_PRIORITY",
-                    "HAS_WINFORMS",
-                    "USE_TIMER_SELF_ROOT"
+                    "DESKTOPCLR",
+                    "DESKTOPCLR45"
                 ]
             }
         },
         "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"
+                    "PLIB"
                 ]
             },
             "dependencies": {
-                "System.Linq": "4.0.0",
-                "System.Linq.Expressions": "4.0.0",
-                "System.Linq.Queryable": "4.0.0",
-                "System.Reflection": "4.0.0",
-                "System.Runtime": "4.0.0",
-                "System.Runtime.Extensions": "4.0.0"
+                "System.Linq.Expressions": "4.0.11-rc3-23823",
+                "System.Linq.Queryable": "4.0.1-rc3-23823",
+                "System.Reflection": "4.1.0-rc3-23823"
             }
 
-        },
-        "dotnet5.4": {
-            "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.Linq": "4.0.1-beta-23516",
-                "System.Linq.Expressions": "4.0.11-beta-23516",
-                "System.Linq.Queryable": "4.0.1-beta-23516",
-                "System.Reflection": "4.1.0-beta-23516"
-            }
         }
     }
 }

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

@@ -1,10 +1,11 @@
 {
     "version": "2.0.0-*",
     "title": "Interactive Extensions - Async Library",
-    "description": "Interactive Extensions Async Library used to express queries over asynchronous enumerable sequences.",
-    "authors": [ "Microsoft" ],
+    "description":
+        "Interactive Extensions Async Library used to express queries over asynchronous enumerable sequences.",
+    "authors": ["Microsoft"],
     "copyright": "Copyright (C) Microsoft Corporation",
-    "tags": [ "Ix", "Interactive", "Extensions", "Enumerable", "Asynchronous" ],
+    "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",
@@ -13,78 +14,37 @@
         "net40": {
             "compilationOptions": {
                 "define": [
-                    "NO_TASK_DELAY",
                     "HAS_APTCA",
-                    "HAS_WINFORMS",
-                    "USE_TIMER_SELF_ROOT",
-                    "NO_WEAKREFOFT"
+                    "DESKTOPCLR",
+                    "DESKTOPCLR40"
                 ]
             }
         },
         "net45": {
             "compilationOptions": {
                 "define": [
-                    "NO_EVENTARGS_CONSTRAINT",
-                    "HAS_EDI",
-                    "HAS_WINRT",
-                    "HAS_PROGRESS",
-                    "PREFER_ASYNC",
                     "HAS_AWAIT",
                     "HAS_APTCA",
-                    "HAS_DISPATCHER_PRIORITY",
-                    "HAS_WINFORMS",
-                    "USE_TIMER_SELF_ROOT"
+                    "DESKTOPCLR",
+                    "DESKTOPCLR45"
                 ]
             }
         },
         "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.Threading": "4.0.0",
-                "System.Runtime": "4.0.0",
-                "System.Runtime.Extensions": "4.0.0"
-            }
-            
-        },
-        "dotnet5.4": {
-            "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"
+                    "PLIB"
                 ]
             },
             "dependencies": {
-                "System.Linq": "4.0.1-beta-23516",
-                "System.Threading": "4.0.11-beta-23516"
+                "System.Diagnostics.Debug": "4.0.11-rc3-23823",
+                "System.Linq": "4.0.1-rc3-23823",
+                "System.Runtime.Extensions": "4.1.0-rc3-23823",
+                "System.Resources.ResourceManager": "4.0.1-rc3-23823",
+                "System.Runtime": "4.1.0-rc3-23823",
+                "System.Threading": "4.0.11-rc3-23823"
             }
         }
     }

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

@@ -1,10 +1,11 @@
 {
     "version": "2.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" ],
+    "description":
+        "Interactive Extensions Providers Library used to build query providers and express queries over enumerable sequences.",
+    "authors": ["Microsoft"],
     "copyright": "Copyright (C) Microsoft Corporation",
-    "tags": [ "Ix", "Interactive", "Extensions", "Enumerable" ],
+    "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",
@@ -16,83 +17,36 @@
         "net40": {
             "compilationOptions": {
                 "define": [
-                    "NO_TASK_DELAY",
                     "HAS_APTCA",
-                    "HAS_WINFORMS",
-                    "USE_TIMER_SELF_ROOT",
-                    "NO_WEAKREFOFT"
+                    "DESKTOPCLR",
+                    "DESKTOPCLR40"
                 ]
             }
         },
         "net45": {
             "compilationOptions": {
                 "define": [
-                    "NO_EVENTARGS_CONSTRAINT",
-                    "HAS_EDI",
-                    "HAS_WINRT",
-                    "HAS_PROGRESS",
-                    "PREFER_ASYNC",
                     "HAS_AWAIT",
                     "HAS_APTCA",
-                    "HAS_DISPATCHER_PRIORITY",
-                    "HAS_WINFORMS",
-                    "USE_TIMER_SELF_ROOT"
+                    "DESKTOPCLR",
+                    "DESKTOPCLR45"
                 ]
             }
         },
         "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"
+                    "PLIB"
                 ]
             },
             "dependencies": {
-                "System.Linq": "4.0.0",
-                "System.Linq.Expressions": "4.0.0",
-                "System.Linq.Queryable": "4.0.0",
-                "System.Reflection": "4.0.0",
-                "System.Runtime": "4.0.0",
-                "System.Runtime.Extensions": "4.0.0"
+                "System.Linq.Expressions": "4.0.11-rc3-23823",
+                "System.Linq.Queryable": "4.0.1-rc3-23823",
+                "System.Reflection": "4.1.0-rc3-23823"
             }
 
-        },
-        "dotnet5.4": {
-            "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.Linq": "4.0.1-beta-23516",
-                "System.Linq.Expressions": "4.0.11-beta-23516",
-                "System.Linq.Queryable": "4.0.1-beta-23516",
-                "System.Reflection":"4.1.0-beta-23516" 
-            }
         }
     }
 }

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

@@ -13,79 +13,38 @@
         "net40": {
             "compilationOptions": {
                 "define": [
-                    "NO_TASK_DELAY",
                     "HAS_APTCA",
-                    "HAS_WINFORMS",
-                    "USE_TIMER_SELF_ROOT",
-                    "NO_WEAKREFOFT"
+                    "DESKTOPCLR",
+                    "DESKTOPCLR40"
                 ]
             }
         },
         "net45": {
             "compilationOptions": {
                 "define": [
-                    "NO_EVENTARGS_CONSTRAINT",
-                    "HAS_EDI",
-                    "HAS_WINRT",
-                    "HAS_PROGRESS",
-                    "PREFER_ASYNC",
                     "HAS_AWAIT",
                     "HAS_APTCA",
-                    "HAS_DISPATCHER_PRIORITY",
-                    "HAS_WINFORMS",
-                    "USE_TIMER_SELF_ROOT"
+                    "DESKTOPCLR",
+                    "DESKTOPCLR45"
                 ]
             }
         },
         "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"
+                    "PLIB"
                 ]
             },
             "dependencies": {
-                "System.Linq": "4.0.0",
-                "System.Threading": "4.0.0",
-                "System.Runtime": "4.0.0",
-                "System.Runtime.Extensions": "4.0.0"
+                "System.Diagnostics.Debug": "4.0.11-rc3-23823",
+                "System.Linq": "4.0.1-rc3-23823",
+                "System.Resources.ResourceManager": "4.0.1-rc3-23823",
+                "System.Runtime": "4.1.0-rc3-23823",
+                "System.Threading": "4.0.11-rc3-23823"
             }
 
-        },
-        "dotnet5.4": {
-            "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.Linq": "4.0.1-beta-23516",
-                "System.Threading": "4.0.11-beta-23516"
-            }
         }
     }
 }

Ix.NET/Source/Tests/project.json

@@ -2,9 +2,9 @@
     "version": "2.0.0-*",
     "title": "Interactive Extensions - Tests",
     "description": "Unit Tests",
-    "authors": [ "Microsoft" ],
+    "authors": ["Microsoft"],
     "copyright": "Copyright (C) Microsoft Corporation",
-    "tags": [ ],
+    "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",
@@ -19,58 +19,18 @@
         "App.cs"
     ],
     "commands": {
-      "test": "xunit.runner.dnx"
+        "test": "xunit.runner.dnx"
     },
     "frameworks": {
         "dnx451": {
             "compilationOptions": {
                 "define": [
-                    "NO_EVENTARGS_CONSTRAINT",
-                    "HAS_EDI",
-                    "HAS_WINRT",
-                    "HAS_PROGRESS",
-                    "PREFER_ASYNC",
                     "HAS_AWAIT",
                     "HAS_APTCA",
-                    "HAS_DISPATCHER_PRIORITY",
-                    "HAS_WINFORMS",
-                    "USE_TIMER_SELF_ROOT"
+                    "DESKTOPCLR",
+                    "DESKTOPCLR45"
                 ]
-            },
-            "frameworkAssemblies": {
-                "System.Runtime": "4.0.0.0",
-                "System.Threading.Tasks": "4.0.0.0"
             }
-        },
-    "dnx461": {
-      "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.Linq": "4.0.0",
-        "System.Threading": "4.0.0",
-        "System.Threading.Tasks": "4.0.0",
-        "System.Threading.Timer": "4.0.0",
-        "System.Runtime": "4.0.0",
-        "System.Runtime.Extensions": "4.0.0",
-        "System.Reflection": "4.0.0",        
-        "System.Reflection.Extensions": "4.0.0"
-      }
+        }
     }
-  }
 }