Merge branch 'master' into bugfix/issue380

seesharper · web-flow · commit 98ed2d2f72b8 · 2018-11-02T20:32:03.000+01:00
diff --git a/src/Dotnet.Script.DependencyModel/ProjectSystem/ScriptParser.cs b/src/Dotnet.Script.DependencyModel/ProjectSystem/ScriptParser.cs
@@ -71,8 +71,7 @@ public ParseResult ParseFromFiles(IEnumerable<string> csxFiles)
         const string DirectivePatternSuffix = Hws + @"""nuget:"
                                             // https://github.com/NuGet/docs.microsoft.com-nuget/issues/543#issue-270039223
                                             + Hws + @"(\w+(?:[_.-]\w+)*)"
-                                            + Hws + @","
-                                            + Hws + @"(.+?)""";
+                                            + @"(?:" + Hws + "," + Hws + @"(.+?))?""";
 
         private static IEnumerable<PackageReference> ReadPackageReferencesFromReferenceDirective(string fileContent)
         {
diff --git a/src/Dotnet.Script.Tests/ScriptPackagesTests.cs b/src/Dotnet.Script.Tests/ScriptPackagesTests.cs
@@ -101,7 +101,7 @@ private string Execute(string scriptFileName)
                 Console.SetError(stringWriter);
                 var baseDir = AppDomain.CurrentDomain.BaseDirectory;
                 var fullPathToScriptFile = Path.Combine(baseDir, "..", "..", "..", "TestFixtures", "ScriptPackage", scriptFileName);
-                Program.Main(new[] { fullPathToScriptFile });
+                Program.Main(new[] { fullPathToScriptFile , "--nocache"});
                 return output.ToString();
 
             }
diff --git a/src/Dotnet.Script.Tests/ScriptParserTests.cs b/src/Dotnet.Script.Tests/ScriptParserTests.cs
@@ -30,6 +30,20 @@ public void ShouldResolveSinglePackage()
             Assert.Equal("1.2.3", result.PackageReferences.Single().Version.Value);
         }
 
+        [Theory]
+        [InlineData("#r \"nuget:Package\"")]
+        [InlineData("#load \"nuget:Package\"")]
+        public void ShouldResolveSingleVersionlessPackage(string code)
+        {
+            var parser = CreateParser();
+
+            var result = parser.ParseFromCode(code);
+
+            Assert.Equal(1, result.PackageReferences.Count);
+            Assert.Equal("Package", result.PackageReferences.Single().Id.Value);
+            Assert.Equal(string.Empty, result.PackageReferences.Single().Version.Value);
+        }
+
         [Fact]
         public void ShouldResolveSinglePackageFromLoadDirective()
         {
@@ -86,6 +100,9 @@ public void ShouldResolveMultiplePackages()
         [InlineData("#load \"nuget:P a c k a g e, 1.2.3\"")]
         [InlineData("#load \"nuget:Pack/age, 1.2.3\"")]
         [InlineData("#load \"nuget:Package,\"")]
+        [InlineData("#load \"nuget:Package \"")]
+        [InlineData("#load \"nuget:Package\t\"")]
+        [InlineData("#load \"nuget:Package\n\"")]
         [InlineData("\r #r\"nuget:Package, 1.2.3\"")]
         [InlineData("#r\n\"nuget:Package, 1.2.3\"")]
         [InlineData("#r \"nuget:\nPackage, 1.2.3\"")]
@@ -94,6 +111,9 @@ public void ShouldResolveMultiplePackages()
         [InlineData("#r \"nuget:P a c k a g e, 1.2.3\"")]
         [InlineData("#r \"nuget:Pack/age, 1.2.3\"")]
         [InlineData("#r \"nuget:Package,\"")]
+        [InlineData("#r \"nuget:Package \"")]
+        [InlineData("#r \"nuget:Package\t\"")]
+        [InlineData("#r \"nuget:Package\n\"")]
         public void ShouldNotMatchBadDirectives(string code)
         {
             var parser = CreateParser();

Original file line number	Diff line number	Diff line change
`@@ -71,8 +71,7 @@ public ParseResult ParseFromFiles(IEnumerable<string> csxFiles)`
`71`	`71`	`const string DirectivePatternSuffix = Hws + @"""nuget:"`
`72`	`72`	`// https://github.com/NuGet/docs.microsoft.com-nuget/issues/543#issue-270039223`
`73`	`73`	`+ Hws + @"(\w+(?:[_.-]\w+)*)"`
`74`		`- + Hws + @","`
`75`		`- + Hws + @"(.+?)""";`
	`74`	`+ + @"(?:" + Hws + "," + Hws + @"(.+?))?""";`
`76`	`75`
`77`	`76`	`private static IEnumerable<PackageReference> ReadPackageReferencesFromReferenceDirective(string fileContent)`
`78`	`77`	`{`
Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ private string Execute(string scriptFileName)`
`101`	`101`	`Console.SetError(stringWriter);`
`102`	`102`	`var baseDir = AppDomain.CurrentDomain.BaseDirectory;`
`103`	`103`	`var fullPathToScriptFile = Path.Combine(baseDir, "..", "..", "..", "TestFixtures", "ScriptPackage", scriptFileName);`
`104`		`- Program.Main(new[] { fullPathToScriptFile });`
	`104`	`+ Program.Main(new[] { fullPathToScriptFile , "--nocache"});`
`105`	`105`	`return output.ToString();`
`106`	`106`
`107`	`107`	`}`