Merge branch 'dev' into main

Color-Chan · Nov 15, 2023 · 272bb12 · 272bb12
2 parents 4adc7a6 + 7d10579
commit 272bb12
Show file tree

Hide file tree

Showing 69 changed files with 107 additions and 193 deletions.
diff --git a/.github/README.md b/.github/README.md
@@ -81,8 +81,8 @@ Color-Chan.Discord is a powerful Discord library made to communicate with the [D
 
 ### Built With
 
-* [.NET 7](https://dotnet.microsoft.com/download/dotnet/7.0)
-* [ASP.NET](https://docs.microsoft.com/en-us/aspnet/core/?view=aspnetcore-7.0)
+* [.NET 8](https://dotnet.microsoft.com/download/dotnet/8.0)
+* [ASP.NET](https://docs.microsoft.com/en-us/aspnet/core/?view=aspnetcore-8.0)
 
 
 <!-- GETTING STARTED -->
@@ -93,8 +93,8 @@ To get a local copy up and running follow these simple steps.
 
 ### Prerequisites
 
-* [.NET 7](https://dotnet.microsoft.com/download/dotnet/7.0)
-* [ASP.NET](https://docs.microsoft.com/en-us/aspnet/core/?view=aspnetcore-7.0)
+* [.NET 8](https://dotnet.microsoft.com/download/dotnet/8.0)
+* [ASP.NET](https://docs.microsoft.com/en-us/aspnet/core/?view=aspnetcore-8.0)
 
 ### Installation
 

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -14,7 +14,7 @@ jobs:
       - name: Setup .NET SDK
         uses: actions/setup-dotnet@v3
         with:
-         dotnet-version: 7.0.x
+         dotnet-version: 8.0.x
 
       - name: Install dependencies
         run: dotnet restore

diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -17,7 +17,7 @@ jobs:
       - name: Setup .NET SDK
         uses: actions/setup-dotnet@v3
         with:
-         dotnet-version: 7.0.x
+         dotnet-version: 8.0.x
 
       - name: Install dependencies
         run: dotnet restore

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -16,7 +16,7 @@ jobs:
     - name: Setup .NET SDK
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 7.0.x
+        dotnet-version: 8.0.x
 
     - name: Set VERSION variable from tag
       run: echo "VERSION=${GITHUB_REF/refs\/tags\/v/}" >> $GITHUB_ENV

diff --git a/samples/ButtonArgs/ButtonArgs.csproj b/samples/ButtonArgs/ButtonArgs.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <Nullable>enable</Nullable>
         <IsPackable>false</IsPackable>
       <UserSecretsId>3c72aee8-c02f-4ad5-9bf6-6bf2cd2be934</UserSecretsId>

diff --git a/samples/ButtonArgs/Dockerfile b/samples/ButtonArgs/Dockerfile
@@ -1,5 +1,5 @@
 # Setup base image
-FROM mcr.microsoft.com/dotnet/sdk:7.0-alpine AS base
+FROM mcr.microsoft.com/dotnet/sdk:8.0-alpine AS base
 
 LABEL maintainer="BrammyS <https://github.com/BrammyS>"
 LABEL org.label-schema.name="ButtonArgs"
@@ -11,18 +11,18 @@ COPY . .
 WORKDIR /samples/ButtonArgs
 
 # Restore dependencies
-RUN dotnet restore "ButtonArgs.csproj"  --runtime alpine-x64
+RUN dotnet restore "ButtonArgs.csproj"  --runtime linux-musl-x64
 
 # Publish the application
 RUN dotnet publish "ButtonArgs.csproj" \
     -c Release -o /app/publish \
     --no-restore \
-    --runtime alpine-x64 \
+    --runtime linux-musl-x64 \
     --self-contained true \
     /p:PublishSingleFile=true
 
 # Setup final runtime image
-FROM mcr.microsoft.com/dotnet/runtime-deps:7.0-alpine AS final
+FROM mcr.microsoft.com/dotnet/runtime-deps:8.0-alpine AS final
 
 # Create a user to run the application
 RUN adduser --disabled-password \

diff --git a/samples/HelloWorldButton/Dockerfile b/samples/HelloWorldButton/Dockerfile
@@ -1,5 +1,5 @@
 # Setup base image
-FROM mcr.microsoft.com/dotnet/sdk:7.0-alpine AS base
+FROM mcr.microsoft.com/dotnet/sdk:8.0-alpine AS base
 
 LABEL maintainer="BrammyS <https://github.com/BrammyS>"
 LABEL org.label-schema.name="HelloWorldButton"
@@ -11,18 +11,18 @@ COPY . .
 WORKDIR /samples/HelloWorldButton
 
 # Restore dependencies
-RUN dotnet restore "HelloWorldButton.csproj"  --runtime alpine-x64
+RUN dotnet restore "HelloWorldButton.csproj"  --runtime linux-musl-x64
 
 # Publish the application
 RUN dotnet publish "HelloWorldButton.csproj" \
     -c Release -o /app/publish \
     --no-restore \
-    --runtime alpine-x64 \
+    --runtime linux-musl-x64 \
     --self-contained true \
     /p:PublishSingleFile=true
 
 # Setup final runtime image
-FROM mcr.microsoft.com/dotnet/runtime-deps:7.0-alpine AS final
+FROM mcr.microsoft.com/dotnet/runtime-deps:8.0-alpine AS final
 
 # Create a user to run the application
 RUN adduser --disabled-password \

diff --git a/samples/HelloWorldButton/HelloWorldButton.csproj b/samples/HelloWorldButton/HelloWorldButton.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <Nullable>enable</Nullable>
         <IsPackable>false</IsPackable>
       <UserSecretsId>fe482994-aceb-4c88-a9fe-9a5a2f516974</UserSecretsId>

diff --git a/samples/Pong/Dockerfile b/samples/Pong/Dockerfile
@@ -1,5 +1,5 @@
 # Setup base image
-FROM mcr.microsoft.com/dotnet/sdk:7.0-alpine AS base
+FROM mcr.microsoft.com/dotnet/sdk:8.0-alpine AS base
 
 LABEL maintainer="BrammyS <https://github.com/BrammyS>"
 LABEL org.label-schema.name="Pong"
@@ -11,18 +11,18 @@ COPY . .
 WORKDIR /samples/Pong
 
 # Restore dependencies
-RUN dotnet restore "Pong.csproj"  --runtime alpine-x64
+RUN dotnet restore "Pong.csproj"  --runtime linux-musl-x64
 
 # Publish the application
 RUN dotnet publish "Pong.csproj" \
     -c Release -o /app/publish \
     --no-restore \
-    --runtime alpine-x64 \
+    --runtime linux-musl-x64 \
     --self-contained true \
     /p:PublishSingleFile=true
 
 # Setup final runtime image
-FROM mcr.microsoft.com/dotnet/runtime-deps:7.0-alpine AS final
+FROM mcr.microsoft.com/dotnet/runtime-deps:8.0-alpine AS final
 
 # Create a user to run the application
 RUN adduser --disabled-password \

diff --git a/samples/Pong/Pong.csproj b/samples/Pong/Pong.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <Nullable>enable</Nullable>
         <IsPackable>false</IsPackable>
       <UserSecretsId>83cbda5f-eb93-49b2-8ee5-0ab83422e142</UserSecretsId>

diff --git a/samples/RoleManager/Dockerfile b/samples/RoleManager/Dockerfile
@@ -1,5 +1,5 @@
 # Setup base image
-FROM mcr.microsoft.com/dotnet/sdk:7.0-alpine AS base
+FROM mcr.microsoft.com/dotnet/sdk:8.0-alpine AS base
 
 LABEL maintainer="BrammyS <https://github.com/BrammyS>"
 LABEL org.label-schema.name="RoleManager"
@@ -11,18 +11,18 @@ COPY . .
 WORKDIR /samples/RoleManager
 
 # Restore dependencies
-RUN dotnet restore "RoleManager.csproj"  --runtime alpine-x64
+RUN dotnet restore "RoleManager.csproj"  --runtime linux-musl-x64
 
 # Publish the application
 RUN dotnet publish "RoleManager.csproj" \
     -c Release -o /app/publish \
     --no-restore \
-    --runtime alpine-x64 \
+    --runtime linux-musl-x64 \
     --self-contained true \
     /p:PublishSingleFile=true
 
 # Setup final runtime image
-FROM mcr.microsoft.com/dotnet/runtime-deps:7.0-alpine AS final
+FROM mcr.microsoft.com/dotnet/runtime-deps:8.0-alpine AS final
 
 # Create a user to run the application
 RUN adduser --disabled-password \

diff --git a/samples/RoleManager/RoleManager.csproj b/samples/RoleManager/RoleManager.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <Nullable>enable</Nullable>
         <IsPackable>false</IsPackable>
       <UserSecretsId>72f45dfc-6b7d-4fd4-a992-4b8055771ed5</UserSecretsId>

diff --git a/src/Color-Chan.Discord.Caching/Color-Chan.Discord.Caching.csproj b/src/Color-Chan.Discord.Caching/Color-Chan.Discord.Caching.csproj
@@ -1,22 +1,22 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <RootNamespace>Color_Chan.Discord.Caching</RootNamespace>
         <Nullable>enable</Nullable>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="7.0.0"/>
-        <PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="7.0.11"/>
-        <PackageReference Include="Microsoft.Extensions.Options" Version="7.0.1"/>
+        <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="8.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Options" Version="8.0.0" />
     </ItemGroup>
 
     <PropertyGroup>
         <Title>Color-Chan.Discord.Chaching</Title>
         <Authors>BrammyS</Authors>
         <Copyright>BrammyS 2021</Copyright>
-        <Description>A Discord library made for slash commands. Using Discord webhooks and .NET 5.</Description>
+        <Description>A Discord library made for slash commands. Using Discord webhooks and .NET 8.</Description>
 
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
         <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>

diff --git a/src/Color-Chan.Discord.Commands/Color-Chan.Discord.Commands.csproj b/src/Color-Chan.Discord.Commands/Color-Chan.Discord.Commands.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <RootNamespace>Color_Chan.Discord.Commands</RootNamespace>
         <Nullable>enable</Nullable>
     </PropertyGroup>
@@ -21,7 +21,7 @@
         <Title>Color-Chan.Discord.Commands</Title>
         <Authors>BrammyS</Authors>
         <Copyright>BrammyS 2021</Copyright>
-        <Description>A Discord library made for slash commands. Using Discord webhooks and .NET 5.</Description>
+        <Description>A Discord library made for slash commands. Using Discord webhooks and .NET 8.</Description>
 
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
         <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>

diff --git a/src/Color-Chan.Discord.Core/Color-Chan.Discord.Core.csproj b/src/Color-Chan.Discord.Core/Color-Chan.Discord.Core.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <RootNamespace>Color_Chan.Discord.Core</RootNamespace>
         <Nullable>enable</Nullable>
     </PropertyGroup>
@@ -11,7 +11,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="7.0.11" />
+        <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="8.0.0" />
     </ItemGroup>
 
     <ItemGroup>
@@ -22,7 +22,7 @@
         <Title>Color-Chan.Discord.Core</Title>
         <Authors>BrammyS</Authors>
         <Copyright>BrammyS 2021</Copyright>
-        <Description>A Discord library made for slash commands. Using Discord webhooks and .NET 5.</Description>
+        <Description>A Discord library made for slash commands. Using Discord webhooks and .NET 8.</Description>
 
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
         <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>

diff --git a/src/Color-Chan.Discord.Rest/Color-Chan.Discord.Rest.csproj b/src/Color-Chan.Discord.Rest/Color-Chan.Discord.Rest.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <RootNamespace>Color_Chan.Discord.Rest</RootNamespace>
         <Nullable>enable</Nullable>
     </PropertyGroup>
@@ -24,7 +24,7 @@
         <Title>Color-Chan.Discord.Rest</Title>
         <Authors>BrammyS</Authors>
         <Copyright>BrammyS 2021</Copyright>
-        <Description>A Discord library made for slash commands. Using Discord webhooks and .NET 5.</Description>
+        <Description>A Discord library made for slash commands. Using Discord webhooks and .NET 8.</Description>
 
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
         <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>

diff --git a/src/Color-Chan.Discord/Color-Chan.Discord.csproj b/src/Color-Chan.Discord/Color-Chan.Discord.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <RootNamespace>Color_Chan.Discord</RootNamespace>
         <Nullable>enable</Nullable>
         <Product>Color-Chan.Discord</Product>
@@ -25,7 +25,7 @@
         <Title>Color-Chan.Discord</Title>
         <Authors>BrammyS</Authors>
         <Copyright>BrammyS 2021</Copyright>
-        <Description>A Discord library made for slash commands. Using Discord webhooks and .NET 5.</Description>
+        <Description>A Discord library made for slash commands. Using Discord webhooks and .NET 8.</Description>
 
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
         <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>

diff --git a/tests/Color-Chan.Discord.Caching.Tests/Color-Chan.Discord.Caching.Tests.csproj b/tests/Color-Chan.Discord.Caching.Tests/Color-Chan.Discord.Caching.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <RootNamespace>Color_Chan.Discord.Caching.Tests</RootNamespace>
         <IsPackable>false</IsPackable>
         <Nullable>enable</Nullable>
@@ -10,9 +10,9 @@
     <ItemGroup>
         <PackageReference Include="FluentAssertions" Version="6.12.0"/>
         <PackageReference Include="GitHubActionsTestLogger" Version="2.3.3"/>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2"/>
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0"/>
         <PackageReference Include="Moq" Version="4.20.69"/>
-        <PackageReference Include="nunit" Version="3.13.3"/>
+        <PackageReference Include="nunit" Version="3.14.0"/>
         <PackageReference Include="NUnit3TestAdapter" Version="4.5.0"/>
     </ItemGroup>
 

diff --git a/tests/Color-Chan.Discord.Commands.Tests/Color-Chan.Discord.Commands.Tests.csproj b/tests/Color-Chan.Discord.Commands.Tests/Color-Chan.Discord.Commands.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <RootNamespace>Color_Chan.Discord.Commands.Tests</RootNamespace>
         <Nullable>enable</Nullable>
         <IsPackable>false</IsPackable>
@@ -10,9 +10,9 @@
     <ItemGroup>
         <PackageReference Include="FluentAssertions" Version="6.12.0"/>
         <PackageReference Include="GitHubActionsTestLogger" Version="2.3.3"/>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2"/>
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0"/>
         <PackageReference Include="Moq" Version="4.20.69"/>
-        <PackageReference Include="nunit" Version="3.13.3"/>
+        <PackageReference Include="nunit" Version="3.14.0"/>
         <PackageReference Include="NUnit3TestAdapter" Version="4.5.0"/>
     </ItemGroup>
 

diff --git a/tests/Color-Chan.Discord.Core.Tests/Color-Chan.Discord.Core.Tests.csproj b/tests/Color-Chan.Discord.Core.Tests/Color-Chan.Discord.Core.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <RootNamespace>Color_Chan.Discord.Core.Tests</RootNamespace>
         <Nullable>enable</Nullable>
         <IsPackable>false</IsPackable>
@@ -10,9 +10,9 @@
     <ItemGroup>
         <PackageReference Include="FluentAssertions" Version="6.12.0"/>
         <PackageReference Include="GitHubActionsTestLogger" Version="2.3.3"/>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2"/>
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0"/>
         <PackageReference Include="Moq" Version="4.20.69"/>
-        <PackageReference Include="nunit" Version="3.13.3"/>
+        <PackageReference Include="nunit" Version="3.14.0"/>
         <PackageReference Include="NUnit3TestAdapter" Version="4.5.0"/>
     </ItemGroup>
 

diff --git a/...iscord.Core.Tests/Common/API/DataModels/Application/DiscordApplicationCommandDataTests.cs b/...iscord.Core.Tests/Common/API/DataModels/Application/DiscordApplicationCommandDataTests.cs
@@ -4,6 +4,4 @@
 namespace Color_Chan.Discord.Core.Tests.Common.API.DataModels.Application;
 
 [TestFixture]
-public class DiscordApplicationCommandDataTests : JsonTestBase<DiscordApplicationCommandData>
-{
-}
+public class DiscordApplicationCommandDataTests : JsonTestBase<DiscordApplicationCommandData>;
diff --git a/...Tests/Common/API/DataModels/Application/DiscordApplicationCommandOptionChoiceDataTests.cs b/...Tests/Common/API/DataModels/Application/DiscordApplicationCommandOptionChoiceDataTests.cs
@@ -4,6 +4,4 @@
 namespace Color_Chan.Discord.Core.Tests.Common.API.DataModels.Application;
 
 [TestFixture]
-public class DiscordApplicationCommandOptionChoiceDataTests : JsonTestBase<DiscordApplicationCommandOptionChoiceData>
-{
-}
+public class DiscordApplicationCommandOptionChoiceDataTests : JsonTestBase<DiscordApplicationCommandOptionChoiceData>;