Prepare for version 0.11 (#262)

dnperfors · web-flow · commit 97d8a84443d5 · 2024-06-14T22:46:02.000+02:00
* Update nuget packages
* Remove .NET 7 support
* bump version
* Add nbgv tool to fix build.
* Replace sonar.login with sonar.token
* Fix some sonarqube warnings
* Update PublicAPI.Shipped.txt
* Update changelog
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -3,10 +3,18 @@
   "isRoot": true,
   "tools": {
     "dotnet-sonarscanner": {
-      "version": "6.0.0",
+      "version": "6.2.0",
       "commands": [
         "dotnet-sonarscanner"
-      ]
+      ],
+      "rollForward": false
+    },
+    "nbgv": {
+      "version": "3.6.139",
+      "commands": [
+        "nbgv"
+      ],
+      "rollForward": false
     }
   }
 }
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -27,7 +27,6 @@ jobs:
       with:
         dotnet-version: |
           6.0.x
-          7.0.x
           8.0.x
         include-prerelease: true
     - name: Dump .NET info
@@ -38,7 +37,7 @@ jobs:
       if: ${{ github.actor != 'dependabot[bot]' }}
       env:
         SONAR_TOKEN: ${{secrets.SONAR_TOKEN}}
-      run: dotnet sonarscanner begin -d:sonar.host.url=https://sonarcloud.io -organization:testablehttpclient -key:testablehttpclient_TestableHttpClient -version:`dotnet nbgv get-version --variable NuGetPackageVersion` -d:sonar.cs.opencover.reportsPaths=**/coverage.opencover.xml -d:sonar.login=${{env.SONAR_TOKEN}}
+      run: dotnet sonarscanner begin -d:sonar.host.url=https://sonarcloud.io -organization:testablehttpclient -key:testablehttpclient_TestableHttpClient -version:`dotnet nbgv get-version --variable NuGetPackageVersion` -d:sonar.cs.opencover.reportsPaths=**/coverage.opencover.xml -d:sonar.token=${{env.SONAR_TOKEN}}
     - name: Restore dependencies
       run: dotnet restore
     - name: Build source code
@@ -50,7 +49,7 @@ jobs:
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         SONAR_TOKEN: ${{secrets.SONAR_TOKEN}}
-      run: dotnet sonarscanner end -d:sonar.login=${{env.SONAR_TOKEN}}
+      run: dotnet sonarscanner end -d:sonar.token=${{env.SONAR_TOKEN}}
     - name: Check source file format
       run: dotnet format --no-restore --verify-no-changes
     - name: Pack
@@ -79,7 +78,6 @@ jobs:
       with:
         dotnet-version: |
           6.0.x
-          7.0.x
           8.0.x
         include-prerelease: true
     - name: Dump .NET info
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,8 +4,9 @@ All notable changes to TestableHttpClient will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and 
 this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [0.11] - Unplanned
+## [0.11] - 2024-06-14
 ### Removed
+- .NET 7.0 target, since it is no longer supported
 - `ShouldHaveMadeRequestsTo(this TestableHttpMessageHandler, string, bool)` and `ShouldHaveMadeRequestsTo(this TestableHttpMessageHandler, string, bool, int)` have been removed. CaseInsensitivity is controlled by the `UriPatternMatchingOptions` that can be set on the `TestableHttpMessageHandler`.
 - `WithRequestUri(this IHttpRequestMessagesCheck, string, bool)` and `WithRequestUri(this IHttpRequestMessagesCheck, string, bool, int)` have been removed. CaseInsensitivity is controlled by the `UriPatternMatchingOptions` that can be set on the `TestableHttpMessageHandler`.
 - `WithQueryString` has been removed, since `ShouldHaveMadeRequestTo` and `WithRequestUri` now properly support querystrings.
diff --git a/README.md b/README.md
@@ -83,7 +83,6 @@ The following versions are being actively tested and thus supported:
 
 - .NET Framework 4.6, 4.7 and 4.8
 - .NET 6.0
-- .NET 7.0
 - .NET 8.0
 
 These versions are supported as long as Microsoft supports them, we do our best to test and support newer versions as soon as possible.
diff --git a/src/TestableHttpClient/PublicAPI.Shipped.txt b/src/TestableHttpClient/PublicAPI.Shipped.txt
@@ -25,8 +25,14 @@ TestableHttpClient.RoutingOptions.SchemeCaseInsensitive.set -> void
 TestableHttpClient.UriPatternMatchingOptions
 TestableHttpClient.UriPatternMatchingOptions.DefaultQueryFormat.get -> System.UriFormat
 TestableHttpClient.UriPatternMatchingOptions.DefaultQueryFormat.set -> void
+TestableHttpClient.UriPatternMatchingOptions.HostCaseInsensitive.get -> bool
+TestableHttpClient.UriPatternMatchingOptions.HostCaseInsensitive.set -> void
+TestableHttpClient.UriPatternMatchingOptions.PathCaseInsensitive.get -> bool
+TestableHttpClient.UriPatternMatchingOptions.PathCaseInsensitive.set -> void
 TestableHttpClient.UriPatternMatchingOptions.QueryCaseInsensitive.get -> bool
 TestableHttpClient.UriPatternMatchingOptions.QueryCaseInsensitive.set -> void
+TestableHttpClient.UriPatternMatchingOptions.SchemeCaseInsensitive.get -> bool
+TestableHttpClient.UriPatternMatchingOptions.SchemeCaseInsensitive.set -> void
 TestableHttpClient.UriPatternMatchingOptions.UriPatternMatchingOptions() -> void
 
 TestableHttpClient.IRoutingResponseBuilder
diff --git a/src/TestableHttpClient/PublicAPI.Unshipped.txt b/src/TestableHttpClient/PublicAPI.Unshipped.txt
@@ -1,6 +1 @@
-﻿TestableHttpClient.UriPatternMatchingOptions.HostCaseInsensitive.get -> bool
-TestableHttpClient.UriPatternMatchingOptions.HostCaseInsensitive.set -> void
-TestableHttpClient.UriPatternMatchingOptions.PathCaseInsensitive.get -> bool
-TestableHttpClient.UriPatternMatchingOptions.PathCaseInsensitive.set -> void
-TestableHttpClient.UriPatternMatchingOptions.SchemeCaseInsensitive.get -> bool
-TestableHttpClient.UriPatternMatchingOptions.SchemeCaseInsensitive.set -> void
+﻿
diff --git a/src/TestableHttpClient/TestableHttpClient.csproj b/src/TestableHttpClient/TestableHttpClient.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net6.0;net8.0</TargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -35,24 +35,19 @@
     <PackageReference Include="System.Net.Http" Version="4.3.4" />
     <PackageReference Include="System.Text.Json" Version="4.6.0" />
     <PackageReference Include="Perfors.UnreachableException" Version="1.0.0" />
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
     <PackageReference Include="PolyKit.Embedded" Version="3.0.9" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
     <PackageReference Include="Perfors.UnreachableException" Version="1.0.0" />
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
     <PackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.3.4" PrivateAssets="All">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Nerdbank.GitVersioning" Version="3.6.133" PrivateAssets="All" />
+    <PackageReference Include="Nerdbank.GitVersioning" Version="3.6.139" PrivateAssets="All" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/TestableHttpClient/Utils/Value.cs b/src/TestableHttpClient/Utils/Value.cs
@@ -12,21 +12,21 @@ internal abstract record Value
 }
 
 [DebuggerDisplay("Any value")]
-file record AnyValue : Value
+file sealed record AnyValue : Value
 {
     internal override bool Matches(string value, bool ignoreCase) => true;
 }
 
 [DebuggerDisplay("Exact value: {expectedValue}")]
-file record ExactValue : Value
+file sealed record ExactValue : Value
 {
     private readonly string expectedValue;
     public ExactValue(string expectedValue) => this.expectedValue = expectedValue;
     internal override bool Matches(string value, bool ignoreCase) => expectedValue.Equals(value, ignoreCase ? StringComparison.OrdinalIgnoreCase : StringComparison.Ordinal);
 }
 
 [DebuggerDisplay("Pattern value: {pattern}")]
-file record PatternValue : Value
+file sealed record PatternValue : Value
 {
     private readonly string pattern;
     public PatternValue(string pattern) => this.pattern = pattern;
diff --git a/test/Directory.Build.targets b/test/Directory.Build.targets
@@ -1,13 +1,13 @@
 <Project>
   <ItemGroup>
-    <PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="17.8.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="xunit" Version="2.6.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.4">
+    <!-- <PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="17.8.0" /> -->
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
+    <PackageReference Include="xunit" Version="2.8.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="6.0.0">
+    <PackageReference Include="coverlet.collector" Version="6.0.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/test/TestableHttpClient.IntegrationTests/TestableHttpClient.IntegrationTests.csproj b/test/TestableHttpClient.IntegrationTests/TestableHttpClient.IntegrationTests.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net462;net47;net48;net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net462;net47;net48;net6.0;net8.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
@@ -14,12 +14,6 @@
     <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="[6.0.*,7.0.0)" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="[7.0.*,8.0.0)" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="[7.0.*,8.0.0)" />
-    <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="[7.0.*,8.0.0)" />
-  </ItemGroup>
-
   <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="[8.0.*,)" />
     <PackageReference Include="Microsoft.Extensions.Http" Version="[8.0.*,)" />
diff --git a/test/TestableHttpClient.Tests/TestableHttpClient.Tests.csproj b/test/TestableHttpClient.Tests/TestableHttpClient.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net462;net47;net48;net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net462;net47;net48;net6.0;net8.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
@@ -10,7 +10,7 @@
 
   <ItemGroup>
     <PackageReference Include="NSubstitute" Version="5.1.0" />
-    <PackageReference Include="NSubstitute.Analyzers.CSharp" Version="1.0.16">
+    <PackageReference Include="NSubstitute.Analyzers.CSharp" Version="1.0.17">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/version.json b/version.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-  "version": "0.11-beta",
+  "version": "0.11",
   "versionHeightOffset": -1,
   "publicReleaseRefSpec": [
     "^refs/tags/v\\d+(?:\\.\\d+)?$"

Original file line number	Diff line number	Diff line change
`@@ -12,21 +12,21 @@ internal abstract record Value`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`[DebuggerDisplay("Any value")]`
`15`		`-file record AnyValue : Value`
	`15`	`+file sealed record AnyValue : Value`
`16`	`16`	`{`
`17`	`17`	`internal override bool Matches(string value, bool ignoreCase) => true;`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`[DebuggerDisplay("Exact value: {expectedValue}")]`
`21`		`-file record ExactValue : Value`
	`21`	`+file sealed record ExactValue : Value`
`22`	`22`	`{`
`23`	`23`	`private readonly string expectedValue;`
`24`	`24`	`public ExactValue(string expectedValue) => this.expectedValue = expectedValue;`
`25`	`25`	`internal override bool Matches(string value, bool ignoreCase) => expectedValue.Equals(value, ignoreCase ? StringComparison.OrdinalIgnoreCase : StringComparison.Ordinal);`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`[DebuggerDisplay("Pattern value: {pattern}")]`
`29`		`-file record PatternValue : Value`
	`29`	`+file sealed record PatternValue : Value`
`30`	`30`	`{`
`31`	`31`	`private readonly string pattern;`
`32`	`32`	`public PatternValue(string pattern) => this.pattern = pattern;`