Merge branch 'Kemyke-fix_load_absolute_path_legacy_format' into develop

* Kemyke-fix_load_absolute_path_legacy_format:
  Change the legacy pattern validation. Do not rely on Uri.TryCreate, use a regex instead. This will fix the absolute path handling issues. Add tests for testing legacy and new patterns with relative and absolute pathes on all platform.

Author: devlead

src/Cake.Core.Tests/Unit/Scripting/Processors/LoadDirectiveProcessorTests.cs

@@ -4,6 +4,7 @@
 
 using Cake.Core.Scripting.Processors.Loading;
 using Cake.Core.Tests.Fixtures;
+using Cake.Testing.Xunit;
 using Xunit;
 
 namespace Cake.Core.Tests.Unit.Scripting.Processors
@@ -137,5 +138,81 @@ public void Should_Insert_Line_Directives_When_Processing_Load_Directives()
             Assert.Equal(result.Lines[11], "// #l b.cake");
             Assert.Equal(result.Lines[12], "int y=2;");
         }
+
+        [Theory]
+        [InlineData("#load \"/utils.cake\"")]
+        [InlineData("#load \"local:?path=/utils.cake\"")]
+        public void Should_Process_AbsolutePath_Script_Reference_Found_In_Source(string source)
+        {
+            // Given
+            var fixture = new ScriptAnalyzerFixture();
+            fixture.Providers.Add(new FileLoadDirectiveProvider());
+            fixture.GivenScriptExist("/Working/script.cake", source);
+            fixture.GivenScriptExist("/utils.cake", "Console.WriteLine();");
+
+            // When
+            var result = fixture.Analyze("/Working/script.cake");
+
+            // Then
+            Assert.Equal(1, result.Script.Includes.Count);
+            Assert.Equal("/utils.cake", result.Script.Includes[0].Path.FullPath);
+        }
+
+        [Theory]
+        [InlineData("#load \"test/utils.cake\"")]
+        [InlineData("#load \"local:?path=test/utils.cake\"")]
+        public void Should_Process_RelativePath_Script_Reference_Found_In_Source(string source)
+        {
+            // Given
+            var fixture = new ScriptAnalyzerFixture();
+            fixture.Providers.Add(new FileLoadDirectiveProvider());
+            fixture.GivenScriptExist("/Working/script.cake", source);
+            fixture.GivenScriptExist("/Working/test/utils.cake", "Console.WriteLine();");
+
+            // When
+            var result = fixture.Analyze("/Working/script.cake");
+
+            // Then
+            Assert.Equal(1, result.Script.Includes.Count);
+            Assert.Equal("/Working/test/utils.cake", result.Script.Includes[0].Path.FullPath);
+        }
+
+        [WindowsTheory]
+        [InlineData("#load \"c:/utils.cake\"")]
+        [InlineData("#load \"local:?path=c:/utils.cake\"")]
+        public void Should_Process_WindowsAbsolutePath_Script_Reference_Found_In_Source(string source)
+        {
+            // Given
+            var fixture = new ScriptAnalyzerFixture();
+            fixture.Providers.Add(new FileLoadDirectiveProvider());
+            fixture.GivenScriptExist("/Working/script.cake", source);
+            fixture.GivenScriptExist("c:/utils.cake", "Console.WriteLine();");
+
+            // When
+            var result = fixture.Analyze("/Working/script.cake");
+
+            // Then
+            Assert.Equal(1, result.Script.Includes.Count);
+            Assert.Equal("c:/utils.cake", result.Script.Includes[0].Path.FullPath);
+        }
+
+        [WindowsTheory]
+        [InlineData("#load \"test/utils.cake\"")]
+        [InlineData("#load \"local:?path=test/utils.cake\"")]
+        public void Should_Process_WindowsRelativePath_Script_Reference_Found_In_Source(string source)
+        {
+            // Given
+            var fixture = new ScriptAnalyzerFixture();
+            fixture.Providers.Add(new FileLoadDirectiveProvider());
+            fixture.GivenScriptExist("/Working/script.cake", source);
+            fixture.GivenScriptExist("/Working/test/utils.cake", "Console.WriteLine();");
+
+            // When
+            var result = fixture.Analyze("/Working/script.cake");
+
+            // Then
+            Assert.Equal(1, result.Script.Includes.Count);
+            Assert.Equal("/Working/test/utils.cake", result.Script.Includes[0].Path.FullPath);
+        }
     }
 }

src/Cake.Core/Scripting/Processors/UriDirectiveProcessor.cs

@@ -6,16 +6,24 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using System.Text.RegularExpressions;
 using Cake.Core.Scripting.Analysis;
 
 namespace Cake.Core.Scripting.Processors
 {
     internal abstract class UriDirectiveProcessor : LineProcessor
     {
+        private readonly Regex _uriPrefixPattern;
+
         protected abstract IEnumerable<string> GetDirectiveNames();
 
         protected abstract void AddToContext(IScriptAnalyzerContext context, Uri uri);
 
+        protected UriDirectiveProcessor()
+        {
+            _uriPrefixPattern = new Regex("^([a-zA-Z]{2,}:)");
+        }
+
         public sealed override bool Process(IScriptAnalyzerContext context, string line, out string replacement)
         {
             if (context == null)
@@ -60,13 +68,22 @@ public sealed override bool Process(IScriptAnalyzerContext context, string line,
         private Uri ParseUriFromTokens(string[] tokens)
         {
             Uri uri;
-            if (!Uri.TryCreate(tokens[1].UnQuote(), UriKind.Absolute, out uri))
+            if (IsUriFromLegacyPattern(tokens))
             {
                 uri = CreateUriFromLegacyFormat(tokens);
             }
+            else
+            {
+                uri = new Uri(tokens[1].UnQuote(), UriKind.Absolute);
+            }
             return uri;
         }
 
+        private bool IsUriFromLegacyPattern(string[] tokens)
+        {
+            return !_uriPrefixPattern.IsMatch(tokens[1].UnQuote());
+        }
+
         protected virtual Uri CreateUriFromLegacyFormat(string[] tokens)
         {
             var builder = new StringBuilder();