Prepare fore release 0.8 (#182)

* Added codeql pipeline Fixes #162
* Add .NET 7.0 support
* Update nuget packages
* Update version and release notes for v0.8
* Update README with supported .NET versions

Author: dnperfors

.config/dotnet-tools.json

@@ -7,12 +7,6 @@
       "commands": [
         "dotnet-sonarscanner"
       ]
-    },
-    "nbgv": {
-      "version": "3.5.113",
-      "commands": [
-        "nbgv"
-      ]
     }
   }
 }

.editorconfig

@@ -19,70 +19,78 @@ dotnet_style_qualification_for_event = false:warning
 dotnet_style_predefined_type_for_locals_parameters_members = true:error
 dotnet_style_predefined_type_for_member_access = true:error
 
+csharp_preferred_modifier_order=public,private,protected,internal,file,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,required,volatile,async:warning
 dotnet_style_require_accessibility_modifiers = always:error
 dotnet_style_readonly_field = true:warning
-csharp_preferred_modifier_order=public,private,protected,internal,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async:warning
+csharp_prefer_static_local_function = true:warning
 
 dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity:suggestion
 dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity:suggestion
 dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:suggestion
 dotnet_style_parentheses_in_other_operators = never_if_unnecessary:warning
 
 dotnet_style_object_initializer = true:suggestion
+csharp_style_inlined_variable_declaration = true:warning
 dotnet_style_collection_initializer = true:suggestion
+dotnet_style_prefer_auto_properties = true:silent
 dotnet_style_explicit_tuple_names = true:suggestion
+csharp_prefer_simple_default_expression = true:warning
 dotnet_style_prefer_inferred_tuple_names = true:suggestion
 dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion
-dotnet_style_prefer_auto_properties = true:silent
+csharp_style_prefer_local_over_anonymous_function = true:warning
+csharp_style_deconstructed_variable_declaration = true:suggestion
 dotnet_style_prefer_conditional_expression_over_assignment = true:suggestion
 dotnet_style_prefer_conditional_expression_over_return = false:suggestion
 dotnet_style_prefer_compound_assignment = true:suggestion
+csharp_style_prefer_index_operator = true:suggestion
+csharp_style_prefer_range_operator = true:suggestion
+dotnet_style_prefer_simplified_boolean_expressions = true:warning
+csharp_style_implicit_object_creation_when_type_is_apparent = true:warning
+csharp_style_prefer_tuple_swap = true:warning
 
+csharp_style_namespace_declarations = file_scoped
+
+csharp_style_throw_expression = true:suggestion
 dotnet_style_coalesce_expression = true:suggestion
 dotnet_style_null_propagation = true:suggestion
+dotnet_style_prefer_is_null_check_over_reference_equality_method = true:warning
+csharp_style_prefer_null_check_over_type_check = true:warning
+csharp_style_conditional_delegate_call = true:suggestion
 
-dotnet_code_quality_unused_parameters = all:warning
-
-csharp_style_var_for_built_in_types = true:suggestion
-csharp_style_var_when_type_is_apparent = true:suggestion
-csharp_style_var_elsewhere = true:suggestion
+csharp_style_var_for_built_in_types = false:suggestion
+csharp_style_var_when_type_is_apparent = false:suggestion
+csharp_style_var_elsewhere = false:suggestion
 
-csharp_style_expression_bodied_methods = false:silent
 csharp_style_expression_bodied_constructors = false:silent
+csharp_style_expression_bodied_methods = false:silent
 csharp_style_expression_bodied_operators = false:silent
 csharp_style_expression_bodied_properties = true:suggestion
 csharp_style_expression_bodied_indexers = true:suggestion
 csharp_style_expression_bodied_accessors = true:suggestion
 csharp_style_expression_bodied_lambdas = true:silent
 csharp_style_expression_bodied_local_functions = false:silent
 
-csharp_style_pattern_matching_over_is_with_cast_check = true:warning
 csharp_style_pattern_matching_over_as_with_null_check = true:warning
-
-csharp_style_inlined_variable_declaration = true:warning
-
-csharp_prefer_simple_default_expression = true:warning
-
-csharp_style_throw_expression = true:suggestion
-csharp_style_conditional_delegate_call = true:suggestion
+csharp_style_pattern_matching_over_is_with_cast_check = true:warning
+csharp_style_prefer_switch_expression = true:warning
+csharp_style_prefer_pattern_matching = true:warning
+csharp_style_prefer_not_pattern = true:warning
+csharp_style_prefer_extended_property_pattern = true:warning
 
 csharp_prefer_braces = true:warning
+csharp_prefer_simple_using_statement = true:warning
+csharp_using_directive_placement = outside_namespace:error
+
+file_header_template = unset
 
 csharp_style_unused_value_expression_statement_preference = discard_variable:suggestion
 csharp_style_unused_value_assignment_preference = discard_variable:suggestion
-
-csharp_style_prefer_index_operator = true:suggestion
-csharp_style_prefer_range_operator = true:suggestion
-
-csharp_style_deconstructed_variable_declaration = true:suggestion
-csharp_style_pattern_local_over_anonymous_function = true:suggestion
-csharp_using_directive_placement = outside_namespace:error
-csharp_prefer_static_local_function = true:suggestion
-csharp_prefer_simple_using_statement = true:warning
-csharp_style_prefer_switch_expression = true:suggestion
+dotnet_code_quality_unused_parameters = all:warning
+dotnet_remove_unnecessary_suppression_exclusions = all:warning
 
 dotnet_sort_system_directives_first = true
 dotnet_separate_import_directive_groups = true
+dotnet_style_namespace_match_folder = true
 
 # CA1303: Do not pass literals as localized parameters
 dotnet_diagnostic.CA1303.severity = silent

.github/workflows/ci.yml

@@ -28,6 +28,7 @@ jobs:
         dotnet-version: |
           3.1.x
           6.0.x
+          7.0.x
     - name: Dump .NET info
       run: dotnet --info
     - name: Restore dotnet tools
@@ -78,6 +79,7 @@ jobs:
         dotnet-version: |
           3.1
           6.0
+          7.0
     - name: Dump .NET info
       run: dotnet --info
     - name: Restore dependencies
@@ -98,7 +100,7 @@ jobs:
       uses: actions/setup-dotnet@v1
       with:
         dotnet-version: |
-          6.0
+          7.0
     - uses: actions/download-artifact@v2
       with:
         name: artifacts

.github/workflows/codeql.yml

@@ -0,0 +1,40 @@
+name: "CodeQL"
+
+on:
+  push:
+    branches-ignore:
+      - 'dependabot/**'
+  pull_request:
+  schedule:
+    - cron: '0 8 * * 1'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    steps:
+    - name: Checkout Repository
+      uses: actions/checkout@v2
+    - name: Fetch all history for all tags and branches
+      run: git fetch --prune --unshallow
+    - name: Setup .NET versions
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: |
+          3.1
+          6.0
+          7.0
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v2
+      with:
+        queries: security-and-quality
+        languages: csharp
+    - name: Build source code
+      run: dotnet build --configuration Release
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v2

CHANGELOG.md

@@ -4,7 +4,7 @@ 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.8] - Unplanned
+## [0.8] - 2022-11-08
 ### Deprecated
 - `TestableHttpMessageHandler.SimulateTimeout` is deprecated, and can be replaced with `RespondWith(Responses.Timeout())`.
 - `TestableHttpMessageHandler.RespondWith(Func<HttpRequestMessage, HttpResponseMessage>)` had been deprecated, it's functionality is replaced by IResponse.
@@ -16,6 +16,7 @@ this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 ### Added
 - `CreateClient` now accepts `DelegateHandlers` in order to chain Handlers. The InnerHandler property of each handler is set automatically and the `TestableHttpMessageHandler` is automatically set as the last handler. This is showcased with Polly in the integration tests.
 - Added support for .NET Framework 4.6.2, .NET Framework 4.7 and .NET Framework 4.8 by running the tests against these versions.
+- Added support for .NET 7
 - When validating requests, an `HttpRequestMessageAssertionException` will be thrown when the content of a request is disposed. This typically happens on .NET Framework when the runtime decides to use the older version of System.Net.Http.
 - Added several `Responses`, including `Delayed`, `Timeout`, `Configured`, `Sequenced`, `StatusCode` and `Json`. These responses can now be used inside the `RespondWith`.
 - Added the possibility to set and override the JsonSerializerOptions.
@@ -26,6 +27,7 @@ this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 - The `HttpRequestMessage` is always added to the response, which is now possible, since we no longer allow reusing responses.
 - Added `ConfigureAwait(false)` to all calls, since we now use async/await in the library.
 - The check on request uri is now case insensitive by default, when test url's that are case sensitive set the `ignoreCase` parameter to false.
+- The project has been moved to an organisation, so all the url's have been changed and an icon is added to the NuGet package.
 
 ## [0.7] - 2022-09-22
 ### Changed
@@ -230,6 +232,7 @@ this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 - Automatically build project when pushing changes to github and when creating a pull request
 - Automatically deploy to NuGet when creating a tag in github
 
+[0.8]: https://github.com/testablehttpclient/TestableHttpClient/compare/v0.7...v0.8
 [0.7]: https://github.com/testablehttpclient/TestableHttpClient/compare/v0.6...v0.7
 [0.6]: https://github.com/testablehttpclient/TestableHttpClient/compare/v0.5...v0.6
 [0.5]: https://github.com/testablehttpclient/TestableHttpClient/compare/v0.4...v0.5

Directory.Build.props

@@ -1,16 +1,18 @@
 <Project>
   <PropertyGroup>
-    <LangVersion>10.0</LangVersion>
+    <LangVersion>11.0</LangVersion>
     <Nullable>enable</Nullable>
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
     <EnableNETAnalyzers>true</EnableNETAnalyzers>
     <AnalysisMode>AllEnabledByDefault</AnalysisMode>
+
+    <IsTestProject>$(MSBuildProjectName.EndsWith('Tests'))</IsTestProject>
   </PropertyGroup>
 
-  <PropertyGroup>
+  <PropertyGroup Condition="'$(IsTestProject)' == 'false'">
     <Version>0.0.1</Version>
     <Authors>David Perfors</Authors>
-    <Copyright>Copyright (c) 2020 David Perfors</Copyright>
+    <Copyright>Copyright (c) 2022 David Perfors</Copyright>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
     <DevelopmentDependency>false</DevelopmentDependency>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
@@ -29,7 +31,7 @@
     <RepositoryType>git</RepositoryType>
   </PropertyGroup>
 
-  <ItemGroup>
+  <ItemGroup Condition="'$(IsTestProject)' == 'false'">
     <None Include="$(MSBuildThisFileDirectory)/images/icon.png" Pack="true" PackagePath="" />
     <None Include="$(MSBuildThisFileDirectory)/LICENSE.md" Pack="true" PackagePath="" />
     <None Include="$(MSBuildProjectDirectory)/README.md" Pack="true" PackagePath="" />

Directory.Build.targets

@@ -1,6 +1,6 @@
 <Project>
   <ItemGroup>
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All"/>
-    <PackageReference Include="Nerdbank.GitVersioning" Version="3.5.113" PrivateAssets="All"/>
+    <PackageReference Include="Nerdbank.GitVersioning" Version="3.5.119" PrivateAssets="All"/>
   </ItemGroup>
 </Project>

README.md

@@ -1,6 +1,6 @@
 # TestableHttpClient
 
-![GitHub](https://img.shields.io/github/license/testablehttpclient/TestableHttpClient) ![GitHub Workflow Status](https://img.shields.io/github/workflow/status/testablehttpclient/TestableHttpClient/ci)
+![GitHub](https://img.shields.io/github/license/testablehttpclient/TestableHttpClient) ![GitHub Workflow Status](https://img.shields.io/github/workflow/status/testablehttpclient/TestableHttpClient/CI)
 
 Using HttpClient in code that is unit tested is seen as rather difficult, these libraries aims to make it easier to assert the calls that are made via an HttpClient and to make assertions on the HttpResponseMessages.
 
@@ -57,10 +57,12 @@ Check.That(testHandler).HasMadeRequestsTo("https://httpbin.org/*");
 ## Supported .NET versions
 
 TestableHttpClient is build as a netstandard2.0 library, so theoretically it can work on every .NET version that support netstandard2.0.
-However, only the following versions are being actively tested and thus supported:
+The following versions are being actively tested and thus supported:
 
+- .NET Framework 4.6 and up
 - .NET Core 3.1
 - .NET 6.0
+- .NET 7.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.
 

global.json

@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "6.0.203",
+    "version": "7.0.100",
     "allowPrerelease": false,
     "rollForward": "latestMajor"
   }

src/TestableHttpClient.NFluent/FluentHttpRequestMessagesChecks.cs

@@ -6,7 +6,7 @@
 internal class FluentHttpRequestMessagesChecks : FluentSut<IEnumerable<HttpRequestMessage>>, IHttpRequestMessagesCheck
 {
     private IEnumerable<HttpRequestMessage> requests;
-    private readonly List<string> requestConditions = new List<string>();
+    private readonly List<string> requestConditions = new();
 
     public FluentHttpRequestMessagesChecks(IEnumerable<HttpRequestMessage> httpRequestMessages, TestableHttpMessageHandlerOptions? options = null)
         : base(httpRequestMessages, Check.Reporter, false)