From 5c6dc0c7e64d6f76b35f65320d160f7bbb89b78f Mon Sep 17 00:00:00 2001 From: martincostello Date: Thu, 4 May 2023 10:48:00 +0100 Subject: [PATCH 01/23] Update to .NET 8 preview 3 - Update to preview 3 of .NET 8. - Fix ambiguous method caused by new overload. - Enable CI for the `dotnet-vnext` branch. - Drop unsupported TFM from benchmarks. - Remove redundant `--configuration Release`. - Use `$PSScriptRoot`. --- .github/workflows/build.yml | 2 +- .vscode/launch.json | 2 +- .vsconfig | 2 +- Directory.Packages.props | 4 ++-- build.ps1 | 3 +-- global.json | 2 +- samples/SampleApp.Tests/SampleApp.Tests.csproj | 2 +- samples/SampleApp/SampleApp.csproj | 2 +- .../JustEat.HttpClientInterception.Benchmarks.csproj | 2 +- .../JustEat.HttpClientInterception.Tests.csproj | 2 +- 10 files changed, 11 insertions(+), 12 deletions(-) mode change 100755 => 100644 build.ps1 diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8a237a41..115a68a9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -61,7 +61,7 @@ jobs: - uses: codecov/codecov-action@eaaf4bedf32dbdc6b720b63067d99c4d77d6047d # v3.1.4 name: Upload coverage to Codecov with: - file: ./artifacts/coverage/coverage.net7.0.cobertura.xml + file: ./artifacts/coverage/coverage.net8.0.cobertura.xml flags: ${{ matrix.os_name }} - name: Publish artifacts diff --git a/.vscode/launch.json b/.vscode/launch.json index 7c66af5a..7a970311 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -6,7 +6,7 @@ "type": "coreclr", "request": "launch", "preLaunchTask": "build", - "program": "${workspaceFolder}/samples/SampleApp/bin/Debug/net7.0/SampleApp.dll", + "program": "${workspaceFolder}/samples/SampleApp/bin/Debug/net8.0/SampleApp.dll", "args": [], "cwd": "${workspaceFolder}/samples/SampleApp", "stopAtEntry": false, diff --git a/.vsconfig b/.vsconfig index 06e10617..a991ed17 100644 --- a/.vsconfig +++ b/.vsconfig @@ -3,7 +3,7 @@ "components": [ "Microsoft.VisualStudio.Component.CoreEditor", "Microsoft.VisualStudio.Workload.CoreEditor", - "Microsoft.NetCore.Component.Runtime.7.0", + "Microsoft.NetCore.Component.Runtime.8.0", "Microsoft.NetCore.Component.SDK", "Microsoft.VisualStudio.Component.Roslyn.Compiler", "Microsoft.VisualStudio.Component.Roslyn.LanguageServices" diff --git a/Directory.Packages.props b/Directory.Packages.props index 27c45f18..d5519b04 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -5,7 +5,7 @@ - + @@ -27,7 +27,7 @@ - + diff --git a/build.ps1 b/build.ps1 old mode 100755 new mode 100644 index 832a7985..6b0d2843 --- a/build.ps1 +++ b/build.ps1 @@ -97,7 +97,6 @@ function DotNetPack { & $dotnet ` pack $Project ` --output $PackageOutputPath ` - --configuration $Configuration ` --include-symbols ` --include-source ` $additionalArgs @@ -117,7 +116,7 @@ function DotNetTest { $additionalArgs += "GitHubActions;report-warnings=false" } - & $dotnet test $Project --output $OutputPath --configuration $Configuration $additionalArgs + & $dotnet test $Project --output $OutputPath --configuration "Release" $additionalArgs if ($LASTEXITCODE -ne 0) { throw "dotnet test failed with exit code $LASTEXITCODE" diff --git a/global.json b/global.json index 0115ef04..1afce8dd 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "7.0.403", + "version": "8.0.100-preview.3.23178.7", "allowPrerelease": false, "rollForward": "latestMajor" } diff --git a/samples/SampleApp.Tests/SampleApp.Tests.csproj b/samples/SampleApp.Tests/SampleApp.Tests.csproj index 31fa7957..bfb2bbb4 100644 --- a/samples/SampleApp.Tests/SampleApp.Tests.csproj +++ b/samples/SampleApp.Tests/SampleApp.Tests.csproj @@ -2,7 +2,7 @@ true $(NoWarn);CA1056;CA1062;CA1707;CA1711;CA1861;CA2007;SA1600 - net7.0 + net8.0 diff --git a/samples/SampleApp/SampleApp.csproj b/samples/SampleApp/SampleApp.csproj index e09d5c17..ee242234 100644 --- a/samples/SampleApp/SampleApp.csproj +++ b/samples/SampleApp/SampleApp.csproj @@ -2,7 +2,7 @@ inprocess $(NoWarn);CA1062;CA2007;SA1600 - net7.0 + net8.0 diff --git a/tests/HttpClientInterception.Benchmarks/JustEat.HttpClientInterception.Benchmarks.csproj b/tests/HttpClientInterception.Benchmarks/JustEat.HttpClientInterception.Benchmarks.csproj index 09b573d9..604f2222 100644 --- a/tests/HttpClientInterception.Benchmarks/JustEat.HttpClientInterception.Benchmarks.csproj +++ b/tests/HttpClientInterception.Benchmarks/JustEat.HttpClientInterception.Benchmarks.csproj @@ -5,7 +5,7 @@ Exe JustEat.HttpClientInterception Benchmarks for JustEat.HttpClientInterception - net472;net6.0;net7.0 + net472;net6.0;net8.0 diff --git a/tests/HttpClientInterception.Tests/JustEat.HttpClientInterception.Tests.csproj b/tests/HttpClientInterception.Tests/JustEat.HttpClientInterception.Tests.csproj index cdff2a8c..0bb0b684 100644 --- a/tests/HttpClientInterception.Tests/JustEat.HttpClientInterception.Tests.csproj +++ b/tests/HttpClientInterception.Tests/JustEat.HttpClientInterception.Tests.csproj @@ -5,7 +5,7 @@ $(NoWarn);CA1303;CA1600;CA1707;CA1812;CA1861;CA2000;CA2007;SA1600 JustEat.HttpClientInterception Tests for JustEat.HttpClientInterception - net7.0 + net8.0 From 473a1938f85c70d2d8595c2f086ee2e0cd0bd51d Mon Sep 17 00:00:00 2001 From: "jet-codeflow-maintainer[bot]" <131594757+jet-codeflow-maintainer[bot]@users.noreply.github.com> Date: Tue, 16 May 2023 16:43:58 +0000 Subject: [PATCH 02/23] Update .NET SDK to 8.0.100-preview.4.23260.5 (#562) * Update .NET SDK Update .NET SDK to version 8.0.100-preview.4.23260.5. --- updated-dependencies: - dependency-name: Microsoft.NET.Sdk dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: jet-codeflow-maintainer[bot] <131594757+jet-codeflow-maintainer[bot]@users.noreply.github.com> * Bump .NET NuGet packages Bumps .NET dependencies to their latest versions for the .NET 8.0.100-preview.4.23260.5 SDK. Bumps Microsoft.AspNetCore.Mvc.Testing from 8.0.0-preview.3.23177.8 to 8.0.0-preview.4.23260.4. Bumps Microsoft.NET.Test.Sdk from 17.5.0 to 17.6.0. --- updated-dependencies: - dependency-name: Microsoft.AspNetCore.Mvc.Testing dependency-type: direct:production update-type: version-update:semver-major - dependency-name: Microsoft.NET.Test.Sdk dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: jet-codeflow-maintainer[bot] <131594757+jet-codeflow-maintainer[bot]@users.noreply.github.com> --------- Signed-off-by: jet-codeflow-maintainer[bot] <131594757+jet-codeflow-maintainer[bot]@users.noreply.github.com> Co-authored-by: jet-codeflow-maintainer[bot] <131594757+jet-codeflow-maintainer[bot]@users.noreply.github.com> --- Directory.Packages.props | 2 +- global.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index d5519b04..97e4184c 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -5,7 +5,7 @@ - + diff --git a/global.json b/global.json index 1afce8dd..65942b69 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "8.0.100-preview.3.23178.7", + "version": "8.0.100-preview.4.23260.5", "allowPrerelease": false, "rollForward": "latestMajor" } From bf09e3ae962ca6dfdfc7c32451132d02f362d9a2 Mon Sep 17 00:00:00 2001 From: martincostello Date: Wed, 17 May 2023 16:08:17 +0100 Subject: [PATCH 03/23] Use UseArtifactsOutput Use `UseArtifactsOutput=true` instead of explicitly setting the output path, as well as dropping explicit use of `--configuration` now that the default is `Release`. --- .github/workflows/build.yml | 2 +- Directory.Build.props | 1 + Directory.Build.targets | 4 ++-- build.ps1 | 19 +++---------------- 4 files changed, 7 insertions(+), 19 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 115a68a9..81846446 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -74,7 +74,7 @@ jobs: uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3 with: name: packages-${{ matrix.os_name }} - path: ./artifacts/packages + path: ./artifacts/package/release if-no-files-found: error validate-packages: diff --git a/Directory.Build.props b/Directory.Build.props index 9634b702..7e5c7124 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -36,6 +36,7 @@ $(PackageProjectUrl).git snupkg true + true 4.0.0.0 4.1.0 beta.$(GITHUB_RUN_NUMBER) diff --git a/Directory.Build.targets b/Directory.Build.targets index 75b781a6..a6a77799 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -20,11 +20,11 @@ - $([System.IO.Path]::Combine($(OutputPath), 'coverage', 'coverage')) + $([System.IO.Path]::Combine($(ArtifactsPath), 'coverage', 'coverage')) true HTML $(ReportGeneratorReportTypes);MarkdownSummaryGitHub - $([System.IO.Path]::Combine($(OutputPath), 'coverage')) + $([System.IO.Path]::Combine($(ArtifactsPath), 'coverage')) $([System.IO.Path]::Combine($(ReportGeneratorTargetDirectory), 'coverage.$(TargetFramework).json')) <_MarkdownSummaryPrefix><details><summary>:chart_with_upwards_trend: <b>$(AssemblyName) Code Coverage report</b></summary> <_MarkdownSummarySuffix></details> diff --git a/build.ps1 b/build.ps1 index 6b0d2843..b879ee26 100644 --- a/build.ps1 +++ b/build.ps1 @@ -4,8 +4,6 @@ #Requires -Version 7 param( - [Parameter(Mandatory = $false)][string] $Configuration = "Release", - [Parameter(Mandatory = $false)][string] $OutputPath = "", [Parameter(Mandatory = $false)][switch] $SkipTests ) @@ -24,10 +22,6 @@ $testProjects = @( $dotnetVersion = (Get-Content $sdkFile | Out-String | ConvertFrom-Json).sdk.version -if ($OutputPath -eq "") { - $OutputPath = Join-Path "$(Convert-Path "$PSScriptRoot")" "artifacts" -} - $installDotNetSdk = $false; if (($null -eq (Get-Command "dotnet" -ErrorAction SilentlyContinue)) -and ($null -eq (Get-Command "dotnet.exe" -ErrorAction SilentlyContinue))) { @@ -85,8 +79,6 @@ if ($installDotNetSdk -eq $true) { function DotNetPack { param([string]$Project) - $PackageOutputPath = (Join-Path $OutputPath "packages") - $additionalArgs = @() if ($VersionSuffix) { @@ -94,12 +86,7 @@ function DotNetPack { $additionalArgs += $VersionSuffix } - & $dotnet ` - pack $Project ` - --output $PackageOutputPath ` - --include-symbols ` - --include-source ` - $additionalArgs + & $dotnet pack $Project --include-symbols --include-source $additionalArgs if ($LASTEXITCODE -ne 0) { throw "dotnet pack failed with exit code $LASTEXITCODE" @@ -116,7 +103,7 @@ function DotNetTest { $additionalArgs += "GitHubActions;report-warnings=false" } - & $dotnet test $Project --output $OutputPath --configuration "Release" $additionalArgs + & $dotnet test $Project --configuration "Release" $additionalArgs if ($LASTEXITCODE -ne 0) { throw "dotnet test failed with exit code $LASTEXITCODE" @@ -128,7 +115,7 @@ Write-Host "Packaging library..." -ForegroundColor Green DotNetPack $libraryProject Write-Host "Running tests..." -ForegroundColor Green -Remove-Item -Path (Join-Path $OutputPath "coverage" "coverage.*.json") -Force -ErrorAction SilentlyContinue | Out-Null +Remove-Item -Path (Join-Path $solutionPath "artifacts" "coverage" "coverage.*.json") -Force -ErrorAction SilentlyContinue | Out-Null ForEach ($testProject in $testProjects) { DotNetTest $testProject } From 6da7ee8971b9f28f33499dac77af7993a2594cd8 Mon Sep 17 00:00:00 2001 From: martincostello Date: Thu, 18 May 2023 13:54:56 +0100 Subject: [PATCH 04/23] Set executable bit Set the executable bit for Linux and macOS. --- build.ps1 | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 build.ps1 diff --git a/build.ps1 b/build.ps1 old mode 100644 new mode 100755 From 3f145ea04f76099540296b660b4fd87d1060ea56 Mon Sep 17 00:00:00 2001 From: "jet-codeflow-maintainer[bot]" <131594757+jet-codeflow-maintainer[bot]@users.noreply.github.com> Date: Wed, 14 Jun 2023 13:16:20 +0000 Subject: [PATCH 05/23] Update .NET SDK to 8.0.100-preview.5.23303.2 (#594) * Update .NET SDK Update .NET SDK to version 8.0.100-preview.5.23303.2. --- updated-dependencies: - dependency-name: Microsoft.NET.Sdk dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: jet-codeflow-maintainer[bot] <131594757+jet-codeflow-maintainer[bot]@users.noreply.github.com> * Bump Microsoft.AspNetCore.Mvc.Testing from 8.0.0-preview.4.23260.4 to 8.0.0-preview.5.23302.2 Bumps Microsoft.AspNetCore.Mvc.Testing from 8.0.0-preview.4.23260.4 to 8.0.0-preview.5.23302.2. --- updated-dependencies: - dependency-name: Microsoft.AspNetCore.Mvc.Testing dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: jet-codeflow-maintainer[bot] <131594757+jet-codeflow-maintainer[bot]@users.noreply.github.com> * Remove condition Remove condition to add implicit using statement for all TFMs. --------- Signed-off-by: jet-codeflow-maintainer[bot] <131594757+jet-codeflow-maintainer[bot]@users.noreply.github.com> Co-authored-by: jet-codeflow-maintainer[bot] <131594757+jet-codeflow-maintainer[bot]@users.noreply.github.com> Co-authored-by: Martin Costello --- Directory.Build.props | 3 +++ Directory.Packages.props | 2 +- global.json | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 7e5c7124..17f9523b 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -52,6 +52,9 @@ + + + diff --git a/Directory.Packages.props b/Directory.Packages.props index 97e4184c..2fed11ba 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -5,7 +5,7 @@ - + diff --git a/global.json b/global.json index 65942b69..f6c1981f 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "8.0.100-preview.4.23260.5", + "version": "8.0.100-preview.5.23303.2", "allowPrerelease": false, "rollForward": "latestMajor" } From c1b49551b0d39614e002f8bd39c8a6e8df6106df Mon Sep 17 00:00:00 2001 From: Martin Costello Date: Wed, 14 Jun 2023 16:54:46 +0100 Subject: [PATCH 06/23] Bump System.Text.Json for .NET 8 preview 5 Update from preview 3 package. --- Directory.Packages.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 2fed11ba..056c289c 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -27,7 +27,7 @@ - + From dd55b0af5c16c8627e1917e8d985d8b0adc910ac Mon Sep 17 00:00:00 2001 From: Martin Costello Date: Thu, 22 Jun 2023 08:58:43 +0100 Subject: [PATCH 07/23] Remove Microsoft.SourceLink.GitHub The Microsoft.SourceLink.GitHub package is now added automatically by the .NET SDK. --- Directory.Packages.props | 2 -- 1 file changed, 2 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 056c289c..987b2d97 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -10,7 +10,6 @@ - @@ -31,7 +30,6 @@ - From 8b73518729dea4386f2c15a520e9badfec34b412 Mon Sep 17 00:00:00 2001 From: "jet-codeflow-maintainer[bot]" <131594757+jet-codeflow-maintainer[bot]@users.noreply.github.com> Date: Tue, 11 Jul 2023 17:49:18 +0000 Subject: [PATCH 08/23] Update .NET SDK to 8.0.100-preview.6.23330.14 (#608) * Update .NET SDK Update .NET SDK to version 8.0.100-preview.6.23330.14. --- updated-dependencies: - dependency-name: Microsoft.NET.Sdk dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: jet-codeflow-maintainer[bot] <131594757+jet-codeflow-maintainer[bot]@users.noreply.github.com> * Bump Microsoft.AspNetCore.Mvc.Testing from 8.0.0-preview.5.23302.2 to 8.0.0-preview.6.23329.11 Bumps Microsoft.AspNetCore.Mvc.Testing from 8.0.0-preview.5.23302.2 to 8.0.0-preview.6.23329.11. --- updated-dependencies: - dependency-name: Microsoft.AspNetCore.Mvc.Testing dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: jet-codeflow-maintainer[bot] <131594757+jet-codeflow-maintainer[bot]@users.noreply.github.com> --------- Signed-off-by: jet-codeflow-maintainer[bot] <131594757+jet-codeflow-maintainer[bot]@users.noreply.github.com> Co-authored-by: jet-codeflow-maintainer[bot] <131594757+jet-codeflow-maintainer[bot]@users.noreply.github.com> --- Directory.Packages.props | 2 +- global.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 987b2d97..9abb93c6 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -5,7 +5,7 @@ - + diff --git a/global.json b/global.json index f6c1981f..4c8324bd 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "8.0.100-preview.5.23303.2", + "version": "8.0.100-preview.6.23330.14", "allowPrerelease": false, "rollForward": "latestMajor" } From a6c10ed60448e3a946a6da1ae121681e845e689d Mon Sep 17 00:00:00 2001 From: Martin Costello Date: Wed, 12 Jul 2023 07:54:40 +0100 Subject: [PATCH 09/23] Bump System.Text.Json Update System.Text.Json to .NET 8 preview 6. --- Directory.Packages.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 9abb93c6..2bf007d7 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -26,7 +26,7 @@ - + From e8a59da47aba3f6745df84e7d0fa3286af30315e Mon Sep 17 00:00:00 2001 From: "jet-codeflow-maintainer[bot]" <131594757+jet-codeflow-maintainer[bot]@users.noreply.github.com> Date: Tue, 8 Aug 2023 17:22:48 +0000 Subject: [PATCH 10/23] Update .NET SDK to 8.0.100-preview.7.23376.3 (#619) * Update .NET SDK Update .NET SDK to version 8.0.100-preview.7.23376.3. --- updated-dependencies: - dependency-name: Microsoft.NET.Sdk dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: jet-codeflow-maintainer[bot] <131594757+jet-codeflow-maintainer[bot]@users.noreply.github.com> * Bump Microsoft.AspNetCore.Mvc.Testing from 8.0.0-preview.6.23329.11 to 8.0.0-preview.7.23375.9 Bumps Microsoft.AspNetCore.Mvc.Testing from 8.0.0-preview.6.23329.11 to 8.0.0-preview.7.23375.9. --- updated-dependencies: - dependency-name: Microsoft.AspNetCore.Mvc.Testing dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: jet-codeflow-maintainer[bot] <131594757+jet-codeflow-maintainer[bot]@users.noreply.github.com> * Fix CA1849 warnings Fix (or suppress) CA1849 warnings. --------- Signed-off-by: jet-codeflow-maintainer[bot] <131594757+jet-codeflow-maintainer[bot]@users.noreply.github.com> Co-authored-by: jet-codeflow-maintainer[bot] <131594757+jet-codeflow-maintainer[bot]@users.noreply.github.com> Co-authored-by: martincostello --- Directory.Packages.props | 2 +- global.json | 2 +- .../Bundles/BundleExtensionsTests.cs | 2 ++ tests/HttpClientInterception.Tests/Examples.cs | 6 +++--- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 2bf007d7..1976041b 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -5,7 +5,7 @@ - + diff --git a/global.json b/global.json index 4c8324bd..442b2e33 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "8.0.100-preview.6.23330.14", + "version": "8.0.100-preview.7.23376.3", "allowPrerelease": false, "rollForward": "latestMajor" } diff --git a/tests/HttpClientInterception.Tests/Bundles/BundleExtensionsTests.cs b/tests/HttpClientInterception.Tests/Bundles/BundleExtensionsTests.cs index 627424f8..95524b5f 100644 --- a/tests/HttpClientInterception.Tests/Bundles/BundleExtensionsTests.cs +++ b/tests/HttpClientInterception.Tests/Bundles/BundleExtensionsTests.cs @@ -7,6 +7,8 @@ namespace JustEat.HttpClientInterception.Bundles; +#pragma warning disable CA1849 + public static class BundleExtensionsTests { public static IEnumerable BundleFiles diff --git a/tests/HttpClientInterception.Tests/Examples.cs b/tests/HttpClientInterception.Tests/Examples.cs index b6049722..55589d7b 100644 --- a/tests/HttpClientInterception.Tests/Examples.cs +++ b/tests/HttpClientInterception.Tests/Examples.cs @@ -601,9 +601,9 @@ public static async Task Use_Custom_Request_Matching_With_Priorities() public static async Task Intercept_Http_Requests_Registered_Using_A_Bundle_File() { // Arrange - var options = new HttpClientInterceptorOptions() - .RegisterBundle("example-bundle.json") - .ThrowsOnMissingRegistration(); + var options = await new HttpClientInterceptorOptions() + .ThrowsOnMissingRegistration() + .RegisterBundleAsync("example-bundle.json"); // Act string content; From a0d7c7befe69369925583eea6d7e0b07842c92ff Mon Sep 17 00:00:00 2001 From: Martin Costello Date: Thu, 10 Aug 2023 10:24:40 +0100 Subject: [PATCH 11/23] Bump System.Text.Json Bump System.Text.Json for preview 7. --- Directory.Packages.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 1976041b..515cdbf8 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -26,7 +26,7 @@ - + From d83debeb83b2d58c2b556708fb5353b918bf515b Mon Sep 17 00:00:00 2001 From: "jet-codeflow-maintainer[bot]" <131594757+jet-codeflow-maintainer[bot]@users.noreply.github.com> Date: Tue, 12 Sep 2023 17:38:09 +0000 Subject: [PATCH 12/23] Update .NET SDK (#643) Update .NET SDK to version 8.0.100-rc.1.23455.8. --- updated-dependencies: - dependency-name: Microsoft.NET.Sdk dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: jet-codeflow-maintainer[bot] <131594757+jet-codeflow-maintainer[bot]@users.noreply.github.com> Co-authored-by: jet-codeflow-maintainer[bot] <131594757+jet-codeflow-maintainer[bot]@users.noreply.github.com> --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index 442b2e33..0219936d 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "8.0.100-preview.7.23376.3", + "version": "8.0.100-rc.1.23455.8", "allowPrerelease": false, "rollForward": "latestMajor" } From a0c67983f4f0d25a07fdfd68ba457a44b2b4f9e4 Mon Sep 17 00:00:00 2001 From: "jet-codeflow-maintainer[bot]" <131594757+jet-codeflow-maintainer[bot]@users.noreply.github.com> Date: Mon, 25 Sep 2023 17:10:28 +0000 Subject: [PATCH 13/23] Update .NET SDK (#644) Update .NET SDK to version 8.0.100-rc.1.23463.5. --- updated-dependencies: - dependency-name: Microsoft.NET.Sdk dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: jet-codeflow-maintainer[bot] <131594757+jet-codeflow-maintainer[bot]@users.noreply.github.com> Co-authored-by: jet-codeflow-maintainer[bot] <131594757+jet-codeflow-maintainer[bot]@users.noreply.github.com> --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index 0219936d..1b1293f7 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "8.0.100-rc.1.23455.8", + "version": "8.0.100-rc.1.23463.5", "allowPrerelease": false, "rollForward": "latestMajor" } From 0179a4eda3f7479e2761cc934919c8ac52bfeafb Mon Sep 17 00:00:00 2001 From: martincostello Date: Mon, 25 Sep 2023 18:13:41 +0100 Subject: [PATCH 14/23] Update NuGet packages Update NuGet packages for RC1. --- Directory.Packages.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 515cdbf8..8bb69e11 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -5,7 +5,7 @@ - + @@ -26,7 +26,7 @@ - + From 94ff6834714b8072239ff9abaca3ba4052c998ff Mon Sep 17 00:00:00 2001 From: martincostello Date: Sat, 30 Sep 2023 13:04:05 +0100 Subject: [PATCH 15/23] Fix typo Fix spelling of extension. --- .../HttpClientInterceptorOptionsExtensions.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/HttpClientInterception/HttpClientInterceptorOptionsExtensions.cs b/src/HttpClientInterception/HttpClientInterceptorOptionsExtensions.cs index 4e0776dd..44e33f60 100644 --- a/src/HttpClientInterception/HttpClientInterceptorOptionsExtensions.cs +++ b/src/HttpClientInterception/HttpClientInterceptorOptionsExtensions.cs @@ -10,7 +10,7 @@ namespace JustEat.HttpClientInterception; /// -/// A class containing extention methods for the class. This class cannot be inherited. +/// A class containing extension methods for the class. This class cannot be inherited. /// [EditorBrowsable(EditorBrowsableState.Never)] public static class HttpClientInterceptorOptionsExtensions From 7b8520dd6d0c2753af7c27858ae8d4785f41459d Mon Sep 17 00:00:00 2001 From: martincostello Date: Sat, 30 Sep 2023 13:17:22 +0100 Subject: [PATCH 16/23] Remove CommonAssemblyInfo Remove `CommonAssemblyInfo` and use MSBuild property to set `[CLSCompliant(false)]`. --- CommonAssemblyInfo.cs | 10 ---------- Directory.Build.props | 5 ++++- HttpClientInterception.sln | 1 - 3 files changed, 4 insertions(+), 12 deletions(-) delete mode 100644 CommonAssemblyInfo.cs diff --git a/CommonAssemblyInfo.cs b/CommonAssemblyInfo.cs deleted file mode 100644 index c47ca64a..00000000 --- a/CommonAssemblyInfo.cs +++ /dev/null @@ -1,10 +0,0 @@ -// Copyright (c) Just Eat, 2017. All rights reserved. -// Licensed under the Apache 2.0 license. See the LICENSE file in the project root for full license information. - -using System.Reflection; -using System.Runtime.InteropServices; - -[assembly: AssemblyCulture("")] -[assembly: AssemblyTrademark("")] -[assembly: CLSCompliant(false)] -[assembly: ComVisible(false)] diff --git a/Directory.Build.props b/Directory.Build.props index 17f9523b..34efb5b1 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,7 +1,10 @@ - + + <_Parameter1>false + <_Parameter1_IsLiteral>true + $(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb diff --git a/HttpClientInterception.sln b/HttpClientInterception.sln index a27dded5..b88c1eac 100644 --- a/HttpClientInterception.sln +++ b/HttpClientInterception.sln @@ -12,7 +12,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution .gitignore = .gitignore .vsconfig = .vsconfig build.ps1 = build.ps1 - CommonAssemblyInfo.cs = CommonAssemblyInfo.cs Directory.Build.props = Directory.Build.props Directory.Build.targets = Directory.Build.targets Directory.Packages.props = Directory.Packages.props From f90aed212d945a3ada8307d1d57161b5c4d223c5 Mon Sep 17 00:00:00 2001 From: martincostello Date: Sat, 30 Sep 2023 13:18:55 +0100 Subject: [PATCH 17/23] Use C# 12 features - Use primary constructors where relevant. - Use collection literals where relevant. - Remove redundant analysis suppressions. - Apply some IDE suggestions. --- Directory.Build.props | 2 ++ README.md | 13 +++---------- .../HttpClientInterceptionFilter.cs | 11 ++--------- samples/SampleApp.Tests/ReposTests.cs | 10 +++++----- .../SampleApp/Extensions/HttpClientExtensions.cs | 2 ++ samples/SampleApp/Program.cs | 7 ++----- .../HttpClientInterceptorOptions.cs | 4 ++-- .../StringSyntaxAttribute.cs | 15 ++++----------- .../InterceptionBenchmarks.cs | 2 -- .../HttpClientInterception.Benchmarks/Program.cs | 2 -- tests/HttpClientInterception.Tests/Examples.cs | 4 ++-- ...HttpClientInterceptorOptionsExtensionsTests.cs | 6 +++--- .../HttpRequestInterceptionBuilderTests.cs | 12 ++++++------ .../InterceptingHttpMessageHandlerTests.cs | 2 +- 14 files changed, 34 insertions(+), 58 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 34efb5b1..c753a507 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -27,6 +27,8 @@ en-US $(NoWarn);CA1054;CA2234 $(NoWarn);SA0001 + + $(NoWarn);SA1010 package-icon.png Apache-2.0 https://github.com/justeattakeaway/httpclient-interception diff --git a/README.md b/README.md index 1fed32aa..78e3eb94 100644 --- a/README.md +++ b/README.md @@ -159,15 +159,8 @@ A working example of this approach can be found in the [sample application](http /// A class that registers an intercepting HTTP message handler at the end of /// the message handler pipeline when an is created. /// -public sealed class HttpClientInterceptionFilter : IHttpMessageHandlerBuilderFilter +public sealed class HttpClientInterceptionFilter(HttpClientInterceptorOptions options) : IHttpMessageHandlerBuilderFilter { - private readonly HttpClientInterceptorOptions _options; - - public HttpClientInterceptionFilter(HttpClientInterceptorOptions options) - { - _options = options; - } - /// public Action Configure(Action next) { @@ -177,12 +170,12 @@ public sealed class HttpClientInterceptionFilter : IHttpMessageHandlerBuilderFil next(builder); // Add the interceptor as the last message handler - builder.AdditionalHandlers.Add(_options.CreateHttpMessageHandler()); + builder.AdditionalHandlers.Add(options.CreateHttpMessageHandler()); }; } } ``` -snippet source | anchor +snippet source | anchor #### Setting Up HttpClient for Dependency Injection Manually diff --git a/samples/SampleApp.Tests/HttpClientInterceptionFilter.cs b/samples/SampleApp.Tests/HttpClientInterceptionFilter.cs index 79a63ff4..07dc3e99 100644 --- a/samples/SampleApp.Tests/HttpClientInterceptionFilter.cs +++ b/samples/SampleApp.Tests/HttpClientInterceptionFilter.cs @@ -12,15 +12,8 @@ namespace SampleApp.Tests; /// A class that registers an intercepting HTTP message handler at the end of /// the message handler pipeline when an is created. /// -public sealed class HttpClientInterceptionFilter : IHttpMessageHandlerBuilderFilter +public sealed class HttpClientInterceptionFilter(HttpClientInterceptorOptions options) : IHttpMessageHandlerBuilderFilter { - private readonly HttpClientInterceptorOptions _options; - - public HttpClientInterceptionFilter(HttpClientInterceptorOptions options) - { - _options = options; - } - /// public Action Configure(Action next) { @@ -30,7 +23,7 @@ public Action Configure(Action - { - OutputHelper.WriteLine($"HTTP {request.Method} {request.RequestUri}"); - return Task.CompletedTask; - }; + { + OutputHelper.WriteLine($"HTTP {request.Method} {request.RequestUri}"); + return Task.CompletedTask; + }; // Arrange - use a scope to clean-up registrations using (Fixture.Interceptor.BeginScope()) @@ -59,7 +59,7 @@ public async Task Can_Get_Organization_Repositories() } // Assert - Our application should have parsed the stub-names - actual.ShouldBe(new[] { "bar", "foo" }); + actual.ShouldBe(["bar", "foo"]); } } diff --git a/samples/SampleApp/Extensions/HttpClientExtensions.cs b/samples/SampleApp/Extensions/HttpClientExtensions.cs index 65a63d65..4463ca71 100644 --- a/samples/SampleApp/Extensions/HttpClientExtensions.cs +++ b/samples/SampleApp/Extensions/HttpClientExtensions.cs @@ -12,6 +12,8 @@ public static class HttpClientExtensions { public static IHttpClientBuilder AddHttpClients(this IServiceCollection services) { + services.ConfigureHttpJsonOptions((options) => options.SerializerOptions.WriteIndented = true); + // Register a Refit-based typed client for use in the controller, which // configures the HttpClient with the appropriate base URL and HTTP request // headers. It also adds two custom delegating handlers. diff --git a/samples/SampleApp/Program.cs b/samples/SampleApp/Program.cs index 7176fc8d..699bd02b 100644 --- a/samples/SampleApp/Program.cs +++ b/samples/SampleApp/Program.cs @@ -1,9 +1,6 @@ // Copyright (c) Just Eat, 2017. All rights reserved. // Licensed under the Apache 2.0 license. See the LICENSE file in the project root for full license information. -#pragma warning disable CA1852 - -using System.Text.Json; using SampleApp.Extensions; using SampleApp.Services; @@ -21,7 +18,7 @@ ICollection repositories = await github.GetRepositoriesAsync(organization, count ?? 100); // Return the repositories' names - var names = new List(); + List names = []; foreach (var repository in repositories) { @@ -30,7 +27,7 @@ names.Sort(); - return Results.Json(names, new JsonSerializerOptions() { WriteIndented = true }); + return Results.Json(names); }); app.Run(); diff --git a/src/HttpClientInterception/HttpClientInterceptorOptions.cs b/src/HttpClientInterception/HttpClientInterceptorOptions.cs index 928885ed..096d0a63 100644 --- a/src/HttpClientInterception/HttpClientInterceptorOptions.cs +++ b/src/HttpClientInterception/HttpClientInterceptorOptions.cs @@ -476,7 +476,7 @@ private static async Task BuildResponseAsync(HttpRequestMes } else { - byte[] content = await response.ContentFactory!().ConfigureAwait(false) ?? Array.Empty(); + byte[] content = await response.ContentFactory!().ConfigureAwait(false) ?? []; result.Content = new ByteArrayContent(content); } @@ -542,7 +542,7 @@ private sealed class OptionsScope : IDisposable { private readonly HttpClientInterceptorOptions _parent; private readonly IDictionary _old; - private readonly IDictionary _new; + private readonly ConcurrentDictionary _new; internal OptionsScope(HttpClientInterceptorOptions parent) { diff --git a/src/HttpClientInterception/StringSyntaxAttribute.cs b/src/HttpClientInterception/StringSyntaxAttribute.cs index b12077c3..3c602dcf 100644 --- a/src/HttpClientInterception/StringSyntaxAttribute.cs +++ b/src/HttpClientInterception/StringSyntaxAttribute.cs @@ -7,24 +7,17 @@ namespace System.Diagnostics.CodeAnalysis; [AttributeUsage(AttributeTargets.Parameter | AttributeTargets.Field | AttributeTargets.Property, AllowMultiple = false, Inherited = false)] -internal sealed class StringSyntaxAttribute : Attribute +internal sealed class StringSyntaxAttribute(string syntax, params object?[] arguments) : Attribute { public const string Uri = nameof(Uri); public StringSyntaxAttribute(string syntax) + : this(syntax, []) { - Syntax = syntax; - Arguments = Array.Empty(); } - public StringSyntaxAttribute(string syntax, params object?[] arguments) - { - Syntax = syntax; - Arguments = arguments; - } - - public string Syntax { get; } + public string Syntax { get; } = syntax; - public object?[] Arguments { get; } + public object?[] Arguments { get; } = arguments; } #endif diff --git a/tests/HttpClientInterception.Benchmarks/InterceptionBenchmarks.cs b/tests/HttpClientInterception.Benchmarks/InterceptionBenchmarks.cs index 9c67596b..61b69bec 100644 --- a/tests/HttpClientInterception.Benchmarks/InterceptionBenchmarks.cs +++ b/tests/HttpClientInterception.Benchmarks/InterceptionBenchmarks.cs @@ -67,10 +67,8 @@ public InterceptionBenchmarks() ContentSerializer = new SystemTextJsonContentSerializer(), }; -#pragma warning disable CA2000 _client = _options.CreateHttpClient(); _service = RestService.For(_options.CreateHttpClient("https://api.github.com"), refitSettings); -#pragma warning restore CA2000 } [Benchmark] diff --git a/tests/HttpClientInterception.Benchmarks/Program.cs b/tests/HttpClientInterception.Benchmarks/Program.cs index fef99326..af45a2ae 100644 --- a/tests/HttpClientInterception.Benchmarks/Program.cs +++ b/tests/HttpClientInterception.Benchmarks/Program.cs @@ -1,8 +1,6 @@ // Copyright (c) Just Eat, 2017. All rights reserved. // Licensed under the Apache 2.0 license. See the LICENSE file in the project root for full license information. -#pragma warning disable CA1852 - using BenchmarkDotNet.Running; using JustEat.HttpClientInterception; diff --git a/tests/HttpClientInterception.Tests/Examples.cs b/tests/HttpClientInterception.Tests/Examples.cs index 55589d7b..e4ad4ba4 100644 --- a/tests/HttpClientInterception.Tests/Examples.cs +++ b/tests/HttpClientInterception.Tests/Examples.cs @@ -113,7 +113,7 @@ public static async Task Intercept_Http_Get_For_Raw_Bytes() byte[] content = await client.GetByteArrayAsync("https://files.domain.com/setup.exe"); // Assert - content.ShouldBe(new byte[] { 0, 1, 2, 3, 4 }); + content.ShouldBe([0, 1, 2, 3, 4]); } [Fact] @@ -286,7 +286,7 @@ public static async Task Intercept_Custom_Http_Method() byte[] content = await response.Content.ReadAsByteArrayAsync(); // Assert - content.ShouldBe(new byte[] { 0, 1 }); + content.ShouldBe([0, 1]); } [Fact] diff --git a/tests/HttpClientInterception.Tests/HttpClientInterceptorOptionsExtensionsTests.cs b/tests/HttpClientInterception.Tests/HttpClientInterceptorOptionsExtensionsTests.cs index d5d67840..d92f2c46 100644 --- a/tests/HttpClientInterception.Tests/HttpClientInterceptorOptionsExtensionsTests.cs +++ b/tests/HttpClientInterception.Tests/HttpClientInterceptorOptionsExtensionsTests.cs @@ -10,7 +10,7 @@ public static async Task RegisterGetJson_For_With_Defaults_Registers_Interceptio { // Arrange string requestUri = "https://google.com/"; - string[] expected = new[] { "foo", "bar" }; + string[] expected = ["foo", "bar"]; var options = new HttpClientInterceptorOptions().RegisterGetJson(requestUri, expected); @@ -212,7 +212,7 @@ public static void Register_For_Array_Throws_If_Options_Is_Null() HttpClientInterceptorOptions options = null; // Act and Assert - Should.Throw(() => options.Register(Array.Empty()), "options"); + Should.Throw(() => options.Register([]), "options"); } [Fact] @@ -267,7 +267,7 @@ public static void ThrowsOnMissingRegistration_Throws_If_Options_Is_Null() HttpClientInterceptorOptions options = null; // Act and Assert - Should.Throw(() => options.ThrowsOnMissingRegistration(), "options"); + Should.Throw(options.ThrowsOnMissingRegistration, "options"); } [Fact] diff --git a/tests/HttpClientInterception.Tests/HttpRequestInterceptionBuilderTests.cs b/tests/HttpClientInterception.Tests/HttpRequestInterceptionBuilderTests.cs index 92ad05e8..e88c579b 100644 --- a/tests/HttpClientInterception.Tests/HttpRequestInterceptionBuilderTests.cs +++ b/tests/HttpClientInterception.Tests/HttpRequestInterceptionBuilderTests.cs @@ -2216,7 +2216,7 @@ public static async Task Builder_For_Posted_Json_To_Match_Intercepts_Requests_Th public static void Builder_ForAll_Throws_ArgumentNullException_If_Custom_Matching_Delegate_Is_Null() { // Arrange - HttpRequestInterceptionBuilder InterceptionBuilder() => + static HttpRequestInterceptionBuilder InterceptionBuilder() => new HttpRequestInterceptionBuilder() .Requests() .ForHttps() @@ -2234,7 +2234,7 @@ HttpRequestInterceptionBuilder InterceptionBuilder() => public static void Builder_ForAll_Throws_InvalidOperationException_If_Custom_Matching_Delegate_Is_Empty() { // Arrange - HttpRequestInterceptionBuilder InterceptionBuilder() => + static HttpRequestInterceptionBuilder InterceptionBuilder() => new HttpRequestInterceptionBuilder() .Requests() .ForHttps() @@ -2252,7 +2252,7 @@ HttpRequestInterceptionBuilder InterceptionBuilder() => public static void Builder_ForAll_Throws_ArgumentNullException_If_Async_Custom_Matching_Delegate_Is_Null() { // Arrange - HttpRequestInterceptionBuilder InterceptionBuilder() => + static HttpRequestInterceptionBuilder InterceptionBuilder() => new HttpRequestInterceptionBuilder() .Requests() .ForHttps() @@ -2270,7 +2270,7 @@ HttpRequestInterceptionBuilder InterceptionBuilder() => public static void Builder_ForAll_Throws_InvalidOperationException_If_Async_Custom_Matching_Delegate_Is_Empty() { // Arrange - HttpRequestInterceptionBuilder InterceptionBuilder() => + static HttpRequestInterceptionBuilder InterceptionBuilder() => new HttpRequestInterceptionBuilder() .Requests() .ForHttps() @@ -2288,7 +2288,7 @@ HttpRequestInterceptionBuilder InterceptionBuilder() => public static void Builder_ForAll_Throws_InvalidOperationException_If_At_Least_One_Async_Custom_Matching_Delegate_Is_Null() { // Arrange - HttpRequestInterceptionBuilder InterceptionBuilder() => + static HttpRequestInterceptionBuilder InterceptionBuilder() => new HttpRequestInterceptionBuilder() .Requests() .ForHttps() @@ -2306,7 +2306,7 @@ HttpRequestInterceptionBuilder InterceptionBuilder() => public static void Builder_ForAll_Throws_InvalidOperationException_If_At_Least_One_Custom_Matching_Delegate_Is_Null() { // Arrange - HttpRequestInterceptionBuilder InterceptionBuilder() => + static HttpRequestInterceptionBuilder InterceptionBuilder() => new HttpRequestInterceptionBuilder() .Requests() .ForHttps() diff --git a/tests/HttpClientInterception.Tests/InterceptingHttpMessageHandlerTests.cs b/tests/HttpClientInterception.Tests/InterceptingHttpMessageHandlerTests.cs index 0fe35242..df6540d7 100644 --- a/tests/HttpClientInterception.Tests/InterceptingHttpMessageHandlerTests.cs +++ b/tests/HttpClientInterception.Tests/InterceptingHttpMessageHandlerTests.cs @@ -93,7 +93,7 @@ public static async Task SendAsync_Calls_OnSend_With_RequestMessage() var requestUrl = "https://google.com/foo"; var options = new HttpClientInterceptorOptions() - .RegisterByteArray(HttpMethod.Get, new Uri(requestUrl), () => Array.Empty()); + .RegisterByteArray(HttpMethod.Get, new Uri(requestUrl), Array.Empty); int expected = 7; int actual = 0; From bb5d04f07c9704adc4b19420efa80de362b69a75 Mon Sep 17 00:00:00 2001 From: martincostello Date: Sat, 30 Sep 2023 13:32:36 +0100 Subject: [PATCH 18/23] Suppress CA2000 warning Visual Studio was wrong about it being redundant. --- .../HttpClientInterception.Benchmarks/InterceptionBenchmarks.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/HttpClientInterception.Benchmarks/InterceptionBenchmarks.cs b/tests/HttpClientInterception.Benchmarks/InterceptionBenchmarks.cs index 61b69bec..9c67596b 100644 --- a/tests/HttpClientInterception.Benchmarks/InterceptionBenchmarks.cs +++ b/tests/HttpClientInterception.Benchmarks/InterceptionBenchmarks.cs @@ -67,8 +67,10 @@ public InterceptionBenchmarks() ContentSerializer = new SystemTextJsonContentSerializer(), }; +#pragma warning disable CA2000 _client = _options.CreateHttpClient(); _service = RestService.For(_options.CreateHttpClient("https://api.github.com"), refitSettings); +#pragma warning restore CA2000 } [Benchmark] From 0d19d73c19d2ef374bfb7b298d74c676b53a415c Mon Sep 17 00:00:00 2001 From: "jet-codeflow-maintainer[bot]" <131594757+jet-codeflow-maintainer[bot]@users.noreply.github.com> Date: Tue, 10 Oct 2023 18:56:39 +0100 Subject: [PATCH 19/23] Update .NET SDK to 8.0.100-rc.2.23502.2 (#657) * Update .NET SDK Update .NET SDK to version 8.0.100-rc.2.23502.2. --- updated-dependencies: - dependency-name: Microsoft.NET.Sdk dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: jet-codeflow-maintainer[bot] <131594757+jet-codeflow-maintainer[bot]@users.noreply.github.com> * Bump Microsoft.AspNetCore.Mvc.Testing from 8.0.0-rc.1.23421.29 to 8.0.0-rc.2.23480.2 Bumps Microsoft.AspNetCore.Mvc.Testing from 8.0.0-rc.1.23421.29 to 8.0.0-rc.2.23480.2. --- updated-dependencies: - dependency-name: Microsoft.AspNetCore.Mvc.Testing dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: jet-codeflow-maintainer[bot] <131594757+jet-codeflow-maintainer[bot]@users.noreply.github.com> --------- Signed-off-by: jet-codeflow-maintainer[bot] <131594757+jet-codeflow-maintainer[bot]@users.noreply.github.com> Co-authored-by: jet-codeflow-maintainer[bot] <131594757+jet-codeflow-maintainer[bot]@users.noreply.github.com> --- Directory.Packages.props | 2 +- global.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 8bb69e11..70d6b359 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -5,7 +5,7 @@ - + diff --git a/global.json b/global.json index 1b1293f7..11df4509 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "8.0.100-rc.1.23463.5", + "version": "8.0.100-rc.2.23502.2", "allowPrerelease": false, "rollForward": "latestMajor" } From 4300f91e57df76b8605484d242d7c85c8aff3a0e Mon Sep 17 00:00:00 2001 From: Martin Costello Date: Tue, 10 Oct 2023 20:02:10 +0100 Subject: [PATCH 20/23] Update NuGet package Update NuGet package for RC2. --- Directory.Packages.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 70d6b359..2e86e8aa 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -26,7 +26,7 @@ - + From ff3a891a473d335fd7b09be3e1babe5b1ff2bc42 Mon Sep 17 00:00:00 2001 From: Martin Costello Date: Sun, 5 Nov 2023 16:31:01 +0000 Subject: [PATCH 21/23] Use terminal logger Use the new MSBuild terminal logger. --- build.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.ps1 b/build.ps1 index b879ee26..dabf653e 100755 --- a/build.ps1 +++ b/build.ps1 @@ -86,7 +86,7 @@ function DotNetPack { $additionalArgs += $VersionSuffix } - & $dotnet pack $Project --include-symbols --include-source $additionalArgs + & $dotnet pack $Project --include-symbols --include-source --tl $additionalArgs if ($LASTEXITCODE -ne 0) { throw "dotnet pack failed with exit code $LASTEXITCODE" @@ -103,7 +103,7 @@ function DotNetTest { $additionalArgs += "GitHubActions;report-warnings=false" } - & $dotnet test $Project --configuration "Release" $additionalArgs + & $dotnet test $Project --configuration "Release" --tl $additionalArgs if ($LASTEXITCODE -ne 0) { throw "dotnet test failed with exit code $LASTEXITCODE" From cefc7f0ee1722ce2f42440203ff6d4dfee13a00b Mon Sep 17 00:00:00 2001 From: "jet-codeflow-maintainer[bot]" <131594757+jet-codeflow-maintainer[bot]@users.noreply.github.com> Date: Tue, 14 Nov 2023 16:03:51 +0000 Subject: [PATCH 22/23] Update .NET SDK to 8.0.100 (#680) * Update .NET SDK Update .NET SDK to version 8.0.100. --- updated-dependencies: - dependency-name: Microsoft.NET.Sdk dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: jet-codeflow-maintainer[bot] <131594757+jet-codeflow-maintainer[bot]@users.noreply.github.com> * Bump Microsoft.AspNetCore.Mvc.Testing from 8.0.0-rc.2.23480.2 to 8.0.0 Bumps Microsoft.AspNetCore.Mvc.Testing from 8.0.0-rc.2.23480.2 to 8.0.0. --- updated-dependencies: - dependency-name: Microsoft.AspNetCore.Mvc.Testing dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: jet-codeflow-maintainer[bot] <131594757+jet-codeflow-maintainer[bot]@users.noreply.github.com> --------- Signed-off-by: jet-codeflow-maintainer[bot] <131594757+jet-codeflow-maintainer[bot]@users.noreply.github.com> Co-authored-by: jet-codeflow-maintainer[bot] <131594757+jet-codeflow-maintainer[bot]@users.noreply.github.com> --- Directory.Packages.props | 2 +- global.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 2e86e8aa..4589314c 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -5,7 +5,7 @@ - + diff --git a/global.json b/global.json index 11df4509..33d26e56 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "8.0.100-rc.2.23502.2", + "version": "8.0.100", "allowPrerelease": false, "rollForward": "latestMajor" } From b6917f4074ed8f3cc42a2da6c2989b09e5dbdfdd Mon Sep 17 00:00:00 2001 From: martincostello Date: Tue, 14 Nov 2023 16:22:02 +0000 Subject: [PATCH 23/23] Update NuGet package Use stable NuGet package version. --- Directory.Packages.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 4589314c..f6ce9145 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -26,7 +26,7 @@ - +