Skip to content

Commit 035d7e4

Browse files
f2calvf2calv
authored
F2calv/2025 08 updates (#268)
* nuget updates * logging * ctr fixes * analyzer suggestion * nuget updates * lint fixes
1 parent 65d6cb3 commit 035d7e4

File tree

8 files changed

+27
-27
lines changed

8 files changed

+27
-27
lines changed

‎.pre-commit-config.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
repos:
22
- repo: https://github.com/pre-commit/pre-commit-hooks
3-
rev: v5.0.0
3+
rev: v6.0.0
44
hooks:
55
- id: check-xml
66
- id: check-yaml
@@ -16,7 +16,7 @@ repos:
1616
hooks:
1717
- id: check-json5
1818
- repo: https://github.com/igorshubovych/markdownlint-cli
19-
rev: v0.44.0
19+
rev: v0.45.0
2020
hooks:
2121
- id: markdownlint
2222
args: ["--disable", "MD013", "--disable", "MD034", "--"]

‎Directory.Build.props‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,13 @@
3434
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
3535
</PropertyGroup>
3636

37-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
37+
<PropertyGroup>
3838
<!-- IDE1006 - suppress roslyn naming convention messages -->
3939
<!-- IDE0079 - Remove unnecessary suppression -->
4040
<!-- IDE0042 - Variable declaration can be deconstructed -->
41-
<NoWarn>IDE1006;IDE0079;IDE0042</NoWarn>
42-
</PropertyGroup>
43-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
44-
<!-- suppress 'Unreachable code detected' -->
45-
<NoWarn>CS0162</NoWarn>
41+
<!-- CS0162 - Unreachable code detected. -->
42+
<!-- S125 - Remove this commented out code. -->
43+
<NoWarn>IDE1006;IDE0079;IDE0042;S125</NoWarn>
4644
</PropertyGroup>
4745

4846
<PropertyGroup>

‎Directory.Packages.props‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,21 @@
33
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
44
</PropertyGroup>
55
<ItemGroup>
6-
<PackageVersion Include="AzurePipelinesToGitHubActionsConverter.Core" Version="1.3.60" />
7-
<PackageVersion Include="CasCap.Common.Extensions" Version="4.3.5" />
8-
<PackageVersion Include="CasCap.Common.Net" Version="4.3.5" />
9-
<PackageVersion Include="CasCap.Common.Testing" Version="4.3.5" />
6+
<PackageVersion Include="AzurePipelinesToGitHubActionsConverter.Core" Version="1.3.72" />
7+
<PackageVersion Include="CasCap.Common.Extensions" Version="4.3.6" />
8+
<PackageVersion Include="CasCap.Common.Net" Version="4.3.6" />
9+
<PackageVersion Include="CasCap.Common.Testing" Version="4.3.6" />
1010
<PackageVersion Include="ConsoleTables" Version="2.7.0" />
1111
<PackageVersion Include="Figgle" Version="0.6.5" />
1212
<PackageVersion Include="Figgle.Fonts" Version="0.6.5" />
1313
<PackageVersion Include="McMaster.Extensions.CommandLineUtils" Version="4.1.1" />
1414
<PackageVersion Include="McMaster.Extensions.Hosting.CommandLine" Version="4.1.1" />
15-
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="9.0.7" />
16-
<PackageVersion Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.7" />
17-
<PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="9.0.7" />
18-
<PackageVersion Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.7" />
19-
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.7" />
20-
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.7" />
15+
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="9.0.8" />
16+
<PackageVersion Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.8" />
17+
<PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="9.0.8" />
18+
<PackageVersion Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.8" />
19+
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.8" />
20+
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.8" />
2121
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
2222
<PackageVersion Include="Microsoft.TeamFoundation.DistributedTask.WebApi" Version="19.225.1" />
2323
<PackageVersion Include="Microsoft.TeamFoundationServer.Client" Version="19.225.1" />
@@ -30,6 +30,6 @@
3030
<PackageVersion Include="coverlet.msbuild" Version="6.0.4" />
3131
<PackageVersion Include="semver" Version="3.0.0" />
3232
<PackageVersion Include="xunit" Version="2.9.3" />
33-
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.1" />
33+
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.3" />
3434
</ItemGroup>
35-
</Project>
35+
</Project>

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,4 +110,4 @@ All YAML files generated are output into sub-folders of a project folder, i.e. u
110110

111111
### Feedback/Issues
112112

113-
Please post any issues or feedback [here](https://github.com/f2calv/yamlizr/issues).
113+
Please post any issues or feedback [to GitHub issues](https://github.com/f2calv/yamlizr/issues).

‎src/CasCap.Api.AzureDevOps.Tests/Tests/TestBase.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public abstract class TestBase
1111
{
1212
protected IApiService _apiSvc;
1313

14-
public TestBase(ITestOutputHelper output)
14+
protected TestBase(ITestOutputHelper output)
1515
{
1616
//dotnet user-secrets set CasCap:AzureDevOpsOptions:PAT "xxxxx" <-- test PAT here
1717

‎src/CasCap.Api.AzureDevOps/Models/AzureDevOps/TaskGroupVersion.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
namespace CasCap.Models;
22

3-
public struct TaskGroupVersion
3+
public readonly struct TaskGroupVersion
44
{
55
public TaskGroupVersion(Guid _taskGroupId, int _version)
66
{

‎src/CasCap.Api.AzureDevOps/Services/ApiService.cs‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,17 @@ public ApiService(ILogger<ApiService> logger, string PAT) : base()
2525

2626
public async Task<List<TaskObj>> GetAllExtensions(string organisationUri)
2727
{
28-
_logger.LogInformation("Retrieving all extensions for organisation '{organisation}'", organisationUri);
28+
_logger.LogInformation("{ClassName} retrieving all extensions for organisation '{OrganisationUri}'",
29+
nameof(ApiService), organisationUri);
2930
var res = await Get<Tasks, object>($"{organisationUri}/_apis/distributedtask/tasks/");
30-
return res.result is not null && res.result is not null && res.result.value is not null ? res.result.value : null;
31+
return res.result is not null && res.result.value is not null ? res.result.value : null;
3132
}
3233

3334
//https://docs.microsoft.com/en-us/rest/api/azure/devops/pipelines/runs/run%20pipeline?view=azure-devops-rest-6.0
3435
public async Task<string> Validate(string organisation, string project, int pipelineId, string pipelineYaml)
3536
{
36-
_logger.LogInformation("Validating YAML for project '{project}' in organisation '{organisation}'", project, organisation);
37+
_logger.LogInformation("{ClassName} validating YAML for project '{Project}' in organisation '{Organisation}'",
38+
nameof(ApiService), project, organisation);
3739
var req = new
3840
{
3941
previewRun = true,

‎src/CasCap.DevOpsYamlizrCli/Commands/CommandBase.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public abstract class CommandBase
2626
protected /*readonly*/ IConsole _console;
2727
protected /*readonly*/ IApiService _apiSvc;
2828

29-
public CommandBase(ILogger<CommandBase> logger, ILoggerFactory loggerFactory, IConsole console)
29+
protected CommandBase(ILogger<CommandBase> logger, ILoggerFactory loggerFactory, IConsole console)
3030
{
3131
_logger = logger;
3232
_loggerFactory = loggerFactory;

0 commit comments

Comments
 (0)