Ignore global.json files when emitting projects during publish to fix #…

…2656

misc/GlobalJsonInProjectDir/Expected/approot/global.json

@@ -0,0 +1,6 @@
+{
+  "projects": [
+    "src"
+  ],
+  "packages": "packages"
+}

misc/GlobalJsonInProjectDir/Expected/approot/src/Project/project.json

@@ -0,0 +1,9 @@
+{
+  "dependencies": {
+  },
+
+  "frameworks" : {
+    "dnx451": { },
+    "dnxcore50": { }
+  }
+}

misc/GlobalJsonInProjectDir/Project/global.json

@@ -0,0 +1,2 @@
+{
+}

misc/GlobalJsonInProjectDir/Project/project.json

@@ -0,0 +1,9 @@
+{
+  "dependencies": {
+  },
+
+  "frameworks" : {
+    "dnx451": { },
+    "dnxcore50": { }
+  }
+}

src/Microsoft.Dnx.Runtime/ProjectFilesCollection.cs

@@ -12,7 +12,7 @@ namespace Microsoft.Dnx.Runtime
     public class ProjectFilesCollection
     {
         public static readonly string[] DefaultCompileBuiltInPatterns = new[] { @"**/*.cs" };
-        public static readonly string[] DefaultPublishExcludePatterns = new[] { @"obj/**/*.*", @"bin/**/*.*", @"**/.*/**" };
+        public static readonly string[] DefaultPublishExcludePatterns = new[] { @"obj/**/*.*", @"bin/**/*.*", @"**/.*/**", @"**/global.json" };
         public static readonly string[] DefaultPreprocessPatterns = new[] { @"compiler/preprocess/**/*.cs" };
         public static readonly string[] DefaultSharedPatterns = new[] { @"compiler/shared/**/*.cs" };
         public static readonly string[] DefaultResourcesBuiltInPatterns = new[] { @"compiler/resources/**/*", "**/*.resx" };

test/Microsoft.Dnx.Tooling.FunctionalTests/DnuPublishTests2.cs

@@ -0,0 +1,34 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System.IO;
+using Microsoft.Dnx.Testing;
+using Xunit;
+
+namespace Microsoft.Dnx.Tooling.FunctionalTests
+{
+    [Collection(nameof(ToolingFunctionalTestCollection))]
+    public class DnuPublishTests2 : DnxSdkFunctionalTestBase
+    {
+        [Theory]
+        [MemberData(nameof(DnxSdks))]
+        public void GlobalJsonInProjectDir(DnxSdk sdk)
+        {
+            const string solutionName = "GlobalJsonInProjectDir";
+
+            var solution = TestUtils.GetSolution<DnuPublishTests>(sdk, solutionName);
+            var projectPath = Path.Combine(solution.RootPath, "Project");
+            var outputPath = Path.Combine(solution.RootPath, "Output");
+            var expectedOutputPath = Path.Combine(solution.RootPath, "Expected");
+
+            var result = sdk.Dnu.Publish(
+                projectPath,
+                outputPath);
+            result.EnsureSuccess();
+
+            var actualOutputStructure = new Dir(outputPath);
+            var expectedOutputStructure = new Dir(expectedOutputPath);
+            DirAssert.Equal(expectedOutputStructure, actualOutputStructure);
+        }
+    }
+}

test/Microsoft.Dnx.Tooling.FunctionalTests/ToolingFunctionalTestCollection.cs

@@ -0,0 +1,13 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using Xunit;
+
+namespace Microsoft.Dnx.Tooling.FunctionalTests
+{
+
+    [CollectionDefinition(nameof(ToolingFunctionalTestCollection))]
+    public class ToolingFunctionalTestCollection : ICollectionFixture<ToolingFunctionalTestFixture>
+    {
+    }
+}

test/Microsoft.Dnx.Tooling.FunctionalTests/ToolingFunctionalTestFixture.cs

@@ -0,0 +1,29 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using Microsoft.Dnx.Testing;
+
+namespace Microsoft.Dnx.Tooling.FunctionalTests
+{
+    public class ToolingFunctionalTestFixture : IDisposable
+    {
+        public ToolingFunctionalTestFixture()
+        {
+            Console.WriteLine($@"
+Environment information:
+  DNX_HOME: {Environment.GetEnvironmentVariable("DNX_HOME")}
+  DNX_SDK_VERSION_FOR_TESTING: {Environment.GetEnvironmentVariable("DNX_SDK_VERSION_FOR_TESTING")}
+
+Information of DNX under testing:
+  DNX Home: {DnxSdk.GetRuntimeHome()}
+  DNX Version: {DnxSdkFunctionalTestBase.SdkVersionForTesting}
+");
+        }
+
+        public void Dispose()
+        {
+
+        }
+    }
+}

test/Microsoft.Dnx.Tooling.FunctionalTests/project.json

@@ -3,6 +3,7 @@
         "Microsoft.AspNet.Testing": "1.0.0-*",
         "Microsoft.Dnx.CommonTestUtils": "1.0.0-*",
         "Microsoft.Dnx.Runtime.Sources": "1.0.0-*",
+        "Microsoft.Dnx.Testing.CommonUtils": "1.0.0-*",
         "Microsoft.Dnx.Tooling": "1.0.0-*",
         "xunit.runner.aspnet": "2.0.0-aspnet-*"
     },