diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 473db4e..aa642c9 100644 --- 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 index e5cf992..c456e0b 100644 --- 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 index 1335718..aa7229e 100644 --- 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 index 8f1c4bc..8be990e 100644 --- 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 index cc0fc49..2027fe9 100644 --- a/Samples/HelloWorld/HelloWorld.csproj +++ b/Samples/HelloWorld/HelloWorld.csproj @@ -1,7 +1,7 @@ - net6.0 + net8.0 false enable latest diff --git a/source/src/Slackbot.Net.Endpoints/Authentication/SlackbotEventsAuthenticationAuthenticationHandler.cs b/source/src/Slackbot.Net.Endpoints/Authentication/SlackbotEventsAuthenticationAuthenticationHandler.cs index 5ff5a47..6aa72ad 100644 --- 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 options, ILoggerFactory logger, UrlEncoder encoder, - ISystemClock clock) : base(options, logger, encoder, clock) + IOptionsMonitor 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(); } -} \ No newline at end of file +} diff --git a/source/src/Slackbot.Net.Endpoints/Slackbot.Net.Endpoints.csproj b/source/src/Slackbot.Net.Endpoints/Slackbot.Net.Endpoints.csproj index a0edb2e..314a2c3 100644 --- a/source/src/Slackbot.Net.Endpoints/Slackbot.Net.Endpoints.csproj +++ b/source/src/Slackbot.Net.Endpoints/Slackbot.Net.Endpoints.csproj @@ -1,7 +1,7 @@ - net6.0 + net8.0 Slackbot.Net.Endpoints enable latest diff --git a/source/src/Slackbot.Net.Shared/Slackbot.Net.Shared.csproj b/source/src/Slackbot.Net.Shared/Slackbot.Net.Shared.csproj index b4d74ff..cf7de18 100644 --- a/source/src/Slackbot.Net.Shared/Slackbot.Net.Shared.csproj +++ b/source/src/Slackbot.Net.Shared/Slackbot.Net.Shared.csproj @@ -1,9 +1,9 @@ - net6.0 + net8.0 enable - latest + latest false 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 index 0f1a432..7882135 100644 --- 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 @@ - net6.0 + net8.0 Slackbot.Net.SlackClients.Http enable latest @@ -21,8 +21,8 @@ - - + + 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 index d9c54cf..607a711 100644 --- 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 @@  - net6.0 + net8.0 false Slackbot.Net.Tests enable @@ -10,7 +10,7 @@ - +