Merge branch 'rel/1.0.0' of https://github.com/dotnet/cli into kestrel-tests2

TestAssets/TestProjects/DependencyContextValidator/DependencyContextValidator/Validator.cs

@@ -44,6 +44,7 @@ namespace Microsoft.Extensions.DependencyModel
                     var resolvedPaths = compilationLibrary.ResolveReferencePaths();
                     foreach (var resolvedPath in resolvedPaths)
                     {
+                        Console.WriteLine($"Compilation {compilationLibrary.Name}:{Path.GetFileName(resolvedPath)}");
                         if (!File.Exists(resolvedPath))
                         {
                             Error($"Compilataion library resolved to non existent path {resolvedPath}");
@@ -55,8 +56,10 @@ namespace Microsoft.Extensions.DependencyModel
             foreach (var runtimeLibrary in context.RuntimeLibraries)
             {
                 CheckMetadata(runtimeLibrary);
-                foreach (var assembly in runtimeLibrary.GetDefaultNativeAssets(context)) {}
-                foreach (var native in runtimeLibrary.GetDefaultAssemblyNames(context)) {}
+                foreach (var native in runtimeLibrary.GetDefaultNativeAssets(context)) {}
+                foreach (var assembly in runtimeLibrary.GetDefaultAssemblyNames(context)) {
+                    Console.WriteLine($"Runtime {runtimeLibrary.Name}:{assembly.Name}");
+                }
             }
 
             foreach (var native in context.GetDefaultNativeAssets()) {}

TestAssets/TestProjects/DependencyContextValidator/DependencyContextValidator/project.json

@@ -1,15 +1,19 @@
 {
   "version": "1.0.0-*",
   "dependencies": {
-    "NETStandard.Library": "1.5.0-rc2-23931",
     "Microsoft.Extensions.DependencyModel": {
       "target": "project",
       "version": "1.0.0-*"
     }
   },
   "frameworks": {
-    "netstandardapp1.5": {
-      "imports": "dnxcore50"
+    "netstandard1.5": {
+      "imports": "dnxcore50",
+      "dependencies": {
+        "NETStandard.Library": "1.5.0-rc2-23931",
+      }
+    },
+    "net451": {
     }
   }
 }

TestAssets/TestProjects/DependencyContextValidator/TestAppFullClr/Program.cs

@@ -0,0 +1,16 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+using System.Diagnostics;
+
+namespace TestApp
+{
+    public class Program
+    {
+        public static void Main(string[] args)
+        {
+            Microsoft.Extensions.DependencyModel.DependencyContextValidator.Validate(true);
+        }
+    }
+}

TestAssets/TestProjects/DependencyContextValidator/TestAppFullClr/project.json

@@ -0,0 +1,14 @@
+{
+  "version": "1.0.0-*",
+  "compilationOptions": {
+    "emitEntryPoint": true,
+    "preserveCompilationContext": true
+  },
+  "dependencies": {
+    "DependencyContextValidator": "1.0.0-*"
+  },
+  "frameworks": {
+    "net451": {
+    }
+  }
+}

TestAssets/TestProjects/DependencyContextValidator/TestAppPortable/Program.cs

@@ -0,0 +1,16 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+using System.Diagnostics;
+
+namespace TestApp
+{
+    public class Program
+    {
+        public static void Main(string[] args)
+        {
+            Microsoft.Extensions.DependencyModel.DependencyContextValidator.Validate(true);
+        }
+    }
+}

TestAssets/TestProjects/DependencyContextValidator/TestAppPortable/project.json

@@ -0,0 +1,19 @@
+{
+  "version": "1.0.0-*",
+  "compilationOptions": {
+    "emitEntryPoint": true,
+    "preserveCompilationContext": true
+  },
+  "dependencies": {
+    "Microsoft.NETCore.App": {
+        "type": "platform",
+        "version": "1.0.0-rc2-23931"
+    },
+    "DependencyContextValidator": "1.0.0-*"
+  },
+  "frameworks": {
+    "netstandard1.5": {
+      "imports" : "dnxcore50"
+    }
+  }
+}

TestAssets/TestProjects/DependencyContextValidator/TestAppPortableDeps/Program.cs

@@ -0,0 +1,16 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+using System.Diagnostics;
+
+namespace TestApp
+{
+    public class Program
+    {
+        public static void Main(string[] args)
+        {
+            Microsoft.Extensions.DependencyModel.DependencyContextValidator.Validate(true);
+        }
+    }
+}

TestAssets/TestProjects/DependencyContextValidator/TestAppPortableDeps/project.json

@@ -0,0 +1,18 @@
+{
+  "version": "1.0.0-*",
+  "compilationOptions": {
+    "emitEntryPoint": true,
+  },
+  "dependencies": {
+    "Microsoft.NETCore.App": {
+        "type": "platform",
+        "version": "1.0.0-rc2-23931"
+    },
+    "DependencyContextValidator": "1.0.0-*"
+  },
+  "frameworks": {
+    "netstandard1.5": {
+      "imports" : "dnxcore50"
+    }
+  }
+}

TestAssets/TestProjects/PortableTests/PortableAppCompilationContext/Program.cs

@@ -0,0 +1,12 @@
+using System;
+
+namespace PortableApp
+{
+    public static class Program
+    {
+        public static void Main(string[] args)
+        {
+            Console.WriteLine("Hello, World!");
+        }
+    }
+}

TestAssets/TestProjects/PortableTests/PortableAppCompilationContext/project.json

@@ -0,0 +1,21 @@
+{
+  "compilationOptions": {
+    "emitEntryPoint": true,
+    "preserveCompilationContext": true
+  },
+  "dependencies": {},
+  "frameworks": {
+    "netstandard1.5": {
+      "imports": [
+        "dnxcore50",
+        "portable-net45+win8"
+      ],
+      "dependencies": {
+        "Microsoft.NETCore.App": {
+          "type": "platform",
+          "version": "1.0.0-rc2-23931"
+        }
+      }
+    }
+  }
+}