Skip to content

Commit d537e5c

Browse files
authored
build: add .NET 11 targeting and update CI tooling (#33)
1 parent 9248123 commit d537e5c

8 files changed

Lines changed: 39 additions & 63 deletions

File tree

.github/workflows/build.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,12 @@ on:
1111
permissions: write-all
1212
jobs:
1313
build:
14-
uses: LayeredCraft/devops-templates/.github/workflows/package-build.yaml@v6.2
14+
uses: LayeredCraft/devops-templates/.github/workflows/package-build.yaml@v7.6
1515
with:
1616
hasTests: true
17-
useMtpRunner: true
18-
testDirectory: "test"
1917
dotnet-version: |
2018
8.0.x
2119
9.0.x
2220
10.0.x
21+
11.0.x
2322
secrets: inherit

.github/workflows/pr-build.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ on:
77
permissions: write-all
88
jobs:
99
build:
10-
uses: LayeredCraft/devops-templates/.github/workflows/pr-build.yaml@v6.2
10+
uses: LayeredCraft/devops-templates/.github/workflows/pr-build.yaml@v7.6
1111
with:
12-
solution: LayeredCraft.StructuredLogging.sln
13-
useMtpRunner: true
12+
solution: LayeredCraft.StructuredLogging.slnx
1413
hasTests: true
1514
dotnetVersion: |
1615
8.0.x
1716
9.0.x
1817
10.0.x
18+
11.0.x
1919
runCdk: false
2020
secrets: inherit

Directory.Packages.props

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,13 @@
66
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.3" />
77
</ItemGroup>
88
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
9-
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.13" />
9+
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.15" />
1010
</ItemGroup>
1111
<ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
12-
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.3" />
12+
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.6" />
13+
</ItemGroup>
14+
<ItemGroup Condition="'$(TargetFramework)' == 'net11.0'">
15+
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="11.0.0-preview.3.26207.106" />
1316
</ItemGroup>
1417
<ItemGroup Label="GitHub">
1518
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="10.0.103" PrivateAssets="All" />
@@ -18,8 +21,8 @@
1821
<PackageVersion Include="AutoFixture" Version="4.18.1" />
1922
<PackageVersion Include="AutoFixture.AutoNSubstitute" Version="4.18.1" />
2023
<PackageVersion Include="AutoFixture.Xunit3" Version="4.19.0" />
21-
<PackageVersion Include="AwesomeAssertions" Version="9.3.0" />
22-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
24+
<PackageVersion Include="AwesomeAssertions" Version="9.4.0" />
25+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.4.0" />
2326
<PackageVersion Include="NSubstitute" Version="5.3.0" />
2427
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5">
2528
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

LayeredCraft.StructuredLogging.sln

Lines changed: 0 additions & 51 deletions
This file was deleted.
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<Solution>
2+
<Folder Name="/git/">
3+
<File Path=".github/dependabot.yml" />
4+
<File Path=".github/workflows/build.yaml" />
5+
<File Path=".github/workflows/pr-build.yaml" />
6+
<File Path=".gitignore" />
7+
</Folder>
8+
<Folder Name="/Solution Items/">
9+
<File Path="Directory.Build.props" />
10+
<File Path="Directory.Packages.props" />
11+
<File Path="global.json" />
12+
<File Path="README.md" />
13+
</Folder>
14+
<Folder Name="/src/">
15+
<Project Path="src/LayeredCraft.StructuredLogging/LayeredCraft.StructuredLogging.csproj" />
16+
</Folder>
17+
<Folder Name="/test/">
18+
<Project Path="test/LayeredCraft.StructuredLogging.Tests/LayeredCraft.StructuredLogging.Tests.csproj" />
19+
</Folder>
20+
</Solution>

global.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"test": {
3+
"runner": "Microsoft.Testing.Platform"
4+
}
5+
}

src/LayeredCraft.StructuredLogging/LayeredCraft.StructuredLogging.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<ImplicitUsings>enable</ImplicitUsings>
55
<Nullable>enable</Nullable>
6-
<TargetFrameworks>net8.0;net9.0;netstandard2.1;netstandard2.0;net10.0</TargetFrameworks>
6+
<TargetFrameworks>net8.0;net9.0;netstandard2.1;netstandard2.0;net10.0;net11.0</TargetFrameworks>
77
<LangVersion>default</LangVersion>
88

99
<!-- Package metadata -->

test/LayeredCraft.StructuredLogging.Tests/LayeredCraft.StructuredLogging.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<ImplicitUsings>enable</ImplicitUsings>
55
<Nullable>enable</Nullable>
66
<OutputType>Exe</OutputType>
7-
<TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
7+
<TargetFrameworks>net8.0;net9.0;net10.0;net11.0</TargetFrameworks>
88
<LangVersion>default</LangVersion>
99
<!--
1010
To enable the Microsoft Testing Platform 'dotnet test' experience, add property:

0 commit comments

Comments
 (0)