diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml index cadddc6..8a513c3 100644 --- a/.github/dependabot.yaml +++ b/.github/dependabot.yaml @@ -5,7 +5,7 @@ updates: directory: "/" schedule: interval: 'cron' - cronjob: '0 8 * * MON#1' + cronjob: '0 8 * * MON#-1' timezone: 'Europe/Oslo' commit-message: prefix: "build:" @@ -23,7 +23,7 @@ updates: directory: "/" schedule: interval: 'cron' - cronjob: '0 8 * * MON#1' + cronjob: '0 8 * * MON#-1' timezone: 'Europe/Oslo' commit-message: prefix: "ci:" \ No newline at end of file diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index c69ccca..5232b48 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -18,7 +18,7 @@ jobs: - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 - name: Setup dotnet - uses: actions/setup-dotnet@c2fa09f4bde5ebb9d1777cf28262a3eb3db3ced7 # v5.2.0 + uses: actions/setup-dotnet@9a946fdbd5fb07b82b2f5a4466058b876ab72bb2 # v5.3.0 with: dotnet-version: | 8.0.x diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index dde0766..ba8a6bb 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -16,7 +16,7 @@ jobs: - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 - name: Setup .NET 10 - uses: actions/setup-dotnet@c2fa09f4bde5ebb9d1777cf28262a3eb3db3ced7 # v5.2.0 + uses: actions/setup-dotnet@9a946fdbd5fb07b82b2f5a4466058b876ab72bb2 # v5.3.0 with: dotnet-version: 10.0.* @@ -28,7 +28,7 @@ jobs: - name: Docker meta id: meta - uses: docker/metadata-action@030e881283bb7a6894de51c315a6bfe6a94e05cf # v6.0.0 + uses: docker/metadata-action@80c7e94dd9b9319bd5eb7a0e0fe9291e23a2a2e9 # v6.1.0 with: flavor: | latest=false @@ -38,7 +38,7 @@ jobs: type=semver,pattern={{version}} - name: Pack .NET project - run: dotnet pack Intility.Logging.sln -o Intility.Logging/output --property:Version=${{ steps.meta.outputs.tags }} + run: dotnet pack Intility.Logging.slnx -o Intility.Logging/output --property:Version=${{ steps.meta.outputs.tags }} # Get a short-lived NuGet API key - name: NuGet login diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 8d1e6f7..172fd78 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -11,10 +11,10 @@ jobs: release-please: runs-on: ubuntu-latest steps: - - uses: actions/create-github-app-token@1b10c78c7865c340bc4f6099eb2f838309f1e8c3 # v3.1.1 + - uses: actions/create-github-app-token@bcd2ba49218906704ab6c1aa796996da409d3eb1 # v3.2.0 id: app-token with: - app-id: ${{ vars.RELEASE_BOT_APP_ID }} + client-id: ${{ vars.RELEASE_BOT_CLIENT_ID }} private-key: ${{ secrets.RELEASE_BOT_PRIVATE_KEY }} - uses: googleapis/release-please-action@45996ed1f6d02564a971a2fa1b5860e934307cf7 # v5.0.0 with: diff --git a/Intility.Logging.sln b/Intility.Logging.sln deleted file mode 100644 index 9bc07b0..0000000 --- a/Intility.Logging.sln +++ /dev/null @@ -1,154 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.32112.339 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{4073E5F4-CD63-4DAA-864D-83A76827807E}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Intility.Logging.AspNetCore", "src\Intility.Logging.AspNetCore\Intility.Logging.AspNetCore.csproj", "{2CE796A8-05F7-4C69-A6A5-D46DCCDC9AC4}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Intility.Extensions.Logging", "src\Intility.Extensions.Logging\Intility.Extensions.Logging.csproj", "{2FD4CE1A-743F-4845-88CD-3FDF40618A66}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Intility.Extensions.Logging.Elasticsearch", "src\Intility.Extensions.Logging.Elasticsearch\Intility.Extensions.Logging.Elasticsearch.csproj", "{30C7ECBD-6EA2-44E4-BFD0-13CD9E96E758}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Intility.Extensions.Logging.Sentry", "src\Intility.Extensions.Logging.Sentry\Intility.Extensions.Logging.Sentry.csproj", "{E5D0E124-FC4E-48A1-B96C-ADA424C8D4BA}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{A5767C5D-9A48-4485-8D5E-686F34B2B766}" - ProjectSection(SolutionItems) = preProject - samples\Directory.Build.props = samples\Directory.Build.props - EndProjectSection -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebSample", "samples\WebSample\WebSample.csproj", "{2C7C52E9-835F-4051-9A5E-7D985545A795}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WorkerSample", "samples\WorkerSample\WorkerSample.csproj", "{25312E6A-4BA3-4FDF-AA7C-CF2A10CDA2AA}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MinimalApiSample", "samples\MinimalApiSample\MinimalApiSample.csproj", "{B647AC70-7210-462A-A43C-6EB4AFCB7ED4}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{0AB3BF05-4346-4AA6-1389-037BE0695223}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Intility.Logging.Tests", "tests\Intility.Logging.Tests\Intility.Logging.Tests.csproj", "{97695851-9359-45F1-AEC8-0876E7061D54}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 - Release|Any CPU = Release|Any CPU - Release|x64 = Release|x64 - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {2CE796A8-05F7-4C69-A6A5-D46DCCDC9AC4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2CE796A8-05F7-4C69-A6A5-D46DCCDC9AC4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2CE796A8-05F7-4C69-A6A5-D46DCCDC9AC4}.Debug|x64.ActiveCfg = Debug|Any CPU - {2CE796A8-05F7-4C69-A6A5-D46DCCDC9AC4}.Debug|x64.Build.0 = Debug|Any CPU - {2CE796A8-05F7-4C69-A6A5-D46DCCDC9AC4}.Debug|x86.ActiveCfg = Debug|Any CPU - {2CE796A8-05F7-4C69-A6A5-D46DCCDC9AC4}.Debug|x86.Build.0 = Debug|Any CPU - {2CE796A8-05F7-4C69-A6A5-D46DCCDC9AC4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2CE796A8-05F7-4C69-A6A5-D46DCCDC9AC4}.Release|Any CPU.Build.0 = Release|Any CPU - {2CE796A8-05F7-4C69-A6A5-D46DCCDC9AC4}.Release|x64.ActiveCfg = Release|Any CPU - {2CE796A8-05F7-4C69-A6A5-D46DCCDC9AC4}.Release|x64.Build.0 = Release|Any CPU - {2CE796A8-05F7-4C69-A6A5-D46DCCDC9AC4}.Release|x86.ActiveCfg = Release|Any CPU - {2CE796A8-05F7-4C69-A6A5-D46DCCDC9AC4}.Release|x86.Build.0 = Release|Any CPU - {2FD4CE1A-743F-4845-88CD-3FDF40618A66}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2FD4CE1A-743F-4845-88CD-3FDF40618A66}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2FD4CE1A-743F-4845-88CD-3FDF40618A66}.Debug|x64.ActiveCfg = Debug|Any CPU - {2FD4CE1A-743F-4845-88CD-3FDF40618A66}.Debug|x64.Build.0 = Debug|Any CPU - {2FD4CE1A-743F-4845-88CD-3FDF40618A66}.Debug|x86.ActiveCfg = Debug|Any CPU - {2FD4CE1A-743F-4845-88CD-3FDF40618A66}.Debug|x86.Build.0 = Debug|Any CPU - {2FD4CE1A-743F-4845-88CD-3FDF40618A66}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2FD4CE1A-743F-4845-88CD-3FDF40618A66}.Release|Any CPU.Build.0 = Release|Any CPU - {2FD4CE1A-743F-4845-88CD-3FDF40618A66}.Release|x64.ActiveCfg = Release|Any CPU - {2FD4CE1A-743F-4845-88CD-3FDF40618A66}.Release|x64.Build.0 = Release|Any CPU - {2FD4CE1A-743F-4845-88CD-3FDF40618A66}.Release|x86.ActiveCfg = Release|Any CPU - {2FD4CE1A-743F-4845-88CD-3FDF40618A66}.Release|x86.Build.0 = Release|Any CPU - {30C7ECBD-6EA2-44E4-BFD0-13CD9E96E758}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {30C7ECBD-6EA2-44E4-BFD0-13CD9E96E758}.Debug|Any CPU.Build.0 = Debug|Any CPU - {30C7ECBD-6EA2-44E4-BFD0-13CD9E96E758}.Debug|x64.ActiveCfg = Debug|Any CPU - {30C7ECBD-6EA2-44E4-BFD0-13CD9E96E758}.Debug|x64.Build.0 = Debug|Any CPU - {30C7ECBD-6EA2-44E4-BFD0-13CD9E96E758}.Debug|x86.ActiveCfg = Debug|Any CPU - {30C7ECBD-6EA2-44E4-BFD0-13CD9E96E758}.Debug|x86.Build.0 = Debug|Any CPU - {30C7ECBD-6EA2-44E4-BFD0-13CD9E96E758}.Release|Any CPU.ActiveCfg = Release|Any CPU - {30C7ECBD-6EA2-44E4-BFD0-13CD9E96E758}.Release|Any CPU.Build.0 = Release|Any CPU - {30C7ECBD-6EA2-44E4-BFD0-13CD9E96E758}.Release|x64.ActiveCfg = Release|Any CPU - {30C7ECBD-6EA2-44E4-BFD0-13CD9E96E758}.Release|x64.Build.0 = Release|Any CPU - {30C7ECBD-6EA2-44E4-BFD0-13CD9E96E758}.Release|x86.ActiveCfg = Release|Any CPU - {30C7ECBD-6EA2-44E4-BFD0-13CD9E96E758}.Release|x86.Build.0 = Release|Any CPU - {E5D0E124-FC4E-48A1-B96C-ADA424C8D4BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E5D0E124-FC4E-48A1-B96C-ADA424C8D4BA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E5D0E124-FC4E-48A1-B96C-ADA424C8D4BA}.Debug|x64.ActiveCfg = Debug|Any CPU - {E5D0E124-FC4E-48A1-B96C-ADA424C8D4BA}.Debug|x64.Build.0 = Debug|Any CPU - {E5D0E124-FC4E-48A1-B96C-ADA424C8D4BA}.Debug|x86.ActiveCfg = Debug|Any CPU - {E5D0E124-FC4E-48A1-B96C-ADA424C8D4BA}.Debug|x86.Build.0 = Debug|Any CPU - {E5D0E124-FC4E-48A1-B96C-ADA424C8D4BA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E5D0E124-FC4E-48A1-B96C-ADA424C8D4BA}.Release|Any CPU.Build.0 = Release|Any CPU - {E5D0E124-FC4E-48A1-B96C-ADA424C8D4BA}.Release|x64.ActiveCfg = Release|Any CPU - {E5D0E124-FC4E-48A1-B96C-ADA424C8D4BA}.Release|x64.Build.0 = Release|Any CPU - {E5D0E124-FC4E-48A1-B96C-ADA424C8D4BA}.Release|x86.ActiveCfg = Release|Any CPU - {E5D0E124-FC4E-48A1-B96C-ADA424C8D4BA}.Release|x86.Build.0 = Release|Any CPU - {2C7C52E9-835F-4051-9A5E-7D985545A795}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2C7C52E9-835F-4051-9A5E-7D985545A795}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2C7C52E9-835F-4051-9A5E-7D985545A795}.Debug|x64.ActiveCfg = Debug|Any CPU - {2C7C52E9-835F-4051-9A5E-7D985545A795}.Debug|x64.Build.0 = Debug|Any CPU - {2C7C52E9-835F-4051-9A5E-7D985545A795}.Debug|x86.ActiveCfg = Debug|Any CPU - {2C7C52E9-835F-4051-9A5E-7D985545A795}.Debug|x86.Build.0 = Debug|Any CPU - {2C7C52E9-835F-4051-9A5E-7D985545A795}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2C7C52E9-835F-4051-9A5E-7D985545A795}.Release|Any CPU.Build.0 = Release|Any CPU - {2C7C52E9-835F-4051-9A5E-7D985545A795}.Release|x64.ActiveCfg = Release|Any CPU - {2C7C52E9-835F-4051-9A5E-7D985545A795}.Release|x64.Build.0 = Release|Any CPU - {2C7C52E9-835F-4051-9A5E-7D985545A795}.Release|x86.ActiveCfg = Release|Any CPU - {2C7C52E9-835F-4051-9A5E-7D985545A795}.Release|x86.Build.0 = Release|Any CPU - {25312E6A-4BA3-4FDF-AA7C-CF2A10CDA2AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {25312E6A-4BA3-4FDF-AA7C-CF2A10CDA2AA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {25312E6A-4BA3-4FDF-AA7C-CF2A10CDA2AA}.Debug|x64.ActiveCfg = Debug|Any CPU - {25312E6A-4BA3-4FDF-AA7C-CF2A10CDA2AA}.Debug|x64.Build.0 = Debug|Any CPU - {25312E6A-4BA3-4FDF-AA7C-CF2A10CDA2AA}.Debug|x86.ActiveCfg = Debug|Any CPU - {25312E6A-4BA3-4FDF-AA7C-CF2A10CDA2AA}.Debug|x86.Build.0 = Debug|Any CPU - {25312E6A-4BA3-4FDF-AA7C-CF2A10CDA2AA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {25312E6A-4BA3-4FDF-AA7C-CF2A10CDA2AA}.Release|Any CPU.Build.0 = Release|Any CPU - {25312E6A-4BA3-4FDF-AA7C-CF2A10CDA2AA}.Release|x64.ActiveCfg = Release|Any CPU - {25312E6A-4BA3-4FDF-AA7C-CF2A10CDA2AA}.Release|x64.Build.0 = Release|Any CPU - {25312E6A-4BA3-4FDF-AA7C-CF2A10CDA2AA}.Release|x86.ActiveCfg = Release|Any CPU - {25312E6A-4BA3-4FDF-AA7C-CF2A10CDA2AA}.Release|x86.Build.0 = Release|Any CPU - {B647AC70-7210-462A-A43C-6EB4AFCB7ED4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B647AC70-7210-462A-A43C-6EB4AFCB7ED4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B647AC70-7210-462A-A43C-6EB4AFCB7ED4}.Debug|x64.ActiveCfg = Debug|Any CPU - {B647AC70-7210-462A-A43C-6EB4AFCB7ED4}.Debug|x64.Build.0 = Debug|Any CPU - {B647AC70-7210-462A-A43C-6EB4AFCB7ED4}.Debug|x86.ActiveCfg = Debug|Any CPU - {B647AC70-7210-462A-A43C-6EB4AFCB7ED4}.Debug|x86.Build.0 = Debug|Any CPU - {B647AC70-7210-462A-A43C-6EB4AFCB7ED4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B647AC70-7210-462A-A43C-6EB4AFCB7ED4}.Release|Any CPU.Build.0 = Release|Any CPU - {B647AC70-7210-462A-A43C-6EB4AFCB7ED4}.Release|x64.ActiveCfg = Release|Any CPU - {B647AC70-7210-462A-A43C-6EB4AFCB7ED4}.Release|x64.Build.0 = Release|Any CPU - {B647AC70-7210-462A-A43C-6EB4AFCB7ED4}.Release|x86.ActiveCfg = Release|Any CPU - {B647AC70-7210-462A-A43C-6EB4AFCB7ED4}.Release|x86.Build.0 = Release|Any CPU - {97695851-9359-45F1-AEC8-0876E7061D54}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {97695851-9359-45F1-AEC8-0876E7061D54}.Debug|Any CPU.Build.0 = Debug|Any CPU - {97695851-9359-45F1-AEC8-0876E7061D54}.Debug|x64.ActiveCfg = Debug|Any CPU - {97695851-9359-45F1-AEC8-0876E7061D54}.Debug|x64.Build.0 = Debug|Any CPU - {97695851-9359-45F1-AEC8-0876E7061D54}.Debug|x86.ActiveCfg = Debug|Any CPU - {97695851-9359-45F1-AEC8-0876E7061D54}.Debug|x86.Build.0 = Debug|Any CPU - {97695851-9359-45F1-AEC8-0876E7061D54}.Release|Any CPU.ActiveCfg = Release|Any CPU - {97695851-9359-45F1-AEC8-0876E7061D54}.Release|Any CPU.Build.0 = Release|Any CPU - {97695851-9359-45F1-AEC8-0876E7061D54}.Release|x64.ActiveCfg = Release|Any CPU - {97695851-9359-45F1-AEC8-0876E7061D54}.Release|x64.Build.0 = Release|Any CPU - {97695851-9359-45F1-AEC8-0876E7061D54}.Release|x86.ActiveCfg = Release|Any CPU - {97695851-9359-45F1-AEC8-0876E7061D54}.Release|x86.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {2CE796A8-05F7-4C69-A6A5-D46DCCDC9AC4} = {4073E5F4-CD63-4DAA-864D-83A76827807E} - {2FD4CE1A-743F-4845-88CD-3FDF40618A66} = {4073E5F4-CD63-4DAA-864D-83A76827807E} - {30C7ECBD-6EA2-44E4-BFD0-13CD9E96E758} = {4073E5F4-CD63-4DAA-864D-83A76827807E} - {E5D0E124-FC4E-48A1-B96C-ADA424C8D4BA} = {4073E5F4-CD63-4DAA-864D-83A76827807E} - {2C7C52E9-835F-4051-9A5E-7D985545A795} = {A5767C5D-9A48-4485-8D5E-686F34B2B766} - {25312E6A-4BA3-4FDF-AA7C-CF2A10CDA2AA} = {A5767C5D-9A48-4485-8D5E-686F34B2B766} - {B647AC70-7210-462A-A43C-6EB4AFCB7ED4} = {A5767C5D-9A48-4485-8D5E-686F34B2B766} - {97695851-9359-45F1-AEC8-0876E7061D54} = {0AB3BF05-4346-4AA6-1389-037BE0695223} - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {4B2214E5-8A73-47CE-9C97-4910BC331A86} - EndGlobalSection -EndGlobal diff --git a/Intility.Logging.slnx b/Intility.Logging.slnx new file mode 100644 index 0000000..2bf56eb --- /dev/null +++ b/Intility.Logging.slnx @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/samples/MinimalApiSample/MinimalApiSample.csproj b/samples/MinimalApiSample/MinimalApiSample.csproj index 98338c0..ea3fa78 100644 --- a/samples/MinimalApiSample/MinimalApiSample.csproj +++ b/samples/MinimalApiSample/MinimalApiSample.csproj @@ -7,7 +7,7 @@ - + diff --git a/samples/WorkerSample/WorkerSample.csproj b/samples/WorkerSample/WorkerSample.csproj index b265df6..d6aca7b 100644 --- a/samples/WorkerSample/WorkerSample.csproj +++ b/samples/WorkerSample/WorkerSample.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/Intility.Extensions.Logging.Sentry/Intility.Extensions.Logging.Sentry.csproj b/src/Intility.Extensions.Logging.Sentry/Intility.Extensions.Logging.Sentry.csproj index 77fe544..4085e26 100644 --- a/src/Intility.Extensions.Logging.Sentry/Intility.Extensions.Logging.Sentry.csproj +++ b/src/Intility.Extensions.Logging.Sentry/Intility.Extensions.Logging.Sentry.csproj @@ -20,8 +20,8 @@ - - + + diff --git a/src/Intility.Extensions.Logging/Intility.Extensions.Logging.csproj b/src/Intility.Extensions.Logging/Intility.Extensions.Logging.csproj index 060cc2c..249a80b 100644 --- a/src/Intility.Extensions.Logging/Intility.Extensions.Logging.csproj +++ b/src/Intility.Extensions.Logging/Intility.Extensions.Logging.csproj @@ -22,7 +22,7 @@ - + diff --git a/src/Intility.Logging.AspNetCore/Intility.Logging.AspNetCore.csproj b/src/Intility.Logging.AspNetCore/Intility.Logging.AspNetCore.csproj index 34c16f2..9b36719 100644 --- a/src/Intility.Logging.AspNetCore/Intility.Logging.AspNetCore.csproj +++ b/src/Intility.Logging.AspNetCore/Intility.Logging.AspNetCore.csproj @@ -25,12 +25,12 @@ - + - - + + diff --git a/tests/Intility.Logging.Tests/Intility.Logging.Tests.csproj b/tests/Intility.Logging.Tests/Intility.Logging.Tests.csproj index 94762f5..6a00150 100644 --- a/tests/Intility.Logging.Tests/Intility.Logging.Tests.csproj +++ b/tests/Intility.Logging.Tests/Intility.Logging.Tests.csproj @@ -8,8 +8,8 @@ - - + +