diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 0f068d6..9e54ae1 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -11,13 +11,12 @@ on: permissions: write-all jobs: build: - uses: LayeredCraft/devops-templates/.github/workflows/package-build.yaml@v6.2 + uses: LayeredCraft/devops-templates/.github/workflows/package-build.yaml@v7.6 with: hasTests: true - useMtpRunner: true - testDirectory: "test" dotnet-version: | 8.0.x 9.0.x 10.0.x + 11.0.x secrets: inherit diff --git a/.github/workflows/pr-build.yaml b/.github/workflows/pr-build.yaml index 3121d86..19e43d4 100644 --- a/.github/workflows/pr-build.yaml +++ b/.github/workflows/pr-build.yaml @@ -7,14 +7,14 @@ on: permissions: write-all jobs: build: - uses: LayeredCraft/devops-templates/.github/workflows/pr-build.yaml@v6.2 + uses: LayeredCraft/devops-templates/.github/workflows/pr-build.yaml@v7.6 with: - solution: LayeredCraft.StructuredLogging.sln - useMtpRunner: true + solution: LayeredCraft.StructuredLogging.slnx hasTests: true dotnetVersion: | 8.0.x 9.0.x 10.0.x + 11.0.x runCdk: false secrets: inherit \ No newline at end of file diff --git a/Directory.Packages.props b/Directory.Packages.props index 95326da..b368d62 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -6,10 +6,13 @@ - + - + + + + @@ -18,8 +21,8 @@ - - + + runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/LayeredCraft.StructuredLogging.sln b/LayeredCraft.StructuredLogging.sln deleted file mode 100644 index 02e14cb..0000000 --- a/LayeredCraft.StructuredLogging.sln +++ /dev/null @@ -1,51 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.31903.59 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{1BF6691E-696C-42E0-B42C-C7274F1234A4}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{6FFCCE67-D59F-4089-B3EE-822E5CDD0253}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LayeredCraft.StructuredLogging.Tests", "test\LayeredCraft.StructuredLogging.Tests\LayeredCraft.StructuredLogging.Tests.csproj", "{378ED5C6-96C6-418F-860E-CF48A53E20FD}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LayeredCraft.StructuredLogging", "src\LayeredCraft.StructuredLogging\LayeredCraft.StructuredLogging.csproj", "{236B0640-4113-4D3F-AF03-D3EBAE3ABA96}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "git", "git", "{86A57C7D-5E4C-4472-9937-CEB5506632E1}" - ProjectSection(SolutionItems) = preProject - .github\dependabot.yml = .github\dependabot.yml - .github\workflows\build.yaml = .github\workflows\build.yaml - .github\workflows\pr-build.yaml = .github\workflows\pr-build.yaml - .gitignore = .gitignore - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{CC807B14-C3E2-4149-87CE-680148C97D15}" - ProjectSection(SolutionItems) = preProject - README.md = README.md - Directory.Build.props = Directory.Build.props - Directory.Packages.props = Directory.Packages.props - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {378ED5C6-96C6-418F-860E-CF48A53E20FD} = {6FFCCE67-D59F-4089-B3EE-822E5CDD0253} - {236B0640-4113-4D3F-AF03-D3EBAE3ABA96} = {1BF6691E-696C-42E0-B42C-C7274F1234A4} - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {378ED5C6-96C6-418F-860E-CF48A53E20FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {378ED5C6-96C6-418F-860E-CF48A53E20FD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {378ED5C6-96C6-418F-860E-CF48A53E20FD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {378ED5C6-96C6-418F-860E-CF48A53E20FD}.Release|Any CPU.Build.0 = Release|Any CPU - {236B0640-4113-4D3F-AF03-D3EBAE3ABA96}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {236B0640-4113-4D3F-AF03-D3EBAE3ABA96}.Debug|Any CPU.Build.0 = Debug|Any CPU - {236B0640-4113-4D3F-AF03-D3EBAE3ABA96}.Release|Any CPU.ActiveCfg = Release|Any CPU - {236B0640-4113-4D3F-AF03-D3EBAE3ABA96}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection -EndGlobal diff --git a/LayeredCraft.StructuredLogging.slnx b/LayeredCraft.StructuredLogging.slnx new file mode 100644 index 0000000..8088d4d --- /dev/null +++ b/LayeredCraft.StructuredLogging.slnx @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/global.json b/global.json new file mode 100644 index 0000000..3140116 --- /dev/null +++ b/global.json @@ -0,0 +1,5 @@ +{ + "test": { + "runner": "Microsoft.Testing.Platform" + } +} diff --git a/src/LayeredCraft.StructuredLogging/LayeredCraft.StructuredLogging.csproj b/src/LayeredCraft.StructuredLogging/LayeredCraft.StructuredLogging.csproj index 2c51629..3fb1ea5 100644 --- a/src/LayeredCraft.StructuredLogging/LayeredCraft.StructuredLogging.csproj +++ b/src/LayeredCraft.StructuredLogging/LayeredCraft.StructuredLogging.csproj @@ -3,7 +3,7 @@ enable enable - net8.0;net9.0;netstandard2.1;netstandard2.0;net10.0 + net8.0;net9.0;netstandard2.1;netstandard2.0;net10.0;net11.0 default diff --git a/test/LayeredCraft.StructuredLogging.Tests/LayeredCraft.StructuredLogging.Tests.csproj b/test/LayeredCraft.StructuredLogging.Tests/LayeredCraft.StructuredLogging.Tests.csproj index db6dd12..b6b0e17 100644 --- a/test/LayeredCraft.StructuredLogging.Tests/LayeredCraft.StructuredLogging.Tests.csproj +++ b/test/LayeredCraft.StructuredLogging.Tests/LayeredCraft.StructuredLogging.Tests.csproj @@ -4,7 +4,7 @@ enable enable Exe - net8.0;net9.0;net10.0 + net8.0;net9.0;net10.0;net11.0 default