.NET 8 (#10)

johnkors · web-flow · commit 297298558188 · 2023-11-16T00:27:41.000+01:00
* Update build scripts

* .NET 8

+semver:major
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -16,11 +16,11 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
-      - name: Setup .NET 6
-        uses: actions/setup-dotnet@v1
+      - uses: actions/checkout@v3
+      - name: Setup .NET
+        uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: 6.0.x
+          dotnet-version: 8.0.x
       - name: Restore dependencies
         run: dotnet restore source
       - name: Build
diff --git a/.github/workflows/PreRelease.yml b/.github/workflows/PreRelease.yml
@@ -8,21 +8,21 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 0
       - run: echo "ACTIONS_ALLOW_UNSECURE_COMMANDS=true" >> $GITHUB_ENV
       - name: Install GitVersion
-        uses: gittools/actions/gitversion/setup@v0.9.7
+        uses: gittools/actions/gitversion/setup@v0
         with:
           versionSpec: "5.x"
-      - name: Setup .NET 6
-        uses: actions/setup-dotnet@v1
+      - name: Setup .NET
+        uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: "6.0.x"
+          dotnet-version: "8.0.x"
       - name: Determine Version
         id: gitversion
-        uses: gittools/actions/gitversion/execute@v0.9.7
+        uses: gittools/actions/gitversion/execute@v0
         with:
           useConfigFile: true
       - name: Pack
diff --git a/.github/workflows/Release.yml b/.github/workflows/Release.yml
@@ -8,21 +8,21 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 0
       - run: echo "ACTIONS_ALLOW_UNSECURE_COMMANDS=true" >> $GITHUB_ENV
       - name: Install GitVersion
-        uses: gittools/actions/gitversion/setup@v0.9.7
+        uses: gittools/actions/gitversion/setup@v0
         with:
           versionSpec: "5.x"
-      - name: Setup .NET 6
-        uses: actions/setup-dotnet@v1
+      - name: Setup .NET
+        uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: "6.0.x"
+          dotnet-version: "8.0.x"
       - name: Determine Version
         id: gitversion
-        uses: gittools/actions/gitversion/execute@v0.9.7
+        uses: gittools/actions/gitversion/execute@v0
         with:
           useConfigFile: true
       - name: Pack
diff --git a/GitVersion.yml b/GitVersion.yml
@@ -1,10 +1,10 @@
 branches:
   master:
-    regex: ^master$
+    regex: ^main$
     mode: ContinuousDeployment
     tag: ""
   feature:
-    regex: ^features?[/-]|(?!^master$|^(hotfix|bugfix)(es)?[/-]|^support[/-]|(^(pull|pull\-requests|pr)[/-]))(^.*$)
+    regex: ^features?[/-]|(?!^main$|^(hotfix|bugfix)(es)?[/-]|^support[/-]|(^(pull|pull\-requests|pr)[/-]))(^.*$)
     mode: ContinuousDeployment
     tag: "feature"
   pull-request:
diff --git a/Samples/HelloWorld/HelloWorld.csproj b/Samples/HelloWorld/HelloWorld.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <IsPackable>false</IsPackable>
         <ImplicitUsings>enable</ImplicitUsings>
         <LangVersion>latest</LangVersion>
diff --git a/source/src/Slackbot.Net.Endpoints/Authentication/SlackbotEventsAuthenticationAuthenticationHandler.cs b/source/src/Slackbot.Net.Endpoints/Authentication/SlackbotEventsAuthenticationAuthenticationHandler.cs
@@ -17,8 +17,8 @@ internal class SlackbotEventsAuthenticationAuthenticationHandler : Authenticatio
     private readonly string _signingSecret;
 
     public SlackbotEventsAuthenticationAuthenticationHandler(
-        IOptionsMonitor<SlackbotEventsAuthenticationOptions> options, ILoggerFactory logger, UrlEncoder encoder,
-        ISystemClock clock) : base(options, logger, encoder, clock)
+        IOptionsMonitor<SlackbotEventsAuthenticationOptions> options, ILoggerFactory logger, UrlEncoder encoder) 
+        : base(options, logger, encoder)
     {
         if (string.IsNullOrEmpty(options.CurrentValue.SigningSecret))
             throw new ArgumentNullException(nameof(SlackbotEventsAuthenticationOptions.SigningSecret));
@@ -94,4 +94,4 @@ private string GeneratedSignature(long timestamp, string body)
 
         return builder.ToString();
     }
-}
+}
diff --git a/source/src/Slackbot.Net.Endpoints/Slackbot.Net.Endpoints.csproj b/source/src/Slackbot.Net.Endpoints/Slackbot.Net.Endpoints.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <RootNamespace>Slackbot.Net.Endpoints</RootNamespace>
         <ImplicitUsings>enable</ImplicitUsings>
         <LangVersion>latest</LangVersion>
diff --git a/source/src/Slackbot.Net.Shared/Slackbot.Net.Shared.csproj b/source/src/Slackbot.Net.Shared/Slackbot.Net.Shared.csproj
@@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
-        <LangVersion>latest</LangVersion>        
+        <LangVersion>latest</LangVersion>
         <IsPackable>false</IsPackable>
     </PropertyGroup>
 
diff --git a/source/src/Slackbot.Net.SlackClients.Http/Slackbot.Net.SlackClients.Http.csproj b/source/src/Slackbot.Net.SlackClients.Http/Slackbot.Net.SlackClients.Http.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <RootNamespace>Slackbot.Net.SlackClients.Http</RootNamespace>
         <ImplicitUsings>enable</ImplicitUsings>
         <LangVersion>latest</LangVersion>
@@ -21,8 +21,8 @@
     </PropertyGroup>
     
     <ItemGroup>
-        <PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
-        <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="6.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/source/test/Slackbot.Net.SlackClients.Http.Tests/Slackbot.Net.SlackClients.Http.Tests.csproj b/source/test/Slackbot.Net.SlackClients.Http.Tests/Slackbot.Net.SlackClients.Http.Tests.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <IsPackable>false</IsPackable>
         <RootNamespace>Slackbot.Net.Tests</RootNamespace>
         <ImplicitUsings>enable</ImplicitUsings>
@@ -10,7 +10,7 @@
 
     <ItemGroup>
         <PackageReference Include="FakeItEasy" Version="5.1.1" />
-        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
         <PackageReference Include="xunit" Version="2.4.1" />
         <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />

Original file line number	Diff line number	Diff line change
`@@ -17,8 +17,8 @@ internal class SlackbotEventsAuthenticationAuthenticationHandler : Authenticatio`
`17`	`17`	`private readonly string _signingSecret;`
`18`	`18`
`19`	`19`	`public SlackbotEventsAuthenticationAuthenticationHandler(`
`20`		`- IOptionsMonitor<SlackbotEventsAuthenticationOptions> options, ILoggerFactory logger, UrlEncoder encoder,`
`21`		`- ISystemClock clock) : base(options, logger, encoder, clock)`
	`20`	`+ IOptionsMonitor<SlackbotEventsAuthenticationOptions> options, ILoggerFactory logger, UrlEncoder encoder)`
	`21`	`+ : base(options, logger, encoder)`
`22`	`22`	`{`
`23`	`23`	`if (string.IsNullOrEmpty(options.CurrentValue.SigningSecret))`
`24`	`24`	`throw new ArgumentNullException(nameof(SlackbotEventsAuthenticationOptions.SigningSecret));`
`@@ -94,4 +94,4 @@ private string GeneratedSignature(long timestamp, string body)`
`94`	`94`
`95`	`95`	`return builder.ToString();`
`96`	`96`	`}`
`97`		`-}`
	`97`	`+}`