Merge pull request #13 from thomasgalliker/update-targetframeworks-net8

Update target framework to .NET 8 + .NET Framework 4.8

Author: thomasgalliker

.editorconfig

@@ -1,12 +1,25 @@
 ####################################################################
-# Editor Configuration (Updated 2022-01-07)
+# Editor Configuration (Updated 2023-07-26)
 #
-# (c)2021 superdev GmbH
+# (c)2023 superdev GmbH
 ####################################################################
 
 root = true
 
+[*.csproj]
+indent_style = space
+indent_size = 2
+tab_width = 2
+
 [*.cs]
+indent_style = space
+indent_size = 4
+tab_width = 4
+end_of_line = crlf
+trim_trailing_whitespace = true
+insert_final_newline = false
+max_line_length = 140
+
 csharp_indent_block_contents = true
 csharp_indent_braces = false
 csharp_indent_case_contents = true
@@ -23,16 +36,16 @@ csharp_new_line_between_query_expression_clauses = true
 
 csharp_prefer_braces = true:error
 csharp_prefer_simple_default_expression = true:error
-csharp_prefer_simple_using_statement = false
+csharp_prefer_simple_using_statement = false:silent
 
+csharp_using_directive_placement = outside_namespace:silent
 csharp_preserve_single_line_blocks = true
-csharp_preserve_single_line_statements = false
+csharp_preserve_single_line_statements = true
 
 csharp_space_after_cast = false
 csharp_space_after_colon_in_inheritance_clause = true
 csharp_space_after_comma = true
 csharp_space_after_dot = false
-
 csharp_space_after_keywords_in_control_flow_statements = true
 csharp_space_after_semicolon_in_for_statement = true
 csharp_space_around_binary_operators = before_and_after
@@ -57,7 +70,7 @@ csharp_style_expression_bodied_accessors = true:none
 csharp_style_expression_bodied_constructors = false:none
 csharp_style_expression_bodied_indexers = true:none
 csharp_style_expression_bodied_lambdas = true:none
-csharp_style_expression_bodied_local_functions = false
+csharp_style_expression_bodied_local_functions = false:silent
 csharp_style_expression_bodied_methods = false:none
 csharp_style_expression_bodied_operators = false:none
 csharp_style_expression_bodied_properties = true:silent
@@ -72,9 +85,13 @@ csharp_style_var_for_built_in_types = true:suggestion
 csharp_style_var_when_type_is_apparent = true:error
 csharp_style_implicit_object_creation_when_type_is_apparent = false
 csharp_style_prefer_switch_expression = false
+csharp_style_namespace_declarations = block_scoped:silent
+csharp_style_prefer_method_group_conversion = true:silent
+csharp_style_prefer_top_level_statements = true:silent
+csharp_style_prefer_null_check_over_type_check = true:suggestion
 
 dotnet_sort_system_directives_first = true
-dotnet_style_coalesce_expression = true:error
+dotnet_style_coalesce_expression = true:suggestion
 dotnet_style_collection_initializer = true:error
 dotnet_style_explicit_tuple_names = true:error
 dotnet_style_null_propagation = true:error
@@ -86,12 +103,20 @@ dotnet_style_qualification_for_event = true:error
 dotnet_style_qualification_for_field = true:error
 dotnet_style_qualification_for_method = true:error
 dotnet_style_qualification_for_property = true:error
-
-end_of_line = crlf
-indent_size = 4
-indent_style = space
-insert_final_newline = false
-tab_width = 4
+dotnet_style_prefer_is_null_check_over_reference_equality_method = true:suggestion
+dotnet_style_prefer_auto_properties = true:silent
+dotnet_style_prefer_simplified_boolean_expressions = false:suggestion
+dotnet_style_prefer_conditional_expression_over_assignment = false:suggestion
+dotnet_style_prefer_conditional_expression_over_return = false:suggestion
+dotnet_style_prefer_inferred_tuple_names = true:suggestion
+dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion
+dotnet_style_prefer_compound_assignment = true:suggestion
+dotnet_style_prefer_simplified_interpolation = true:suggestion
+dotnet_style_namespace_match_folder = true:suggestion
+dotnet_style_operator_placement_when_wrapping = beginning_of_line
+csharp_style_unused_value_expression_statement_preference = discard_variable:none
+csharp_style_unused_value_assignment_preference = discard_variable:none
+csharp_style_prefer_method_group_conversion = true
 
 dotnet_naming_symbols.private_field_symbol.applicable_kinds = field
 dotnet_naming_symbols.private_field_symbol.applicable_accessibilities = private
@@ -111,13 +136,13 @@ dotnet_naming_symbols.parameter_symbol.applicable_kinds = parameter
 dotnet_naming_style.parameter_style.capitalization = camel_case
 dotnet_naming_rule.parameters_are_camel_case.severity = error
 dotnet_naming_rule.parameters_are_camel_case.symbols = parameter_symbol
-dotnet_naming_rule.parameters_are_camel_case.style = parameter_style
+dotnet_naming_rule.parameters_are_camel_case.style = private_field_style
 
 dotnet_naming_symbols.non_interface_type_symbol.applicable_kinds = class,struct,enum,delegate
 dotnet_naming_style.non_interface_type_style.capitalization = pascal_case
 dotnet_naming_rule.non_interface_types_are_pascal_case.severity = error
 dotnet_naming_rule.non_interface_types_are_pascal_case.symbols = non_interface_type_symbol
-dotnet_naming_rule.non_interface_types_are_pascal_case.style = non_interface_type_style
+dotnet_naming_rule.non_interface_types_are_pascal_case.style = non_private_field_style
 
 dotnet_naming_symbols.interface_type_symbol.applicable_kinds = interface
 dotnet_naming_style.interface_type_style.capitalization = pascal_case
@@ -130,11 +155,11 @@ dotnet_naming_symbols.member_symbol.applicable_kinds = method,property,event
 dotnet_naming_style.member_style.capitalization = pascal_case
 dotnet_naming_rule.members_are_pascal_case.severity = error
 dotnet_naming_rule.members_are_pascal_case.symbols = member_symbol
-dotnet_naming_rule.members_are_pascal_case.style = member_style
+dotnet_naming_rule.members_are_pascal_case.style = non_private_field_style
 
 dotnet_naming_rule.static_fields_should_be_pascal_case.severity = suggestion
 dotnet_naming_rule.static_fields_should_be_pascal_case.symbols = static_fields
-dotnet_naming_rule.static_fields_should_be_pascal_case.style = static_field_style
+dotnet_naming_rule.static_fields_should_be_pascal_case.style = non_private_field_style
 dotnet_naming_symbols.static_fields.applicable_kinds = field
 dotnet_naming_symbols.static_fields.applicable_accessibilities = *
 dotnet_naming_symbols.static_fields.required_modifiers = static
@@ -144,4 +169,4 @@ dotnet_naming_style.static_field_style.capitalization = pascal_case
 dotnet_diagnostic.CS4014.severity = error
 
 # IDE0051: Remove unused private members
-dotnet_diagnostic.IDE0051.severity = warning
+dotnet_diagnostic.IDE0051.severity = warning

HttpClient.Caching/HttpClient.Caching.csproj

@@ -6,15 +6,14 @@
 		<VersionPrefix>1.0.0</VersionPrefix>
 		<Version>1.0.0</Version>
 		<Authors>Thomas Galliker</Authors>
-		<TargetFrameworks>net462;netstandard1.2;netstandard2.0;netstandard2.1</TargetFrameworks>
+		<TargetFrameworks>net48;netstandard1.2;netstandard2.0;netstandard2.1;net6.0;net7.0;net8.0</TargetFrameworks>
 		<AssemblyName>HttpClient.Caching</AssemblyName>
 		<PackageId>HttpClient.Caching</PackageId>
 		<PackageTags>httpclient.caching;httpclient;caching;cache;inmemory</PackageTags>
 		<PackageIconUrl>https://raw.githubusercontent.com/thomasgalliker/HttpClient.Caching/develop/logo.png</PackageIconUrl>
 		<PackageProjectUrl>https://github.com/thomasgalliker/HttpClient.Caching</PackageProjectUrl>
 		<RepositoryType>git</RepositoryType>
 		<RepositoryUrl>https://github.com/thomasgalliker/HttpClient.Caching</RepositoryUrl>
-		<RuntimeIdentifiers>win10-x64</RuntimeIdentifiers>
 		<PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.2' ">$(PackageTargetFallback);netcoreapp1.0</PackageTargetFallback>
 		<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard1.2' ">1.6.1</NetStandardImplicitPackageVersion>
 		<SignAssembly>True</SignAssembly>
@@ -32,15 +31,15 @@
 1.0.0
 - Initial release
 		</PackageReleaseNotes>
-		<Copyright>Copyright 2022</Copyright>
+		<Copyright>Copyright $([System.DateTime]::Now.ToString(`yyyy`)) © Thomas Galliker</Copyright>
 		<PackageReadmeFile>README.md</PackageReadmeFile>
 	</PropertyGroup>
 
 	<ItemGroup>
 		<PackageReference Include="Newtonsoft.Json" Version="[11.0.2,)" />
 	</ItemGroup>
 
-	<ItemGroup Condition=" '$(TargetFramework)' == 'net462' ">
+	<ItemGroup Condition=" '$(TargetFramework)' == 'net48' ">
 		<Reference Include="System.Net.Http" />
 	</ItemGroup>
 

HttpClient.Caching/InMemory/IMemoryCache.cs

@@ -8,6 +8,8 @@ namespace Microsoft.Extensions.Caching.InMemory
     /// </summary>
     public interface IMemoryCache : IDisposable
     {
+        int Count { get; }
+
         /// <summary>Gets the item associated with this key if present.</summary>
         /// <param name="key">An object identifying the requested entry.</param>
         /// <param name="value">The located value or null.</param>
@@ -23,6 +25,8 @@ public interface IMemoryCache : IDisposable
         /// <param name="key">An object identifying the entry.</param>
         void Remove(object key);
 
+        void Compact(double percentage);
+
         void Clear();
     }
 }

HttpClient.Caching/InMemory/MemoryCache.cs

@@ -12,12 +12,13 @@ namespace Microsoft.Extensions.Caching.InMemory
     public class MemoryCache : IMemoryCache
     {
         private readonly ConcurrentDictionary<object, CacheEntry> entries;
-        private bool disposed;
         private readonly Action<CacheEntry> setEntry;
         private readonly Action<CacheEntry> entryExpirationNotification;
         private readonly ISystemClock clock;
         private readonly TimeSpan expirationScanFrequency;
+
         private DateTimeOffset lastExpirationScan;
+        private bool disposed;
 
         public int Count => this.entries.Count;
 
@@ -110,10 +111,7 @@ private void SetEntry(CacheEntry entry)
                     entry.InvokeEvictionCallbacks();
                 }
 
-                if (cacheEntry != null)
-                {
-                    cacheEntry.InvokeEvictionCallbacks();
-                }
+                cacheEntry?.InvokeEvictionCallbacks();
             }
             else
             {

README.md

@@ -59,7 +59,7 @@ HttpClient allows to inject a custom http handler. In the follwing example, we i
 ```C#
 static void Main(string[] args)
 {
-    const string url = "http://worldclockapi.com/api/json/utc/now";
+    const string url = "http://worldtimeapi.org/api/timezone/Europe/Zurich";
 
     var httpClientHandler = new HttpClientHandler();
     var cacheExpirationPerHttpResponseCode = CacheExpirationProvider.CreateSimple(TimeSpan.FromSeconds(60), TimeSpan.FromSeconds(10), TimeSpan.FromSeconds(5));
@@ -96,11 +96,11 @@ static void Main(string[] args)
 
 Console output:
 ```
-Attempt 1: HTTP GET http://worldclockapi.com/api/json/utc/now... completed in 625ms
-Attempt 2: HTTP GET http://worldclockapi.com/api/json/utc/now... completed in 48ms
-Attempt 3: HTTP GET http://worldclockapi.com/api/json/utc/now... completed in 1ms
-Attempt 4: HTTP GET http://worldclockapi.com/api/json/utc/now... completed in 1ms
-Attempt 5: HTTP GET http://worldclockapi.com/api/json/utc/now... completed in 1ms
+Attempt 1: HTTP GET http://worldtimeapi.org/api/timezone/Europe/Zurich... completed in 625ms
+Attempt 2: HTTP GET http://worldtimeapi.org/api/timezone/Europe/Zurich... completed in 48ms
+Attempt 3: HTTP GET http://worldtimeapi.org/api/timezone/Europe/Zurich... completed in 1ms
+Attempt 4: HTTP GET http://worldtimeapi.org/api/timezone/Europe/Zurich... completed in 1ms
+Attempt 5: HTTP GET http://worldtimeapi.org/api/timezone/Europe/Zurich... completed in 1ms
 
 TotalRequests: 5
 -> CacheHit: 4
@@ -118,7 +118,7 @@ with InMemoryCacheHandler.
 ```C#
 static void Main(string[] args)
 {
-    const string url = "http://worldclockapi.com/api/json/utc/now";
+    const string url = "http://worldtimeapi.org/api/timezone/Europe/Zurich";
 
     var httpClientHandler = new HttpClientHandler();
     var cacheExpirationPerHttpResponseCode = CacheExpirationProvider.CreateSimple(TimeSpan.FromSeconds(60), TimeSpan.FromSeconds(10), TimeSpan.FromSeconds(5));

Samples/ConsoleAppSample/Program.cs

@@ -11,7 +11,7 @@ internal class Program
     {
         private static void Main(string[] args)
         {
-            const string url = "http://worldclockapi.com/api/json/utc/now";
+            const string url = "http://worldtimeapi.org/api/timezone/Europe/Zurich";
 
             // HttpClient uses an HttpClientHandler nested into InMemoryCacheHandler in order to handle http get response caching
             var httpClientHandler = new HttpClientHandler();

Tests/HttpClient.Caching.Tests/Extensions/StringExtensions.cs

@@ -1,33 +1,31 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net462;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>net48;net8.0</TargetFrameworks>
     <AssemblyName>HttpClient.Caching.Tests</AssemblyName>
     <PackageId>HttpClient.Caching.Tests</PackageId>
-    <RuntimeIdentifiers>win10-x64</RuntimeIdentifiers>
     <IncludeBuildOutput>false</IncludeBuildOutput>
     <RootNamespace>HttpClient.Caching.Tests</RootNamespace>
     <NeutralLanguage>en</NeutralLanguage>
   </PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="coverlet.msbuild" Version="3.1.2">
+		<PackageReference Include="coverlet.msbuild" Version="6.0.1">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
-		<PackageReference Include="ncrontab" Version="3.3.1" />
-		<PackageReference Include="ObjectDumper.NET" Version="3.3.20" />
-		<PackageReference Include="xunit" Version="2.4.1" />
-		<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+		<PackageReference Include="ObjectDumper.NET" Version="4.1.15" />
+		<PackageReference Include="xunit" Version="2.7.0" />
+		<PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 			<PrivateAssets>all</PrivateAssets>
 		</PackageReference>
-		<PackageReference Include="Moq.AutoMock" Version="3.3.0" />
-		<PackageReference Include="FluentAssertions" Version="6.6.0" />
+		<PackageReference Include="Moq.AutoMock" Version="3.5.0" />
+		<PackageReference Include="FluentAssertions" Version="6.12.0" />
 	</ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net462' ">
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net48' ">
     <Reference Include="System.Net.Http" />
   </ItemGroup>