From b0ee65d070cf87b8864769e6ba80e9cc4c50007c Mon Sep 17 00:00:00 2001 From: Jerome Haltom Date: Fri, 20 Dec 2024 11:14:22 -0600 Subject: [PATCH] Fix up. --- .github/workflows/Cogito.Serilog.yml | 227 ++++++++++++++++++ .gitignore | 4 +- Cogito.Serilog.dist.msbuildproj | 32 +++ Cogito.Serilog.sln | 39 ++- Directory.Build.props | 42 +++- GitVersion.yml | 16 +- global.json | 9 + .../Cogito.Serilog.Autofac}/AssemblyModule.cs | 0 .../Cogito.Serilog.Autofac.csproj | 1 - .../Autofac/ModuleTests.cs | 0 .../Cogito.Serilog.Tests.csproj | 2 +- .../ExceptionLogContextDataEnricherTests.cs | 0 .../Cogito.Serilog}/Cogito.Serilog.csproj | 1 - .../DefaultLoggerConfigurationBuilder.cs | 0 .../DefaultLoggerConfiguratorProvider.cs | 0 .../Cogito.Serilog}/DelegateLogEventSink.cs | 0 .../JArrayDestructuringPolicy.cs | 0 .../JObjectDestructuringPolicy.cs | 0 .../JValueDestructuringPolicy.cs | 0 .../DestructuringPolicyConfigurator.cs | 0 .../EnricherLoggerConfigurator.cs | 0 .../ExceptionLogContextDataEnricher.cs | 0 .../Enrichers/HostEnvironmentEnricher.cs | 0 .../ExceptionLoggerConfigurator.cs | 0 .../ILoggerConfigurationBuilder.cs | 0 .../Cogito.Serilog}/ILoggerConfigurator.cs | 0 .../ILoggerConfiguratorProvider.cs | 0 src/dist-nuget/dist-nuget.csproj | 17 ++ src/dist-tests/dist-tests.csproj | 36 +++ 29 files changed, 407 insertions(+), 19 deletions(-) create mode 100644 .github/workflows/Cogito.Serilog.yml create mode 100644 Cogito.Serilog.dist.msbuildproj create mode 100644 global.json rename {Cogito.Serilog.Autofac => src/Cogito.Serilog.Autofac}/AssemblyModule.cs (100%) rename {Cogito.Serilog.Autofac => src/Cogito.Serilog.Autofac}/Cogito.Serilog.Autofac.csproj (92%) rename {Cogito.Serilog.Tests => src/Cogito.Serilog.Tests}/Autofac/ModuleTests.cs (100%) rename {Cogito.Serilog.Tests => src/Cogito.Serilog.Tests}/Cogito.Serilog.Tests.csproj (93%) rename {Cogito.Serilog.Tests => src/Cogito.Serilog.Tests}/ExceptionLogContextDataEnricherTests.cs (100%) rename {Cogito.Serilog => src/Cogito.Serilog}/Cogito.Serilog.csproj (93%) rename {Cogito.Serilog => src/Cogito.Serilog}/DefaultLoggerConfigurationBuilder.cs (100%) rename {Cogito.Serilog => src/Cogito.Serilog}/DefaultLoggerConfiguratorProvider.cs (100%) rename {Cogito.Serilog => src/Cogito.Serilog}/DelegateLogEventSink.cs (100%) rename {Cogito.Serilog => src/Cogito.Serilog}/Destructuring/JArrayDestructuringPolicy.cs (100%) rename {Cogito.Serilog => src/Cogito.Serilog}/Destructuring/JObjectDestructuringPolicy.cs (100%) rename {Cogito.Serilog => src/Cogito.Serilog}/Destructuring/JValueDestructuringPolicy.cs (100%) rename {Cogito.Serilog => src/Cogito.Serilog}/DestructuringPolicyConfigurator.cs (100%) rename {Cogito.Serilog => src/Cogito.Serilog}/EnricherLoggerConfigurator.cs (100%) rename {Cogito.Serilog => src/Cogito.Serilog}/Enrichers/ExceptionLogContextDataEnricher.cs (100%) rename {Cogito.Serilog => src/Cogito.Serilog}/Enrichers/HostEnvironmentEnricher.cs (100%) rename {Cogito.Serilog => src/Cogito.Serilog}/ExceptionLoggerConfigurator.cs (100%) rename {Cogito.Serilog => src/Cogito.Serilog}/ILoggerConfigurationBuilder.cs (100%) rename {Cogito.Serilog => src/Cogito.Serilog}/ILoggerConfigurator.cs (100%) rename {Cogito.Serilog => src/Cogito.Serilog}/ILoggerConfiguratorProvider.cs (100%) create mode 100644 src/dist-nuget/dist-nuget.csproj create mode 100644 src/dist-tests/dist-tests.csproj diff --git a/.github/workflows/Cogito.Serilog.yml b/.github/workflows/Cogito.Serilog.yml new file mode 100644 index 0000000..4d2934d --- /dev/null +++ b/.github/workflows/Cogito.Serilog.yml @@ -0,0 +1,227 @@ +name: Cogito.Serilog + +on: + workflow_dispatch: + push: + branches: + - main + - develop + pull_request: + branches: + - main + - develop + release: + types: + - created + +jobs: + build: + name: Build + runs-on: ubuntu-latest + steps: + - name: Checkout Source + uses: actions/checkout@v4 + with: + fetch-depth: 0 + - name: Setup .NET 6.0 + uses: actions/setup-dotnet@v4 + with: + dotnet-version: 6.0.x + - name: Setup .NET 8.0 + uses: actions/setup-dotnet@v4 + with: + dotnet-version: 8.0.x + - name: Install GitVersion + uses: gittools/actions/gitversion/setup@v3 + with: + versionSpec: 5.x + - name: Execute GitVersion + uses: gittools/actions/gitversion/execute@v3 + with: + useConfigFile: true + - name: Add NuGet Source (GitHub) + shell: pwsh + run: dotnet nuget add source --username USERNAME --password $env:GITHUB_TOKEN --store-password-in-clear-text --name alethic $env:GITHUB_REPOS + env: + GITHUB_REPOS: https://nuget.pkg.github.com/${{ github.repository_owner }}/index.json + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: NuGet Restore + run: dotnet restore Cogito.Serilog.sln + - name: Build + shell: pwsh + run: | + dotnet msbuild /m /bl ` + /p:Configuration="Release" ` + /p:Platform="Any CPU" ` + /p:Version=${env:GitVersion_FullSemVer} ` + /p:AssemblyVersion=${env:GitVersion_AssemblySemVer} ` + /p:InformationalVersion=${env:GitVersion_InformationalVersion} ` + /p:FileVersion=${env:GitVersion_AssemblySemFileVer} ` + /p:PackageVersion=${env:GitVersion_FullSemVer} ` + /p:RepositoryUrl="${env:GITHUB_SERVER_URL}/${env:GITHUB_REPOSITORY}.git" ` + /p:PackageProjectUrl="${env:GITHUB_SERVER_URL}/${env:GITHUB_REPOSITORY}" ` + /p:BuildInParallel=true ` + /p:ContinuousIntegrationBuild=true ` + Cogito.Serilog.dist.msbuildproj + - name: Upload MSBuild Log + if: ${{ always() }} + uses: actions/upload-artifact@v4 + with: + name: msbuild.binlog + path: msbuild.binlog + - name: Upload NuGet Packages + uses: actions/upload-artifact@v4 + with: + name: nuget + path: dist/nuget/*.nupkg + - name: Package Tests + run: tar czvf tests.tar.gz tests + working-directory: dist + - name: Upload Tests + uses: actions/upload-artifact@v4 + with: + name: tests + path: dist/tests.tar.gz + test: + strategy: + matrix: + run: + - Cogito.Serilog.Tests + sys: + - win-x64 + - linux-x64 + - osx-x64 + - osx-arm64 + tfm: + - net481 + - net6.0 + - net8.0 + exclude: + - tfm: net48 + sys: linux-x64 + - tfm: net48 + sys: osx-x64 + - tfm: net48 + sys: osx-arm64 + name: Test (${{ matrix.run }}:${{ matrix.tfm }}:${{ matrix.sys }}) + timeout-minutes: 240 + needs: + - build + runs-on: ${{ fromJSON('{"win-x64":["windows-2022"],"linux-x64":["ubuntu-22.04"],"osx-x64":["macos-13"],"osx-arm64":["macos-14"]}')[matrix.sys] }} + steps: + - name: Setup .NET 6.0 + uses: actions/setup-dotnet@v4 + with: + dotnet-version: 6.0.x + - name: Setup .NET 8.0 + uses: actions/setup-dotnet@v4 + with: + dotnet-version: 8.0.x + - name: Download Tests + uses: actions/download-artifact@v4 + with: + name: tests + - name: Restore Tests + run: tar xzvf tests.tar.gz + - name: Execute Tests + timeout-minutes: 240 + shell: pwsh + run: | + # assign powershell variables + $run = "${{ matrix.run }}" + $tfm = "${{ matrix.tfm }}" + $sys = "${{ matrix.sys }}" + + # suite name can contain filter expression after ? + $split = $run.IndexOf("?") + if ($split -gt -1) { + $tst = $run.Substring(0, $split) + $qry = $run.Substring($split + 1) + } else { + $tst = $run + } + + # scan and process test assemblies + $tests = $(gi .\tests\$tst\$tfm\*.Tests.dll) + if ($tests) { + $argl = @( + "-f", $tfm, + "-v:diag", + "--results-directory", "TestResults", + "--logger:console;verbosity=diag", + "--logger:trx" + ) + + $runsettings = $(gi .\tests\$tst\$tfm\*.runsettings) + if ($runsettings) { + $argl += "--settings:$runsettings" + } + + if ($qry -ne "" -and $qry -ne $null) { + $argl += @("--filter", $qry) + Add-Content $env:GITHUB_ENV "`nRET=TestResults--$tst-$qry--$tfm--$sys" + } else { + Add-Content $env:GITHUB_ENV "`nRET=TestResults--$tst--$tfm--$sys" + } + + dotnet test @argl $tests[0].FullName + } + - name: Archive Test Results + if: always() && startsWith(env.RET, 'TestResults--') + run: tar czvf TestResults.tar.gz TestResults + working-directory: ${{ env.WORKPATH }} + - name: Upload Test Results + if: always() && startsWith(env.RET, 'TestResults--') + uses: actions/upload-artifact@v4 + with: + name: ${{ env.RET }} + path: TestResults.tar.gz + release: + name: Release + if: github.event_name != 'pull_request' + needs: + - test + runs-on: ubuntu-22.04 + steps: + - name: Checkout Source + uses: actions/checkout@v4 + with: + fetch-depth: 0 + - name: Install GitVersion + uses: gittools/actions/gitversion/setup@v3 + with: + versionSpec: 5.x + - name: Execute GitVersion + id: GitVersion + uses: gittools/actions/gitversion/execute@v3 + with: + useConfigFile: true + - name: Download NuGet Packages + uses: actions/download-artifact@v4 + with: + name: nuget + path: dist/nuget + - name: Create Release + if: github.ref_type == 'tag' + uses: ncipollo/release-action@v1 + with: + tag: ${{ steps.GitVersion.outputs.semVer }} + allowUpdates: true + omitBodyDuringUpdate: true + artifacts: dist/nuget/*.nupkg,dist/nuget/*.snupkg,dist/doc.zip + makeLatest: true + token: ${{ secrets.GITHUB_TOKEN }} + - name: Push NuGet (GitHub) + if: github.event_name != 'pull_request' + shell: pwsh + run: dotnet nuget push dist/nuget/*.nupkg --source $env:GITHUB_REPOS --api-key $env:GITHUB_TOKEN --skip-duplicate + env: + GITHUB_REPOS: https://nuget.pkg.github.com/${{ github.repository_owner }}/index.json + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: Push NuGet + if: github.ref_type == 'tag' + shell: pwsh + run: dotnet nuget push dist/nuget/*.nupkg --source $env:NUGET_REPOS --api-key $env:NUGET_TOKEN --skip-duplicate + env: + NUGET_REPOS: https://api.nuget.org/v3/index.json + NUGET_TOKEN: ${{ secrets.NUGET_TOKEN }} diff --git a/.gitignore b/.gitignore index 3c4efe2..c2b1370 100644 --- a/.gitignore +++ b/.gitignore @@ -258,4 +258,6 @@ paket-files/ # Python Tools for Visual Studio (PTVS) __pycache__/ -*.pyc \ No newline at end of file +*.pyc + +/dist \ No newline at end of file diff --git a/Cogito.Serilog.dist.msbuildproj b/Cogito.Serilog.dist.msbuildproj new file mode 100644 index 0000000..b167f14 --- /dev/null +++ b/Cogito.Serilog.dist.msbuildproj @@ -0,0 +1,32 @@ + + + $(DISTDIR) + $([System.IO.Path]::Combine('$(MSBuildThisFileDirectory)', 'dist')) + $([System.IO.Path]::GetFullPath('$(DistDir)')) + $([System.IO.Path]::Combine('$(MSBuildThisFileDirectory)', 'Cogito.Serilog.sln')) + Release + Any CPU + + + + + dist%5Cdist-nuget:Publish + PublishDir=$(DistDir)\nuget + + + dist%5Cdist-tests:Publish + PublishDir=$(DistDir)\tests + + + + + + <_TargetsForPublish Include="@(TargetsForPublish)"> + %(TargetsForPublish.Properties) + + + + + + + diff --git a/Cogito.Serilog.sln b/Cogito.Serilog.sln index 511e1b0..deb5b9b 100644 --- a/Cogito.Serilog.sln +++ b/Cogito.Serilog.sln @@ -1,19 +1,33 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29721.120 +# Visual Studio Version 17 +VisualStudioVersion = 17.12.35527.113 d17.12 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{7271F8CF-C4EC-47FE-91F3-FF3331482C4F}" ProjectSection(SolutionItems) = preProject + .gitattributes = .gitattributes + .gitignore = .gitignore appveyor.yml = appveyor.yml + Cogito.Serilog.dist.msbuildproj = Cogito.Serilog.dist.msbuildproj + .github\workflows\Cogito.Serilog.yml = .github\workflows\Cogito.Serilog.yml Directory.Build.props = Directory.Build.props + GitVersion.yml = GitVersion.yml + global.json = global.json EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cogito.Serilog", "Cogito.Serilog\Cogito.Serilog.csproj", "{CBA6505F-8781-4A5E-9A4A-6942EBD66ED4}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cogito.Serilog", "src\Cogito.Serilog\Cogito.Serilog.csproj", "{CBA6505F-8781-4A5E-9A4A-6942EBD66ED4}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cogito.Serilog.Autofac", "Cogito.Serilog.Autofac\Cogito.Serilog.Autofac.csproj", "{7B309A5F-E9BC-46D0-B776-0B13CB65AEDF}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cogito.Serilog.Autofac", "src\Cogito.Serilog.Autofac\Cogito.Serilog.Autofac.csproj", "{7B309A5F-E9BC-46D0-B776-0B13CB65AEDF}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cogito.Serilog.Tests", "Cogito.Serilog.Tests\Cogito.Serilog.Tests.csproj", "{1B6B5D05-9BA9-43BA-A4F2-35A85015FBBF}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cogito.Serilog.Tests", "src\Cogito.Serilog.Tests\Cogito.Serilog.Tests.csproj", "{1B6B5D05-9BA9-43BA-A4F2-35A85015FBBF}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "dist", "dist", "{49376E09-31A8-43AE-9A22-9F34A3DEC6B7}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{30CA5786-F236-40AD-96CD-1590BB7FC6AC}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dist-nuget", "src\dist-nuget\dist-nuget.csproj", "{E19E6FFF-84A5-4466-9DBA-442BD6D8E678}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dist-tests", "src\dist-tests\dist-tests.csproj", "{25FC413A-C3B9-4BF9-9DCC-001916066CE7}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -33,10 +47,25 @@ Global {1B6B5D05-9BA9-43BA-A4F2-35A85015FBBF}.Debug|Any CPU.Build.0 = Debug|Any CPU {1B6B5D05-9BA9-43BA-A4F2-35A85015FBBF}.Release|Any CPU.ActiveCfg = Release|Any CPU {1B6B5D05-9BA9-43BA-A4F2-35A85015FBBF}.Release|Any CPU.Build.0 = Release|Any CPU + {E19E6FFF-84A5-4466-9DBA-442BD6D8E678}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E19E6FFF-84A5-4466-9DBA-442BD6D8E678}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E19E6FFF-84A5-4466-9DBA-442BD6D8E678}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E19E6FFF-84A5-4466-9DBA-442BD6D8E678}.Release|Any CPU.Build.0 = Release|Any CPU + {25FC413A-C3B9-4BF9-9DCC-001916066CE7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {25FC413A-C3B9-4BF9-9DCC-001916066CE7}.Debug|Any CPU.Build.0 = Debug|Any CPU + {25FC413A-C3B9-4BF9-9DCC-001916066CE7}.Release|Any CPU.ActiveCfg = Release|Any CPU + {25FC413A-C3B9-4BF9-9DCC-001916066CE7}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {CBA6505F-8781-4A5E-9A4A-6942EBD66ED4} = {30CA5786-F236-40AD-96CD-1590BB7FC6AC} + {7B309A5F-E9BC-46D0-B776-0B13CB65AEDF} = {30CA5786-F236-40AD-96CD-1590BB7FC6AC} + {1B6B5D05-9BA9-43BA-A4F2-35A85015FBBF} = {30CA5786-F236-40AD-96CD-1590BB7FC6AC} + {E19E6FFF-84A5-4466-9DBA-442BD6D8E678} = {49376E09-31A8-43AE-9A22-9F34A3DEC6B7} + {25FC413A-C3B9-4BF9-9DCC-001916066CE7} = {49376E09-31A8-43AE-9A22-9F34A3DEC6B7} + EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {FF4B3820-4206-4316-82A5-DEA5792C6A71} EndGlobalSection diff --git a/Directory.Build.props b/Directory.Build.props index 1ddb32a..0e8229a 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,15 +1,39 @@ - Jerome Haltom - Alethic Solutions - https://github.com/alethic/Cogito.Serilog - git - https://github.com/alethic/Cogito.Serilog - MIT - icon.png - 8.0 + 12.0 + - + + + + Cogito.Serilog + @(Authors, ',') + $([System.DateTime]::UtcNow.Year.ToString()) + Copyright © $(CurrentYear) @(Authors, ', ') + + + + 0 + $(DefaultMajorVersion).0.0-dev + $(DefaultMajorVersion).0.0.0 + $(DefaultMajorVersion).0.0.0 + $(DefaultMajorVersion).0.0.0 + + + + https://github.com/alethic/Cogito.Serilog.git + git + https://github.com/alethic/Cogito.Serilog + $(Version) + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + diff --git a/GitVersion.yml b/GitVersion.yml index 0093d88..cfabef0 100644 --- a/GitVersion.yml +++ b/GitVersion.yml @@ -1 +1,15 @@ -mode: Mainline +mode: ContinuousDeployment +assembly-file-versioning-format: '{Major}.{Minor}.{Patch}.{WeightedPreReleaseNumber ?? 0}' +major-version-bump-message: '\+semver:\s?(major)' +minor-version-bump-message: '\+semver:\s?(minor)' +patch-version-bump-message: '\+semver:\s?(patch)' +branches: + main: + regex: ^main$ + tag: pre + increment: Patch + develop: + regex: ^develop$ + tag: dev + increment: Minor + \ No newline at end of file diff --git a/global.json b/global.json new file mode 100644 index 0000000..5b3ef7d --- /dev/null +++ b/global.json @@ -0,0 +1,9 @@ +{ + "sdk": { + "version": "8.0.100", + "rollForward": "latestFeature" + }, + "msbuild-sdks": { + "Microsoft.Build.NoTargets": "3.7.56" + } +} diff --git a/Cogito.Serilog.Autofac/AssemblyModule.cs b/src/Cogito.Serilog.Autofac/AssemblyModule.cs similarity index 100% rename from Cogito.Serilog.Autofac/AssemblyModule.cs rename to src/Cogito.Serilog.Autofac/AssemblyModule.cs diff --git a/Cogito.Serilog.Autofac/Cogito.Serilog.Autofac.csproj b/src/Cogito.Serilog.Autofac/Cogito.Serilog.Autofac.csproj similarity index 92% rename from Cogito.Serilog.Autofac/Cogito.Serilog.Autofac.csproj rename to src/Cogito.Serilog.Autofac/Cogito.Serilog.Autofac.csproj index fc177e2..db77c9f 100644 --- a/Cogito.Serilog.Autofac/Cogito.Serilog.Autofac.csproj +++ b/src/Cogito.Serilog.Autofac/Cogito.Serilog.Autofac.csproj @@ -3,7 +3,6 @@ netstandard2.0 Autofac extension for Serilog. - true diff --git a/Cogito.Serilog.Tests/Autofac/ModuleTests.cs b/src/Cogito.Serilog.Tests/Autofac/ModuleTests.cs similarity index 100% rename from Cogito.Serilog.Tests/Autofac/ModuleTests.cs rename to src/Cogito.Serilog.Tests/Autofac/ModuleTests.cs diff --git a/Cogito.Serilog.Tests/Cogito.Serilog.Tests.csproj b/src/Cogito.Serilog.Tests/Cogito.Serilog.Tests.csproj similarity index 93% rename from Cogito.Serilog.Tests/Cogito.Serilog.Tests.csproj rename to src/Cogito.Serilog.Tests/Cogito.Serilog.Tests.csproj index 8adc332..a76cb40 100644 --- a/Cogito.Serilog.Tests/Cogito.Serilog.Tests.csproj +++ b/src/Cogito.Serilog.Tests/Cogito.Serilog.Tests.csproj @@ -1,7 +1,7 @@  - net6.0;net48 + net8.0;net6.0;net481 false diff --git a/Cogito.Serilog.Tests/ExceptionLogContextDataEnricherTests.cs b/src/Cogito.Serilog.Tests/ExceptionLogContextDataEnricherTests.cs similarity index 100% rename from Cogito.Serilog.Tests/ExceptionLogContextDataEnricherTests.cs rename to src/Cogito.Serilog.Tests/ExceptionLogContextDataEnricherTests.cs diff --git a/Cogito.Serilog/Cogito.Serilog.csproj b/src/Cogito.Serilog/Cogito.Serilog.csproj similarity index 93% rename from Cogito.Serilog/Cogito.Serilog.csproj rename to src/Cogito.Serilog/Cogito.Serilog.csproj index 56cc53d..8920791 100644 --- a/Cogito.Serilog/Cogito.Serilog.csproj +++ b/src/Cogito.Serilog/Cogito.Serilog.csproj @@ -3,7 +3,6 @@ netstandard2.0 Various utilities for Serilog. - true diff --git a/Cogito.Serilog/DefaultLoggerConfigurationBuilder.cs b/src/Cogito.Serilog/DefaultLoggerConfigurationBuilder.cs similarity index 100% rename from Cogito.Serilog/DefaultLoggerConfigurationBuilder.cs rename to src/Cogito.Serilog/DefaultLoggerConfigurationBuilder.cs diff --git a/Cogito.Serilog/DefaultLoggerConfiguratorProvider.cs b/src/Cogito.Serilog/DefaultLoggerConfiguratorProvider.cs similarity index 100% rename from Cogito.Serilog/DefaultLoggerConfiguratorProvider.cs rename to src/Cogito.Serilog/DefaultLoggerConfiguratorProvider.cs diff --git a/Cogito.Serilog/DelegateLogEventSink.cs b/src/Cogito.Serilog/DelegateLogEventSink.cs similarity index 100% rename from Cogito.Serilog/DelegateLogEventSink.cs rename to src/Cogito.Serilog/DelegateLogEventSink.cs diff --git a/Cogito.Serilog/Destructuring/JArrayDestructuringPolicy.cs b/src/Cogito.Serilog/Destructuring/JArrayDestructuringPolicy.cs similarity index 100% rename from Cogito.Serilog/Destructuring/JArrayDestructuringPolicy.cs rename to src/Cogito.Serilog/Destructuring/JArrayDestructuringPolicy.cs diff --git a/Cogito.Serilog/Destructuring/JObjectDestructuringPolicy.cs b/src/Cogito.Serilog/Destructuring/JObjectDestructuringPolicy.cs similarity index 100% rename from Cogito.Serilog/Destructuring/JObjectDestructuringPolicy.cs rename to src/Cogito.Serilog/Destructuring/JObjectDestructuringPolicy.cs diff --git a/Cogito.Serilog/Destructuring/JValueDestructuringPolicy.cs b/src/Cogito.Serilog/Destructuring/JValueDestructuringPolicy.cs similarity index 100% rename from Cogito.Serilog/Destructuring/JValueDestructuringPolicy.cs rename to src/Cogito.Serilog/Destructuring/JValueDestructuringPolicy.cs diff --git a/Cogito.Serilog/DestructuringPolicyConfigurator.cs b/src/Cogito.Serilog/DestructuringPolicyConfigurator.cs similarity index 100% rename from Cogito.Serilog/DestructuringPolicyConfigurator.cs rename to src/Cogito.Serilog/DestructuringPolicyConfigurator.cs diff --git a/Cogito.Serilog/EnricherLoggerConfigurator.cs b/src/Cogito.Serilog/EnricherLoggerConfigurator.cs similarity index 100% rename from Cogito.Serilog/EnricherLoggerConfigurator.cs rename to src/Cogito.Serilog/EnricherLoggerConfigurator.cs diff --git a/Cogito.Serilog/Enrichers/ExceptionLogContextDataEnricher.cs b/src/Cogito.Serilog/Enrichers/ExceptionLogContextDataEnricher.cs similarity index 100% rename from Cogito.Serilog/Enrichers/ExceptionLogContextDataEnricher.cs rename to src/Cogito.Serilog/Enrichers/ExceptionLogContextDataEnricher.cs diff --git a/Cogito.Serilog/Enrichers/HostEnvironmentEnricher.cs b/src/Cogito.Serilog/Enrichers/HostEnvironmentEnricher.cs similarity index 100% rename from Cogito.Serilog/Enrichers/HostEnvironmentEnricher.cs rename to src/Cogito.Serilog/Enrichers/HostEnvironmentEnricher.cs diff --git a/Cogito.Serilog/ExceptionLoggerConfigurator.cs b/src/Cogito.Serilog/ExceptionLoggerConfigurator.cs similarity index 100% rename from Cogito.Serilog/ExceptionLoggerConfigurator.cs rename to src/Cogito.Serilog/ExceptionLoggerConfigurator.cs diff --git a/Cogito.Serilog/ILoggerConfigurationBuilder.cs b/src/Cogito.Serilog/ILoggerConfigurationBuilder.cs similarity index 100% rename from Cogito.Serilog/ILoggerConfigurationBuilder.cs rename to src/Cogito.Serilog/ILoggerConfigurationBuilder.cs diff --git a/Cogito.Serilog/ILoggerConfigurator.cs b/src/Cogito.Serilog/ILoggerConfigurator.cs similarity index 100% rename from Cogito.Serilog/ILoggerConfigurator.cs rename to src/Cogito.Serilog/ILoggerConfigurator.cs diff --git a/Cogito.Serilog/ILoggerConfiguratorProvider.cs b/src/Cogito.Serilog/ILoggerConfiguratorProvider.cs similarity index 100% rename from Cogito.Serilog/ILoggerConfiguratorProvider.cs rename to src/Cogito.Serilog/ILoggerConfiguratorProvider.cs diff --git a/src/dist-nuget/dist-nuget.csproj b/src/dist-nuget/dist-nuget.csproj new file mode 100644 index 0000000..f35c973 --- /dev/null +++ b/src/dist-nuget/dist-nuget.csproj @@ -0,0 +1,17 @@ + + + netstandard2.0 + false + false + + + + + . + + + . + + + + diff --git a/src/dist-tests/dist-tests.csproj b/src/dist-tests/dist-tests.csproj new file mode 100644 index 0000000..01a5586 --- /dev/null +++ b/src/dist-tests/dist-tests.csproj @@ -0,0 +1,36 @@ + + + netstandard2.0 + false + false + + + + + + + + + + + + + + <_ProjectName>%(TestTarget.ProjectName) + <_ProjectFile>%(TestTarget.ProjectFile) + <_ProjectFile Condition=" '$(_ProjectFile)' == '' And Exists('..\$(_ProjectName)\$(_ProjectName).csproj') ">..\$(_ProjectName)\$(_ProjectName).csproj + <_ProjectFile Condition=" '$(_ProjectFile)' == '' And Exists('..\$(_ProjectName)\$(_ProjectName).msbuildproj') ">..\$(_ProjectName)\$(_ProjectName).msbuildproj + <_TargetFramework>%(TestTarget.TargetFramework) + + + + + + TargetFramework=$(_TargetFramework) + $(_ProjectName)\$(_TargetFramework) + PreserveNewest + + + + +