Merge pull request #303 from Aiko-IT-Systems/re-enable-net6

feat: re-enable net6

Author: Lulalaby

.github/workflows/build.yml

@@ -16,11 +16,10 @@ env:
 
 jobs:
   build:
-    timeout-minutes: 6
+    timeout-minutes: 15
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest]
-        dotnet: [7.0.203]
     runs-on: ${{ matrix.os }}
     name: Build library
     steps:
@@ -29,7 +28,9 @@ jobs:
     - name: Setup .NET
       uses: actions/[email protected]
       with:
-        dotnet-version: ${{ matrix.dotnet }}
+        dotnet-version: |
+          7.0.203
+          6.x
     - name: Build library
       run: dotnet build -c Release -v normal DisCatSharp.sln
     - name: Test library

.github/workflows/codeql-analysis.yml

@@ -30,6 +30,6 @@ jobs:
         languages: ${{ matrix.language }}
     - name: Build
       run: |
-        dotnet build -c Release -v minimal -f net7.0 --no-self-contained DisCatSharp.sln
+        dotnet build -c Release -v minimal --no-self-contained DisCatSharp.sln
     - name: Perform CodeQL Analysis
       uses: github/codeql-action/analyze@v2

.github/workflows/documentation.yml

@@ -10,7 +10,7 @@ env:
 
 jobs:
   build:
-    timeout-minutes: 30
+    timeout-minutes: 25
     runs-on: ubuntu-latest
     name: Build documentation
     steps:
@@ -29,7 +29,8 @@ jobs:
     - name: Restore packages
       run: dotnet restore DisCatSharp.sln
     - name: Build library
-      run: dotnet build -c Release --no-restore -v minimal DisCatSharp.sln
+      run: dotnet build -c Release --no-restore -v minimal -f net7.0 DisCatSharp.sln
+      timeout-minutes: 7
       continue-on-error: true
     - name: Add Custom Plugins
       run: cp -R DisCatSharp.Docs/dcs/plugins/* /home/runner/.dotnet/tools/.store/docfx/2.67.0/docfx/2.67.0/tools/net7.0/any/

.github/workflows/documentation_test.yml

@@ -12,7 +12,7 @@ env:
 
 jobs:
   build:
-    timeout-minutes: 15
+    timeout-minutes: 20
     runs-on: ubuntu-latest
     name: Build documentation
     steps:
@@ -30,8 +30,8 @@ jobs:
     - name: Restore packages
       run: dotnet restore DisCatSharp.sln
     - name: Build library
-      run: dotnet build -c Release -v minimal --no-restore DisCatSharp.sln
-      timeout-minutes: 3
+      run: dotnet build -c Release -v minimal -f net7.0 --no-restore DisCatSharp.sln
+      timeout-minutes: 7
       continue-on-error: true
     - name: Add Custom Plugins
       run: cp -R DisCatSharp.Docs/dcs/plugins/* /home/runner/.dotnet/tools/.store/docfx/2.67.0/docfx/2.67.0/tools/net7.0/any/

.github/workflows/release.yml

@@ -20,7 +20,7 @@ env:
 
 jobs:
   release:
-    timeout-minutes: 30
+    timeout-minutes: 15
     runs-on: windows-latest
     name: Build library and release
     steps:
@@ -29,7 +29,9 @@ jobs:
       - name: Setup .NET
         uses: actions/[email protected]
         with:
-          dotnet-version: 7.0.203
+          dotnet-version: |
+            7.0.203
+            6.x
       - name: Restore dependencies
         run: dotnet restore DisCatSharp.sln
       - name: Build library as full release

DisCatSharp.ApplicationCommands/DisCatSharp.ApplicationCommands.csproj

@@ -21,7 +21,7 @@ Use it on top of your DisCatSharp powered bot and unleash the power of applicati
 
 Documentation: https://docs.discatsharp.tech/articles/modules/application_commands/intro.html
 	</Description>
-	<PackageTags>DisCatSharp,Discord API Wrapper,Discord,Bots,Discord Bots,AITSYS,Net7,Application Commands,Context Menu Commands</PackageTags>
+	<PackageTags>DisCatSharp,Discord API Wrapper,Discord,Bots,Discord Bots,AITSYS,Net6,Net7,Application Commands,Context Menu Commands</PackageTags>
   </PropertyGroup>
 
   <ItemGroup>

DisCatSharp.CommandsNext/DisCatSharp.CommandsNext.csproj

@@ -22,7 +22,7 @@ Allow your users to use text commands in your bot.
 Note: Requires the Message Content Intent enabled for your discord application.
 Documentation: https://docs.discatsharp.tech/articles/modules/commandsnext/intro.html
 	</Description>
-	<PackageTags>DisCatSharp,Discord API Wrapper,Discord,Bots,Discord Bots,AITSYS,Net7,Text Commands</PackageTags>
+	<PackageTags>DisCatSharp,Discord API Wrapper,Discord,Bots,Discord Bots,AITSYS,Net6,Net7,Text Commands</PackageTags>
   </PropertyGroup>
 
   <ItemGroup>

DisCatSharp.Common/DisCatSharp.Common.csproj

@@ -22,7 +22,7 @@ DisCatSharp Common Extension
 
 Common tools for DisCatSharp, like regexes and converters!
 	</Description>
-	<PackageTags>DisCatSharp,Discord API Wrapper,Discord,Bots,Discord Bots,AITSYS,Net7,Common Tools</PackageTags>
+	<PackageTags>DisCatSharp,Discord API Wrapper,Discord,Bots,Discord Bots,AITSYS,Net6,Net7,Common Tools</PackageTags>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 

DisCatSharp.Configuration/DisCatSharp.Configuration.csproj

@@ -16,7 +16,7 @@
     <PropertyGroup>
       <PackageId>DisCatSharp.Configuration</PackageId>
       <Description>Configuration for the DisCatSharp Hosting Extension.</Description>
-	<PackageTags>DisCatSharp,Discord API Wrapper,Discord,Bots,Discord Bots,AITSYS,Net7,Hosting,Web,Configuration</PackageTags>
+	<PackageTags>DisCatSharp,Discord API Wrapper,Discord,Bots,Discord Bots,AITSYS,Net6,Net7,Hosting,Web,Configuration</PackageTags>
     </PropertyGroup>
 
     <ItemGroup>

DisCatSharp.Experimental/DisCatSharp.Experimental.csproj

@@ -19,7 +19,7 @@
 
 	  Experimental changes for DisCatSharp.
 	</Description>
-	<PackageTags>DisCatSharp,Experimental,Discord API Wrapper,Discord,Bots,Discord Bots,AITSYS,Net7</PackageTags>
+	<PackageTags>DisCatSharp,Experimental,Discord API Wrapper,Discord,Bots,Discord Bots,AITSYS,Net6,Net7</PackageTags>
   </PropertyGroup>
 
   <ItemGroup>