Skip to content

Commit e663135

Browse files
committed
Tools/SdkVersionAnalyzer - enable analysis
1 parent cfbee7a commit e663135

File tree

5 files changed

+18
-15
lines changed

5 files changed

+18
-15
lines changed

tools/SdkVersionAnalyzer/ActionWorkflowAnalyzer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ private static IEnumerable<DotnetSdkVersion> ExtractDotnetSdkVersions(string con
132132
foreach (var step in (YamlSequenceNode)stepsNode)
133133
{
134134
var jobStepNode = (YamlMappingNode)step;
135-
if (jobStepNode.Children.TryGetValue(new YamlScalarNode("uses"), out var usesNode) && usesNode.ToString().StartsWith("actions/setup-dotnet"))
135+
if (jobStepNode.Children.TryGetValue(new YamlScalarNode("uses"), out var usesNode) && usesNode.ToString().StartsWith("actions/setup-dotnet", StringComparison.Ordinal))
136136
{
137137
var withNode = (YamlMappingNode)jobStepNode.Children[new YamlScalarNode("with")];
138138
var dotnetVersionNode = (YamlScalarNode)withNode.Children[new YamlScalarNode("dotnet-version")];

tools/SdkVersionAnalyzer/DockerfileAnalyzer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,6 @@ private static string[] GetDockerfiles(string root)
168168

169169
private static RunInstruction? GetDotnetInstallingInstruction(Dockerfile dockerfile)
170170
{
171-
return dockerfile.Items.OfType<RunInstruction>().SingleOrDefault(i => i.ToString().Contains("./dotnet-install.sh"));
171+
return dockerfile.Items.OfType<RunInstruction>().SingleOrDefault(i => i.ToString().Contains("./dotnet-install.sh", StringComparison.Ordinal));
172172
}
173173
}

tools/SdkVersionAnalyzer/DotnetSdkVersion.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33

44
namespace SdkVersionAnalyzer;
55

6-
internal record DotnetSdkVersion(string? Net8SdkVersion, string? Net9SdkVersion, string? Net10SdkVersion);
6+
internal sealed record DotnetSdkVersion(string? Net8SdkVersion, string? Net9SdkVersion, string? Net10SdkVersion);
Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,18 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<PropertyGroup>
4-
<TargetFramework>net10.0</TargetFramework>
5-
<ImplicitUsings>enable</ImplicitUsings>
6-
<Nullable>enable</Nullable>
7-
<OutputType>Exe</OutputType>
8-
</PropertyGroup>
3+
<PropertyGroup>
4+
<TargetFramework>net10.0</TargetFramework>
5+
<ImplicitUsings>enable</ImplicitUsings>
6+
<Nullable>enable</Nullable>
7+
<OutputType>Exe</OutputType>
8+
<!-- CA1303 Do not pass literals as localized parameters. It is internal tool, so no need to localize Console messages. -->
9+
<NoWarn>$(NoWarn);CA1303</NoWarn>
10+
<AnalysisLevel>latest-All</AnalysisLevel>
11+
</PropertyGroup>
912

10-
<ItemGroup>
11-
<PackageReference Include="Valleysoft.DockerfileModel" />
12-
<PackageReference Include="YamlDotNet" />
13-
</ItemGroup>
13+
<ItemGroup>
14+
<PackageReference Include="Valleysoft.DockerfileModel" />
15+
<PackageReference Include="YamlDotNet" />
16+
</ItemGroup>
1417

15-
</Project>
18+
</Project>

tools/SdkVersionAnalyzer/VersionComparer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public static bool IsNet9Version(string versionString)
3333

3434
public static bool IsNet10Version(string versionString)
3535
{
36-
return versionString.StartsWith("10");
36+
return versionString.StartsWith("10", StringComparison.Ordinal);
3737
}
3838

3939
private static bool CompareVersion(string expectedVersion, string? extractedVersion)

0 commit comments

Comments
 (0)