.NET 9 (#13)

(signed)

+semver:major

Author: johnkors

source/.editorconfig .editorconfig

@@ -3,6 +3,7 @@ root = true
 
 [*]
 charset = utf-8
+insert_final_newline = true
 
 # C# files
 [*.cs]
@@ -15,8 +16,8 @@ indent_style = space
 tab_width = 4
 
 # New line preferences
-end_of_line = crlf
-insert_final_newline = true
+trim_trailing_whitespace = true
+
 
 #### .NET Coding Conventions ####
 
@@ -37,7 +38,7 @@ dotnet_style_parentheses_in_other_operators = never_if_unnecessary:silent
 dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity:silent
 
 # Modifier preferences
-dotnet_style_require_accessibility_modifiers = for_non_interface_members:silent
+dotnet_style_require_accessibility_modifiers = for_non_interface_members:warning
 
 # Expression-level preferences
 csharp_style_deconstructed_variable_declaration = true:suggestion
@@ -65,9 +66,9 @@ dotnet_code_quality_unused_parameters = all:suggestion
 #### C# Coding Conventions ####
 
 # var preferences
-csharp_style_var_elsewhere = false:silent
-csharp_style_var_for_built_in_types = false:silent
-csharp_style_var_when_type_is_apparent = false:silent
+csharp_style_var_elsewhere = true:silent
+csharp_style_var_for_built_in_types = true:silent
+csharp_style_var_when_type_is_apparent = true:silent
 
 # Expression-bodied members
 csharp_style_expression_bodied_accessors = true:silent
@@ -87,7 +88,7 @@ csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion
 csharp_style_conditional_delegate_call = true:suggestion
 
 # Modifier preferences
-csharp_preferred_modifier_order = public,private,protected,internal,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async
+csharp_preferred_modifier_order = public, private, protected, internal, static, extern, new, virtual, abstract, sealed, override, readonly, unsafe, volatile, async
 
 # Code-block preferences
 csharp_prefer_braces = true:silent
@@ -100,6 +101,12 @@ csharp_style_prefer_range_operator = true:suggestion
 csharp_style_unused_value_assignment_preference = discard_variable:suggestion
 csharp_style_unused_value_expression_statement_preference = discard_variable:silent
 
+# C# 10
+csharp_style_namespace_declarations = file_scoped:error
+csharp_style_prefer_primary_constructors = true
+dotnet_diagnostic.IDE0290.severity = error
+
+
 #### C# Formatting Rules ####
 
 # New line preferences
@@ -146,3 +153,9 @@ csharp_space_between_square_brackets = false
 # Wrapping preferences
 csharp_preserve_single_line_blocks = true
 csharp_preserve_single_line_statements = true
+
+
+[*.csproj]
+indent_size = 2
+indent_style = space
+tab_width = 2

.github/workflows/CI.yml

@@ -16,11 +16,11 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Setup .NET
-        uses: actions/setup-dotnet@v3
+        uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 8.0.x
+          dotnet-version: 9.0.x
       - name: Restore dependencies
         run: dotnet restore source
       - name: Build

.github/workflows/PreRelease.yml

@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - run: echo "ACTIONS_ALLOW_UNSECURE_COMMANDS=true" >> $GITHUB_ENV
@@ -19,7 +19,7 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: "8.0.x"
+          dotnet-version: "9.0.x"
       - name: Determine Version
         id: gitversion
         uses: gittools/actions/gitversion/execute@v0

.github/workflows/Release.yml

@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - run: echo "ACTIONS_ALLOW_UNSECURE_COMMANDS=true" >> $GITHUB_ENV
@@ -19,7 +19,7 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: "8.0.x"
+          dotnet-version: "9.0.x"
       - name: Determine Version
         id: gitversion
         uses: gittools/actions/gitversion/execute@v0

Samples/HelloWorld/HelloWorld.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net9.0</TargetFramework>
         <IsPackable>false</IsPackable>
         <ImplicitUsings>enable</ImplicitUsings>
         <LangVersion>latest</LangVersion>

readme.md

@@ -1,14 +1,15 @@
 # Slackbot.NET
 
-
 [![Build](https://github.com/slackbot-net/slackbot.net/workflows/CI/badge.svg)](https://github.com/slackbot.net/slackbot.net/actions)
 
-
 ## What?
+
 An opinionated ASP.NET Core middleware to create simple Slackbots using the Slack event API.
 
 ### Install
-Download it from NuGet:[![NuGet](https://img.shields.io/nuget/dt/slackbot.net.endpoints.svg)](https://www.nuget.org/packages/slackbot.net.endpoints/)
+
+Download it from
+NuGet:[![NuGet](https://img.shields.io/nuget/dt/slackbot.net.endpoints.svg)](https://www.nuget.org/packages/slackbot.net.endpoints/)
 
 ### Docs
 

source/src/Slackbot.Net.Endpoints/Abstractions/EventHandledResponse.cs

@@ -1,11 +1,6 @@
 namespace Slackbot.Net.Endpoints.Abstractions;
 
-public class EventHandledResponse
+public class EventHandledResponse(string response)
 {
-    public string Response { get; }
-
-    public EventHandledResponse(string response)
-    {
-        Response = response;
-    }
-}
+    public string Response { get; } = response;
+}

source/src/Slackbot.Net.Endpoints/Abstractions/IHandleAppHomeOpened.cs

@@ -5,4 +5,4 @@ namespace Slackbot.Net.Endpoints.Abstractions;
 public interface IHandleAppHomeOpened
 {
     Task<EventHandledResponse> Handle(EventMetaData eventMetadata, AppHomeOpenedEvent payload);
-}
+}

source/src/Slackbot.Net.Endpoints/Abstractions/IHandleAppMentions.cs

@@ -5,6 +5,14 @@ namespace Slackbot.Net.Endpoints.Abstractions;
 public interface IHandleAppMentions
 {
     Task<EventHandledResponse> Handle(EventMetaData eventMetadata, AppMentionEvent slackEvent);
-    bool ShouldHandle(AppMentionEvent slackEvent) => true;
-    (string HandlerTrigger, string Description) GetHelpDescription() => ("", "");
-}
+
+    bool ShouldHandle(AppMentionEvent slackEvent)
+    {
+        return true;
+    }
+
+    (string HandlerTrigger, string Description) GetHelpDescription()
+    {
+        return ("", "");
+    }
+}

source/src/Slackbot.Net.Endpoints/Abstractions/IHandleInteractiveBlockActions.cs

@@ -5,4 +5,4 @@ namespace Slackbot.Net.Endpoints.Abstractions;
 public interface IHandleInteractiveBlockActions
 {
     Task<EventHandledResponse> Handle(BlockActionInteraction blockActionEvent);
-}
+}

source/src/Slackbot.Net.Endpoints/Abstractions/IHandleMemberJoinedChannel.cs

@@ -5,4 +5,4 @@ namespace Slackbot.Net.Endpoints.Abstractions;
 public interface IHandleMemberJoinedChannel
 {
     Task<EventHandledResponse> Handle(EventMetaData eventMetadata, MemberJoinedChannelEvent memberjoined);
-}
+}

source/src/Slackbot.Net.Endpoints/Abstractions/IHandleMessageActions.cs

@@ -5,4 +5,4 @@ namespace Slackbot.Net.Endpoints.Abstractions;
 public interface IHandleMessageActions
 {
     Task<EventHandledResponse> Handle(MessageActionInteraction blockActionEvent);
-}
+}

source/src/Slackbot.Net.Endpoints/Abstractions/IHandleViewSubmissions.cs

@@ -5,4 +5,4 @@ namespace Slackbot.Net.Endpoints.Abstractions;
 public interface IHandleViewSubmissions
 {
     Task<EventHandledResponse> Handle(ViewSubmission payload);
-}
+}

source/src/Slackbot.Net.Endpoints/Abstractions/INoOpAppMentions.cs

@@ -2,5 +2,4 @@ namespace Slackbot.Net.Endpoints.Abstractions;
 
 public interface INoOpAppMentions : IHandleAppMentions
 {
-        
-}
+}

source/src/Slackbot.Net.Endpoints/Abstractions/ISelectAppMentionEventHandlers.cs

@@ -4,5 +4,6 @@ namespace Slackbot.Net.Endpoints.Abstractions;
 
 public interface ISelectAppMentionEventHandlers
 {
-    Task<IEnumerable<IHandleAppMentions>> GetAppMentionEventHandlerFor(EventMetaData eventMetadata, AppMentionEvent slackEvent);
-}
+    Task<IEnumerable<IHandleAppMentions>> GetAppMentionEventHandlerFor(EventMetaData eventMetadata,
+        AppMentionEvent slackEvent);
+}

source/src/Slackbot.Net.Endpoints/Abstractions/IShortcutHandlers.cs

@@ -6,4 +6,4 @@ public interface IShortcutAppMentions
 {
     Task Handle(EventMetaData eventMetadata, AppMentionEvent @event);
     bool ShouldShortcut(AppMentionEvent @event);
-}
+}

source/src/Slackbot.Net.Endpoints/Abstractions/IUninstall.cs

@@ -3,4 +3,4 @@ namespace Slackbot.Net.Endpoints.Abstractions;
 public interface IUninstall
 {
     Task OnUninstalled(string teamId, string teamName);
-}
+}

source/src/Slackbot.Net.Endpoints/AppMentionEventHandlerSelector.cs

@@ -5,22 +5,15 @@
 
 namespace Slackbot.Net.Endpoints;
 
-internal class AppMentionEventHandlerSelector : ISelectAppMentionEventHandlers
+internal class AppMentionEventHandlerSelector(ILoggerFactory loggerFactory, IServiceProvider provider)
+    : ISelectAppMentionEventHandlers
 {
-    private readonly ILoggerFactory _loggerFactory;
-    private readonly IServiceProvider _provider;
-
-    public AppMentionEventHandlerSelector(ILoggerFactory loggerFactory, IServiceProvider provider)
-    {
-        _loggerFactory = loggerFactory;
-        _provider = provider;
-    }
-        
-    public async Task<IEnumerable<IHandleAppMentions>> GetAppMentionEventHandlerFor(EventMetaData eventMetadata, AppMentionEvent slackEvent)
+    public async Task<IEnumerable<IHandleAppMentions>> GetAppMentionEventHandlerFor(EventMetaData eventMetadata,
+        AppMentionEvent slackEvent)
     {
-        var allHandlers = _provider.GetServices<IHandleAppMentions>();
-        var shortCutter = _provider.GetService<IShortcutAppMentions>();
-        var noopHandler = _provider.GetService<INoOpAppMentions>();
+        var allHandlers = provider.GetServices<IHandleAppMentions>();
+        var shortCutter = provider.GetService<IShortcutAppMentions>();
+        var noopHandler = provider.GetService<INoOpAppMentions>();
 
         if (shortCutter != null && shortCutter.ShouldShortcut(slackEvent))
         {
@@ -29,21 +22,25 @@ public async Task<IEnumerable<IHandleAppMentions>> GetAppMentionEventHandlerFor(
         }
 
         return SelectHandler(allHandlers, noopHandler, slackEvent);
- 
     }
 
-    private IEnumerable<IHandleAppMentions> SelectHandler(IEnumerable<IHandleAppMentions> handlers, INoOpAppMentions noOpAppMentions, AppMentionEvent message)
+    private IEnumerable<IHandleAppMentions> SelectHandler(IEnumerable<IHandleAppMentions> handlers,
+        INoOpAppMentions noOpAppMentions, AppMentionEvent message)
     {
         var matchingHandlers = handlers.Where(s => s.ShouldHandle(message));
         if (matchingHandlers.Any())
+        {
             return matchingHandlers;
-            
-        if(noOpAppMentions != null)
+        }
+
+        if (noOpAppMentions != null)
+        {
             return new List<IHandleAppMentions> { noOpAppMentions };
-            
+        }
+
         return new List<IHandleAppMentions>
         {
-            new NoOpAppMentionEventHandler(_loggerFactory.CreateLogger<NoOpAppMentionEventHandler>())
+            new NoOpAppMentionEventHandler(loggerFactory.CreateLogger<NoOpAppMentionEventHandler>())
         };
     }
-}
+}

source/src/Slackbot.Net.Endpoints/Authentication/AuthenticationBuilderExtensions.cs

@@ -6,20 +6,22 @@ namespace Slackbot.Net.Endpoints.Authentication;
 
 public static class AuthenticationBuilderExtensions
 {
-    public static AuthenticationBuilder AddSlackbotEvents(this AuthenticationBuilder builder, Action<SlackbotEventsAuthenticationOptions> optionsAction)
+    public static AuthenticationBuilder AddSlackbotEvents(this AuthenticationBuilder builder,
+        Action<SlackbotEventsAuthenticationOptions> optionsAction)
     {
         builder.Services.Configure(optionsAction);
-        return builder.AddScheme<SlackbotEventsAuthenticationOptions, SlackbotEventsAuthenticationAuthenticationHandler>(SlackbotEventsAuthenticationConstants.AuthenticationScheme, optionsAction);
+        return builder
+            .AddScheme<SlackbotEventsAuthenticationOptions, SlackbotEventsAuthenticationAuthenticationHandler>(
+                SlackbotEventsAuthenticationConstants.AuthenticationScheme, optionsAction);
     }
 }
 
 public class SlackbotEventsAuthenticationOptions : AuthenticationSchemeOptions
 {
-    [Required]
-    public string SigningSecret { get; set; }
+    [Required] public string SigningSecret { get; set; }
 }
 
 public static class SlackbotEventsAuthenticationConstants
 {
     public const string AuthenticationScheme = "SlacbotEventsAuthenticationScheme";
-}
+}