Skip to content

Commit d39172e

Browse files
gfsgfs
authored
Update dependencies (#522)
* Update dependencies * Improve stability of ClassCleanup
1 parent 908ee75 commit d39172e

File tree

10 files changed

+80
-40
lines changed

10 files changed

+80
-40
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.663" />
69+
<PackageReference Include="DotLiquid" Version="2.2.677" />
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.RulesEngine/AppInspector.RulesEngine.csproj

Lines changed: 4 additions & 4 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" />
33+
<PackageReference Include="gstocco.YamlDotNet.YamlPath" Version="1.0.12" />
3434
<PackageReference Include="JsonCons.JsonPath" Version="1.1.0" />
35-
<PackageReference Include="Microsoft.CST.OAT" Version="1.2.39" />
36-
<PackageReference Include="Microsoft.CST.RecursiveExtractor" Version="1.1.20" />
35+
<PackageReference Include="Microsoft.CST.OAT" Version="1.2.42" />
36+
<PackageReference Include="Microsoft.CST.RecursiveExtractor" Version="1.2.8" />
3737
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
3838
<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
39-
<PackageReference Include="YamlDotNet" Version="12.2.0" />
39+
<PackageReference Include="YamlDotNet" Version="12.3.1" />
4040
</ItemGroup>
4141

4242
<ItemGroup>

‎AppInspector.Tests/AppInspector.Tests.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818

1919
<ItemGroup>
2020
<PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
21-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
22-
<PackageReference Include="MSTest.TestAdapter" Version="3.0.0" />
23-
<PackageReference Include="MSTest.TestFramework" Version="3.0.0" />
21+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
22+
<PackageReference Include="MSTest.TestAdapter" Version="3.0.2" />
23+
<PackageReference Include="MSTest.TestFramework" Version="3.0.2" />
2424
<PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0" />
2525
<PackageReference Include="System.Reflection" Version="4.3.0" />
2626
<PackageReference Include="System.Runtime.Extensions" Version="4.3.1" />

‎AppInspector.Tests/Commands/TestAnalyzeCmd.cs

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using System.Collections.Generic;
1+
using System;
2+
using System.Collections.Generic;
23
using System.Diagnostics.CodeAnalysis;
34
using System.IO;
45
using System.Linq;
@@ -331,7 +332,14 @@ public void InitOutput()
331332
[ClassCleanup]
332333
public static void CleanUp()
333334
{
334-
Directory.Delete(TestHelpers.GetPath(TestHelpers.AppPath.testOutput), true);
335+
try
336+
{
337+
Directory.Delete(TestHelpers.GetPath(TestHelpers.AppPath.testOutput), true);
338+
}
339+
catch (Exception e)
340+
{
341+
Console.Error.WriteLine(e.Message);
342+
}
335343
}
336344

337345
[DataTestMethod]

‎AppInspector.Tests/Commands/TestExportTagsCmd.cs

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using System.Diagnostics.CodeAnalysis;
1+
using System;
2+
using System.Diagnostics.CodeAnalysis;
23
using System.IO;
34
using Microsoft.ApplicationInspector.Commands;
45
using Microsoft.ApplicationInspector.Common;
@@ -109,7 +110,14 @@ public void InitOutput()
109110
[ClassCleanup]
110111
public static void CleanUp()
111112
{
112-
Directory.Delete(TestHelpers.GetPath(TestHelpers.AppPath.testOutput), true);
113+
try
114+
{
115+
Directory.Delete(TestHelpers.GetPath(TestHelpers.AppPath.testOutput), true);
116+
}
117+
catch (Exception e)
118+
{
119+
Console.Error.WriteLine(e.Message);
120+
}
113121
}
114122

115123
[TestMethod]

‎AppInspector.Tests/Commands/TestTagDiffCmd.cs

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,14 @@ public void InitOutput()
107107
[ClassCleanup]
108108
public static void CleanUp()
109109
{
110-
Directory.Delete(TestHelpers.GetPath(TestHelpers.AppPath.testOutput), true);
110+
try
111+
{
112+
Directory.Delete(TestHelpers.GetPath(TestHelpers.AppPath.testOutput), true);
113+
}
114+
catch (Exception e)
115+
{
116+
Console.Error.WriteLine(e.Message);
117+
}
111118
}
112119

113120
[DataRow(TagTestType.Equality, TagDiffResult.ExitCode.TestPassed)]

‎AppInspector.Tests/Commands/TestVerifyRulesCmd.cs

Lines changed: 29 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1-
using System.Diagnostics.CodeAnalysis;
1+
using System;
2+
using System.Diagnostics.CodeAnalysis;
23
using System.IO;
4+
using CommandLine;
35
using Microsoft.ApplicationInspector.Commands;
46
using Microsoft.ApplicationInspector.Common;
57
using Microsoft.ApplicationInspector.Logging;
@@ -20,7 +22,7 @@ public class TestVerifyRulesCmd
2022
private readonly string _invalidFileRegexes = @"[
2123
{
2224
""name"": ""Platform: Microsoft Windows"",
23-
""id"": ""AI_TEST_WINDOWS"",
25+
""id"": ""AI_TEST_WINDOWS_INVALID_REGEX"",
2426
""description"": ""This rule checks for the string 'windows'"",
2527
""tags"": [
2628
""Test.Tags.Windows""
@@ -44,7 +46,7 @@ public class TestVerifyRulesCmd
4446
private readonly string _invalidJsonValidRule = @"
4547
{
4648
""name"": ""Platform: Microsoft Windows"",
47-
""id"": ""AI_TEST_WINDOWS"",
49+
""id"": ""AI_TEST_WINDOWS_INVALID_JSON"",
4850
""description"": ""This rule checks for the string 'windows'"",
4951
""tags"": [
5052
""Test.Tags.Windows""
@@ -66,7 +68,7 @@ public class TestVerifyRulesCmd
6668
private readonly string _knownLanguages = @"[
6769
{
6870
""name"": ""Platform: Microsoft Windows"",
69-
""id"": ""AI_TEST_WINDOWS"",
71+
""id"": ""AI_TEST_WINDOWS_INVALID_LANGAUGE"",
7072
""description"": ""This rule checks for the string 'windows'"",
7173
""tags"": [
7274
""Test.Tags.Windows""
@@ -90,7 +92,7 @@ public class TestVerifyRulesCmd
9092
private readonly string _mustMatchRule = @"[
9193
{
9294
""name"": ""Platform: Microsoft Windows"",
93-
""id"": ""AI_TEST_WINDOWS"",
95+
""id"": ""AI_TEST_WINDOWS_MUST_MATCH"",
9496
""description"": ""This rule checks for the string 'windows'"",
9597
""tags"": [
9698
""Test.Tags.Windows""
@@ -115,7 +117,7 @@ public class TestVerifyRulesCmd
115117
private readonly string _mustMatchRuleFail = @"[
116118
{
117119
""name"": ""Platform: Microsoft Windows"",
118-
""id"": ""AI_TEST_WINDOWS"",
120+
""id"": ""AI_TEST_WINDOWS_MUST_MATCH_FAIL"",
119121
""description"": ""This rule checks for the string 'windows'"",
120122
""tags"": [
121123
""Test.Tags.Windows""
@@ -140,7 +142,7 @@ public class TestVerifyRulesCmd
140142
private readonly string _mustNotMatchRule = @"[
141143
{
142144
""name"": ""Platform: Microsoft Windows"",
143-
""id"": ""AI_TEST_WINDOWS"",
145+
""id"": ""AI_TEST_WINDOWS_MUST_NOT_MATCH"",
144146
""description"": ""This rule checks for the string 'windows'"",
145147
""tags"": [
146148
""Test.Tags.Windows""
@@ -165,7 +167,7 @@ public class TestVerifyRulesCmd
165167
private readonly string _mustNotMatchRuleFail = @"[
166168
{
167169
""name"": ""Platform: Microsoft Windows"",
168-
""id"": ""AI_TEST_WINDOWS"",
170+
""id"": ""AI_TEST_WINDOWS_MUST_NOT_MATCH_FAIL"",
169171
""description"": ""This rule checks for the string 'windows'"",
170172
""tags"": [
171173
""Test.Tags.Windows""
@@ -190,7 +192,7 @@ public class TestVerifyRulesCmd
190192
private readonly string _sameId = @"[
191193
{
192194
""name"": ""Platform: Microsoft Windows"",
193-
""id"": ""AI_TEST_WINDOWS"",
195+
""id"": ""AI_TEST_WINDOWS_SAME_ID"",
194196
""description"": ""This rule checks for the string 'windows'"",
195197
""tags"": [
196198
""Test.Tags.Windows""
@@ -209,7 +211,7 @@ public class TestVerifyRulesCmd
209211
},
210212
{
211213
""name"": ""Platform: Linux"",
212-
""id"": ""AI_TEST_WINDOWS"",
214+
""id"": ""AI_TEST_WINDOWS_SAME_ID"",
213215
""description"": ""This rule checks for the string 'linux'"",
214216
""tags"": [
215217
""Test.Tags.Linux""
@@ -305,7 +307,14 @@ public void InitOutput()
305307
[ClassCleanup]
306308
public static void CleanUp()
307309
{
308-
Directory.Delete(TestHelpers.GetPath(TestHelpers.AppPath.testOutput), true);
310+
try
311+
{
312+
Directory.Delete(TestHelpers.GetPath(TestHelpers.AppPath.testOutput), true);
313+
}
314+
catch (Exception e)
315+
{
316+
Console.Error.WriteLine(e.Message);
317+
}
309318
}
310319

311320
/// <summary>
@@ -334,7 +343,7 @@ public void CustomRules()
334343
[TestMethod]
335344
public void UnclosedJson()
336345
{
337-
var path = Path.GetTempFileName();
346+
var path = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName());
338347
File.WriteAllText(path, _invalidJsonValidRule);
339348
VerifyRulesOptions options = new()
340349
{
@@ -363,7 +372,7 @@ public void NullId()
363372
[TestMethod]
364373
public void DuplicateId()
365374
{
366-
var path = Path.GetTempFileName();
375+
var path = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName());
367376
File.WriteAllText(path, _sameId);
368377
VerifyRulesOptions options = new()
369378
{
@@ -379,7 +388,7 @@ public void DuplicateId()
379388
[TestMethod]
380389
public void DuplicateIdCheckDisabled()
381390
{
382-
var path = Path.GetTempFileName();
391+
var path = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName());
383392
File.WriteAllText(path, _sameId);
384393
VerifyRulesOptions options = new()
385394
{
@@ -396,7 +405,7 @@ public void DuplicateIdCheckDisabled()
396405
[TestMethod]
397406
public void InvalidRegex()
398407
{
399-
var path = Path.GetTempFileName();
408+
var path = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName());
400409
File.WriteAllText(path, _invalidFileRegexes);
401410
VerifyRulesOptions options = new()
402411
{
@@ -412,7 +421,7 @@ public void InvalidRegex()
412421
[TestMethod]
413422
public void UnknownLanguage()
414423
{
415-
var path = Path.GetTempFileName();
424+
var path = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName());
416425
File.WriteAllText(path, _knownLanguages);
417426
VerifyRulesOptions options = new()
418427
{
@@ -428,7 +437,7 @@ public void UnknownLanguage()
428437
[TestMethod]
429438
public void MustMatch()
430439
{
431-
var path = Path.GetTempFileName();
440+
var path = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName());
432441
File.WriteAllText(path, _mustMatchRule);
433442
VerifyRulesOptions options = new()
434443
{
@@ -444,7 +453,7 @@ public void MustMatch()
444453
[TestMethod]
445454
public void MustMatchDetectIncorrect()
446455
{
447-
var path = Path.GetTempFileName();
456+
var path = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName());
448457
File.WriteAllText(path, _mustMatchRuleFail);
449458
VerifyRulesOptions options = new()
450459
{
@@ -460,7 +469,7 @@ public void MustMatchDetectIncorrect()
460469
[TestMethod]
461470
public void MustNotMatch()
462471
{
463-
var path = Path.GetTempFileName();
472+
var path = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName());
464473
File.WriteAllText(path, _mustNotMatchRule);
465474
VerifyRulesOptions options = new()
466475
{
@@ -476,7 +485,7 @@ public void MustNotMatch()
476485
[TestMethod]
477486
public void MustNotMatchDetectIncorrect()
478487
{
479-
var path = Path.GetTempFileName();
488+
var path = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName());
480489
File.WriteAllText(path, _mustNotMatchRuleFail);
481490
VerifyRulesOptions options = new()
482491
{

‎AppInspector.Tests/Languages/LanguagesTests.cs

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using System.Diagnostics.CodeAnalysis;
1+
using System;
2+
using System.Diagnostics.CodeAnalysis;
23
using System.IO;
34
using Microsoft.ApplicationInspector.Logging;
45
using Microsoft.Extensions.Logging;
@@ -63,7 +64,14 @@ public void InitOutput()
6364
[ClassCleanup]
6465
public static void CleanUp()
6566
{
66-
Directory.Delete(TestHelpers.GetPath(TestHelpers.AppPath.testOutput), true);
67+
try
68+
{
69+
Directory.Delete(TestHelpers.GetPath(TestHelpers.AppPath.testOutput), true);
70+
}
71+
catch (Exception e)
72+
{
73+
Console.Error.WriteLine(e.Message);
74+
}
6775
}
6876

6977
[TestMethod]

‎AppInspector/AppInspector.Commands.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,10 @@
5252

5353
<ItemGroup>
5454
<PackageReference Include="CommandLineParser" Version="2.9.1" />
55-
<PackageReference Include="DotLiquid" Version="2.2.663" />
55+
<PackageReference Include="DotLiquid" Version="2.2.677" />
5656
<PackageReference Include="Glob" Version="1.1.9" />
57-
<PackageReference Include="Microsoft.CST.OAT" Version="1.2.39" />
58-
<PackageReference Include="Microsoft.CST.RecursiveExtractor" Version="1.1.20" />
57+
<PackageReference Include="Microsoft.CST.OAT" Version="1.2.42" />
58+
<PackageReference Include="Microsoft.CST.RecursiveExtractor" Version="1.2.8" />
5959
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
6060
<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
6161
<PackageReference Include="ShellProgressBar" Version="5.2.0" />

‎Benchmarks/Benchmarks.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="BenchmarkDotNet" Version="0.13.2" />
12-
<PackageReference Include="BenchmarkDotNet.Diagnostics.Windows" Version="0.13.2" />
11+
<PackageReference Include="BenchmarkDotNet" Version="0.13.4" />
12+
<PackageReference Include="BenchmarkDotNet.Diagnostics.Windows" Version="0.13.4" />
1313

1414
</ItemGroup>
1515
<ItemGroup>

0 commit comments

Comments
 (0)