Skip to content

Commit a10f53a

Browse files
seesharperseesharper
committed
Removed parsing target framework from shebang
1 parent 0c60d96 commit a10f53a

File tree

4 files changed

+8
-73
lines changed

4 files changed

+8
-73
lines changed

‎src/Dotnet.Script.DependencyModel/ProjectSystem/ParseResult.cs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,14 @@
11
using System.Collections.Generic;
22

33
namespace Dotnet.Script.DependencyModel.ProjectSystem
4-
{
4+
{
55
public class ParseResult
66
{
7-
public ParseResult(IReadOnlyCollection<PackageReference> packageReferences, string targetFramework)
7+
public ParseResult(IReadOnlyCollection<PackageReference> packageReferences)
88
{
99
PackageReferences = packageReferences;
10-
TargetFramework = targetFramework;
1110
}
1211

1312
public IReadOnlyCollection<PackageReference> PackageReferences { get; }
14-
15-
public string TargetFramework { get; }
1613
}
1714
}

‎src/Dotnet.Script.DependencyModel/ProjectSystem/ScriptParser.cs

Lines changed: 2 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -17,51 +17,24 @@ public ScriptParser(LogFactory logFactory)
1717

1818
public ParseResult ParseFromCode(string code)
1919
{
20-
string currentTargetFramework = null;
2120
var allPackageReferences = new HashSet<PackageReference>();
2221
allPackageReferences.UnionWith(ReadPackageReferencesFromReferenceDirective(code));
2322
allPackageReferences.UnionWith(ReadPackageReferencesFromLoadDirective(code));
24-
string targetFramework = ReadTargetFramework(code);
25-
if (targetFramework != null)
26-
{
27-
if (currentTargetFramework != null && targetFramework != currentTargetFramework)
28-
{
29-
_logger.Debug($"Found multiple target frameworks. Using {currentTargetFramework}.");
30-
}
31-
else
32-
{
33-
currentTargetFramework = targetFramework;
34-
}
35-
}
36-
37-
return new ParseResult(allPackageReferences, currentTargetFramework);
23+
return new ParseResult(allPackageReferences);
3824
}
3925

4026
public ParseResult ParseFromFiles(IEnumerable<string> csxFiles)
4127
{
4228
var allPackageReferences = new HashSet<PackageReference>();
43-
string currentTargetFramework = null;
4429
foreach (var csxFile in csxFiles)
4530
{
4631
_logger.Debug($"Parsing {csxFile}");
4732
var fileContent = File.ReadAllText(csxFile);
4833
allPackageReferences.UnionWith(ReadPackageReferencesFromReferenceDirective(fileContent));
4934
allPackageReferences.UnionWith(ReadPackageReferencesFromLoadDirective(fileContent));
50-
string targetFramework = ReadTargetFramework(fileContent);
51-
if (targetFramework != null)
52-
{
53-
if (currentTargetFramework != null && targetFramework != currentTargetFramework)
54-
{
55-
_logger.Debug($"Found multiple target frameworks. Using {currentTargetFramework}.");
56-
}
57-
else
58-
{
59-
currentTargetFramework = targetFramework;
60-
}
61-
}
6235
}
6336

64-
return new ParseResult(allPackageReferences, currentTargetFramework);
37+
return new ParseResult(allPackageReferences);
6538
}
6639

6740
const string Hws = @"[\x20\t]*"; // hws = horizontal whitespace
@@ -98,16 +71,5 @@ private static IEnumerable<PackageReference> ReadPackageReferencesFromDirective(
9871
yield return packageReference;
9972
}
10073
}
101-
102-
private static string ReadTargetFramework(string fileContent)
103-
{
104-
const string pattern = @"^" + Hws + @"#!" + Hws + @"""(.*)""";
105-
var match = Regex.Match(fileContent, pattern);
106-
if (match.Success)
107-
{
108-
return match.Groups[1].Value;
109-
}
110-
return null;
111-
}
11274
}
11375
}

‎src/Dotnet.Script.DependencyModel/ProjectSystem/ScriptProjectProvider.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public ProjectFileInfo CreateProjectForRepl(string code, string targetDirectory,
5858
projectFile.PackageReferences.Add(packageReference);
5959
}
6060

61-
projectFile.TargetFramework = parseResultFromCode.TargetFramework ?? defaultTargetFramework;
61+
projectFile.TargetFramework = defaultTargetFramework;
6262

6363
projectFile.Save(pathToProjectFile);
6464

@@ -127,7 +127,7 @@ public ProjectFile CreateProjectFileFromScriptFiles(string defaultTargetFramewor
127127
projectFile.PackageReferences.Add(packageReference);
128128
}
129129

130-
projectFile.TargetFramework = parseresult.TargetFramework ?? defaultTargetFramework;
130+
projectFile.TargetFramework = defaultTargetFramework;
131131
return projectFile;
132132
}
133133

‎src/Dotnet.Script.Tests/ScriptParserTests.cs

Lines changed: 2 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public class ScriptParserTests
1414

1515
public ScriptParserTests(ITestOutputHelper testOutputHelper)
1616
{
17-
testOutputHelper.Capture(minimumLogLevel:0);
17+
testOutputHelper.Capture(minimumLogLevel: 0);
1818
_scriptEnvironment = ScriptEnvironment.Default;
1919
}
2020

@@ -70,7 +70,7 @@ public void ShouldResolveUniquePackages(string id, string version)
7070
var result = parser.ParseFromCode(code.ToString());
7171

7272
Assert.Equal(1, result.PackageReferences.Count);
73-
Assert.Equal("Package", result.PackageReferences.Single().Id.Value );
73+
Assert.Equal("Package", result.PackageReferences.Single().Id.Value);
7474
Assert.Equal("1.2.3-beta-1", result.PackageReferences.Single().Version.Value);
7575
}
7676

@@ -123,30 +123,6 @@ public void ShouldNotMatchBadDirectives(string code)
123123
Assert.Equal(0, result.PackageReferences.Count);
124124
}
125125

126-
[Fact]
127-
public void ShouldParseTargetFramework()
128-
{
129-
var parser = CreateParser();
130-
131-
var result = parser.ParseFromCode($"#! \"{_scriptEnvironment.TargetFramework}\"");
132-
133-
Assert.Equal(_scriptEnvironment.TargetFramework, result.TargetFramework);
134-
}
135-
136-
[Theory]
137-
[InlineData("\n#! \"TARGET_FRAMEWORK\"")]
138-
[InlineData("\r#! \"TARGET_FRAMEWORK\"")]
139-
[InlineData("#!\n\"TARGET_FRAMEWORK\"")]
140-
[InlineData("#!\r\"TARGET_FRAMEWORK\"")]
141-
public void ShouldNotParseBadTargetFramework(string code)
142-
{
143-
var parser = CreateParser();
144-
145-
var result = parser.ParseFromCode(code.Replace("TARGET_FRAMEWORK", _scriptEnvironment.TargetFramework));
146-
147-
Assert.Null(result.TargetFramework);
148-
}
149-
150126
private ScriptParser CreateParser()
151127
{
152128
return new ScriptParser(TestOutputHelper.CreateTestLogFactory());

0 commit comments

Comments
 (0)