Merge branch 'main' into nuget-release-4.5.4

microsoft · Feb 29, 2024 · fd35e22 · fd35e22
2 parents d4a6403 + 23dfdcf
commit fd35e22
Show file tree

Hide file tree

Showing 10 changed files with 434 additions and 2,074 deletions.
diff --git a/src/Sarif.Multitool.Library/Rules/ADO2012.ProvideRequiredReportingDescriptorProperties.cs b/src/Sarif.Multitool.Library/Rules/ADO2012.ProvideRequiredReportingDescriptorProperties.cs
@@ -7,7 +7,7 @@
 namespace Microsoft.CodeAnalysis.Sarif.Multitool.Rules
 {
     public class AdoProvideRequiredReportingDescriptorProperties
-        : BaseProvideRequiredResultProperties
+        : BaseProvideRequiredReportingDescriptorProperties
     {
         /// <summary>
         /// ADO2012

diff --git a/src/Sarif.Multitool.Library/Rules/Base2012.ProvideRequiredReportingDescriptorProperties.cs b/src/Sarif.Multitool.Library/Rules/Base2012.ProvideRequiredReportingDescriptorProperties.cs
@@ -5,7 +5,7 @@
 
 namespace Microsoft.CodeAnalysis.Sarif.Multitool.Rules
 {
-    public class Base2012ProvideRequiredReportingDescriptorProperties
+    public class BaseProvideRequiredReportingDescriptorProperties
         : SarifValidationSkimmerBase
     {
         public override string Id => string.Empty;
@@ -15,7 +15,7 @@ public class Base2012ProvideRequiredReportingDescriptorProperties
             nameof(RuleResources.Base2012_ProvideRequiredReportingDescriptorProperties_Error_MissingIdProperty_Text)
         };
 
-        private ICollection<string> BaseMessageResourceNames => _baseMessageResourceNames;
+        protected ICollection<string> BaseMessageResourceNames => _baseMessageResourceNames;
 
         public override HashSet<RuleKind> RuleKinds => new HashSet<RuleKind>();
 

diff --git a/...rif/TestData/Multitool/BaselineOption/ExpectedOutputs/TEST1001.ValidateWithBaseline.sarif b/...rif/TestData/Multitool/BaselineOption/ExpectedOutputs/TEST1001.ValidateWithBaseline.sarif
diff --git a/...stData/Multitool/BaselineOption/ExpectedOutputs/TEST1002.ValidateBaseline.NoResults.sarif b/...stData/Multitool/BaselineOption/ExpectedOutputs/TEST1002.ValidateBaseline.NoResults.sarif
diff --git a/...ta/Multitool/BaselineOption/ExpectedOutputs/TEST1003.ValidateBaseline.AbsentResults.sarif b/...ta/Multitool/BaselineOption/ExpectedOutputs/TEST1003.ValidateBaseline.AbsentResults.sarif
diff --git a/...tData/Multitool/BaselineOption/ExpectedOutputs/TEST1004.ValidateBaseline.NewResults.sarif b/...tData/Multitool/BaselineOption/ExpectedOutputs/TEST1004.ValidateBaseline.NewResults.sarif
diff --git a/...Multitool/BaselineOption/ExpectedOutputs/TEST1005.ValidateBaseline.UnchangedResults.sarif b/...Multitool/BaselineOption/ExpectedOutputs/TEST1005.ValidateBaseline.UnchangedResults.sarif
diff --git a/...a/Multitool/BaselineOption/ExpectedOutputs/TEST1006.ValidateBaseline.UpdatedResults.sarif b/...a/Multitool/BaselineOption/ExpectedOutputs/TEST1006.ValidateBaseline.UpdatedResults.sarif
diff --git a/...ol/BaselineOption/ExpectedOutputs/TEST1007.ValidateBaseline.LessResultsThanBaseline.sarif b/...ol/BaselineOption/ExpectedOutputs/TEST1007.ValidateBaseline.LessResultsThanBaseline.sarif
diff --git a/...ata/Multitool/BaselineOption/ExpectedOutputs/TEST1008.ValidateBaseline.InlineUpdate.sarif b/...ata/Multitool/BaselineOption/ExpectedOutputs/TEST1008.ValidateBaseline.InlineUpdate.sarif