Merge branch 'v1.2.1' into main

BrackeysBot · Jun 1, 2023 · 4017495 · 4017495
2 parents d834753 + 1bb8f4e
commit 4017495
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 20 deletions.
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -14,9 +14,9 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Setup .NET
-      uses: actions/setup-dotnet@v1
+      uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: 7.0.x
     - name: Add NuGet source
       run: dotnet nuget add source --username oliverbooth --password ${{ secrets.GITHUB_TOKEN }} --store-password-in-clear-text --name github "https://nuget.pkg.github.com/oliverbooth/index.json"
     - name: Restore dependencies

diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml
@@ -15,9 +15,9 @@ jobs:
       uses: actions/checkout@v3
 
     - name: Setup .NET
-      uses: actions/setup-dotnet@v2
+      uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: 7.0.x
 
     - name: Add GitHub NuGet source
       run: dotnet nuget add source --username oliverbooth --password ${{ secrets.GITHUB_TOKEN }} --store-password-in-clear-text --name github "https://nuget.pkg.github.com/oliverbooth/index.json"

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -15,9 +15,9 @@ jobs:
       uses: actions/checkout@v3
 
     - name: Setup .NET
-      uses: actions/setup-dotnet@v2
+      uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: 7.0.x
 
     - name: Add GitHub NuGet source
       run: dotnet nuget add source --username oliverbooth --password ${{ secrets.GITHUB_TOKEN }} --store-password-in-clear-text --name github "https://nuget.pkg.github.com/oliverbooth/index.json"

diff --git a/Cloak/Cloak.csproj b/Cloak/Cloak.csproj
@@ -2,11 +2,11 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net7.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
-        <VersionPrefix>1.2.0</VersionPrefix>
+        <VersionPrefix>1.2.1</VersionPrefix>
     </PropertyGroup>
 
     <PropertyGroup Condition="'$(VersionSuffix)' != '' And '$(BuildNumber)' == ''">
@@ -28,20 +28,20 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="DSharpPlus" Version="4.4.0-nightly-01453"/>
-        <PackageReference Include="DSharpPlus.SlashCommands" Version="4.4.0-nightly-01453"/>
+        <PackageReference Include="DSharpPlus" Version="4.4.1"/>
+        <PackageReference Include="DSharpPlus.SlashCommands" Version="4.4.1"/>
         <PackageReference Include="Humanizer.Core" Version="2.14.1"/>
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.4">
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.5">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.4"/>
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.5"/>
         <PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1"/>
-        <PackageReference Include="NLog" Version="5.1.2"/>
-        <PackageReference Include="NLog.Extensions.Logging" Version="5.2.2"/>
-        <PackageReference Include="X10D" Version="3.2.0-nightly.165"/>
-        <PackageReference Include="X10D.DSharpPlus" Version="3.2.0-nightly.165"/>
-        <PackageReference Include="X10D.Hosting" Version="3.2.0-nightly.165"/>
+        <PackageReference Include="NLog" Version="5.2.0"/>
+        <PackageReference Include="NLog.Extensions.Logging" Version="5.3.0"/>
+        <PackageReference Include="X10D" Version="3.2.0"/>
+        <PackageReference Include="X10D.DSharpPlus" Version="3.2.0"/>
+        <PackageReference Include="X10D.Hosting" Version="3.2.0"/>
     </ItemGroup>
 
     <ItemGroup>

diff --git a/Dockerfile b/Dockerfile
@@ -1,7 +1,7 @@
-FROM mcr.microsoft.com/dotnet/runtime:6.0 AS base
+FROM mcr.microsoft.com/dotnet/runtime:7.0 AS base
 WORKDIR /app
 
-FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
+FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build
 WORKDIR /src
 COPY ["Cloak/Cloak.csproj", "Cloak/"]
 RUN dotnet restore "Cloak/Cloak.csproj"

diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "6.0.0",
+    "version": "7.0.0",
     "rollForward": "latestMinor",
     "allowPrerelease": false
   }