Remove net4 support from project.json

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

@@ -24,19 +24,12 @@
   },
 
   "dependencies": {
-    "System.Interactive.Async": { "target": "project" }
+    "System.Interactive.Async": { "target": "project" },
+    "System.Linq.Expressions": "4.0.11-rc2-24027",
+    "System.Linq.Queryable": "4.0.1-rc2-24027"
   },
   
   "frameworks": {
-    "net40": {
-      "buildOptions": {
-        "define": [
-          "HAS_APTCA",
-          "DESKTOPCLR",
-          "DESKTOPCLR40"
-        ]
-      }
-    },
     "net45": {
       "buildOptions": {
         "define": [
@@ -54,10 +47,6 @@
           "CRIPPLED_REFLECTION",
           "PLIB"
         ]
-      },
-      "dependencies": {
-        "System.Linq.Expressions": "4.0.11-rc2-24027",
-        "System.Linq.Queryable": "4.0.1-rc2-24027"
       }
     }
   }

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

@@ -2,11 +2,11 @@
   "version": "3.0.0-*",
   "title": "Interactive Extensions - Async Library",
   "description": "Interactive Extensions Async Library used to express queries over asynchronous enumerable sequences.",
-  "authors": ["Microsoft"],
+  "authors": [ "Microsoft" ],
   "copyright": "Copyright (C) Microsoft Corporation",
-  
+
   "packOptions": {
-    "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",
@@ -23,16 +23,11 @@
     }
   },
 
+  "dependencies": {
+    "NETStandard.Library": "1.5.0-rc2-24027"
+  },
+
   "frameworks": {
-    "net40": {
-      "buildOptions": {
-        "define": [
-          "HAS_APTCA",
-          "DESKTOPCLR",
-          "DESKTOPCLR40"
-        ]
-      }
-    },
     "net45": {
       "buildOptions": {
         "define": [
@@ -50,9 +45,6 @@
           "CRIPPLED_REFLECTION",
           "PLIB"
         ]
-      },
-      "dependencies": {
-        "NETStandard.Library": "1.5.0-rc2-24027"
       }
     }
   }

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

@@ -24,19 +24,12 @@
   },
   
   "dependencies": {
-    "System.Interactive": { "target": "project" }
+    "System.Interactive": { "target": "project" },
+    "System.Linq.Expressions": "4.0.11-rc2-24027",
+    "System.Linq.Queryable": "4.0.1-rc2-24027"
   },
   
   "frameworks": {
-    "net40": {
-      "buildOptions": {
-        "define": [
-          "HAS_APTCA",
-          "DESKTOPCLR",
-          "DESKTOPCLR40"
-        ]
-      }
-    },
     "net45": {
       "buildOptions": {
         "define": [
@@ -54,10 +47,6 @@
           "CRIPPLED_REFLECTION",
           "PLIB"
         ]
-      },
-      "dependencies": {
-        "System.Linq.Expressions": "4.0.11-rc2-24027",
-        "System.Linq.Queryable": "4.0.1-rc2-24027"
       }
     }
   }

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

@@ -23,16 +23,11 @@
     }
   },
 
+  "dependencies": {
+    "NETStandard.Library": "1.5.0-rc2-24027"
+  },
+
   "frameworks": {
-    "net40": {
-      "buildOptions": {
-        "define": [
-          "HAS_APTCA",
-          "DESKTOPCLR",
-          "DESKTOPCLR40"
-        ]
-      }
-    },
     "net45": {
       "buildOptions": {
         "define": [
@@ -50,9 +45,6 @@
           "CRIPPLED_REFLECTION",
           "PLIB"
         ]
-      },
-      "dependencies": {
-        "NETStandard.Library": "1.5.0-rc2-24027"
       }
     }
   }

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

@@ -22,25 +22,15 @@
       "includeFiles": "Properties/System.Reactive.Core.rd.xml"
     }
   },
-  
+
   "dependencies": {
-    "System.Reactive.Interfaces": { "target": "project" }
+    "System.Reactive.Interfaces": { "target": "project" },
+    "System.ComponentModel": "4.0.1-rc2-24027",
+    "System.Diagnostics.Contracts": "4.0.1-rc2-24027",
+    "System.Dynamic.Runtime": "4.0.11-rc2-24027"
   },
   
   "frameworks": {
-    "net40": {
-      "buildOptions": {
-        "define": [
-          "NO_TASK_DELAY",
-          "HAS_APTCA",
-          "HAS_WINFORMS",
-          "USE_TIMER_SELF_ROOT",
-          "NO_WEAKREFOFT",
-          "DESKTOPCLR",
-          "DESKTOPCLR40"
-        ]
-      }
-    },
     "net45": {
       "buildOptions": {
         "define": [
@@ -96,11 +86,6 @@
           "USE_TIMER_SELF_ROOT",
           "PLIB"
         ]
-      },
-      "dependencies": {
-        "System.ComponentModel": "4.0.1-rc2-24027",
-        "System.Diagnostics.Contracts": "4.0.1-rc2-24027",
-        "System.Dynamic.Runtime": "4.0.11-rc2-24027"
       }
     },
     "netstandard1.3": {
@@ -121,11 +106,6 @@
           "PLIB",
           "USE_TIMER_SELF_ROOT"
         ]
-      },
-      "dependencies": {
-        "System.ComponentModel": "4.0.1-rc2-24027",
-        "System.Diagnostics.Contracts": "4.0.1-rc2-24027",
-        "System.Dynamic.Runtime": "4.0.11-rc2-24027"
       }
     },
     "netcoreapp1.0": {
@@ -147,9 +127,6 @@
         ]
       },
       "dependencies": {
-        "System.ComponentModel": "4.0.1-rc2-24027",
-        "System.Diagnostics.Contracts": "4.0.1-rc2-24027",
-        "System.Dynamic.Runtime": "4.0.11-rc2-24027",
         "System.Threading.Thread": "4.0.0-rc2-24027",
         "System.Threading.ThreadPool": "4.0.10-rc2-24027"
       }

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

@@ -30,19 +30,6 @@
   },
   
   "frameworks": {
-    "net40": {
-      "buildOptions": {
-        "define": [
-          "NO_TASK_DELAY",
-          "HAS_APTCA",
-          "HAS_WINFORMS",
-          "USE_TIMER_SELF_ROOT",
-          "NO_WEAKREFOFT",
-          "DESKTOPCLR",
-          "DESKTOPCLR40"
-        ]
-      }
-    },
     "net45": {
       "buildOptions": {
         "define": [
@@ -98,9 +85,6 @@
           "USE_TIMER_SELF_ROOT",
           "PLIB"
         ]
-      },
-      "dependencies": {
-            
       }
     },
     "netstandard1.3": {
@@ -121,9 +105,6 @@
           "PLIB",
           "USE_TIMER_SELF_ROOT"
         ]
-      },
-      "dependencies": {
-            
       }
     }
   }

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

@@ -2,11 +2,11 @@
   "version": "3.0.0-*",
   "title": "Reactive Extensions - Interfaces Library",
   "description": "Reactive Extensions Interfaces Library containing essential interfaces.",
-  "authors": ["Microsoft"],
+  "authors": [ "Microsoft" ],
   "copyright": "Copyright (C) Microsoft Corporation",
 
   "packOptions": {
-    "tags": ["Rx", "Reactive", "Extensions", "Observable", "LINQ", "Events"],
+    "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",
@@ -19,21 +19,13 @@
     "nowarn": [ "CS1591" ],
     "xmlDoc": true
   },
-  
+
+  "dependencies": {
+    "NETStandard.Library": "1.5.0-rc2-24027",
+    "System.Linq.Expressions": "4.0.11-rc2-24027"
+  },
+
   "frameworks": {
-    "net40": {
-      "buildOptions": {
-        "define": [
-          "NO_TASK_DELAY",
-          "HAS_APTCA",
-          "HAS_WINFORMS",
-          "USE_TIMER_SELF_ROOT",
-          "NO_WEAKREFOFT",
-          "DESKTOPCLR",
-          "DESKTOPCLR40"
-        ]
-      }
-    },
     "net45": {
       "buildOptions": {
         "define": [
@@ -70,10 +62,6 @@
           "USE_TIMER_SELF_ROOT",
           "PLIB"
         ]
-      },
-      "dependencies": {
-        "NETStandard.Library": "1.5.0-rc2-24027",
-        "System.Linq.Expressions": "4.0.11-rc2-24027"
       }
     }
   }

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

@@ -32,23 +32,11 @@
   },
   
   "dependencies": {
-    "System.Reactive.Core": { "target": "project" }
+    "System.Reactive.Core": { "target": "project" },
+    "System.Runtime.InteropServices.WindowsRuntime": "4.0.1-rc2-24027"
   },
   
   "frameworks": {
-    "net40": {
-      "buildOptions": {
-        "define": [
-          "NO_TASK_DELAY",
-          "HAS_APTCA",
-          "HAS_WINFORMS",
-          "USE_TIMER_SELF_ROOT",
-          "NO_WEAKREFOFT",
-          "DESKTOPCLR",
-          "DESKTOPCLR40"
-        ]
-      }
-    },
     "net45": {
       "buildOptions": {
         "define": [
@@ -104,9 +92,6 @@
           "USE_TIMER_SELF_ROOT",
           "PLIB"
         ]
-      },
-      "dependencies": {
-        "System.Runtime.InteropServices.WindowsRuntime": "4.0.1-rc2-24027"
       }
     },
     "netstandard1.3": {
@@ -127,9 +112,6 @@
           "PLIB",
           "USE_TIMER_SELF_ROOT"
         ]
-      },
-      "dependencies": {
-        "System.Runtime.InteropServices.WindowsRuntime": "4.0.1-rc2-24027"
       }
     }
   }

Rx.NET/Source/System.Reactive.Observable.Aliases/project.json

@@ -25,19 +25,6 @@
   },
   
   "frameworks": {
-    "net40": {
-      "buildOptions": {
-        "define": [
-          "NO_TASK_DELAY",
-          "HAS_APTCA",
-          "HAS_WINFORMS",
-          "USE_TIMER_SELF_ROOT",
-          "NO_WEAKREFOFT",
-          "DESKTOPCLR",
-          "DESKTOPCLR40"
-        ]
-      }
-    },
     "net45": {
       "buildOptions": {
         "define": [
@@ -93,9 +80,6 @@
           "USE_TIMER_SELF_ROOT",
           "PLIB"
         ]
-      },
-      "dependencies": {
-            
       }
     },
     "netstandard1.3": {
@@ -116,9 +100,6 @@
           "PLIB",
           "USE_TIMER_SELF_ROOT"
         ]
-      },
-      "dependencies": {
-            
       }
     }
   }

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

@@ -31,19 +31,6 @@
   },
   
   "frameworks": {
-    "net40": {
-      "buildOptions": {
-        "define": [
-          "NO_TASK_DELAY",
-          "HAS_APTCA",
-          "HAS_WINFORMS",
-          "USE_TIMER_SELF_ROOT",
-          "NO_WEAKREFOFT",
-          "DESKTOPCLR",
-          "DESKTOPCLR40"
-        ]
-      }
-    },
     "net45": {
       "buildOptions": {
         "define": [
@@ -99,9 +86,6 @@
           "USE_TIMER_SELF_ROOT",
           "PLIB"
         ]
-      },
-      "dependencies": {
-
       }
     },
     "netstandard1.3": {
@@ -122,9 +106,6 @@
           "PLIB",
           "USE_TIMER_SELF_ROOT"
         ]
-      },
-      "dependencies": {
-
       }
     },
     "netcoreapp1.0": {
@@ -144,8 +125,6 @@
           "PLIB",
           "USE_TIMER_SELF_ROOT"
         ]
-      },
-      "dependencies": {
       }
     },
     "wpa81": {

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

@@ -22,25 +22,14 @@
       "includeFiles": "Properties/System.Reactive.Providers.rd.xml"
     }
   },
-  
+
   "dependencies": {
-    "System.Reactive.Linq": { "target": "project" }
+    "System.Reactive.Linq": { "target": "project" },
+    "System.Linq.Queryable": "4.0.1-rc2-24027",
+    "System.Reflection.Extensions": "4.0.1-rc2-24027"
   },
   
   "frameworks": {
-    "net40": {
-      "buildOptions": {
-        "define": [
-          "NO_TASK_DELAY",
-          "HAS_APTCA",
-          "HAS_WINFORMS",
-          "USE_TIMER_SELF_ROOT",
-          "NO_WEAKREFOFT",
-          "DESKTOPCLR",
-          "DESKTOPCLR40"
-        ]
-      }
-    },
     "net45": {
       "buildOptions": {
         "define": [
@@ -57,9 +46,6 @@
           "DESKTOPCLR",
           "DESKTOPCLR45"
         ]
-      },
-      "dependencies": {
-            
       }
     },
     "net46": {
@@ -99,10 +85,6 @@
           "USE_TIMER_SELF_ROOT",
           "PLIB"
         ]
-      },
-      "dependencies": {
-        "System.Linq.Queryable": "4.0.1-rc2-24027",
-        "System.Reflection.Extensions": "4.0.1-rc2-24027"
       }
     },
     "netstandard1.3": {
@@ -123,10 +105,6 @@
           "PLIB",
           "USE_TIMER_SELF_ROOT"
         ]
-      },
-      "dependencies": {
-        "System.Linq.Queryable": "4.0.1-rc2-24027",
-        "System.Reflection.Extensions": "4.0.1-rc2-24027"
       }
     }
   }

Rx.NET/Source/System.Reactive.Runtime.Remoting/project.json

@@ -28,19 +28,6 @@
   },
   
   "frameworks": {
-    "net40": {
-      "buildOptions": {
-        "define": [
-          "NO_TASK_DELAY",
-          "HAS_APTCA",
-          "HAS_WINFORMS",
-          "USE_TIMER_SELF_ROOT",
-          "NO_WEAKREFOFT",
-          "DESKTOPCLR",
-          "DESKTOPCLR40"
-        ]
-      }
-    },
     "net45": {
       "buildOptions": {
         "define": [

Rx.NET/Source/System.Reactive.Windows.Forms/project.json

@@ -26,23 +26,6 @@
   },
   
   "frameworks": {
-    "net40": {
-      "buildOptions": {
-        "define": [
-          "NO_TASK_DELAY",
-          "HAS_APTCA",
-          "HAS_WINFORMS",
-          "USE_TIMER_SELF_ROOT",
-          "NO_WEAKREFOFT",
-          "DESKTOPCLR",
-          "DESKTOPCLR40"
-        ]
-      },
-      "frameworkAssemblies": {
-        "System.Windows.Forms": "",
-        "WindowsBase": ""
-      }
-    },
     "net45": {
       "buildOptions": {
         "define": [

Rx.NET/Source/System.Reactive.Windows.Threading/project.json

@@ -26,22 +26,6 @@
   },
   
   "frameworks": {
-    "net40": {
-      "buildOptions": {
-        "define": [
-          "NO_TASK_DELAY",
-          "HAS_APTCA",
-          "HAS_WINFORMS",
-          "USE_TIMER_SELF_ROOT",
-          "NO_WEAKREFOFT",
-          "DESKTOPCLR",
-          "DESKTOPCLR40"
-        ]
-      },
-      "frameworkAssemblies": {
-        "WindowsBase": ""
-      }
-    },
     "net45": {
       "buildOptions": {
         "define": [