Strip directives by commenting out rather than omitting, to keep Diag…

…nostic location correct

src/aggregator-ruleng/DirectivesParser.cs

@@ -103,7 +103,11 @@ internal bool Parse()
 
         internal string GetRuleCode()
         {
-            return string.Join(Environment.NewLine, ruleCode, firstCodeLine, ruleCode.Length - firstCodeLine);
+            StringBuilder sb = new StringBuilder();
+            // Keep directive lines commented out, to maintain source location of rule code for diagnostics.
+            for(int i=0; i<ruleCode.Length; i++)
+               sb.AppendLine(i < firstCodeLine ? $"//{ruleCode[i]}" : ruleCode[i]);
+            return sb.ToString();
         }
 
         // directives

src/unittests-ruleng/RuleTests.cs

@@ -22,7 +22,7 @@ internal static class StringExtensions
     {
         internal static string[] Mince(this string ruleCode)
         {
-            return ruleCode.Split(Environment.NewLine);
+            return ruleCode.Split('\n').Select(line => line.TrimEnd('\r')).ToArray();
         }
     }
 
@@ -349,6 +349,21 @@ public async Task ImportDirective_Fail()
             );
         }
 
+        [Fact]
+        public void Diagnostic_Location_Returned_Correctly()
+        {
+            string ruleCode = @".import=""System.Diagnostics""
+Debug.WriteLine(""test"");
+return string.Empty
+";
+
+            var engine = new RuleEngine(logger, ruleCode.Mince(), SaveMode.Default, dryRun: true);
+            var (success, diagnostics) = engine.VerifyRule();
+            Assert.False(success);
+            Assert.Single(diagnostics);
+            Assert.Equal(2, diagnostics[0].Location.GetLineSpan().StartLinePosition.Line);
+        }
+
         [Fact]
         public async Task DeleteWorkItem()
         {
@@ -487,7 +502,7 @@ public async Task CustomNumericField_HasValue_Succeeds()
             witClient.GetWorkItemAsync(workItemId, expand: WorkItemExpand.All).Returns(workItem);
             string ruleCode = @"
 var customField = self.GetFieldValue<decimal>(""MyOrg.CustomNumericField"", 3.0m);
-return customField.ToString(""N"");
+return customField.ToString(""N"", System.Globalization.CultureInfo.InvariantCulture);
 ";
 
             var engine = new RuleEngine(logger, ruleCode.Mince(), SaveMode.Default, dryRun: true);
@@ -512,7 +527,7 @@ public async Task CustomNumericField_NoValue_ReturnsDefault()
             witClient.GetWorkItemAsync(workItemId, expand: WorkItemExpand.All).Returns(workItem);
             string ruleCode = @"
 var customField = self.GetFieldValue<decimal>(""MyOrg.CustomNumericField"", 3.0m);
-return customField.ToString(""N"");
+return customField.ToString(""N"", System.Globalization.CultureInfo.InvariantCulture);
 ";
 
             var engine = new RuleEngine(logger, ruleCode.Mince(), SaveMode.Default, dryRun: true);