From ebb982f63b89ba6a4238ab6ac07d08fd4dec2966 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 17 Dec 2024 18:58:19 +0000 Subject: [PATCH 01/11] Bump xunit.runner.visualstudio from 3.0.0-pre.49 to 3.0.0 in /ImperatorToCK3.UnitTests (#2369) Bumps [xunit.runner.visualstudio](https://github.com/xunit/visualstudio.xunit) from 3.0.0-pre.49 to 3.0.0.
Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=xunit.runner.visualstudio&package-manager=nuget&previous-version=3.0.0-pre.49&new-version=3.0.0)](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.UnitTests/ImperatorToCK3.UnitTests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ImperatorToCK3.UnitTests/ImperatorToCK3.UnitTests.csproj b/ImperatorToCK3.UnitTests/ImperatorToCK3.UnitTests.csproj index 9fd9e02e0..d459dc315 100644 --- a/ImperatorToCK3.UnitTests/ImperatorToCK3.UnitTests.csproj +++ b/ImperatorToCK3.UnitTests/ImperatorToCK3.UnitTests.csproj @@ -19,7 +19,7 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive all From 4e7cd95fb64cf7c0eaaef6398df7631b58de5aa6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 18 Dec 2024 09:03:58 +0100 Subject: [PATCH 02/11] Bump Roslynator.Analyzers from 4.12.9 to 4.12.10 in /ImperatorToCK3 (#2370) Bumps [Roslynator.Analyzers](https://github.com/dotnet/roslynator) from 4.12.9 to 4.12.10.
Release notes

Sourced from Roslynator.Analyzers's releases.

v4.12.10

Fixed

Changed

  • Update whitespace formatting rules (PR)
  • Ensure that diagnostics are not reported with zero length (PR)
Changelog

Sourced from Roslynator.Analyzers's changelog.

[4.12.10] - 2024-12-17

Fixed

Changed

  • Update whitespace formatting rules (PR)
  • Ensure that diagnostics are not reported with zero length (PR)
Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=Roslynator.Analyzers&package-manager=nuget&previous-version=4.12.9&new-version=4.12.10)](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 cec530f8b..b0f19d39c 100644 --- a/ImperatorToCK3/ImperatorToCK3.csproj +++ b/ImperatorToCK3/ImperatorToCK3.csproj @@ -45,7 +45,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive From bb15c1834997c6fef0e3f1f9154edd125aad311c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 20 Dec 2024 17:05:48 +0000 Subject: [PATCH 03/11] Bump Fronter.NET from `f8e405d` to `f6b5553` (#2371) Bumps [Fronter.NET](https://github.com/ParadoxGameConverters/Fronter.NET) from `f8e405d` to `f6b5553`.
Commits
  • f6b5553 Bump AWSSDK.S3 from 3.7.410.6 to 3.7.410.9 in /Fronter.NET (#721)
  • 42fca3d Bump Sentry from 4.13.0 to 5.0.0 in /Fronter.NET (#722)
  • 764ea1b Bump Roslynator.Analyzers from 4.12.9 to 4.12.10 in /Fronter.NET (#723)
  • See full diff in compare view

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 f8e405dde..f6b5553a4 160000 --- a/Fronter.NET +++ b/Fronter.NET @@ -1 +1 @@ -Subproject commit f8e405ddeb5b0e57ec08443bff02219a859d3639 +Subproject commit f6b5553a46b9b5b04334b5fae30323cfff268e0d From 091f2cd9f0d12fd87ab19d128fb8b172a5936366 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 22 Dec 2024 15:47:38 +0100 Subject: [PATCH 04/11] Bump Meziantou.Analyzer from 2.0.182 to 2.0.183 in /ImperatorToCK3 (#2372) Bumps [Meziantou.Analyzer](https://github.com/meziantou/Meziantou.Analyzer) from 2.0.182 to 2.0.183.
Release notes

Sourced from Meziantou.Analyzer's releases.

2.0.183

NuGet package: https://www.nuget.org/packages/Meziantou.Analyzer/2.0.183

Full Changelog: https://github.com/meziantou/Meziantou.Analyzer/compare/2.0.182...2.0.183

Commits
  • aa97561 Find token from Xunit.TestContext.Current.CancellationToken
  • See full diff in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=Meziantou.Analyzer&package-manager=nuget&previous-version=2.0.182&new-version=2.0.183)](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 b0f19d39c..1170cdb2b 100644 --- a/ImperatorToCK3/ImperatorToCK3.csproj +++ b/ImperatorToCK3/ImperatorToCK3.csproj @@ -38,7 +38,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive From b63f8f40733944415e6a80c9be4f6c31b2a4480d Mon Sep 17 00:00:00 2001 From: IhateTrains Date: Fri, 27 Dec 2024 03:38:09 +0000 Subject: [PATCH 05/11] Remove mapping from BYZ to e_byzantium (#2378) #patch They are different entities. --- .github/workflows/build.yml | 5 +++++ .github/workflows/build_dev_version.yml | 11 ++++++----- .github/workflows/test.yml | 2 ++ ImperatorToCK3/Data_Files/configurables/title_map.txt | 1 - global.json | 2 +- 5 files changed, 14 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cab99749d..e33a8dec3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,7 +18,12 @@ jobs: - uses: actions/checkout@v4 with: submodules: recursive + - name: "List installed dotnet SDKs" + if: matrix.os == 'Windows' + run: dotnet --list-sdks - name: "Setup Dotnet for use with actions" + # don't run on self-hosted Windows + if: ${{ !contains(toJSON(matrix.os), 'windows') || !contains(toJSON(matrix.os), 'self-hosted') }} uses: actions/setup-dotnet@v4 with: global-json-file: global.json diff --git a/.github/workflows/build_dev_version.yml b/.github/workflows/build_dev_version.yml index 18b4e5914..fe9b14048 100644 --- a/.github/workflows/build_dev_version.yml +++ b/.github/workflows/build_dev_version.yml @@ -55,7 +55,8 @@ jobs: - name: "Setup Dotnet for use with actions" uses: actions/setup-dotnet@v4 with: - global-json-file: Fronter.NET/global.json + #global-json-file: Fronter.NET/global.json + global-json-file: global.json - name: "Replace frontend background image" run: | rm Fronter.NET/Fronter.NET/Assets/Images/background.png @@ -69,10 +70,10 @@ jobs: BACKBLAZE_KEY_ID: ${{ secrets.BACKBLAZE_KEY_ID }} BACKBLAZE_APPLICATION_KEY: ${{ secrets.BACKBLAZE_APPLICATION_KEY }} BACKBLAZE_BUCKET_ID: ${{ secrets.BACKBLAZE_BUCKET_ID }} - - name: Setup Dotnet for use with actions - uses: actions/setup-dotnet@v4 - with: - global-json-file: global.json + # - name: Setup Dotnet for use with actions + # uses: actions/setup-dotnet@v4 + # with: + # global-json-file: global.json - name: "Build backend" working-directory: ImperatorToCK3 run: | diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 38b5d6970..d5cdf5e2c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -46,6 +46,8 @@ jobs: fetch-depth: 0 submodules: recursive - name: "Setup Dotnet for use with actions" + # don't run on self-hosted Windows + if: ${{ !contains(toJSON(matrix.os), 'windows') || !contains(toJSON(matrix.os), 'self-hosted') }} uses: actions/setup-dotnet@v4 with: global-json-file: global.json diff --git a/ImperatorToCK3/Data_Files/configurables/title_map.txt b/ImperatorToCK3/Data_Files/configurables/title_map.txt index 4e5a48841..7f4f7bd4b 100644 --- a/ImperatorToCK3/Data_Files/configurables/title_map.txt +++ b/ImperatorToCK3/Data_Files/configurables/title_map.txt @@ -18,7 +18,6 @@ link = { ir = CRT ck3 = k_krete rank = k } link = { ir = KNO ck3 = k_krete rank = k } link = { ir = EPI ck3 = k_epirus rank = k } -link = { ir = BYZ ck3 = e_byzantium rank = e } # Asia Minor diff --git a/global.json b/global.json index c04775c81..e2cedb46b 100644 --- a/global.json +++ b/global.json @@ -2,6 +2,6 @@ "sdk": { "version": "9.0.100", "allowPrerelease": true, - "rollForward": "latestPatch" + "rollForward": "disable" } } From 71c7c38f9a9c201f320cde3d98371b599e5ba2e3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 27 Dec 2024 03:45:56 +0000 Subject: [PATCH 06/11] Bump Meziantou.Analyzer from 2.0.183 to 2.0.184 in /ImperatorToCK3 (#2376) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [Meziantou.Analyzer](https://github.com/meziantou/Meziantou.Analyzer) from 2.0.183 to 2.0.184.
Release notes

Sourced from Meziantou.Analyzer's releases.

2.0.184

NuGet package: https://www.nuget.org/packages/Meziantou.Analyzer/2.0.184

What's Changed

Full Changelog: https://github.com/meziantou/Meziantou.Analyzer/compare/2.0.183...2.0.184

Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=Meziantou.Analyzer&package-manager=nuget&previous-version=2.0.183&new-version=2.0.184)](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 1170cdb2b..3340b8f02 100644 --- a/ImperatorToCK3/ImperatorToCK3.csproj +++ b/ImperatorToCK3/ImperatorToCK3.csproj @@ -38,7 +38,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive From e944c01d3c068bf2adaca2945cbbd8c25f707ec9 Mon Sep 17 00:00:00 2001 From: IhateTrains Date: Fri, 27 Dec 2024 04:15:49 +0000 Subject: [PATCH 07/11] Compatch for Invictus 1.9 (#2379) closes #2375 --- ImperatorToCK3/Data_Files/configurables/culture_map.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ImperatorToCK3/Data_Files/configurables/culture_map.txt b/ImperatorToCK3/Data_Files/configurables/culture_map.txt index 672ff8c3c..36da8da65 100644 --- a/ImperatorToCK3/Data_Files/configurables/culture_map.txt +++ b/ImperatorToCK3/Data_Files/configurables/culture_map.txt @@ -339,7 +339,7 @@ link = { ck3 = breton @ir_breton_cultures } ## North Germanic (Norse) @ir_norse_cultures = "ir=raumarician ir=suiones ir=scandian ir=norwegian ir=swedish ir=danish" -@ir_all_germanic_cultures = "ir=saxon @ir_vandilian_cultures @ir_all_west_germanic_cultures @ir_norse_cultures" # saxon comes from https://steamcommunity.com/sharedfiles/filedetails/?id=3098496649 +@ir_all_germanic_cultures = "ir=saxon ir=indo_germanic @ir_vandilian_cultures @ir_all_west_germanic_cultures @ir_norse_cultures" # indo_germanic comes from Invictus, saxon comes from https://steamcommunity.com/sharedfiles/filedetails/?id=3098496649 # Finnish is restored because we overwrite Finland and Lapponia through I:R input... From 0734944f7e65f6a39c5a9267c8cc1eb2b691916f Mon Sep 17 00:00:00 2001 From: IhateTrains Date: Fri, 27 Dec 2024 13:37:53 +0000 Subject: [PATCH 08/11] Don't convert forts to feudal holdings in non-capital baronies for tribal realms (#2381) #patch --- ImperatorToCK3.UnitTests/CK3/Provinces/ProvinceTests.cs | 4 +++- ImperatorToCK3/CK3/Provinces/Province.cs | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ImperatorToCK3.UnitTests/CK3/Provinces/ProvinceTests.cs b/ImperatorToCK3.UnitTests/CK3/Provinces/ProvinceTests.cs index 17fc7d421..26ac43208 100644 --- a/ImperatorToCK3.UnitTests/CK3/Provinces/ProvinceTests.cs +++ b/ImperatorToCK3.UnitTests/CK3/Provinces/ProvinceTests.cs @@ -170,14 +170,16 @@ public void SetHoldingLogicWorksCorrectlyForAllGovernmentTypes() { " = { province_rank=city_metropolis holy_site=69 fort=yes }", " = { province_rank=city_metropolis fort=yes }", " = { province_rank=city_metropolis }", + " = { province_rank=settlement fort=yes}", " = { province_rank=settlement }", }); ck3Provinces = GetCK3ProvincesForIRGovernment(irProvinces, "tribal_federation"); holdingTypes = ck3Provinces.Select(p => p.GetHoldingType(ck3BookmarkDate)); holdingTypes.Should().Equal( "church_holding", - "castle_holding", + "city_holding", // For non-capital baronies of tribal realms, forts are not converted to castles. "city_holding", + "none", // For non-capital baronies of tribal realms, forts are not converted to castles. "none" ); } diff --git a/ImperatorToCK3/CK3/Provinces/Province.cs b/ImperatorToCK3/CK3/Provinces/Province.cs index 56752f25f..32fae4f06 100644 --- a/ImperatorToCK3/CK3/Provinces/Province.cs +++ b/ImperatorToCK3/CK3/Provinces/Province.cs @@ -258,7 +258,7 @@ private void SetHoldingFromImperator(Title.LandedTitles landedTitles) { } => "church_holding", { IsCountyCapital: false, - GovernmentType: GovernmentType.monarchy or GovernmentType.tribal, + GovernmentType: GovernmentType.monarchy, Fort: true } => "castle_holding", { From 13c219029a962ba56710c8b922ea534be32acb19 Mon Sep 17 00:00:00 2001 From: IhateTrains Date: Fri, 27 Dec 2024 16:52:15 +0000 Subject: [PATCH 09/11] Don't use actions/setup-dotnet in integration_tests.yml (#2382) --- .github/workflows/integration_tests.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml index 5ff3f74f6..882a54bd5 100644 --- a/.github/workflows/integration_tests.yml +++ b/.github/workflows/integration_tests.yml @@ -31,10 +31,10 @@ jobs: ls "C:\Users\Administrator\Documents\Paradox Interactive\Imperator" ls "C:\Users\Administrator\Documents\Paradox Interactive\Imperator\mod" ls "C:\Users\Administrator\Documents\Paradox Interactive\Crusader Kings III\mod" - - name: "Setup Dotnet for use with actions" - uses: actions/setup-dotnet@v4 - with: - global-json-file: global.json + # - name: "Setup Dotnet for use with actions" + # uses: actions/setup-dotnet@v4 + # with: + # global-json-file: global.json - name: "Build converter backend" working-directory: ImperatorToCK3 run: | From 9b6fa901e55dbfdd8d9c9d32a3a605bb2b736671 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 27 Dec 2024 18:25:05 +0100 Subject: [PATCH 10/11] Bump Fronter.NET from `f6b5553` to `ff27b14` (#2383) Bumps [Fronter.NET](https://github.com/ParadoxGameConverters/Fronter.NET) from `f6b5553` to `ff27b14`.
Commits
  • ff27b14 Bump Meziantou.Analyzer from 2.0.183 to 2.0.184 in /Fronter.NET (#731)
  • 86e094b Bump AWSSDK.S3 from 3.7.410.9 to 3.7.410.10 in /Fronter.NET (#729)
  • 91655a0 Don't use actions/setup-dotnet on self-hosted Windows (#732)
  • 1900669 Bump Updater from 6d5e591 to f1c8abb (#730)
  • bca793b Bump xunit.runner.visualstudio from 2.8.2 to 3.0.0 in /Fronter.NET.Tests (#725)
  • 8cdfe8d Bump Meziantou.Analyzer from 2.0.182 to 2.0.183 in /Fronter.NET (#728)
  • See full diff in compare view

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 f6b5553a4..ff27b14da 160000 --- a/Fronter.NET +++ b/Fronter.NET @@ -1 +1 @@ -Subproject commit f6b5553a46b9b5b04334b5fae30323cfff268e0d +Subproject commit ff27b14da29d337643165ecc6cde2e985e10bc58 From 60e746b78e259f0e686e352f4531ced1fb2145ac Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 28 Dec 2024 07:48:16 +0000 Subject: [PATCH 11/11] Bump Magick.NET-Q16-AnyCPU from 14.2.0 to 14.3.0 in /ImperatorToCK3 (#2384) Bumps [Magick.NET-Q16-AnyCPU](https://github.com/dlemstra/Magick.NET) from 14.2.0 to 14.3.0.
Release notes

Sourced from Magick.NET-Q16-AnyCPU's releases.

Magick.NET 14.3.0

What's Changed

  • Make sure FrameCount is 1 when reading a MagickImage (#1761).
  • Make the constructor of ColorProfile that has a name obsolete and only use icc as the name in the future.
  • Fixed memory leak with the return value of MagickImage.FormatExpression.
  • Added missing interface inheritance (#1776).
  • Created Magick.NET.AvaloniaMediaImaging (#1743).

Related changes in ImageMagick since the last release of Magick.NET:

  • Make sure we can write jpeg files with an exif profile that has a length of 65533 (#1764).
  • Move jpeg specific exif detection of profiles with the name app1 to a more generic spot (#1766).

Library updates:

  • ImageMagick 7.1.1-43 (2024-12-22)
  • aom 3.11.0 (2024-11-14)
  • heif 1.19.5 (2024-11-19)
  • jpeg-xl 0.11.1 (2024-11-26)
  • pixman 0.44.2 (2024-12-03)
  • xml 2.13.5 (2024-11-12)

Full Changelog: https://github.com/dlemstra/Magick.NET/compare/14.2.0...14.3.0

Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=Magick.NET-Q16-AnyCPU&package-manager=nuget&previous-version=14.2.0&new-version=14.3.0)](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 3340b8f02..862d04396 100644 --- a/ImperatorToCK3/ImperatorToCK3.csproj +++ b/ImperatorToCK3/ImperatorToCK3.csproj @@ -37,7 +37,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive