Merge branch 'master' into dependabot/nuget/ImperatorToCK3/Magick.NET…

…-Q16-AnyCPU-14.2.0
ParadoxGameConverters · Nov 20, 2024 · 2b5a4b1 · 2b5a4b1
2 parents 0e168f6 + 42fe736
commit 2b5a4b1
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/Fronter.NET b/Fronter.NET
diff --git a/ImperatorToCK3/ImperatorToCK3.csproj b/ImperatorToCK3/ImperatorToCK3.csproj
@@ -49,7 +49,7 @@
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="SixLabors.ImageSharp" Version="3.1.5"/>
+        <PackageReference Include="SixLabors.ImageSharp" Version="3.1.6"/>
     </ItemGroup>
 
     <ItemGroup>

diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "9.0.100-rc.2.24474.11",
+    "version": "9.0.100",
     "allowPrerelease": true,
     "rollForward": "disable"
   }