Merge pull request #482 from mrpmorris/release/6.0

Release/6.0

.gitignore

@@ -2,6 +2,7 @@ publish.bat
 **/PublishProfiles/**
 secrets.txt
 **/MrPMorris.snk
+**/*ncrunch*
 
 ## Ignore Visual Studio temporary files, build results, and
 ## files generated by popular Visual Studio add-ons.
@@ -263,4 +264,4 @@ paket-files/
 
 # Python Tools for Visual Studio (PTVS)
 __pycache__/
-*.pyc
+*.pyc

Docs/releases.md

@@ -1,7 +1,12 @@
 # Releases
 
-## New in 5.10
+## New in 6.0
+* **Breaking change**: Remove support for obsolete versions of .NET framework ([#384](https://github.com/mrpmorris/Fluxor/issues/384))
+* **Breaking change**: Replace IDisposable with IAsyncDisposable in Blazor components ([#324](https://github.com/mrpmorris/Fluxor/issues/324))
+* **Breaking change**: `UseReduxDevTools` no longer ensures `UseRouting` is called ([#360](https://github.com/mrpmorris/Fluxor/issues/360))
+* **Breaking change**: `UseReduxDevTools` no longer requires `Newtonsoft.Json` ([#386](https://github.com/mrpmorris/Fluxor/issues/386))
 * Support Action Filtering in Redux Dev Tools ([#383](https://github.com/mrpmorris/Fluxor/issues/383))
+
 ## New in 5.9
 * Adds additional useful information to exception thrown by `DisposableAction` ([#425](https://github.com/mrpmorris/Fluxor/issues/425))
 * Fix deadlock scenario when dispatching actions from an effect triggered by store activation ([#426](https://github.com/mrpmorris/Fluxor/issues/426))

Source/.editorconfig

@@ -78,3 +78,66 @@ dotnet_style_qualification_for_field = false:suggestion
 dotnet_style_qualification_for_method = false:suggestion
 #prefer properties not to be prefaced with this. or Me. in Visual Basic
 dotnet_style_qualification_for_property = false:suggestion
+csharp_indent_labels = one_less_than_current
+csharp_using_directive_placement = outside_namespace:silent
+csharp_prefer_simple_using_statement = true:suggestion
+csharp_prefer_braces = true:silent
+csharp_style_namespace_declarations = file_scoped:silent
+csharp_style_prefer_method_group_conversion = true:silent
+csharp_style_prefer_top_level_statements = true:silent
+csharp_style_prefer_primary_constructors = true:suggestion
+csharp_style_expression_bodied_constructors = false:silent
+csharp_style_expression_bodied_operators = false:silent
+
+[*.{cs,vb}]
+#### Naming styles ####
+
+# Naming rules
+
+dotnet_naming_rule.interface_should_be_begins_with_i.severity = suggestion
+dotnet_naming_rule.interface_should_be_begins_with_i.symbols = interface
+dotnet_naming_rule.interface_should_be_begins_with_i.style = begins_with_i
+
+dotnet_naming_rule.types_should_be_pascal_case.severity = suggestion
+dotnet_naming_rule.types_should_be_pascal_case.symbols = types
+dotnet_naming_rule.types_should_be_pascal_case.style = pascal_case
+
+dotnet_naming_rule.non_field_members_should_be_pascal_case.severity = suggestion
+dotnet_naming_rule.non_field_members_should_be_pascal_case.symbols = non_field_members
+dotnet_naming_rule.non_field_members_should_be_pascal_case.style = pascal_case
+
+# Symbol specifications
+
+dotnet_naming_symbols.interface.applicable_kinds = interface
+dotnet_naming_symbols.interface.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
+dotnet_naming_symbols.interface.required_modifiers = 
+
+dotnet_naming_symbols.types.applicable_kinds = class, struct, interface, enum
+dotnet_naming_symbols.types.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
+dotnet_naming_symbols.types.required_modifiers = 
+
+dotnet_naming_symbols.non_field_members.applicable_kinds = property, event, method
+dotnet_naming_symbols.non_field_members.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
+dotnet_naming_symbols.non_field_members.required_modifiers = 
+
+# Naming styles
+
+dotnet_naming_style.begins_with_i.required_prefix = I
+dotnet_naming_style.begins_with_i.required_suffix = 
+dotnet_naming_style.begins_with_i.word_separator = 
+dotnet_naming_style.begins_with_i.capitalization = pascal_case
+
+dotnet_naming_style.pascal_case.required_prefix = 
+dotnet_naming_style.pascal_case.required_suffix = 
+dotnet_naming_style.pascal_case.word_separator = 
+dotnet_naming_style.pascal_case.capitalization = pascal_case
+
+dotnet_naming_style.pascal_case.required_prefix = 
+dotnet_naming_style.pascal_case.required_suffix = 
+dotnet_naming_style.pascal_case.word_separator = 
+dotnet_naming_style.pascal_case.capitalization = pascal_case
+dotnet_style_operator_placement_when_wrapping = beginning_of_line
+tab_width = 4
+indent_size = 4
+end_of_line = crlf
+dotnet_style_namespace_match_folder = true:suggestion

Source/Fluxor.sln

@@ -11,9 +11,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{2279CD95
  EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{C2B1D7B3-E943-4EA3-88B0-94433B49080C}"
- ProjectSection(SolutionItems) = preProject
- .editorconfig = .editorconfig
- EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Fluxor", "Lib\Fluxor\Fluxor.csproj", "{863909D3-7E81-4240-8C0A-6F57768D28FF}"
 EndProject

Source/Lib/Directory.Build.props

@@ -1,10 +1,9 @@
 <Project>
  <PropertyGroup>
- <TargetFrameworks>netstandard2.0;netstandard2.1;netcoreapp3.1;net5.0;net6.0;net7.0</TargetFrameworks>
- <LangVersion>10</LangVersion>
- <Version>5.9.0</Version>
- <AssemblyVersion>5.9.0.0</AssemblyVersion>
- <FileVersion>5.9.0.0</FileVersion>
+ <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
+ <Version>6.0.0</Version>
+ <AssemblyVersion>6.0.0.0</AssemblyVersion>
+ <FileVersion>6.0.0.0</FileVersion>
 
  <Authors>Peter Morris</Authors>
  <Company />
@@ -30,6 +29,6 @@
  <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
  </PropertyGroup>
  <ItemGroup>
- <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.*" PrivateAssets="All" />
+ <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.*" PrivateAssets="All" />
  </ItemGroup>
 </Project>

Source/Lib/Fluxor.Blazor.Web.ReduxDevTools/ActionInfo.cs

@@ -2,35 +2,34 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace Fluxor.Blazor.Web.ReduxDevTools
+namespace Fluxor.Blazor.Web.ReduxDevTools;
+
+internal class ActionInfo
 {
- internal class ActionInfo
- {
 #pragma warning disable IDE1006 // Naming Styles
-  public string type { get; }
+ public string type { get; }
 #pragma warning restore IDE1006 // Naming Styles
-  public object Payload { get; }
+ public object Payload { get; }
 
-  public ActionInfo(object action)
-  {
-  if (action is null)
-  throw new ArgumentNullException(nameof(action));
+ public ActionInfo(object action)
+ {
+ if (action is null)
+ throw new ArgumentNullException(nameof(action));
 
-  type = $"{GetTypeDisplayName(action.GetType())}, {action.GetType().Namespace}";
-  Payload = action;
-  }
+ type = $"{GetTypeDisplayName(action.GetType())}, {action.GetType().Namespace}";
+ Payload = action;
+ }
 
-  public static string GetTypeDisplayName(Type type)
-  {
-  if (!type.IsGenericType)
-  return type.Name;
+ public static string GetTypeDisplayName(Type type)
+ {
+ if (!type.IsGenericType)
+ return type.Name;
 
- string name = type.GetGenericTypeDefinition().Name;
- name = name.Remove(name.IndexOf('`'));
- IEnumerable<string> genericTypes = type
- .GetGenericArguments()
- .Select(GetTypeDisplayName);
- return $"{name}<{string.Join(",", genericTypes)}>";
- }
+ string name = type.GetGenericTypeDefinition().Name;
+ name = name.Remove(name.IndexOf('`'));
+ IEnumerable<string> genericTypes = type
+ .GetGenericArguments()
+ .Select(GetTypeDisplayName);
+ return $"{name}<{string.Join(",", genericTypes)}>";
  }
 }

Source/Lib/Fluxor.Blazor.Web.ReduxDevTools/Fluxor.Blazor.Web.ReduxDevTools.csproj

@@ -1,37 +1,34 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
- <PropertyGroup>
- <LangVersion>11</LangVersion>
- <Product>ReduxDevTools for Fluxor Blazor (Web)</Product>
- <Description>Middleware link from a Blazor (Web) Fluxor store to the Redux Dev Tools browser extension for Chrome.</Description>
- <PackageIcon>fluxor-blazor-reduxdevtools-small.png</PackageIcon>
- <PackageTags>Redux Flux DotNet CSharp Blazor RazorComponents ReduxDevTools</PackageTags>
- <SignAssembly Condition="'$(Configuration)'=='Release'">True</SignAssembly>
- </PropertyGroup>
+ <PropertyGroup>
+ <LangVersion>latest</LangVersion>
+ <Product>ReduxDevTools for Fluxor Blazor (Web)</Product>
+ <Description>Middleware link from a Blazor (Web) Fluxor store to the Redux Dev Tools browser extension for Chrome.</Description>
+ <PackageIcon>fluxor-blazor-reduxdevtools-small.png</PackageIcon>
+ <PackageTags>Redux Flux DotNet CSharp Blazor RazorComponents ReduxDevTools</PackageTags>
+ </PropertyGroup>
 
- <ItemGroup>
- <SupportedPlatform Include="browser" />
- </ItemGroup>
+  <ItemGroup>
+  <SupportedPlatform Include="browser" />
+  </ItemGroup>
 
- <ItemGroup>
- <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="7.0.0" Condition="'$(TargetFramework)' == 'net7.0'" />
- <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="6.0.0" Condition="'$(TargetFramework)' == 'net6.0'" />
+ <ItemGroup>
+ <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.0" Condition="'$(TargetFramework)' == 'net8.0'" />
+ <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="7.0.0" Condition="'$(TargetFramework)' == 'net7.0'" />
+ <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="6.0.0" Condition="'$(TargetFramework)' == 'net6.0'" />
 
- <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" Condition="'$(TargetFramework)' == 'net7.0'" />
- <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" Condition="'$(TargetFramework)' == 'net6.0'" />
- </ItemGroup>
+ <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" Condition="'$(TargetFramework)' == 'net8.0'" />
+ <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" Condition="'$(TargetFramework)' == 'net7.0'" />
+ <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" Condition="'$(TargetFramework)' == 'net6.0'" />
+ </ItemGroup>
 
- <ItemGroup>
- <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
- </ItemGroup>
+  <ItemGroup>
+  <ProjectReference Include="..\Fluxor.Blazor.Web\Fluxor.Blazor.Web.csproj" />
+  </ItemGroup>
 
- <ItemGroup>
- <ProjectReference Include="..\Fluxor.Blazor.Web\Fluxor.Blazor.Web.csproj" />
- </ItemGroup>
-
- <ItemGroup>
- <None Include="..\..\..\Images\fluxor-blazor-reduxdevtools-small.png">
- <Pack>True</Pack>
- <PackagePath></PackagePath>
- </None>
- </ItemGroup>
+ <ItemGroup>
+ <None Include="..\..\..\Images\fluxor-blazor-reduxdevtools-small.png">
+ <Pack>True</Pack>
+ <PackagePath></PackagePath>
+ </None>
+ </ItemGroup>
 </Project>

Source/Lib/Fluxor.Blazor.Web.ReduxDevTools/Internal/CallbackObjects/BaseCallbackObject.cs

@@ -1,13 +1,12 @@
-namespace Fluxor.Blazor.Web.ReduxDevTools.Internal.CallbackObjects
+namespace Fluxor.Blazor.Web.ReduxDevTools.Internal.CallbackObjects;
+
+public class BaseCallbackObject<TPayload>
+ where TPayload : BasePayload
 {
- public class BaseCallbackObject<TPayload>
- where TPayload : BasePayload
- {
 #pragma warning disable IDE1006 // Naming Styles
-  public string type { get; set; }
-  public TPayload payload { get; set; }
+ public string type { get; set; }
+ public TPayload payload { get; set; }
 #pragma warning restore IDE1006 // Naming Styles
- }
-
- public class BaseCallbackObject : BaseCallbackObject<BasePayload> { }
 }
+
+public class BaseCallbackObject : BaseCallbackObject<BasePayload> { }

Source/Lib/Fluxor.Blazor.Web.ReduxDevTools/Internal/CallbackObjects/BasePayload.cs

@@ -1,9 +1,8 @@
-namespace Fluxor.Blazor.Web.ReduxDevTools.Internal.CallbackObjects
+namespace Fluxor.Blazor.Web.ReduxDevTools.Internal.CallbackObjects;
+
+public class BasePayload
 {
- public class BasePayload
- {
 #pragma warning disable IDE1006 // Naming Styles
-  public string type { get; set; }
+ public string type { get; set; }
 #pragma warning restore IDE1006 // Naming Styles
- }
 }

Source/Lib/Fluxor.Blazor.Web.ReduxDevTools/Internal/CallbackObjects/JumpToStateCallback.cs

@@ -1,11 +1,8 @@
-using System.Dynamic;
+namespace Fluxor.Blazor.Web.ReduxDevTools.Internal.CallbackObjects;
 
-namespace Fluxor.Blazor.Web.ReduxDevTools.Internal.CallbackObjects
+public class JumpToStateCallback : BaseCallbackObject<JumpToStatePayload>
 {
- public class JumpToStateCallback : BaseCallbackObject<JumpToStatePayload>
- {
 #pragma warning disable IDE1006 // Naming Styles
-  public string state { get; set; }
+ public string state { get; set; }
 #pragma warning restore IDE1006 // Naming Styles
- }
 }

Source/Lib/Fluxor.Blazor.Web.ReduxDevTools/Internal/CallbackObjects/JumpToStatePayload.cs

@@ -1,10 +1,9 @@
-namespace Fluxor.Blazor.Web.ReduxDevTools.Internal.CallbackObjects
+namespace Fluxor.Blazor.Web.ReduxDevTools.Internal.CallbackObjects;
+
+public class JumpToStatePayload : BasePayload
 {
- public class JumpToStatePayload : BasePayload
- {
 #pragma warning disable IDE1006 // Naming Styles
-  public int index { get; set; }
-  public int actionId { get; set; }
+ public int index { get; set; }
+ public int actionId { get; set; }
 #pragma warning restore IDE1006 // Naming Styles
- }
 }