Sfoglia il codice sorgente

Get projects building on dotnet CLI

Oren Novotny 9 anni fa
parent
commit
4854b0ad05

+ 5 - 1
Rx.NET/NuGet.Config

@@ -2,7 +2,11 @@
 <configuration>
   <packageSources>
     <clear />
-    <add key="myget.org dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
+    <add key="myget.org dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />    
+    <add key="dotnet.myget.org dotnet-cli" value="https://dotnet.myget.org/F/dotnet-cli/api/v3/index.json" /> 
+    <add key="coreclr-xunit" value="https://www.myget.org/F/coreclr-xunit/api/v3/index.json" /> 
+    <add key="AspNetCIDev" value="https://www.myget.org/F/aspnetcidev/api/v3/index.json" />
+    <add key="nugetbuild" value="https://www.myget.org/F/nugetbuild/api/v3/index.json" />
     <add key="NuGet.org" value="https://api.nuget.org/v3/index.json" />
   </packageSources>
   <disabledPackageSources>

+ 5 - 3
Rx.NET/Source/Microsoft.Reactive.Testing/project.json

@@ -58,11 +58,12 @@
                 ]
             },
             "dependencies": {
-                "System.Runtime": "4.1.0-rc3-23823"
+                "System.Runtime": "4.1.0-rc2-23904"
             }
             
         },
-        "dotnet5.1": {
+        "netstandard1.0": {
+            "imports": [ "dnxcore50", "portable-win8+net45" ],
             "compilationOptions": {
                 "define": [
                     "NO_EVENTARGS_CONSTRAINT",
@@ -85,7 +86,8 @@
             }
 
         },
-        "dotnet5.4": {
+        "netstandard1.3": {
+            "imports": [ "dnxcore50", "portable-win8+net45" ],
             "compilationOptions": {
                 "define": [
                     "NO_EVENTARGS_CONSTRAINT",

+ 17 - 17
Rx.NET/Source/System.Reactive.Core/project.json

@@ -65,7 +65,7 @@
                 ]
             }
         },
-        "dotnet5.1": {
+        "netstandard1.0": {
             "compilationOptions": {
                 "define": [
                     "NO_EVENTARGS_CONSTRAINT",
@@ -85,17 +85,17 @@
                 ]
             },
             "dependencies": {
-                "System.ComponentModel": "4.0.1-rc3-23823",
-                "System.Diagnostics.Contracts": "4.0.1-rc3-23823",
-                "System.Diagnostics.Debug": "4.0.11-rc3-23823",
-                "System.Dynamic.Runtime": "4.0.11-rc3-23823",
-                "System.Linq": "4.0.1-rc3-23823",
-                "System.Runtime": "4.1.0-rc3-23823",
-                "System.Runtime.Extensions": "4.1.0-rc3-23823",
-                "System.Threading": "4.0.11-rc3-23823"
+                "System.ComponentModel": "4.0.1-rc2-23904",
+                "System.Diagnostics.Contracts": "4.0.1-rc2-23904",
+                "System.Diagnostics.Debug": "4.0.11-rc2-23904",
+                "System.Dynamic.Runtime": "4.0.11-rc2-23904",
+                "System.Linq": "4.0.1-rc2-23904",
+                "System.Runtime": "4.1.0-rc2-23904",
+                "System.Runtime.Extensions": "4.1.0-rc2-23904",
+                "System.Threading": "4.0.11-rc2-23904"
             }
         },
-        "dotnet5.4": {
+        "netstandard1.3": {
             "compilationOptions": {
                 "define": [
                     "NO_EVENTARGS_CONSTRAINT",
@@ -114,13 +114,13 @@
                 ]
             },
             "dependencies": {
-                "System.Collections.Concurrent": "4.0.12-rc3-23823",
-                "System.ComponentModel": "4.0.1-rc3-23823",
-                "System.Linq": "4.0.1-rc3-23823",
-                "System.Threading": "4.0.11-rc3-23823",
-                "System.Threading.Thread": "4.0.0-rc3-23823",
-                "System.Threading.ThreadPool": "4.0.10-rc3-23823",
-                "System.Threading.Timer": "4.0.1-rc3-23823"
+                "System.Collections.Concurrent": "4.0.12-rc2-23904",
+                "System.ComponentModel": "4.0.1-rc2-23904",
+                "System.Linq": "4.0.1-rc2-23904",
+                "System.Threading": "4.0.11-rc2-23904",
+                "System.Threading.Thread": "4.0.0-rc2-23904",
+                "System.Threading.ThreadPool": "4.0.10-rc2-23904",
+                "System.Threading.Timer": "4.0.1-rc2-23904"
             }
         }
     }

+ 2 - 2
Rx.NET/Source/System.Reactive.Experimental/project.json

@@ -67,7 +67,7 @@
                 ]
             }
         },
-        "dotnet5.1": {
+        "netstandard1.0": {
             "compilationOptions": {
                 "define": [
                     "NO_EVENTARGS_CONSTRAINT",
@@ -89,7 +89,7 @@
             "dependencies": {
             }
         },
-        "dotnet5.4": {
+        "netstandard1.3": {
             "compilationOptions": {
                 "define": [
                     "NO_EVENTARGS_CONSTRAINT",

+ 7 - 7
Rx.NET/Source/System.Reactive.Interfaces/project.json

@@ -41,7 +41,7 @@
                 ]
             }
         },
-        "dotnet5.1": {
+        "netstandard1.0": {
             "compilationOptions": {
                 "define": [
                     "NO_EVENTARGS_CONSTRAINT",
@@ -61,12 +61,12 @@
                 ]
             },
             "dependencies": {
-                "System.Diagnostics.Tools": "4.0.1-rc3-23823",
-                "System.Linq": "4.0.1-rc3-23823",
-                "System.Linq.Expressions": "4.0.11-rc3-23823",
-                "System.Resources.ResourceManager": "4.0.1-rc3-23823",
-                "System.Runtime": "4.1.0-rc3-23823",
-                "System.Threading": "4.0.11-rc3-23823"
+                "System.Diagnostics.Tools": "4.0.1-rc2-23904",
+                "System.Linq": "4.0.1-rc2-23904",
+                "System.Linq.Expressions": "4.0.11-rc2-23904",
+                "System.Resources.ResourceManager": "4.0.1-rc2-23904",
+                "System.Runtime": "4.1.0-rc2-23904",
+                "System.Threading": "4.0.11-rc2-23904"
             }
         }
     }

+ 8 - 8
Rx.NET/Source/System.Reactive.Linq/project.json

@@ -72,7 +72,7 @@
                 ]
             }
         },
-        "dotnet5.1": {
+        "netstandard1.0": {
             "compilationOptions": {
                 "define": [
                     "NO_EVENTARGS_CONSTRAINT",
@@ -92,12 +92,12 @@
                 ]
             },
             "dependencies": {
-                "System.Runtime.InteropServices.WindowsRuntime": "4.0.1-rc3-23823",
-                "System.Runtime": "4.1.0-rc3-23823",
-                "System.Runtime.Extensions": "4.1.0-rc3-23823"
+                "System.Runtime.InteropServices.WindowsRuntime": "4.0.1-rc2-23904",
+                "System.Runtime": "4.1.0-rc2-23904",
+                "System.Runtime.Extensions": "4.1.0-rc2-23904"
             }
         },
-        "dotnet5.4": {
+        "netstandard1.3": {
             "compilationOptions": {
                 "define": [
                     "NO_EVENTARGS_CONSTRAINT",
@@ -116,9 +116,9 @@
                 ]
             },
             "dependencies": {
-                "System.Collections.Concurrent": "4.0.12-rc3-23823",
-                "System.Reflection.TypeExtensions": "4.1.0-rc3-23823",
-                "System.Runtime.InteropServices.WindowsRuntime": "4.0.1-rc3-23823"
+                "System.Collections.Concurrent": "4.0.12-rc2-23904",
+                "System.Reflection": "4.1.0-rc2-23904",
+                "System.Runtime.InteropServices.WindowsRuntime": "4.0.1-rc2-23904"
             }
         }
     }

+ 2 - 2
Rx.NET/Source/System.Reactive.Observable.Aliases/project.json

@@ -65,7 +65,7 @@
                 ]
             }
         },
-        "dotnet5.1": {
+        "netstandard1.0": {
             "compilationOptions": {
                 "define": [
                     "NO_EVENTARGS_CONSTRAINT",
@@ -87,7 +87,7 @@
             "dependencies": {
             }
         },
-        "dotnet5.4": {
+        "netstandard1.3": {
             "compilationOptions": {
                 "define": [
                     "NO_EVENTARGS_CONSTRAINT",

+ 2 - 2
Rx.NET/Source/System.Reactive.PlatformServices/project.json

@@ -67,7 +67,7 @@
                 ]
             }
         },
-        "dotnet5.1": {
+        "netstandard1.0": {
             "compilationOptions": {
                 "define": [
                     "NO_EVENTARGS_CONSTRAINT",
@@ -89,7 +89,7 @@
             "dependencies": {
             }
         },
-        "dotnet5.4": {
+        "netstandard1.3": {
             "compilationOptions": {
                 "define": [
                     "NO_EVENTARGS_CONSTRAINT",

+ 5 - 5
Rx.NET/Source/System.Reactive.Providers/project.json

@@ -68,7 +68,7 @@
                 ]
             }
         },
-        "dotnet5.1": {
+        "netstandard1.0": {
             "compilationOptions": {
                 "define": [
                     "NO_EVENTARGS_CONSTRAINT",
@@ -88,11 +88,11 @@
                 ]
             },
             "dependencies": {
-                "System.Linq.Queryable": "4.0.1-rc3-23823",
-                "System.Reflection.Extensions": "4.0.1-rc3-23823"
+                "System.Linq.Queryable": "4.0.1-rc2-23904",
+                "System.Reflection.Extensions": "4.0.1-rc2-23904"
             }
         },
-        "dotnet5.4": {
+        "netstandard1.3": {
             "compilationOptions": {
                 "define": [
                     "NO_EVENTARGS_CONSTRAINT",
@@ -111,7 +111,7 @@
                 ]
             },
             "dependencies": {
-                "System.Linq.Queryable": "4.0.1-rc3-23823"
+                "System.Linq.Queryable": "4.0.1-rc2-23904"
             }
         }
     }

+ 4 - 3
Rx.NET/Source/System.Reactive.WindowsRuntime/project.json

@@ -15,7 +15,8 @@
   },
 
   "frameworks": {
-    "dotnet5.1": {
+    "netstandard1.1": {
+        "imports": [ "dotnet5.2" ],
         "compilationOptions": {
             "define": [
                 "NO_EVENTARGS_CONSTRAINT",
@@ -40,8 +41,8 @@
                 "version": "1.0.1",
                 "type": "build"
             },
-            "System.Threading.Tasks": "4.0.11-rc3-23823",
-            "System.Runtime.WindowsRuntime": "4.0.11-rc3-23823"
+            "System.Threading.Tasks": "4.0.11-rc2-23904",
+            "System.Runtime.WindowsRuntime": "4.0.11-rc2-23904"
         }
 
     }

+ 1 - 1
Rx.NET/Source/Tests.System.Reactive/DispatcherHelpers.cs

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. See License.txt in the project root for license information.
 
 using System;
-#if DOTNET5_1 || DNX451 || DNX461
+#if NETSTANDARDAPP1_5
 using System.Threading;
 #else
 using System.Windows.Threading;

+ 72 - 76
Rx.NET/Source/Tests.System.Reactive/project.json

@@ -1,82 +1,78 @@
 {
-  "version": "3.0.0-*",
-  "title": "Reactive Extensions - Core Library",
-  "description": "Reactive Extensions Core Library containing base classes and scheduler infrastructure.",
-  "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.Interfaces": { "target": "project" },
-    "System.Reactive.Linq": { "target": "project" },
-    "System.Reactive.PlatformServices": { "target": "project" },
-    "Microsoft.Reactive.Testing": { "target": "project" },
-    "System.Reactive.Experimental": { "target": "project" },
-    "System.Reactive.Providers": { "target": "project" }, 
-    "System.Reactive.Observable.Aliases": {"target": "project"},
-    "xunit": "2.1.0",
-    "xunit.runner.dnx": "2.1.0-rc1-build204"
-  },
-  "commands": {
-    "test": "xunit.runner.dnx"
-  },
+    "version": "3.0.0-*",
+    "title": "Reactive Extensions - Core Library",
+    "description": "Reactive Extensions Core Library containing base classes and scheduler infrastructure.",
+    "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,
 
-  "frameworks": {
-    "dnx451": {
-      "compilationOptions": {
-        "define": [
-            "NO_EVENTARGS_CONSTRAINT",
-            "NO_REMOTING",
-            "HAS_EDI",
-            "HAS_WINRT",
-            "HAS_PROGRESS",
-            "PREFER_ASYNC",
-            "HAS_AWAIT",
-            "HAS_APTCA",
-            "HAS_STACKTRACE",
-            "HAS_WINFORMS",
-            "USE_TIMER_SELF_ROOT",
-            "DESKTOPCLR",
-            "DESKTOPCLR45"
-        ]
-      },
-      "dependencies": {
-        "System.Reactive.Windows.Threading": { "target": "project" },
-        "System.Reactive.Windows.Forms": { "target": "project" },
-        "System.Reactive.Runtime.Remoting": { "target": "project" }        
-      },
-      "frameworkAssemblies": {
-      }
+    "dependencies": {
+        "System.Reactive.Interfaces": { "target": "project" },
+        "System.Reactive.Linq": { "target": "project" },
+        "System.Reactive.PlatformServices": { "target": "project" },
+        "Microsoft.Reactive.Testing": { "target": "project" },
+        "System.Reactive.Experimental": { "target": "project" },
+        "System.Reactive.Providers": { "target": "project" },
+        "System.Reactive.Observable.Aliases": { "target": "project" },
+        "xunit": "2.1.0",
+        "NETStandard.Library": "1.0.0-rc2-23904"
     },
-    "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",
-            "DESKTOPCLR",
-            "DESKTOPCLR46"
-        ]
-      },
-        "dependencies": {
-            "System.Reactive.Windows.Threading": { "target": "project" },
-            "System.Reactive.Windows.Forms": { "target": "project" },
-            "System.Reactive.Runtime.Remoting": { "target": "project" }
+    "testRunner": "xunit",
+    "frameworks": {
+        "net461": {
+            "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",
+                    "USE_TIMER_SELF_ROOT",
+                    "DESKTOPCLR",
+                    "DESKTOPCLR46"
+                ]
+            },
+            "dependencies": {
+                "System.Reactive.Windows.Threading": { "target": "project" },
+                "System.Reactive.Windows.Forms": { "target": "project" },
+                "System.Reactive.Runtime.Remoting": { "target": "project" }
+            },
+            "frameworkAssemblies": {
+                "System.Threading.Tasks": "4.0.10.0"
+            }
+        },
+        "netstandardapp1.5": {
+            "imports": [ "dnxcore50", "portable-net45+win8" ],
+            "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": {
+                "dotnet-test-xunit": "1.0.0-dev-79755-47"
+            }
         }
     }
-  }
 }