Merge pull request #573 from filipw/bugfix-working-directory

seesharper · web-flow · commit f4ea82a1bf81 · 2020-08-11T12:43:42.000+02:00
Ignore global.json in script folder
diff --git a/global.json b/global.json
@@ -0,0 +1,6 @@
+{
+  "sdk": {
+    "version": "3.1.102",
+    "rollForward": "latestFeature"
+  }
+}
diff --git a/src/Dotnet.Script.DependencyModel/Context/DotnetRestorer.cs b/src/Dotnet.Script.DependencyModel/Context/DotnetRestorer.cs
@@ -3,6 +3,7 @@
 using Dotnet.Script.DependencyModel.Process;
 using Dotnet.Script.DependencyModel.ProjectSystem;
 using System;
+using System.IO;
 using System.Linq;
 
 namespace Dotnet.Script.DependencyModel.Context
@@ -25,9 +26,12 @@ public void Restore(ProjectFileInfo projectFileInfo, string[] packageSources)
             var packageSourcesArgument = CreatePackageSourcesArguments();
             var configFileArgument = CreateConfigFileArgument();
             var runtimeIdentifier = _scriptEnvironment.RuntimeIdentifier;
+            var workingDirectory = Path.GetFullPath(Path.GetDirectoryName(projectFileInfo.Path));
+
 
             _logger.Debug($"Restoring {projectFileInfo.Path} using the dotnet cli. RuntimeIdentifier : {runtimeIdentifier} NugetConfigFile: {projectFileInfo.NuGetConfigFile}");
-            var exitcode = _commandRunner.Execute("dotnet", $"restore \"{projectFileInfo.Path}\" -r {runtimeIdentifier} {packageSourcesArgument} {configFileArgument}");
+
+            var exitcode = _commandRunner.Execute("dotnet", $"restore \"{projectFileInfo.Path}\" -r {runtimeIdentifier} {packageSourcesArgument} {configFileArgument}", workingDirectory);
             if (exitcode != 0)
             {
                 // We must throw here, otherwise we may incorrectly run with the old 'project.assets.json'
diff --git a/src/Dotnet.Script.Tests/ScriptExecutionTests.cs b/src/Dotnet.Script.Tests/ScriptExecutionTests.cs
@@ -456,6 +456,15 @@ public void ShouldHandleScriptWithTargetFrameworkInShebang()
             Assert.Contains("Hello world!", result.output);
         }
 
+        [Fact]
+        public void ShouldIgnoreGlobalJsonInScriptFolder()
+        {
+            var fixture = "InvalidGlobalJson";
+            var workingDirectory = Path.GetDirectoryName(TestPathUtils.GetPathToTestFixture(fixture));
+            var result = ScriptTestRunner.Default.ExecuteFixture("InvalidGlobalJson", $"--no-cache", workingDirectory);
+            Assert.Contains("Hello world!", result.output);
+        }
+
 
         private static string CreateTestScript(string scriptFolder)
         {
@@ -470,7 +479,7 @@ private static string CreateTestScript(string scriptFolder)
 
         private static void CreateTestPackage(string packageLibraryFolder)
         {
-            ProcessHelper.RunAndCaptureOutput("dotnet", "new classlib -n NuGetConfigTestLibrary", packageLibraryFolder);
+            ProcessHelper.RunAndCaptureOutput("dotnet", "new classlib -n NuGetConfigTestLibrary -f netstandard2.0", packageLibraryFolder);
             var projectFolder = Path.Combine(packageLibraryFolder, "NuGetConfigTestLibrary");
             ProcessHelper.RunAndCaptureOutput("dotnet", $"pack -o \"{Path.Combine(packageLibraryFolder, "packagePath")}\"", projectFolder);
             CreateNuGetConfig(packageLibraryFolder);
diff --git a/src/Dotnet.Script.Tests/ScriptTestRunner.cs b/src/Dotnet.Script.Tests/ScriptTestRunner.cs
@@ -35,10 +35,10 @@ public int ExecuteInProcess(string arguments = null)
             return Program.Main(arguments?.Split(" ") ?? Array.Empty<string>());
         }
 
-        public (string output, int exitCode) ExecuteFixture(string fixture, string arguments = null)
+        public (string output, int exitCode) ExecuteFixture(string fixture, string arguments = null, string workingDirectory = null)
         {
             var pathToFixture = TestPathUtils.GetPathToTestFixture(fixture);
-            var result = ProcessHelper.RunAndCaptureOutput("dotnet", GetDotnetScriptArguments($"{pathToFixture} {arguments}"));
+            var result = ProcessHelper.RunAndCaptureOutput("dotnet", GetDotnetScriptArguments($"{pathToFixture} {arguments}"), workingDirectory);
             return result;
         }
 
diff --git a/src/Dotnet.Script.Tests/TestFixtures/InvalidGlobalJson/InvalidGlobalJson.csx b/src/Dotnet.Script.Tests/TestFixtures/InvalidGlobalJson/InvalidGlobalJson.csx
@@ -0,0 +1 @@
+Console.WriteLine("Hello world!");
diff --git a/src/Dotnet.Script.Tests/TestFixtures/InvalidGlobalJson/global.json b/src/Dotnet.Script.Tests/TestFixtures/InvalidGlobalJson/global.json
@@ -0,0 +1,5 @@
+{
+  "sdk": {
+    "version": "3.0.100"
+  }
+}

Original file line number	Diff line number	Diff line change
`@@ -35,10 +35,10 @@ public int ExecuteInProcess(string arguments = null)`
`35`	`35`	`return Program.Main(arguments?.Split(" ") ?? Array.Empty<string>());`
`36`	`36`	`}`
`37`	`37`
`38`		`- public (string output, int exitCode) ExecuteFixture(string fixture, string arguments = null)`
	`38`	`+ public (string output, int exitCode) ExecuteFixture(string fixture, string arguments = null, string workingDirectory = null)`
`39`	`39`	`{`
`40`	`40`	`var pathToFixture = TestPathUtils.GetPathToTestFixture(fixture);`
`41`		`- var result = ProcessHelper.RunAndCaptureOutput("dotnet", GetDotnetScriptArguments($"{pathToFixture} {arguments}"));`
	`41`	`+ var result = ProcessHelper.RunAndCaptureOutput("dotnet", GetDotnetScriptArguments($"{pathToFixture} {arguments}"), workingDirectory);`
`42`	`42`	`return result;`
`43`	`43`	`}`
`44`	`44`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +{
 +  "sdk": {
 +    "version": "3.0.100"
 +  }
 +}