Skip to content

Commit ee855d7

Browse files
f2calvf2calv
authored
formatting and packages (#238)
* formatting and packages * precommit fixes * devcontainer
1 parent 6f041c6 commit ee855d7

File tree

19 files changed

+106
-51
lines changed

19 files changed

+106
-51
lines changed

‎.devcontainer/devcontainer.json‎

Lines changed: 26 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,30 @@
11
// For format details, see https://aka.ms/devcontainer.json. For config options, see the
22
// README at: https://github.com/devcontainers/templates/tree/main/src/dotnet
33
{
4-
"name": "C# (.NET)",
5-
// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
6-
"image": "mcr.microsoft.com/devcontainers/dotnet:1-8.0-bookworm",
7-
// Features to add to the dev container. More info: https://containers.dev/features.
8-
"features": {
9-
"ghcr.io/devcontainers-contrib/features/pre-commit:2": {}
10-
},
11-
// Use 'forwardPorts' to make a list of ports inside the container available locally.
12-
// "forwardPorts": [5000, 5001],
13-
// "portsAttributes": {
14-
// "5001": {
15-
// "protocol": "https"
16-
// }
17-
// }
18-
// Use 'postCreateCommand' to run commands after the container is created.
19-
"postCreateCommand": "sh . ./.devcontainer/postCreateCommand.sh",
20-
"postStartCommand": "sh . ./.devcontainer/postStartCommand.sh",
21-
// Configure tool-specific properties.
22-
// "customizations": {},
23-
// Comment out to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
24-
"remoteUser": "vscode"
4+
"name": "C# (.NET)",
5+
// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
6+
"image": "mcr.microsoft.com/devcontainers/dotnet:1-8.0-bookworm",
7+
// Features to add to the dev container. More info: https://containers.dev/features.
8+
"features": {
9+
"ghcr.io/devcontainers-contrib/features/pre-commit:2": {},
10+
"ghcr.io/devcontainers/features/docker-outside-of-docker:1": {}
11+
},
12+
// Use 'forwardPorts' to make a list of ports inside the container available locally.
13+
// "forwardPorts": [5000, 5001],
14+
// "portsAttributes": {
15+
// "5001": {
16+
// "protocol": "https"
17+
// }
18+
// }
19+
// Use 'postCreateCommand' to run commands after the container is created.
20+
"postCreateCommand": "sh . ./.devcontainer/postCreateCommand.sh",
21+
"postStartCommand": "sh . ./.devcontainer/postStartCommand.sh",
22+
// Configure tool-specific properties.
23+
// "customizations": {},
24+
"mounts": [
25+
"source=${localEnv:HOME}${localEnv:USERPROFILE}/source/github,target=/workspaces,type=bind,consistency=cached",
26+
"source=${env:HOME}${env:USERPROFILE}/.kube,target=/home/vscode/.kube,type=bind"
27+
]
28+
// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
29+
// "remoteUser": "root"
2530
}

‎.pre-commit-config.yaml‎

Lines changed: 1 addition & 1 deletion
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: v4.6.0
3+
rev: v5.0.0
44
hooks:
55
- id: check-xml
66
- id: check-yaml

‎Directory.Build.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
<PropertyGroup>
44
<RootNamespace>CasCap</RootNamespace>
5-
<LangVersion>12.0</LangVersion>
5+
<LangVersion>13.0</LangVersion>
6+
<ImplicitUsings>enable</ImplicitUsings>
67
<!--nullable we enable on a per project basis-->
78
<!--<Nullable>enable</Nullable>-->
89
<UserSecretsId>b08b24aa-70ab-4ecd-aef9-cce6d49054ec</UserSecretsId>
9-
<ImplicitUsings>enable</ImplicitUsings>
1010
</PropertyGroup>
1111

1212
<PropertyGroup>

‎Directory.Packages.props‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
2+
<Project>
3+
<PropertyGroup>
4+
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
5+
</PropertyGroup>
6+
7+
<ItemGroup>
8+
9+
<PackageVersion Include="AzurePipelinesToGitHubActionsConverter.Core" Version="1.3.39" />
10+
<PackageVersion Include="CasCap.Common.Extensions" Version="4.2.2" />
11+
<PackageVersion Include="CasCap.Common.Net" Version="4.2.2" />
12+
<PackageVersion Include="CasCap.Common.Testing" Version="4.2.2" />
13+
<PackageVersion Include="ConsoleTables" Version="2.6.2" />
14+
<PackageVersion Include="Figgle" Version="0.5.1" />
15+
<PackageVersion Include="McMaster.Extensions.CommandLineUtils" Version="4.1.1" />
16+
<PackageVersion Include="McMaster.Extensions.Hosting.CommandLine" Version="4.1.1" />
17+
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="9.0.0" />
18+
<PackageVersion Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.0" />
19+
<PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="9.0.0" />
20+
<PackageVersion Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.0" />
21+
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.0" />
22+
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.0" />
23+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
24+
<PackageVersion Include="Microsoft.TeamFoundation.DistributedTask.WebApi" Version="19.225.1" />
25+
<PackageVersion Include="Microsoft.TeamFoundationServer.Client" Version="19.225.1" />
26+
<PackageVersion Include="Microsoft.VisualStudio.Services.Client" Version="19.225.1" />
27+
<PackageVersion Include="Microsoft.VisualStudio.Services.Release.Client" Version="19.225.1" />
28+
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
29+
<PackageVersion Include="ShellProgressBar" Version="5.2.0" />
30+
<PackageVersion Include="YamlDotNet" Version="16.2.0" />
31+
<PackageVersion Include="coverlet.collector" Version="6.0.2" />
32+
<PackageVersion Include="coverlet.msbuild" Version="6.0.2" />
33+
<PackageVersion Include="semver" Version="3.0.0" />
34+
<PackageVersion Include="xunit" Version="2.9.2" />
35+
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
36+
37+
</ItemGroup>
38+
</Project>

‎src/CasCap.Apis.AzureDevOps.Tests/CasCap.Apis.AzureDevOps.Tests.csproj‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,22 +9,22 @@
99
</ItemGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="CasCap.Common.Testing" Version="4.2.2" />
13-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
14-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.0" />
15-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.0" />
16-
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.0" />
17-
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.0" />
18-
<PackageReference Include="xunit" Version="2.9.2" />
19-
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
12+
<PackageReference Include="CasCap.Common.Testing" />
13+
<PackageReference Include="Microsoft.NET.Test.Sdk" />
14+
<PackageReference Include="Microsoft.Extensions.Configuration" />
15+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" />
16+
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" />
17+
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" />
18+
<PackageReference Include="xunit" />
19+
<PackageReference Include="xunit.runner.visualstudio">
2020
<PrivateAssets>all</PrivateAssets>
2121
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2222
</PackageReference>
23-
<PackageReference Include="coverlet.collector" Version="6.0.2">
23+
<PackageReference Include="coverlet.collector">
2424
<PrivateAssets>all</PrivateAssets>
2525
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2626
</PackageReference>
27-
<PackageReference Include="coverlet.msbuild" Version="6.0.2">
27+
<PackageReference Include="coverlet.msbuild">
2828
<PrivateAssets>all</PrivateAssets>
2929
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3030
</PackageReference>

‎src/CasCap.Apis.AzureDevOps.Tests/Tests/ApiServiceTests.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using System.Diagnostics;
22
using Xunit;
33
using Xunit.Abstractions;
4+
45
namespace CasCap.Apis.AzureDevOps.Tests;
56

67
public class ApiServiceTests : TestBase

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
using Microsoft.Extensions.DependencyInjection;
55
using Microsoft.Extensions.Logging;
66
using Xunit.Abstractions;
7+
78
namespace CasCap.Apis.AzureDevOps.Tests;
89

910
public abstract class TestBase

‎src/CasCap.Apis.AzureDevOps/CasCap.Apis.AzureDevOps.csproj‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,16 @@
1212
</PropertyGroup>
1313

1414
<ItemGroup>
15-
<PackageReference Include="AzurePipelinesToGitHubActionsConverter.Core" Version="1.3.39" />
16-
<PackageReference Include="CasCap.Common.Extensions" Version="4.2.2" />
17-
<PackageReference Include="CasCap.Common.Net" Version="4.2.2" />
18-
<PackageReference Include="Microsoft.TeamFoundation.DistributedTask.WebApi" Version="19.225.1" />
19-
<PackageReference Include="Microsoft.TeamFoundationServer.Client" Version="19.225.1" />
20-
<PackageReference Include="Microsoft.VisualStudio.Services.Client" Version="19.225.1" />
21-
<PackageReference Include="Microsoft.VisualStudio.Services.Release.Client" Version="19.225.1" />
22-
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
23-
<PackageReference Include="semver" Version="3.0.0" />
24-
<PackageReference Include="YamlDotNet" Version="16.2.0" />
15+
<PackageReference Include="AzurePipelinesToGitHubActionsConverter.Core" />
16+
<PackageReference Include="CasCap.Common.Extensions" />
17+
<PackageReference Include="CasCap.Common.Net" />
18+
<PackageReference Include="Microsoft.TeamFoundation.DistributedTask.WebApi" />
19+
<PackageReference Include="Microsoft.TeamFoundationServer.Client" />
20+
<PackageReference Include="Microsoft.VisualStudio.Services.Client" />
21+
<PackageReference Include="Microsoft.VisualStudio.Services.Release.Client" />
22+
<PackageReference Include="Newtonsoft.Json" />
23+
<PackageReference Include="semver" />
24+
<PackageReference Include="YamlDotNet" />
2525
</ItemGroup>
2626

2727
</Project>

‎src/CasCap.Apis.AzureDevOps/Models/Yaml/Pipeline.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using AzurePipelinesToGitHubActionsConverter.Core.AzurePipelines;
22
using CasCap.Utilities;
33
using YamlDotNet.Serialization;
4+
45
namespace CasCap.Models;
56

67
public class Pipeline

‎src/CasCap.Apis.AzureDevOps/Models/Yaml/StageAzDO.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using AzurePipelinesToGitHubActionsConverter.Core.AzurePipelines;
2+
23
namespace CasCap.Models;
34

45
public class StageAzDO// : Stage //we can't inherit from Stage here as it will mess up the order of the properties when YAMLised.

0 commit comments

Comments
 (0)