From c275f916a1eee609a9acca8b9ef814916808478f Mon Sep 17 00:00:00 2001 From: IhateTrains Date: Wed, 20 Nov 2024 18:28:57 +0100 Subject: [PATCH 1/3] Use .NET SDK 9.0.100 (#2328) --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index 1ca30c7e2..e2cedb46b 100644 --- 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" } From be3a64edf07d3346f982b941d50e8802bed85cf3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 20 Nov 2024 17:31:01 +0000 Subject: [PATCH 2/3] Bump Fronter.NET from `dc056a1` to `4a1e8dc` (#2324) Bumps [Fronter.NET](https://github.com/ParadoxGameConverters/Fronter.NET) from `dc056a1` to `4a1e8dc`.
Commits

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Fronter.NET | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Fronter.NET b/Fronter.NET index dc056a132..4a1e8dc21 160000 --- a/Fronter.NET +++ b/Fronter.NET @@ -1 +1 @@ -Subproject commit dc056a132a99e1a43edd36ae5bb73c64622e2227 +Subproject commit 4a1e8dc21af55e8f4eaaf6365729793405c5218e From 42fe73632c365d3c87bcea18537045d24e432c23 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 20 Nov 2024 17:45:32 +0000 Subject: [PATCH 3/3] Bump SixLabors.ImageSharp from 3.1.5 to 3.1.6 in /ImperatorToCK3 (#2327) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [SixLabors.ImageSharp](https://github.com/SixLabors/ImageSharp) from 3.1.5 to 3.1.6.
Release notes

Sourced from SixLabors.ImageSharp's releases.

v3.1.6

What's Changed

Full Changelog: https://github.com/SixLabors/ImageSharp/compare/v3.1.5...v3.1.6

Commits
  • 313a7e8 Merge pull request #2828 from SixLabors/js/issue-2806
  • c4fd666 Update tests/ImageSharp.Tests/IO/ChunkedMemoryStreamTests.cs
  • c45702d Fix read bug.
  • 6301662 Feedback updates and massively expand write tests
  • b74d2e4 Add WriteByte and optimize ReadByte
  • 03343c4 Simplify and optimize position checking
  • f96f8ca Revert "Update BufferedStreams.cs"
  • 48645f8 Rewrite ChunkedMemoryStream
  • c418bb0 Revert "Remove ChunkedMemoryStream"
  • ee53532 Merge branch 'release/3.1.x' into js/issue-2806
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=SixLabors.ImageSharp&package-manager=nuget&previous-version=3.1.5&new-version=3.1.6)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- ImperatorToCK3/ImperatorToCK3.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ImperatorToCK3/ImperatorToCK3.csproj b/ImperatorToCK3/ImperatorToCK3.csproj index ce328edd7..f6cfe9cbb 100644 --- a/ImperatorToCK3/ImperatorToCK3.csproj +++ b/ImperatorToCK3/ImperatorToCK3.csproj @@ -49,7 +49,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - +