Fixes #723 shebang before sdk

joshuabrink · joshuabrink · commit df73e8883077 · 2024-09-09T00:07:18.000+02:00
diff --git a/src/Dotnet.Script.DependencyModel/ProjectSystem/ScriptParser.cs b/src/Dotnet.Script.DependencyModel/ProjectSystem/ScriptParser.cs
@@ -53,7 +53,7 @@ public ParseResult ParseFromFiles(IEnumerable<string> csxFiles)
         private static string ReadSdkFromReferenceDirective(string fileContent)
         {
             const string pattern = DirectivePatternPrefix + "r" + SdkDirectivePatternSuffix;
-            var match = Regex.Match(fileContent, pattern);
+            var match = Regex.Match(fileContent, pattern, RegexOptions.Multiline);
             if (match.Success)
             {
                 var sdk = match.Groups[1].Value;
diff --git a/src/Dotnet.Script.Tests/ScriptProjectProviderTests.cs b/src/Dotnet.Script.Tests/ScriptProjectProviderTests.cs
@@ -40,5 +40,17 @@ public void ShouldUseSpecifiedSdk()
             var projectFileInfo = provider.CreateProject(TestPathUtils.GetPathToTestFixtureFolder("WebApi"), _scriptEnvironment.TargetFramework, true);
             Assert.Equal("Microsoft.NET.Sdk.Web", XDocument.Load(projectFileInfo.Path).Descendants("Project").Single().Attributes("Sdk").Single().Value);
         }
+
+        // See: https://github.com/dotnet-script/dotnet-script/issues/723
+        [Theory]
+        [InlineData("#!/usr/bin/env dotnet-script\n#r \"sdk:Microsoft.NET.Sdk.Web\"")]
+        [InlineData("#!/usr/bin/env dotnet-script\n\n#r \"sdk:Microsoft.NET.Sdk.Web\"")]
+        public void ShouldHandleShebangBeforeSdk(string code)
+        {
+            var parser = new ScriptParser(TestOutputHelper.CreateTestLogFactory());
+            var result = parser.ParseFromCode(code);
+
+            Assert.Equal("Microsoft.NET.Sdk.Web", result.Sdk);
+        }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ public ParseResult ParseFromFiles(IEnumerable<string> csxFiles)`
`53`	`53`	`private static string ReadSdkFromReferenceDirective(string fileContent)`
`54`	`54`	`{`
`55`	`55`	`const string pattern = DirectivePatternPrefix + "r" + SdkDirectivePatternSuffix;`
`56`		`- var match = Regex.Match(fileContent, pattern);`
	`56`	`+ var match = Regex.Match(fileContent, pattern, RegexOptions.Multiline);`
`57`	`57`	`if (match.Success)`
`58`	`58`	`{`
`59`	`59`	`var sdk = match.Groups[1].Value;`
Original file line number	Diff line number	Diff line change
`@@ -40,5 +40,17 @@ public void ShouldUseSpecifiedSdk()`
`40`	`40`	`var projectFileInfo = provider.CreateProject(TestPathUtils.GetPathToTestFixtureFolder("WebApi"), _scriptEnvironment.TargetFramework, true);`
`41`	`41`	`Assert.Equal("Microsoft.NET.Sdk.Web", XDocument.Load(projectFileInfo.Path).Descendants("Project").Single().Attributes("Sdk").Single().Value);`
`42`	`42`	`}`
	`43`	`+`
	`44`	`+ // See: https://github.com/dotnet-script/dotnet-script/issues/723`
	`45`	`+ [Theory]`
	`46`	`+ [InlineData("#!/usr/bin/env dotnet-script\n#r \"sdk:Microsoft.NET.Sdk.Web\"")]`
	`47`	`+ [InlineData("#!/usr/bin/env dotnet-script\n\n#r \"sdk:Microsoft.NET.Sdk.Web\"")]`
	`48`	`+ public void ShouldHandleShebangBeforeSdk(string code)`
	`49`	`+ {`
	`50`	`+ var parser = new ScriptParser(TestOutputHelper.CreateTestLogFactory());`
	`51`	`+ var result = parser.ParseFromCode(code);`
	`52`	`+`
	`53`	`+ Assert.Equal("Microsoft.NET.Sdk.Web", result.Sdk);`
	`54`	`+ }`
`43`	`55`	`}`
`44`	`56`	`}`