Skip to content

Commit 908ee75

Browse files
authored
Use YamlPath Nuget + Update Dependencies (#519)
1 parent 629dfeb commit 908ee75

File tree

12 files changed

+16
-1627
lines changed

12 files changed

+16
-1627
lines changed

AppInspector.CLI/AppInspector.CLI.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
</ItemGroup>
6767

6868
<ItemGroup>
69-
<PackageReference Include="DotLiquid" Version="2.2.656" />
69+
<PackageReference Include="DotLiquid" Version="2.2.663" />
7070
<PackageReference Include="Sarif.Sdk" Version="3.1.0" />
7171
<PackageReference Include="Serilog" Version="2.12.0" />
7272
<PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0" />

AppInspector.Common/AppInspector.Common.csproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,4 @@
5454
<None Include="..\LICENSE.txt" Pack="true" PackagePath="" />
5555
<None Include="..\icon-128.png" Pack="true" PackagePath="" />
5656
</ItemGroup>
57-
58-
<ItemGroup>
59-
<PackageReference Update="Nerdbank.GitVersioning" Version="3.5.119" />
60-
</ItemGroup>
6157
</Project>

AppInspector.Logging/AppInspector.Logging.csproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,4 @@
4242
<None Include="..\icon-128.png" Pack="true" PackagePath="" />
4343
</ItemGroup>
4444

45-
<ItemGroup>
46-
<PackageReference Update="Nerdbank.GitVersioning" Version="3.5.119" />
47-
</ItemGroup>
48-
4945
</Project>

AppInspector.RulesEngine/AppInspector.RulesEngine.csproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@
3030
</PropertyGroup>
3131

3232
<ItemGroup>
33+
<PackageReference Include="gstocco.YamlDotNet.YamlPath" Version="1.0.10" />
3334
<PackageReference Include="JsonCons.JsonPath" Version="1.1.0" />
34-
<PackageReference Include="Microsoft.CST.OAT" Version="1.2.38" />
35-
<PackageReference Include="Microsoft.CST.RecursiveExtractor" Version="1.1.19" />
35+
<PackageReference Include="Microsoft.CST.OAT" Version="1.2.39" />
36+
<PackageReference Include="Microsoft.CST.RecursiveExtractor" Version="1.1.20" />
3637
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
37-
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
38-
<PackageReference Include="YamlDotNet" Version="12.0.2" />
39-
38+
<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
39+
<PackageReference Include="YamlDotNet" Version="12.2.0" />
4040
</ItemGroup>
4141

4242
<ItemGroup>

AppInspector.RulesEngine/OatExtensions/WithinOperation.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,12 +182,12 @@ public IEnumerable<Violation> WithinValidationDelegate(CST.OAT.Rule rule, Clause
182182
}
183183

184184
var subOp = _analyzer
185-
.GetOperation(wc.SubClause.Key.Operation, wc.SubClause.Key.CustomOperation);
185+
.GetOperation(wc.SubClause.Operation, wc.SubClause.CustomOperation);
186186

187187
if (subOp is null)
188188
{
189189
yield return new Violation(
190-
$"SubClause in Rule {rule.Name} Clause {clause.Label ?? rule.Clauses.IndexOf(clause).ToString(CultureInfo.InvariantCulture)} is of type '{wc.SubClause.Key.Operation},{wc.SubClause.Key.CustomOperation}' is not present in the analyzer.",
190+
$"SubClause in Rule {rule.Name} Clause {clause.Label ?? rule.Clauses.IndexOf(clause).ToString(CultureInfo.InvariantCulture)} is of type '{wc.SubClause.Operation},{wc.SubClause.CustomOperation}' is not present in the analyzer.",
191191
rule, clause);
192192
}
193193
else

AppInspector.RulesEngine/TextContainer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
using System.Reflection;
1010
using System.Text.Json;
1111
using System.Xml.XPath;
12+
using gfs.YamlDotNet.YamlPath;
1213
using JsonCons.JsonPath;
13-
using Microsoft.ApplicationInspector.ExtensionMethods;
1414
using Microsoft.Extensions.Logging;
1515
using Microsoft.Extensions.Logging.Abstractions;
1616
using YamlDotNet.RepresentationModel;

0 commit comments

Comments
 (0)