-
Notifications
You must be signed in to change notification settings - Fork 209
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #390 from serilog/dev
9.0.0 Release
- Loading branch information
Showing
15 changed files
with
156 additions
and
102 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| # If this file is renamed, the incrementing run attempt number will be reset. | ||
|
|
||
| name: CI | ||
|
|
||
| on: | ||
| push: | ||
| branches: [ "dev", "main" ] | ||
| pull_request: | ||
| branches: [ "dev", "main" ] | ||
|
|
||
| env: | ||
| CI_BUILD_NUMBER_BASE: ${{ github.run_number }} | ||
| CI_TARGET_BRANCH: ${{ github.head_ref || github.ref_name }} | ||
|
|
||
| jobs: | ||
| build: | ||
|
|
||
| # The build must run on Windows so that .NET Framework targets can be built and tested. | ||
| runs-on: windows-latest | ||
|
|
||
| permissions: | ||
| contents: write | ||
|
|
||
| steps: | ||
| - uses: actions/checkout@v4 | ||
| - name: Setup | ||
| uses: actions/setup-dotnet@v4 | ||
| with: | ||
| dotnet-version: 9.0.x | ||
| - name: Compute build number | ||
| shell: bash | ||
| run: | | ||
| echo "CI_BUILD_NUMBER=$(($CI_BUILD_NUMBER_BASE+2300))" >> $GITHUB_ENV | ||
| - name: Build and Publish | ||
| env: | ||
| DOTNET_CLI_TELEMETRY_OPTOUT: true | ||
| NUGET_API_KEY: ${{ secrets.NUGET_API_KEY }} | ||
| GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
| shell: pwsh | ||
| run: | | ||
| ./Build.ps1 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -289,3 +289,5 @@ __pycache__/ | |
|
|
||
| samples/Sample/logs/ | ||
|
|
||
| .DS_Store | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,56 +1,79 @@ | ||
| echo "build: Build started" | ||
| Write-Output "build: Tool versions follow" | ||
|
|
||
| dotnet --version | ||
| dotnet --list-sdks | ||
|
|
||
| Write-Output "build: Build started" | ||
|
|
||
| Push-Location $PSScriptRoot | ||
| try { | ||
| if(Test-Path .\artifacts) { | ||
| Write-Output "build: Cleaning ./artifacts" | ||
| Remove-Item ./artifacts -Force -Recurse | ||
| } | ||
|
|
||
| if(Test-Path .\artifacts) { | ||
| echo "build: Cleaning .\artifacts" | ||
| Remove-Item .\artifacts -Force -Recurse | ||
| } | ||
| & dotnet restore --no-cache | ||
|
|
||
| & dotnet restore --no-cache | ||
| $dbp = [Xml] (Get-Content .\Directory.Version.props) | ||
| $versionPrefix = $dbp.Project.PropertyGroup.VersionPrefix | ||
|
|
||
| $branch = @{ $true = $env:APPVEYOR_REPO_BRANCH; $false = $(git symbolic-ref --short -q HEAD) }[$env:APPVEYOR_REPO_BRANCH -ne $NULL]; | ||
| $revision = @{ $true = "{0:00000}" -f [convert]::ToInt32("0" + $env:APPVEYOR_BUILD_NUMBER, 10); $false = "local" }[$env:APPVEYOR_BUILD_NUMBER -ne $NULL]; | ||
| $suffix = @{ $true = ""; $false = "$($branch.Substring(0, [math]::Min(10,$branch.Length)))-$revision"}[$branch -eq "main" -and $revision -ne "local"] | ||
| Write-Output "build: Package version prefix is $versionPrefix" | ||
|
|
||
| echo "build: Version suffix is $suffix" | ||
| $branch = @{ $true = $env:CI_TARGET_BRANCH; $false = $(git symbolic-ref --short -q HEAD) }[$NULL -ne $env:CI_TARGET_BRANCH]; | ||
| $revision = @{ $true = "{0:00000}" -f [convert]::ToInt32("0" + $env:CI_BUILD_NUMBER, 10); $false = "local" }[$NULL -ne $env:CI_BUILD_NUMBER]; | ||
| $suffix = @{ $true = ""; $false = "$($branch.Substring(0, [math]::Min(10,$branch.Length)) -replace '([^a-zA-Z0-9\-]*)', '')-$revision"}[$branch -eq "main" -and $revision -ne "local"] | ||
| $commitHash = $(git rev-parse --short HEAD) | ||
| $buildSuffix = @{ $true = "$($suffix)-$($commitHash)"; $false = "$($branch)-$($commitHash)" }[$suffix -ne ""] | ||
|
|
||
| foreach ($src in ls src/*) { | ||
| Push-Location $src | ||
| Write-Output "build: Package version suffix is $suffix" | ||
| Write-Output "build: Build version suffix is $buildSuffix" | ||
|
|
||
| echo "build: Packaging project in $src" | ||
| & dotnet build -c Release --version-suffix=$buildSuffix /p:ContinuousIntegrationBuild=true | ||
| if($LASTEXITCODE -ne 0) { throw "Build failed" } | ||
|
|
||
| if($suffix) { | ||
| & dotnet pack -c Release --include-source -o ..\..\artifacts --version-suffix=$suffix | ||
| } else { | ||
| & dotnet pack -c Release --include-source -o ..\..\artifacts | ||
| } | ||
| foreach ($src in Get-ChildItem src/*) { | ||
| Push-Location $src | ||
|
|
||
| if($LASTEXITCODE -ne 0) { exit 1 } | ||
| Write-Output "build: Packaging project in $src" | ||
|
|
||
| Pop-Location | ||
| } | ||
| if ($suffix) { | ||
| & dotnet pack -c Release --no-build --no-restore -o ../../artifacts --version-suffix=$suffix | ||
| } else { | ||
| & dotnet pack -c Release --no-build --no-restore -o ../../artifacts | ||
| } | ||
| if($LASTEXITCODE -ne 0) { throw "Packaging failed" } | ||
|
|
||
| foreach ($test in ls test/*.PerformanceTests) { | ||
| Push-Location $test | ||
| Pop-Location | ||
| } | ||
|
|
||
| echo "build: Building performance test project in $test" | ||
| foreach ($test in Get-ChildItem test/*.Tests) { | ||
| Push-Location $test | ||
|
|
||
| & dotnet build -c Release | ||
| if($LASTEXITCODE -ne 0) { exit 2 } | ||
| Write-Output "build: Testing project in $test" | ||
|
|
||
| Pop-Location | ||
| } | ||
| & dotnet test -c Release --no-build --no-restore | ||
| if($LASTEXITCODE -ne 0) { throw "Testing failed" } | ||
|
|
||
| Pop-Location | ||
| } | ||
|
|
||
| foreach ($test in ls test/*.Tests) { | ||
| Push-Location $test | ||
| if ($env:NUGET_API_KEY) { | ||
| # GitHub Actions will only supply this to branch builds and not PRs. We publish | ||
| # builds from any branch this action targets (i.e. main and dev). | ||
|
|
||
| echo "build: Testing project in $test" | ||
| Write-Output "build: Publishing NuGet packages" | ||
|
|
||
| & dotnet test -c Release | ||
| if($LASTEXITCODE -ne 0) { exit 3 } | ||
| foreach ($nupkg in Get-ChildItem artifacts/*.nupkg) { | ||
| & dotnet nuget push -k $env:NUGET_API_KEY -s https://api.nuget.org/v3/index.json "$nupkg" | ||
| if($LASTEXITCODE -ne 0) { throw "Publishing failed" } | ||
| } | ||
|
|
||
| if (!($suffix)) { | ||
| Write-Output "build: Creating release for version $versionPrefix" | ||
|
|
||
| iex "gh release create v$versionPrefix --title v$versionPrefix --generate-notes $(get-item ./artifacts/*.nupkg) $(get-item ./artifacts/*.snupkg)" | ||
| } | ||
| } | ||
| } finally { | ||
| Pop-Location | ||
| } | ||
|
|
||
| Pop-Location |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,25 @@ | ||
| <Project> | ||
| <!-- Properties in this file are expected to be identical for all Serilog organization projects. If | ||
| a property value is project-specific, please record it in the CSPROJ file instead. --> | ||
| <Import Project="$(MSBuildThisFileDirectory)Directory.Version.props" /> | ||
| <PropertyGroup> | ||
| <LangVersion>latest</LangVersion> | ||
| <TreatWarningsAsErrors>True</TreatWarningsAsErrors> | ||
| <SignAssembly>true</SignAssembly> | ||
| <AssemblyOriginatorKeyFile>../../assets/Serilog.snk</AssemblyOriginatorKeyFile> | ||
| <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign> | ||
| <!-- The condition is required to support BenchmarkDotNet --> | ||
| <SignAssembly Condition="Exists('$(MSBuildThisFileDirectory)assets/Serilog.snk')">true</SignAssembly> | ||
| <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)assets/Serilog.snk</AssemblyOriginatorKeyFile> | ||
| <CheckEolTargetFramework>false</CheckEolTargetFramework> | ||
| <Nullable>enable</Nullable> | ||
| <ImplicitUsings>enable</ImplicitUsings> | ||
| <GenerateDocumentationFile>true</GenerateDocumentationFile> | ||
| <PublishRepositoryUrl>true</PublishRepositoryUrl> | ||
| <EmbedUntrackedSources>true</EmbedUntrackedSources> | ||
| <IncludeSymbols>true</IncludeSymbols> | ||
| <SymbolPackageFormat>snupkg</SymbolPackageFormat> | ||
| </PropertyGroup> | ||
| <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'"> | ||
| <Reference Include="System" /> | ||
| <Reference Include="System.Core" /> | ||
| <Reference Include="Microsoft.CSharp" /> | ||
| </ItemGroup> | ||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| <Project> | ||
| <PropertyGroup> | ||
| <!-- This must match the major and minor components of the referenced *.Extensions.* packages (and highest supported .NET TFM). --> | ||
| <VersionPrefix>9.0.0</VersionPrefix> | ||
| </PropertyGroup> | ||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| { | ||
| "sdk": { | ||
| "version": "9.0.100", | ||
| "allowPrerelease": false, | ||
| "version": "8.0.100", | ||
| "rollForward": "latestFeature" | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,16 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk.Web"> | ||
|
|
||
| <PropertyGroup> | ||
| <TargetFramework>net8.0</TargetFramework> | ||
| <TargetFramework>net9.0</TargetFramework> | ||
| <GenerateDocumentationFile>false</GenerateDocumentationFile> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <ProjectReference Include="..\..\src\Serilog.AspNetCore\Serilog.AspNetCore.csproj" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <PackageReference Include="Serilog.Expressions" Version="4.0.0" /> | ||
| <PackageReference Include="Serilog.Expressions" Version="5.0.0" /> | ||
| </ItemGroup> | ||
|
|
||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
11 changes: 6 additions & 5 deletions
11
test/Serilog.AspNetCore.Tests/Serilog.AspNetCore.Tests.csproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,18 +1,19 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
|
|
||
| <PropertyGroup> | ||
| <TargetFramework>net8.0</TargetFramework> | ||
| <TargetFramework>net9.0</TargetFramework> | ||
| <GenerateDocumentationFile>false</GenerateDocumentationFile> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <ProjectReference Include="..\..\src\Serilog.AspNetCore\Serilog.AspNetCore.csproj" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" /> | ||
| <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3" PrivateAssets="all" /> | ||
| <PackageReference Include="xunit" Version="2.6.1" /> | ||
| <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.0" /> | ||
| <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" /> | ||
| <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2" PrivateAssets="all" /> | ||
| <PackageReference Include="xunit" Version="2.9.2" /> | ||
| <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.0" /> | ||
| </ItemGroup> | ||
|
|
||
| </Project> |