From 57952569d67f9a4ed372825e7a0ad4ef479cee8f Mon Sep 17 00:00:00 2001 From: Vitaly Mikhailov Date: Tue, 17 Aug 2021 13:48:02 +0300 Subject: [PATCH 01/38] Update README.md --- README.md | 48 ++++++++++++++++++++++++++++++++++-------------- 1 file changed, 34 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 3607336b..6658febd 100644 --- a/README.md +++ b/README.md @@ -1,31 +1,51 @@ # Bannerlord.ButterLib

- + +
- - CodeFactor + + + + CodeFactor + + + Code Climate maintainability + + + +
- Test - - + + GitHub Workflow Status (event) + + + GitHub Workflow Status (event) + + + +
- - - + +
- + + - + + - + + - + + - + +

From ee99f400c68545fbf4e19f278c2eba34ac682fce Mon Sep 17 00:00:00 2001 From: Vitaly Mikhailov Date: Wed, 18 Aug 2021 10:46:20 +0300 Subject: [PATCH 02/38] Create dependabot.yml --- .github/dependabot.yml | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 00000000..290b2efa --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,9 @@ +version: 2 +updates: + - package-ecosystem: "nuget" + directory: "/" + schedule: + interval: "daily" + ignore: + - dependency-name: "Newtonsoft.Json" + versions: ["11.0.2"] From 3dd7898e52c8d853f0461598dc58a2cef1d5631a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 18 Aug 2021 07:46:40 +0000 Subject: [PATCH 03/38] Bump Microsoft.NET.Test.Sdk from 16.6.1 to 16.11.0 Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 16.6.1 to 16.11.0. - [Release notes](https://github.com/microsoft/vstest/releases) - [Commits](https://github.com/microsoft/vstest/compare/v16.6.1...v16.11.0) --- updated-dependencies: - dependency-name: Microsoft.NET.Test.Sdk dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .../Bannerlord.ButterLib.Implementation.Tests.csproj | 2 +- .../Bannerlord.ButterLib.Tests.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/Bannerlord.ButterLib.Implementation.Tests/Bannerlord.ButterLib.Implementation.Tests.csproj b/tests/Bannerlord.ButterLib.Implementation.Tests/Bannerlord.ButterLib.Implementation.Tests.csproj index 41ddf7f1..5171e1fa 100644 --- a/tests/Bannerlord.ButterLib.Implementation.Tests/Bannerlord.ButterLib.Implementation.Tests.csproj +++ b/tests/Bannerlord.ButterLib.Implementation.Tests/Bannerlord.ButterLib.Implementation.Tests.csproj @@ -16,7 +16,7 @@ - + diff --git a/tests/Bannerlord.ButterLib.Tests/Bannerlord.ButterLib.Tests.csproj b/tests/Bannerlord.ButterLib.Tests/Bannerlord.ButterLib.Tests.csproj index d991467a..d4346b8a 100644 --- a/tests/Bannerlord.ButterLib.Tests/Bannerlord.ButterLib.Tests.csproj +++ b/tests/Bannerlord.ButterLib.Tests/Bannerlord.ButterLib.Tests.csproj @@ -16,7 +16,7 @@ - + From 789084cfc4099e2f3f175f18887833d46780108b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 18 Aug 2021 07:46:42 +0000 Subject: [PATCH 04/38] Bump IsExternalInit from 1.0.0 to 1.0.1 Bumps [IsExternalInit](https://github.com/manuelroemer/IsExternalInit) from 1.0.0 to 1.0.1. - [Release notes](https://github.com/manuelroemer/IsExternalInit/releases) - [Changelog](https://github.com/manuelroemer/IsExternalInit/blob/master/CHANGELOG.md) - [Commits](https://github.com/manuelroemer/IsExternalInit/commits) --- updated-dependencies: - dependency-name: IsExternalInit dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- src/Bannerlord.ButterLib/Bannerlord.ButterLib.csproj | 2 +- src/Bannerlord.ModuleLoader/Bannerlord.ModuleLoader.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Bannerlord.ButterLib/Bannerlord.ButterLib.csproj b/src/Bannerlord.ButterLib/Bannerlord.ButterLib.csproj index fab26ac3..69e649b8 100644 --- a/src/Bannerlord.ButterLib/Bannerlord.ButterLib.csproj +++ b/src/Bannerlord.ButterLib/Bannerlord.ButterLib.csproj @@ -41,7 +41,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/Bannerlord.ModuleLoader/Bannerlord.ModuleLoader.csproj b/src/Bannerlord.ModuleLoader/Bannerlord.ModuleLoader.csproj index 4280845d..ca39fb55 100644 --- a/src/Bannerlord.ModuleLoader/Bannerlord.ModuleLoader.csproj +++ b/src/Bannerlord.ModuleLoader/Bannerlord.ModuleLoader.csproj @@ -44,7 +44,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive From da5718f2819948ebce35dca507f5e4cc16f542c0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 18 Aug 2021 07:47:40 +0000 Subject: [PATCH 05/38] Bump NUnit3TestAdapter from 3.16.1 to 4.0.0 Bumps [NUnit3TestAdapter](https://github.com/nunit/nunit3-vs-adapter) from 3.16.1 to 4.0.0. - [Release notes](https://github.com/nunit/nunit3-vs-adapter/releases) - [Commits](https://github.com/nunit/nunit3-vs-adapter/compare/V3.16.1...V4.0.0) --- updated-dependencies: - dependency-name: NUnit3TestAdapter dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .../Bannerlord.ButterLib.Implementation.Tests.csproj | 2 +- .../Bannerlord.ButterLib.Tests.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/Bannerlord.ButterLib.Implementation.Tests/Bannerlord.ButterLib.Implementation.Tests.csproj b/tests/Bannerlord.ButterLib.Implementation.Tests/Bannerlord.ButterLib.Implementation.Tests.csproj index 5171e1fa..d394582f 100644 --- a/tests/Bannerlord.ButterLib.Implementation.Tests/Bannerlord.ButterLib.Implementation.Tests.csproj +++ b/tests/Bannerlord.ButterLib.Implementation.Tests/Bannerlord.ButterLib.Implementation.Tests.csproj @@ -17,7 +17,7 @@ - + diff --git a/tests/Bannerlord.ButterLib.Tests/Bannerlord.ButterLib.Tests.csproj b/tests/Bannerlord.ButterLib.Tests/Bannerlord.ButterLib.Tests.csproj index d4346b8a..bb5c79df 100644 --- a/tests/Bannerlord.ButterLib.Tests/Bannerlord.ButterLib.Tests.csproj +++ b/tests/Bannerlord.ButterLib.Tests/Bannerlord.ButterLib.Tests.csproj @@ -17,7 +17,7 @@ - + From 0c372d9d73b5dbedceb6c452f5897ba1afc85591 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 18 Aug 2021 07:47:40 +0000 Subject: [PATCH 06/38] Bump nunit from 3.12.0 to 3.13.2 Bumps [nunit](https://github.com/nunit/nunit) from 3.12.0 to 3.13.2. - [Release notes](https://github.com/nunit/nunit/releases) - [Changelog](https://github.com/nunit/nunit/blob/master/CHANGES.md) - [Commits](https://github.com/nunit/nunit/compare/v3.12...v3.13.2) --- updated-dependencies: - dependency-name: nunit dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .../Bannerlord.ButterLib.Implementation.Tests.csproj | 2 +- .../Bannerlord.ButterLib.Tests.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/Bannerlord.ButterLib.Implementation.Tests/Bannerlord.ButterLib.Implementation.Tests.csproj b/tests/Bannerlord.ButterLib.Implementation.Tests/Bannerlord.ButterLib.Implementation.Tests.csproj index 5171e1fa..e5dca511 100644 --- a/tests/Bannerlord.ButterLib.Implementation.Tests/Bannerlord.ButterLib.Implementation.Tests.csproj +++ b/tests/Bannerlord.ButterLib.Implementation.Tests/Bannerlord.ButterLib.Implementation.Tests.csproj @@ -15,7 +15,7 @@ - + diff --git a/tests/Bannerlord.ButterLib.Tests/Bannerlord.ButterLib.Tests.csproj b/tests/Bannerlord.ButterLib.Tests/Bannerlord.ButterLib.Tests.csproj index d4346b8a..1a3bff58 100644 --- a/tests/Bannerlord.ButterLib.Tests/Bannerlord.ButterLib.Tests.csproj +++ b/tests/Bannerlord.ButterLib.Tests/Bannerlord.ButterLib.Tests.csproj @@ -15,7 +15,7 @@ - + From 6bb263b341d18b3b75f58fc1e415f6590a1bba4b Mon Sep 17 00:00:00 2001 From: Vitaly Mikhailov Date: Wed, 18 Aug 2021 11:07:11 +0300 Subject: [PATCH 07/38] Update Directory.Build.props --- src/Directory.Build.props | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Directory.Build.props b/src/Directory.Build.props index e298e10f..bd559dc1 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -2,5 +2,6 @@ + From 5211271d867ee33135a83b50ae65573da919277b Mon Sep 17 00:00:00 2001 From: Vitaly Mikhailov Date: Wed, 18 Aug 2021 11:37:07 +0300 Subject: [PATCH 08/38] Update dependabot.yml --- .github/dependabot.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 290b2efa..0c44e212 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -6,4 +6,4 @@ updates: interval: "daily" ignore: - dependency-name: "Newtonsoft.Json" - versions: ["11.0.2"] + - dependency-name: "Bannerlord.ReferenceAssemblies.*" From 6faf1b4a4bf67853d99fc25b967a94113850ae67 Mon Sep 17 00:00:00 2001 From: Vitaly Mikhailov Date: Wed, 18 Aug 2021 11:38:28 +0300 Subject: [PATCH 09/38] Update Directory.Build.props --- src/Directory.Build.props | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Directory.Build.props b/src/Directory.Build.props index bd559dc1..78d3a962 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -1,7 +1,6 @@ - - + From 68939cb6636e9a5c715e720975ac4341e339f8d1 Mon Sep 17 00:00:00 2001 From: Vitaly Mikhailov Date: Wed, 18 Aug 2021 11:38:36 +0300 Subject: [PATCH 10/38] Update Directory.Build.targets --- src/Directory.Build.targets | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets index a9142ce4..9555f396 100644 --- a/src/Directory.Build.targets +++ b/src/Directory.Build.targets @@ -1,6 +1,5 @@ - - + From 16111b2f1ba9834e12fb2a2c117ac9825b91807f Mon Sep 17 00:00:00 2001 From: Vitaly Mikhailov Date: Wed, 18 Aug 2021 11:38:47 +0300 Subject: [PATCH 11/38] Update Directory.Build.props --- tests/Directory.Build.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props index e298e10f..78d3a962 100644 --- a/tests/Directory.Build.props +++ b/tests/Directory.Build.props @@ -1,6 +1,6 @@ - - + + From 6dafd9e2c262be850b3668271c928ffa1fba21ee Mon Sep 17 00:00:00 2001 From: Vitaly Mikhailov Date: Wed, 18 Aug 2021 11:38:56 +0300 Subject: [PATCH 12/38] Update Directory.Build.targets --- tests/Directory.Build.targets | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/Directory.Build.targets b/tests/Directory.Build.targets index 03632e9d..583df8eb 100644 --- a/tests/Directory.Build.targets +++ b/tests/Directory.Build.targets @@ -1,6 +1,5 @@ - - + From d3108a85ecbca3fdc7936ab5d576a52bce4a10ba Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 18 Aug 2021 08:39:36 +0000 Subject: [PATCH 13/38] Bump Harmony.Extensions from 2.0.0.39 to 2.0.0.41 Bumps [Harmony.Extensions](https://github.com/BUTR/Harmony.Extensions) from 2.0.0.39 to 2.0.0.41. - [Release notes](https://github.com/BUTR/Harmony.Extensions/releases) - [Commits](https://github.com/BUTR/Harmony.Extensions/commits) --- updated-dependencies: - dependency-name: Harmony.Extensions dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- build/common.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/common.props b/build/common.props index 591f319f..ffeb18bc 100644 --- a/build/common.props +++ b/build/common.props @@ -12,7 +12,7 @@ 1.0.0.33 1.6.1.41 - 2.0.0.39 + 2.0.0.41 From db12b0da393f467365921ab2bd77fc3224c9facc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 18 Aug 2021 08:39:53 +0000 Subject: [PATCH 14/38] Bump Bannerlord.BUTR.Shared from 1.6.1.41 to 1.6.1.45 Bumps [Bannerlord.BUTR.Shared](https://github.com/BUTR/Bannerlord.BUTR.Shared) from 1.6.1.41 to 1.6.1.45. - [Release notes](https://github.com/BUTR/Bannerlord.BUTR.Shared/releases) - [Commits](https://github.com/BUTR/Bannerlord.BUTR.Shared/commits) --- updated-dependencies: - dependency-name: Bannerlord.BUTR.Shared dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- build/common.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/common.props b/build/common.props index 591f319f..1ef42bf0 100644 --- a/build/common.props +++ b/build/common.props @@ -11,7 +11,7 @@ 2.0.0 1.0.0.33 - 1.6.1.41 + 1.6.1.45 2.0.0.39 From e5e16d51c92814bfe2f1d7e8403be135b06d07b3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 18 Aug 2021 08:39:59 +0000 Subject: [PATCH 15/38] Bump Microsoft.NETFramework.ReferenceAssemblies from 1.0.0 to 1.0.2 Bumps [Microsoft.NETFramework.ReferenceAssemblies](https://github.com/Microsoft/dotnet) from 1.0.0 to 1.0.2. - [Release notes](https://github.com/Microsoft/dotnet/releases) - [Commits](https://github.com/Microsoft/dotnet/commits) --- updated-dependencies: - dependency-name: Microsoft.NETFramework.ReferenceAssemblies dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- build/common.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/common.props b/build/common.props index 591f319f..26fd2b06 100644 --- a/build/common.props +++ b/build/common.props @@ -102,7 +102,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive From 008f046122a3e8447b0395ddc7bcbf564044ac56 Mon Sep 17 00:00:00 2001 From: Vitaly Mikhailov Date: Wed, 18 Aug 2021 11:40:50 +0300 Subject: [PATCH 16/38] Update dependabot.yml --- .github/dependabot.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 0c44e212..af5092b6 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -7,3 +7,4 @@ updates: ignore: - dependency-name: "Newtonsoft.Json" - dependency-name: "Bannerlord.ReferenceAssemblies.*" + - dependency-name: "Lib.Harmony" From 484115d7b3fb42f5a29c8c57fcce2ca243fea80a Mon Sep 17 00:00:00 2001 From: Vitaly Mikhailov Date: Wed, 18 Aug 2021 11:42:00 +0300 Subject: [PATCH 17/38] Update dependabot.yml --- .github/dependabot.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index af5092b6..979c0fb1 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -8,3 +8,4 @@ updates: - dependency-name: "Newtonsoft.Json" - dependency-name: "Bannerlord.ReferenceAssemblies.*" - dependency-name: "Lib.Harmony" + - dependency-name: "Microsoft.Extensions.*" From 5982dd276d1097f8e267d92072715d86de9db1f3 Mon Sep 17 00:00:00 2001 From: Vitaly Mikhailov Date: Wed, 18 Aug 2021 16:48:50 +0300 Subject: [PATCH 18/38] Update test.yml --- .github/workflows/test.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 8d15e569..da2b30fb 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -32,6 +32,7 @@ env: DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true # Disable sending .NET CLI telemetry to Microsoft. DOTNET_CLI_TELEMETRY_OPTOUT: true + TEST_FILTERS: "+[Bannerlord.ButterLib*]* -[Bannerlord.ButterLib*.Tests]* -[*]System.Diagnostics.CodeAnalysis* -[*]BUTR.DependencyInjection* -[*]Bannerlord.BUTR.Shared* -[*]HarmonyLib.BUTR*" jobs: test: @@ -111,12 +112,12 @@ jobs: - name: Test Coverage run: >- - opencover/OpenCover.Console.exe -register -target:"dotnet.exe" -targetargs:"test tests/Bannerlord.ButterLib.Tests/Bannerlord.ButterLib.Tests.csproj --configuration Debug --no-build" -filter:"+[Bannerlord.ButterLib*]* -[Bannerlord.ButterLib*.Tests]*" -output:coverage_butterlib_stable_debug.xml -mergebyhash; - opencover/OpenCover.Console.exe -register -target:"dotnet.exe" -targetargs:"test tests/Bannerlord.ButterLib.Tests/Bannerlord.ButterLib.Tests.csproj --configuration Release --no-build" -filter:"+[Bannerlord.ButterLib*]* -[Bannerlord.ButterLib*.Tests]*" -output:coverage_butterlib_stable_release.xml -mergebyhash; - opencover/OpenCover.Console.exe -register -target:"dotnet.exe" -targetargs:"test tests/Bannerlord.ButterLib.Implementation.Tests/Bannerlord.ButterLib.Implementation.Tests.csproj --configuration Stable_Debug --no-build" -filter:"+[Bannerlord.ButterLib*]* -[Bannerlord.ButterLib*.Tests]*" -output:coverage_butterlib_impl_stable_debug.xml -mergebyhash; - opencover/OpenCover.Console.exe -register -target:"dotnet.exe" -targetargs:"test tests/Bannerlord.ButterLib.Implementation.Tests/Bannerlord.ButterLib.Implementation.Tests.csproj --configuration Stable_Release --no-build" -filter:"+[Bannerlord.ButterLib*]* -[Bannerlord.ButterLib*.Tests]*" -output:coverage_butterlib_impl_stable_release.xml -mergebyhash; - opencover/OpenCover.Console.exe -register -target:"dotnet.exe" -targetargs:"test tests/Bannerlord.ButterLib.Implementation.Tests/Bannerlord.ButterLib.Implementation.Tests.csproj --configuration Beta_Debug --no-build" -filter:"+[Bannerlord.ButterLib*]* -[Bannerlord.ButterLib*.Tests]*" -output:coverage_butterlib_impl_beta_debug.xml -mergebyhash; - opencover/OpenCover.Console.exe -register -target:"dotnet.exe" -targetargs:"test tests/Bannerlord.ButterLib.Implementation.Tests/Bannerlord.ButterLib.Implementation.Tests.csproj --configuration Beta_Release --no-build" -filter:"+[Bannerlord.ButterLib*]* -[Bannerlord.ButterLib*.Tests]*" -output:coverage_butterlib_impl_beta_release.xml -mergebyhash; + opencover/OpenCover.Console.exe -register -target:"dotnet.exe" -targetargs:"test tests/Bannerlord.ButterLib.Tests/Bannerlord.ButterLib.Tests.csproj --configuration Debug --no-build" -filter:"${{env.TEST_FILTERS}}" -output:coverage_butterlib_stable_debug.xml -mergebyhash; + opencover/OpenCover.Console.exe -register -target:"dotnet.exe" -targetargs:"test tests/Bannerlord.ButterLib.Tests/Bannerlord.ButterLib.Tests.csproj --configuration Release --no-build" -filter:"${{env.TEST_FILTERS}}" -output:coverage_butterlib_stable_release.xml -mergebyhash; + opencover/OpenCover.Console.exe -register -target:"dotnet.exe" -targetargs:"test tests/Bannerlord.ButterLib.Implementation.Tests/Bannerlord.ButterLib.Implementation.Tests.csproj --configuration Stable_Debug --no-build" -filter:"${{env.TEST_FILTERS}}" -output:coverage_butterlib_impl_stable_debug.xml -mergebyhash; + opencover/OpenCover.Console.exe -register -target:"dotnet.exe" -targetargs:"test tests/Bannerlord.ButterLib.Implementation.Tests/Bannerlord.ButterLib.Implementation.Tests.csproj --configuration Stable_Release --no-build" -filter:"${{env.TEST_FILTERS}}" -output:coverage_butterlib_impl_stable_release.xml -mergebyhash; + opencover/OpenCover.Console.exe -register -target:"dotnet.exe" -targetargs:"test tests/Bannerlord.ButterLib.Implementation.Tests/Bannerlord.ButterLib.Implementation.Tests.csproj --configuration Beta_Debug --no-build" -filter:"${{env.TEST_FILTERS}}" -output:coverage_butterlib_impl_beta_debug.xml -mergebyhash; + opencover/OpenCover.Console.exe -register -target:"dotnet.exe" -targetargs:"test tests/Bannerlord.ButterLib.Implementation.Tests/Bannerlord.ButterLib.Implementation.Tests.csproj --configuration Beta_Release --no-build" -filter:"${{env.TEST_FILTERS}}" -output:coverage_butterlib_impl_beta_release.xml -mergebyhash; shell: pwsh - name: ReportGenerator From c82819a1c9ba8775298878abca3b5f66c2fa1ce4 Mon Sep 17 00:00:00 2001 From: Vitaly Mikhailov Date: Wed, 18 Aug 2021 16:49:30 +0300 Subject: [PATCH 19/38] Update test-full.yml --- .github/workflows/test-full.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test-full.yml b/.github/workflows/test-full.yml index 2c5c1980..26af2437 100644 --- a/.github/workflows/test-full.yml +++ b/.github/workflows/test-full.yml @@ -32,6 +32,7 @@ env: DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true # Disable sending .NET CLI telemetry to Microsoft. DOTNET_CLI_TELEMETRY_OPTOUT: true + TEST_FILTERS: "+[Bannerlord.ButterLib*]* -[Bannerlord.ButterLib*.Tests]* -[*]System.Diagnostics.CodeAnalysis* -[*]BUTR.DependencyInjection* -[*]Bannerlord.BUTR.Shared* -[*]HarmonyLib.BUTR*" jobs: test: @@ -86,7 +87,7 @@ jobs: $testproj = "$PWD/tests/Bannerlord.ButterLib.Tests/Bannerlord.ButterLib.Tests.csproj"; $testprojimpl = "$PWD/tests/Bannerlord.ButterLib.Implementation.Tests/Bannerlord.ButterLib.Implementation.Tests.csproj"; - $filter = "+[Bannerlord.ButterLib*]* -[Bannerlord.ButterLib*.Tests]*"; + $filter = "${{env.TEST_FILTERS}}"; $gameversions = Get-Content -Path supported-game-versions.txt; From 0819ffab6c210fd91d488bb081b1c418bbfad724 Mon Sep 17 00:00:00 2001 From: Vitaly Mikhailov Date: Wed, 18 Aug 2021 16:51:02 +0300 Subject: [PATCH 20/38] Update test-full.yml --- .github/workflows/test-full.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test-full.yml b/.github/workflows/test-full.yml index 26af2437..64e64b62 100644 --- a/.github/workflows/test-full.yml +++ b/.github/workflows/test-full.yml @@ -6,11 +6,11 @@ on: # If a new version of the game is released, test the repo against it. # This way we will always know if the repo is broken on a new update. - game_version_update -# push: -# branches: -# - dev -# paths: -# - '.github/workflows/test-full.yml' + push: + branches: + - dev + paths: + - '.github/workflows/test-full.yml' # - 'src/**' # - 'tests/**' # - 'build/**' From cfd1d6e3a186bf012768c52c18d876a66d63f955 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 19 Aug 2021 04:28:35 +0000 Subject: [PATCH 21/38] Bump Bannerlord.BUTR.Shared from 1.6.1.45 to 1.6.1.51 Bumps [Bannerlord.BUTR.Shared](https://github.com/BUTR/Bannerlord.BUTR.Shared) from 1.6.1.45 to 1.6.1.51. - [Release notes](https://github.com/BUTR/Bannerlord.BUTR.Shared/releases) - [Commits](https://github.com/BUTR/Bannerlord.BUTR.Shared/commits) --- updated-dependencies: - dependency-name: Bannerlord.BUTR.Shared dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- build/common.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/common.props b/build/common.props index 0a182515..30b30043 100644 --- a/build/common.props +++ b/build/common.props @@ -11,7 +11,7 @@ 2.0.0 1.0.0.33 - 1.6.1.45 + 1.6.1.51 2.0.0.41 From 1061d16fec3ca4ee85b6810f2d83b4340f724778 Mon Sep 17 00:00:00 2001 From: Vitaly Mikhailov Date: Thu, 19 Aug 2021 12:44:46 +0300 Subject: [PATCH 22/38] Update docfx.yml --- .github/workflows/docfx.yml | 35 +++-------------------------------- 1 file changed, 3 insertions(+), 32 deletions(-) diff --git a/.github/workflows/docfx.yml b/.github/workflows/docfx.yml index 8e3e3262..0abe6248 100644 --- a/.github/workflows/docfx.yml +++ b/.github/workflows/docfx.yml @@ -25,39 +25,10 @@ jobs: name: DocFX documentation runs-on: windows-latest steps: - - name: Checkout Repository - uses: actions/checkout@v2 + - name: DocFX Setup + uses: butr/actions-docfx-setup@v1.1 with: - submodules: recursive - fetch-depth: 0 - - - name: Setup .NET Core - uses: actions/setup-dotnet@master - with: - dotnet-version: 3.1.x - - name: Setup .NET Core - uses: actions/setup-dotnet@master - with: - dotnet-version: 5.0.x - - name: Setup BUTR GPR - uses: actions/setup-dotnet@master - with: - source-url: https://nuget.pkg.github.com/BUTR/index.json - env: - NUGET_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}} - - - name: Setup NuGet - uses: nuget/setup-nuget@v1 - with: - nuget-version: 'latest' - - - name: Generating Newtonsoft.Json xref maps - run: >- - dotnet run -p build/SandcastleXrefGenerator -- ` - Newtonsoft.Json 11.0.2 netstandard2.0 ` - https://www.newtonsoft.com/json/help/html/ ` - $PWD/docs/xrefs/Newtonsoft.Json-xrefmap.yml - shell: pwsh + github-token: ${{secrets.GITHUB_TOKEN}} - name: Build Bannerlord.ButterLib and DocFx.Plugin.LastModified run: >- From 815b54cc7b4b1fa4044650b015140ccaaf33ebad Mon Sep 17 00:00:00 2001 From: Vitaly Mikhailov Date: Thu, 19 Aug 2021 12:45:29 +0300 Subject: [PATCH 23/38] Update publish.yml --- .github/workflows/publish.yml | 69 ++++++----------------------------- 1 file changed, 12 insertions(+), 57 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index e8ba3b6d..735c61c8 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -19,20 +19,10 @@ jobs: name: Build for NexusMods (Stable) runs-on: ubuntu-latest steps: - - name: Checkout Repository - uses: actions/checkout@v2 - - - name: Setup .NET Core - uses: actions/setup-dotnet@master + - name: Setup + uses: butr/actions-common-setup@v1.1 with: - dotnet-version: 5.0.x - - - name: Setup BUTR GPR - uses: actions/setup-dotnet@master - with: - source-url: https://nuget.pkg.github.com/BUTR/index.json - env: - NUGET_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}} + github-token: ${{secrets.GITHUB_TOKEN}} - name: Build Bannerlord.ButterLib Module run: | @@ -88,20 +78,10 @@ jobs: runs-on: ubuntu-latest if: ${{false}} steps: - - name: Checkout Repository - uses: actions/checkout@v2 - - - name: Setup .NET Core - uses: actions/setup-dotnet@master + - name: Setup + uses: butr/actions-common-setup@v1.1 with: - dotnet-version: 3.1.x - - - name: Setup BUTR GPR - uses: actions/setup-dotnet@master - with: - source-url: https://nuget.pkg.github.com/BUTR/index.json - env: - NUGET_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}} + github-token: ${{secrets.GITHUB_TOKEN}} - name: Download stable bannerlord folder uses: actions/download-artifact@v2 @@ -162,25 +142,10 @@ jobs: needs: build runs-on: ubuntu-latest steps: - - name: Checkout Repository - uses: actions/checkout@v2 - - - name: Setup .NET Core - uses: actions/setup-dotnet@master + - name: Setup + uses: butr/actions-common-setup@v1.1 with: - dotnet-version: 5.0.x - - - name: Setup .NET Core - uses: actions/setup-dotnet@master - with: - dotnet-version: 3.1.x - - - name: Setup BUTR GPR - uses: actions/setup-dotnet@master - with: - source-url: https://nuget.pkg.github.com/BUTR/index.json - env: - NUGET_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}} + github-token: ${{secrets.GITHUB_TOKEN}} - name: Pack Bannerlord.ButterLib (Release) run: dotnet pack src/Bannerlord.ButterLib/Bannerlord.ButterLib.csproj --configuration Release -o "./packages" @@ -222,20 +187,10 @@ jobs: runs-on: ubuntu-latest needs: build steps: - - name: Checkout Repository - uses: actions/checkout@v2 - - - name: Setup .NET Core - uses: actions/setup-dotnet@master - with: - dotnet-version: 3.1.x - - - name: Setup BUTR GPR - uses: actions/setup-dotnet@master + - name: Setup + uses: butr/actions-common-setup@v1.1 with: - source-url: https://nuget.pkg.github.com/BUTR/index.json - env: - NUGET_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}} + github-token: ${{secrets.GITHUB_TOKEN}} - name: Download stable bannerlord folder uses: actions/download-artifact@v2 From 86c1e90db092c994abd8816408204e9c4f4f3755 Mon Sep 17 00:00:00 2001 From: Vitaly Mikhailov Date: Thu, 19 Aug 2021 12:47:17 +0300 Subject: [PATCH 24/38] Update test.yml --- .github/workflows/test.yml | 61 ++++++-------------------------------- 1 file changed, 9 insertions(+), 52 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index da2b30fb..24aa0e79 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -39,59 +39,16 @@ jobs: name: Test runs-on: windows-latest steps: - - name: Checkout Repository - uses: actions/checkout@v2 - - - name: Setup .NET Core - uses: actions/setup-dotnet@master - with: - dotnet-version: 5.0.x - - - name: Setup BUTR GPR - uses: actions/setup-dotnet@master - with: - source-url: https://nuget.pkg.github.com/BUTR/index.json - env: - NUGET_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}} - - - name: Download DepotDownloader_2.3.6 - uses: i3h/download-release-asset@v1 - with: - owner: SteamRE - repo: DepotDownloader - tag: DepotDownloader_2.3.6 - file: depotdownloader-2.3.6.zip - - - name: Extract DepotDownloader_2.3.6 - uses: DuckSoft/extract-7z-action@v1.0 - with: - pathSource: depotdownloader-2.3.6.zip - pathTarget: depotdownloader - - - name: Download Bannerlord binaries (Stable) - run: >- - dotnet depotdownloader/DepotDownloader.dll -app 261550 -depot 261551 -beta ${{secrets.SYNCED_GAME_STABLE_VERSION}} -username ${{secrets.STEAM_LOGIN}} - -password ${{secrets.STEAM_PASSWORD}} -filelist ./.github/resources/FileFilters.regexp -dir bannerlord-stable - shell: pwsh - - name: Download Bannerlord binaries (Beta) - run: >- - dotnet depotdownloader/DepotDownloader.dll -app 261550 -depot 261551 -beta ${{secrets.SYNCED_GAME_BETA_VERSION}} -username ${{secrets.STEAM_LOGIN}} - -password ${{secrets.STEAM_PASSWORD}} -filelist ./.github/resources/FileFilters.regexp -dir bannerlord-beta - shell: pwsh - - - name: Download opencover.4.7.922 - uses: i3h/download-release-asset@v1 - with: - owner: OpenCover - repo: opencover - tag: 4.7.922 - file: opencover.4.7.922.zip - - - name: Extract opencover.4.7.922 - uses: DuckSoft/extract-7z-action@v1.0 + - name: Tests Setup + uses: butr/actions-tests-setup@v1.4 with: - pathSource: opencover.4.7.922.zip - pathTarget: opencover + github-token: ${{secrets.GITHUB_TOKEN}} + steam-login: ${{secrets.STEAM_LOGIN}} + steam-password: ${{secrets.STEAM_PASSWORD}} + stable-version: ${{secrets.SYNCED_GAME_STABLE_VERSION}} + beta-version: ${{secrets.SYNCED_GAME_BETA_VERSION}} + stable-directory: 'bannerlord-stable' + beta-directory: 'bannerlord-beta' - name: Test run: >- From 7fd4c0ac040539ee9dd5ada5171f64136938af96 Mon Sep 17 00:00:00 2001 From: Vitaly Mikhailov Date: Thu, 19 Aug 2021 12:48:59 +0300 Subject: [PATCH 25/38] Update test-full.yml --- .github/workflows/test-full.yml | 44 +++------------------------------ 1 file changed, 3 insertions(+), 41 deletions(-) diff --git a/.github/workflows/test-full.yml b/.github/workflows/test-full.yml index 64e64b62..74ad8c48 100644 --- a/.github/workflows/test-full.yml +++ b/.github/workflows/test-full.yml @@ -39,48 +39,10 @@ jobs: name: Test Fully runs-on: windows-latest steps: - - name: Checkout Repository - uses: actions/checkout@v2 - - - name: Setup .NET Core - uses: actions/setup-dotnet@master - with: - dotnet-version: 5.0.x - - - name: Setup BUTR GPR - uses: actions/setup-dotnet@master - with: - source-url: https://nuget.pkg.github.com/BUTR/index.json - env: - NUGET_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}} - - - name: Download DepotDownloader_2.3.6 - uses: i3h/download-release-asset@v1 - with: - owner: SteamRE - repo: DepotDownloader - tag: DepotDownloader_2.3.6 - file: depotdownloader-2.3.6.zip - - - name: Extract DepotDownloader_2.3.6 - uses: DuckSoft/extract-7z-action@v1.0 - with: - pathSource: depotdownloader-2.3.6.zip - pathTarget: depotdownloader - - - name: Download opencover.4.7.922 - uses: i3h/download-release-asset@v1 - with: - owner: OpenCover - repo: opencover - tag: 4.7.922 - file: opencover.4.7.922.zip - - - name: Extract opencover.4.7.922 - uses: DuckSoft/extract-7z-action@v1.0 + - name: Tests Setup + uses: butr/actions-tests-setup@v1.5 with: - pathSource: opencover.4.7.922.zip - pathTarget: opencover + github-token: ${{secrets.GITHUB_TOKEN}} - name: Test run: | From 83182511aa3819a66ead55103be616487ee5cf67 Mon Sep 17 00:00:00 2001 From: Vitaly Mikhailov Date: Thu, 19 Aug 2021 13:01:47 +0300 Subject: [PATCH 26/38] Update dependabot.yml --- .github/dependabot.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 979c0fb1..047864cd 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -9,3 +9,8 @@ updates: - dependency-name: "Bannerlord.ReferenceAssemblies.*" - dependency-name: "Lib.Harmony" - dependency-name: "Microsoft.Extensions.*" + + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "daily" From 2913f9188ab573d2d6cc4a7e98ef34e87f1a39e7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 19 Aug 2021 10:02:11 +0000 Subject: [PATCH 27/38] Bump codecov/codecov-action from 1 to 2.0.2 Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 1 to 2.0.2. - [Release notes](https://github.com/codecov/codecov-action/releases) - [Changelog](https://github.com/codecov/codecov-action/blob/master/CHANGELOG.md) - [Commits](https://github.com/codecov/codecov-action/compare/v1...v2.0.2) --- updated-dependencies: - dependency-name: codecov/codecov-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/test-full.yml | 2 +- .github/workflows/test.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-full.yml b/.github/workflows/test-full.yml index 74ad8c48..ae14daf5 100644 --- a/.github/workflows/test-full.yml +++ b/.github/workflows/test-full.yml @@ -91,7 +91,7 @@ jobs: path: coveragereport - name: Upload ReportGenerator to CodeCov - uses: codecov/codecov-action@v1 + uses: codecov/codecov-action@v2.0.2 with: token: ${{secrets.CODECOV_TOKEN}} file: coveragereport/Cobertura.xml diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 24aa0e79..b29a1e12 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -93,7 +93,7 @@ jobs: path: coveragereport - name: Upload ReportGenerator to CodeCov - uses: codecov/codecov-action@v1 + uses: codecov/codecov-action@v2.0.2 with: token: ${{secrets.CODECOV_TOKEN}} file: coveragereport/Cobertura.xml From 594d668c058b807347ab80a779331a8d16862dc1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 19 Aug 2021 10:02:14 +0000 Subject: [PATCH 28/38] Bump danielpalme/ReportGenerator-GitHub-Action from 4.6.1 to 4.8.12 Bumps [danielpalme/ReportGenerator-GitHub-Action](https://github.com/danielpalme/ReportGenerator-GitHub-Action) from 4.6.1 to 4.8.12. - [Release notes](https://github.com/danielpalme/ReportGenerator-GitHub-Action/releases) - [Commits](https://github.com/danielpalme/ReportGenerator-GitHub-Action/compare/4.6.1...4.8.12) --- updated-dependencies: - dependency-name: danielpalme/ReportGenerator-GitHub-Action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/test-full.yml | 2 +- .github/workflows/test.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-full.yml b/.github/workflows/test-full.yml index 74ad8c48..ac5a12e1 100644 --- a/.github/workflows/test-full.yml +++ b/.github/workflows/test-full.yml @@ -76,7 +76,7 @@ jobs: shell: pwsh - name: ReportGenerator - uses: danielpalme/ReportGenerator-GitHub-Action@4.6.1 + uses: danielpalme/ReportGenerator-GitHub-Action@4.8.12 with: reports: '*.xml' targetdir: 'coveragereport' diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 24aa0e79..34608a0b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -78,7 +78,7 @@ jobs: shell: pwsh - name: ReportGenerator - uses: danielpalme/ReportGenerator-GitHub-Action@4.6.1 + uses: danielpalme/ReportGenerator-GitHub-Action@4.8.12 with: reports: 'coverage_butterlib_stable_debug.xml;coverage_butterlib_stable_release.xml;coverage_butterlib_impl_stable_debug.xml;coverage_butterlib_impl_stable_release.xml;coverage_butterlib_impl_beta_debug.xml;coverage_butterlib_impl_beta_release.xml;' targetdir: 'coveragereport' From 3c71f3cb4aecb7f1cb4a06bea6ef2f16318b5841 Mon Sep 17 00:00:00 2001 From: Vitaly Mikhailov Date: Thu, 19 Aug 2021 18:19:31 +0300 Subject: [PATCH 29/38] Update test-full.yml --- .github/workflows/test-full.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/test-full.yml b/.github/workflows/test-full.yml index da7c51e7..14e57449 100644 --- a/.github/workflows/test-full.yml +++ b/.github/workflows/test-full.yml @@ -49,8 +49,6 @@ jobs: $testproj = "$PWD/tests/Bannerlord.ButterLib.Tests/Bannerlord.ButterLib.Tests.csproj"; $testprojimpl = "$PWD/tests/Bannerlord.ButterLib.Implementation.Tests/Bannerlord.ButterLib.Implementation.Tests.csproj"; - $filter = "${{env.TEST_FILTERS}}"; - $gameversions = Get-Content -Path supported-game-versions.txt; For ($i = 0; $i -le $gameversions.Length - 1; $i++) @@ -63,15 +61,15 @@ jobs: dotnet depotdownloader/DepotDownloader.dll -app 261550 -depot 261551 -beta $gameversion -filelist "$PWD/.github/resources/FileFilters.regexp" -username "${{secrets.STEAM_LOGIN}}" -password "${{secrets.STEAM_PASSWORD}}" -dir "$gamefolder"; } - opencover/OpenCover.Console.exe -register -target:"dotnet.exe" -targetargs:"test $testproj --configuration Debug -p:OverrideGameVersion=$($gameversions[-1]) -p:GameFolder=""$PWD/bannerlord-$($gameversions[-1])""" -filter:"$filter" -output:"coverage_butterlib_$($gameversions[-1])_debug.xml" -mergebyhash; - opencover/OpenCover.Console.exe -register -target:"dotnet.exe" -targetargs:"test $testproj --configuration Release -p:OverrideGameVersion=$($gameversions[-1]) -p:GameFolder=""$PWD/bannerlord-$($gameversions[-1])""" -filter:"$filter" -output:"coverage_butterlib_$($gameversions[-1])_release.xml" -mergebyhash; + opencover/OpenCover.Console.exe -register -target:"dotnet.exe" -targetargs:"test $testproj --configuration Debug -p:OverrideGameVersion=$($gameversions[-1]) -p:GameFolder=""$PWD/bannerlord-$($gameversions[-1])""" -filter:"${{env.TEST_FILTERS}}" -output:"coverage_butterlib_$($gameversions[-1])_debug.xml" -mergebyhash; + opencover/OpenCover.Console.exe -register -target:"dotnet.exe" -targetargs:"test $testproj --configuration Release -p:OverrideGameVersion=$($gameversions[-1]) -p:GameFolder=""$PWD/bannerlord-$($gameversions[-1])""" -filter:"${{env.TEST_FILTERS}}" -output:"coverage_butterlib_$($gameversions[-1])_release.xml" -mergebyhash; For ($i = 0; $i -le $gameversions.Length - 1; $i++) { $gameversion = $gameversions[$i]; $gamefolder = "$PWD/bannerlord-$gameversion"; - opencover/OpenCover.Console.exe -register -target:"dotnet.exe" -targetargs:"test $testprojimpl --configuration Debug -p:OverrideGameVersion=$gameversion -p:GameFolder=""$gamefolder""" -filter:"$filter" -output:"coverage_butterlib_impl_$($gameversion)_debug.xml" -mergebyhash; - opencover/OpenCover.Console.exe -register -target:"dotnet.exe" -targetargs:"test $testprojimpl --configuration Release -p:OverrideGameVersion=$gameversion -p:GameFolder=""$gamefolder""" -filter:"$filter" -output:"coverage_butterlib_impl_$($gameversion)_release.xml" -mergebyhash; + opencover/OpenCover.Console.exe -register -target:"dotnet.exe" -targetargs:"test $testprojimpl --configuration Debug -p:OverrideGameVersion=$gameversion -p:GameFolder=""$gamefolder""" -filter:"${{env.TEST_FILTERS}}" -output:"coverage_butterlib_impl_$($gameversion)_debug.xml" -mergebyhash; + opencover/OpenCover.Console.exe -register -target:"dotnet.exe" -targetargs:"test $testprojimpl --configuration Release -p:OverrideGameVersion=$gameversion -p:GameFolder=""$gamefolder""" -filter:"${{env.TEST_FILTERS}}" -output:"coverage_butterlib_impl_$($gameversion)_release.xml" -mergebyhash; } shell: pwsh From 7a0294d9149d5475871ff670eb921f32b90f3602 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 19 Aug 2021 15:22:53 +0000 Subject: [PATCH 30/38] Bump Harmony.Extensions from 2.0.0.41 to 2.0.0.44 Bumps [Harmony.Extensions](https://github.com/BUTR/Harmony.Extensions) from 2.0.0.41 to 2.0.0.44. - [Release notes](https://github.com/BUTR/Harmony.Extensions/releases) - [Commits](https://github.com/BUTR/Harmony.Extensions/commits) --- updated-dependencies: - dependency-name: Harmony.Extensions dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- build/common.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/common.props b/build/common.props index 30b30043..9afff644 100644 --- a/build/common.props +++ b/build/common.props @@ -12,7 +12,7 @@ 1.0.0.33 1.6.1.51 - 2.0.0.41 + 2.0.0.44 From 19c40f38b334b202b3a57a80b616a9694e00d740 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 19 Aug 2021 15:22:55 +0000 Subject: [PATCH 31/38] Bump Bannerlord.BUTR.Shared from 1.6.1.51 to 1.6.1.54 Bumps [Bannerlord.BUTR.Shared](https://github.com/BUTR/Bannerlord.BUTR.Shared) from 1.6.1.51 to 1.6.1.54. - [Release notes](https://github.com/BUTR/Bannerlord.BUTR.Shared/releases) - [Commits](https://github.com/BUTR/Bannerlord.BUTR.Shared/commits) --- updated-dependencies: - dependency-name: Bannerlord.BUTR.Shared dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- build/common.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/common.props b/build/common.props index 30b30043..5a201e52 100644 --- a/build/common.props +++ b/build/common.props @@ -11,7 +11,7 @@ 2.0.0 1.0.0.33 - 1.6.1.51 + 1.6.1.54 2.0.0.41 From 93dae658262247f0dbecdfc987c6916da9c5a22e Mon Sep 17 00:00:00 2001 From: Alexey Chernyshov Date: Thu, 19 Aug 2021 18:40:50 +0300 Subject: [PATCH 32/38] Updated mod order validation messages --- .../_Module/ModuleData/Languages/EN/sta_strings.xml | 8 +++++--- .../_Module/ModuleData/Languages/RU/sta_strings.xml | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/Bannerlord.ButterLib.Implementation/_Module/ModuleData/Languages/EN/sta_strings.xml b/src/Bannerlord.ButterLib.Implementation/_Module/ModuleData/Languages/EN/sta_strings.xml index ae1cdd1a..7f99a76b 100644 --- a/src/Bannerlord.ButterLib.Implementation/_Module/ModuleData/Languages/EN/sta_strings.xml +++ b/src/Bannerlord.ButterLib.Implementation/_Module/ModuleData/Languages/EN/sta_strings.xml @@ -14,9 +14,11 @@ - - - + + + + + \ No newline at end of file diff --git a/src/Bannerlord.ButterLib.Implementation/_Module/ModuleData/Languages/RU/sta_strings.xml b/src/Bannerlord.ButterLib.Implementation/_Module/ModuleData/Languages/RU/sta_strings.xml index fd58960e..fb7cc38d 100644 --- a/src/Bannerlord.ButterLib.Implementation/_Module/ModuleData/Languages/RU/sta_strings.xml +++ b/src/Bannerlord.ButterLib.Implementation/_Module/ModuleData/Languages/RU/sta_strings.xml @@ -14,9 +14,11 @@ - - - + + + + + \ No newline at end of file From 14c9267a95feccd5f950fdbd56a6a363dfd1eda6 Mon Sep 17 00:00:00 2001 From: Alexey Chernyshov <65975574+artifixer@users.noreply.github.com> Date: Thu, 19 Aug 2021 18:48:17 +0300 Subject: [PATCH 33/38] Fixed formatting --- .../_Module/ModuleData/Languages/EN/sta_strings.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Bannerlord.ButterLib.Implementation/_Module/ModuleData/Languages/EN/sta_strings.xml b/src/Bannerlord.ButterLib.Implementation/_Module/ModuleData/Languages/EN/sta_strings.xml index 7f99a76b..85fe6d04 100644 --- a/src/Bannerlord.ButterLib.Implementation/_Module/ModuleData/Languages/EN/sta_strings.xml +++ b/src/Bannerlord.ButterLib.Implementation/_Module/ModuleData/Languages/EN/sta_strings.xml @@ -15,10 +15,10 @@ - + - + - \ No newline at end of file + From e9132f91675f7ae8f76842fffb827b8fbbe2362f Mon Sep 17 00:00:00 2001 From: Alexey Chernyshov <65975574+artifixer@users.noreply.github.com> Date: Thu, 19 Aug 2021 18:48:38 +0300 Subject: [PATCH 34/38] Fixed formatting --- .../_Module/ModuleData/Languages/RU/sta_strings.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Bannerlord.ButterLib.Implementation/_Module/ModuleData/Languages/RU/sta_strings.xml b/src/Bannerlord.ButterLib.Implementation/_Module/ModuleData/Languages/RU/sta_strings.xml index fb7cc38d..63cd4a9d 100644 --- a/src/Bannerlord.ButterLib.Implementation/_Module/ModuleData/Languages/RU/sta_strings.xml +++ b/src/Bannerlord.ButterLib.Implementation/_Module/ModuleData/Languages/RU/sta_strings.xml @@ -15,10 +15,10 @@ - + - + - \ No newline at end of file + From 4c3d0c3394a7de861ea2cbdd9d92424494262388 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 20 Aug 2021 04:28:31 +0000 Subject: [PATCH 35/38] Bump butr/actions-common-setup from 1.1 to 1.2 Bumps [butr/actions-common-setup](https://github.com/butr/actions-common-setup) from 1.1 to 1.2. - [Release notes](https://github.com/butr/actions-common-setup/releases) - [Commits](https://github.com/butr/actions-common-setup/compare/v1.1...v1.2) --- updated-dependencies: - dependency-name: butr/actions-common-setup dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/publish.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 735c61c8..1685be7f 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -20,7 +20,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Setup - uses: butr/actions-common-setup@v1.1 + uses: butr/actions-common-setup@v1.2 with: github-token: ${{secrets.GITHUB_TOKEN}} @@ -79,7 +79,7 @@ jobs: if: ${{false}} steps: - name: Setup - uses: butr/actions-common-setup@v1.1 + uses: butr/actions-common-setup@v1.2 with: github-token: ${{secrets.GITHUB_TOKEN}} @@ -143,7 +143,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Setup - uses: butr/actions-common-setup@v1.1 + uses: butr/actions-common-setup@v1.2 with: github-token: ${{secrets.GITHUB_TOKEN}} @@ -188,7 +188,7 @@ jobs: needs: build steps: - name: Setup - uses: butr/actions-common-setup@v1.1 + uses: butr/actions-common-setup@v1.2 with: github-token: ${{secrets.GITHUB_TOKEN}} From bc48ac0c300a9e87772697ce9a62095105e68fac Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 20 Aug 2021 04:28:50 +0000 Subject: [PATCH 36/38] Bump Bannerlord.BuildResources from 1.0.0.33 to 1.0.0.36 Bumps [Bannerlord.BuildResources](https://github.com/BUTR/Bannerlord.BuildResources) from 1.0.0.33 to 1.0.0.36. - [Release notes](https://github.com/BUTR/Bannerlord.BuildResources/releases) - [Commits](https://github.com/BUTR/Bannerlord.BuildResources/commits) --- updated-dependencies: - dependency-name: Bannerlord.BuildResources dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- build/common.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/common.props b/build/common.props index cee1320c..87eb6dac 100644 --- a/build/common.props +++ b/build/common.props @@ -10,7 +10,7 @@ 2.0.0 - 1.0.0.33 + 1.0.0.36 1.6.1.54 2.0.0.44 From b88c90c307461ad642e7980b2572147eb550ee29 Mon Sep 17 00:00:00 2001 From: Alexey Chernyshov Date: Fri, 20 Aug 2021 11:20:57 +0300 Subject: [PATCH 37/38] Update for e1.6.2 --- build/common.props | 2 +- changelog.txt | 5 +++++ .../CampaignIdentifier/CampaignIdentifierSubSystem.cs | 4 ++-- .../Extensions/CampaignExtensionsImplementation.cs | 4 ++-- .../DistanceMatrix/DistanceMatrixImplementation.cs | 2 +- .../HotKeys/HotKeyManagerImplementation.cs | 2 +- .../HotKeys/HotKeySubSystem.cs | 2 +- .../ObjectSystem/MBObjectFinder.cs | 2 +- src/Bannerlord.ButterLib.Implementation/SubModule.cs | 2 +- supported-game-versions.txt | 1 + .../DependencyInjectionTests.cs | 2 +- .../TestCampaignBehavior.cs | 4 ++-- 12 files changed, 19 insertions(+), 13 deletions(-) diff --git a/build/common.props b/build/common.props index cee1320c..3d735976 100644 --- a/build/common.props +++ b/build/common.props @@ -4,7 +4,7 @@ - 1.0.27 + 1.0.28 2.1.1 diff --git a/changelog.txt b/changelog.txt index d91be451..5f908050 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,4 +1,9 @@ --------------------------------------------------------------------------------------------------- +Version: 1.0.28 +Game Versions: e1.4.3,e1.5.0,e1.5.1,e1.5.2,e1.5.3,e1.5.4,e1.5.5,e1.5.6,e1.5.7,e1.5.8,e1.5.9,e1.5.10,e1.6.0,e1.6.1,e1.6.2 +* Compatibility with e1.6.2 +* Improvements to mod order validation +--------------------------------------------------------------------------------------------------- Version: 1.0.27 Game Versions: e1.4.3,e1.5.0,e1.5.1,e1.5.2,e1.5.3,e1.5.4,e1.5.5,e1.5.6,e1.5.7,e1.5.8,e1.5.9,e1.5.10,e1.6.0,e1.6.1 * Fixed possible crash on load caused by MBSubModuleBaseEx diff --git a/src/Bannerlord.ButterLib.Implementation/CampaignIdentifier/CampaignIdentifierSubSystem.cs b/src/Bannerlord.ButterLib.Implementation/CampaignIdentifier/CampaignIdentifierSubSystem.cs index 371a9b49..b0d43571 100644 --- a/src/Bannerlord.ButterLib.Implementation/CampaignIdentifier/CampaignIdentifierSubSystem.cs +++ b/src/Bannerlord.ButterLib.Implementation/CampaignIdentifier/CampaignIdentifierSubSystem.cs @@ -28,7 +28,7 @@ public void Enable() #if e143 || e150 || e151 || e152 || e153 Patches.CharacterCreationContentApplyCulturePatch.Enable(_harmony); Patches.ClanInitializeClanPatch.Enable(_harmony); -#elif e154 || e155 || e156 || e157 || e158 || e159 || e1510 || e160 || e161 +#elif e154 || e155 || e156 || e157 || e158 || e159 || e1510 || e160 || e161 || e162 #else #error ConstGameVersionWithPrefix is not handled! #endif @@ -41,7 +41,7 @@ public void Disable() #if e143 || e150 || e151 || e152 || e153 //CharacterCreationContentApplyCulturePatch.Disable(_harmony); //ClanInitializeClanPatch.Disable(_harmony); -#elif e154 || e155 || e156 || e157 || e158 || e159 || e1510 || e160 || e161 +#elif e154 || e155 || e156 || e157 || e158 || e159 || e1510 || e160 || e161 || e162 #else #error ConstGameVersionWithPrefix is not handled! #endif diff --git a/src/Bannerlord.ButterLib.Implementation/CampaignIdentifier/Extensions/CampaignExtensionsImplementation.cs b/src/Bannerlord.ButterLib.Implementation/CampaignIdentifier/Extensions/CampaignExtensionsImplementation.cs index b1436f90..fa8400a5 100644 --- a/src/Bannerlord.ButterLib.Implementation/CampaignIdentifier/Extensions/CampaignExtensionsImplementation.cs +++ b/src/Bannerlord.ButterLib.Implementation/CampaignIdentifier/Extensions/CampaignExtensionsImplementation.cs @@ -16,7 +16,7 @@ internal sealed partial class CampaignExtensionsImplementation : ICampaignExtens return campaign.GameStarted && campaign.GetCampaignBehavior() is { } identifierBehavior ? identifierBehavior.CampaignId : null; -#elif e154 || e155 || e156 || e157 || e158 || e159 || e1510 || e160 || e161 +#elif e154 || e155 || e156 || e157 || e158 || e159 || e1510 || e160 || e161 || e162 return Campaign.Current.UniqueGameId; #else #error ConstGameVersionWithPrefix is not handled! @@ -30,7 +30,7 @@ internal sealed partial class CampaignExtensionsImplementation : ICampaignExtens return campaign.GameStarted && campaign.GetCampaignBehavior() is { } identifierBehavior ? identifierBehavior.CampaignDescriptor : null; -#elif e154 || e155 || e156 || e157 || e158 || e159 || e1510 || e160 || e161 +#elif e154 || e155 || e156 || e157 || e158 || e159 || e1510 || e160 || e161 || e162 return new BlankCampaignDescriptor(Campaign.Current); #else #error ConstGameVersionWithPrefix is not handled! diff --git a/src/Bannerlord.ButterLib.Implementation/DistanceMatrix/DistanceMatrixImplementation.cs b/src/Bannerlord.ButterLib.Implementation/DistanceMatrix/DistanceMatrixImplementation.cs index c1a49b91..3c248425 100644 --- a/src/Bannerlord.ButterLib.Implementation/DistanceMatrix/DistanceMatrixImplementation.cs +++ b/src/Bannerlord.ButterLib.Implementation/DistanceMatrix/DistanceMatrixImplementation.cs @@ -89,7 +89,7 @@ private Dictionary CalculateDistanceMatrix() { #if e143 || e150 || e151 || e152 || e153 || e154 || e155 || e156 || e157 || e158 || e159 || e1510 var activeHeroes = Hero.All -#elif e160 || e161 +#elif e160 || e161 || e162 var activeHeroes = Hero.AllAliveHeroes #else #error ConstGameVersionWithPrefix is not handled! diff --git a/src/Bannerlord.ButterLib.Implementation/HotKeys/HotKeyManagerImplementation.cs b/src/Bannerlord.ButterLib.Implementation/HotKeys/HotKeyManagerImplementation.cs index 9e05dae2..427cb3b8 100644 --- a/src/Bannerlord.ButterLib.Implementation/HotKeys/HotKeyManagerImplementation.cs +++ b/src/Bannerlord.ButterLib.Implementation/HotKeys/HotKeyManagerImplementation.cs @@ -49,7 +49,7 @@ public override IReadOnlyList Build() var hotKeyCategoryContainer = new HotKeyCategoryContainer(_subModName, _hotKeys); #if e143 || e150 || e151 || e152 || e153 || e154 || e155 || e156 || e157 || e158 || e159 TWHotKeyManager.Initialize("Bannerlord", Utilities.GetConfigsPath() + "BannerlordGameKeys.xml", new List { hotKeyCategoryContainer }, true); -#elif e1510 || e160 || e161 +#elif e1510 || e160 || e161 || e162 TWHotKeyManager.Initialize(new PlatformFilePath(EngineFilePaths.ConfigsPath, "BannerlordGameKeys.xml"), new List { hotKeyCategoryContainer }, true); #else #error ConstGameVersionWithPrefix is not handled! diff --git a/src/Bannerlord.ButterLib.Implementation/HotKeys/HotKeySubSystem.cs b/src/Bannerlord.ButterLib.Implementation/HotKeys/HotKeySubSystem.cs index 0c1e9799..38208dca 100644 --- a/src/Bannerlord.ButterLib.Implementation/HotKeys/HotKeySubSystem.cs +++ b/src/Bannerlord.ButterLib.Implementation/HotKeys/HotKeySubSystem.cs @@ -55,7 +55,7 @@ private static void OnApplicationTick(float dt) hotKey.OnPressedInternal(); if (hotKey.GameKey.PrimaryKey.InputKey.IsReleased()) hotKey.OnReleasedInternal(); -#elif e155 || e156 || e157 || e158 || e159 || e1510 || e160 || e161 +#elif e155 || e156 || e157 || e158 || e159 || e1510 || e160 || e161 || e162 if (hotKey.GameKey.KeyboardKey?.InputKey.IsDown() == true || hotKey.GameKey.ControllerKey?.InputKey.IsDown() == true) hotKey.IsDownInternal(); if (hotKey.GameKey.KeyboardKey?.InputKey.IsPressed() == true || hotKey.GameKey.ControllerKey?.InputKey.IsPressed() == true) diff --git a/src/Bannerlord.ButterLib.Implementation/ObjectSystem/MBObjectFinder.cs b/src/Bannerlord.ButterLib.Implementation/ObjectSystem/MBObjectFinder.cs index e62251dc..12b9b695 100644 --- a/src/Bannerlord.ButterLib.Implementation/ObjectSystem/MBObjectFinder.cs +++ b/src/Bannerlord.ButterLib.Implementation/ObjectSystem/MBObjectFinder.cs @@ -28,7 +28,7 @@ internal class MBObjectFinder : IMBObjectFinder return null; } } -#elif e160 || e161 +#elif e160 || e161 || e162 private static readonly AccessTools.FieldRef? CampaignObjectTypeObjects = AccessTools2.FieldRefAccess("_objects"); diff --git a/src/Bannerlord.ButterLib.Implementation/SubModule.cs b/src/Bannerlord.ButterLib.Implementation/SubModule.cs index 52113b0f..a0af00e3 100644 --- a/src/Bannerlord.ButterLib.Implementation/SubModule.cs +++ b/src/Bannerlord.ButterLib.Implementation/SubModule.cs @@ -47,7 +47,7 @@ public void OnServiceRegistration() services.AddSingleton(); #if e143 || e150 || e151 || e152 || e153 services.AddTransient(); -#elif e154 || e155 || e156 || e157 || e158 || e159 || e1510 || e160 || e161 +#elif e154 || e155 || e156 || e157 || e158 || e159 || e1510 || e160 || e161 || e162 services.AddTransient(); #else #error ConstGameVersionWithPrefix is not handled! diff --git a/supported-game-versions.txt b/supported-game-versions.txt index fc59b700..12f6cb26 100644 --- a/supported-game-versions.txt +++ b/supported-game-versions.txt @@ -1,3 +1,4 @@ +e1.6.2 e1.6.1 e1.6.0 e1.5.10 diff --git a/tests/Bannerlord.ButterLib.Implementation.Tests/DependencyInjectionTests.cs b/tests/Bannerlord.ButterLib.Implementation.Tests/DependencyInjectionTests.cs index d16ed739..770ea9c5 100644 --- a/tests/Bannerlord.ButterLib.Implementation.Tests/DependencyInjectionTests.cs +++ b/tests/Bannerlord.ButterLib.Implementation.Tests/DependencyInjectionTests.cs @@ -133,7 +133,7 @@ public void CampaignDescriptor_Test() var hero = (Hero) FormatterServices.GetUninitializedObject(typeof(Hero)); #if e143 || e150 || e151 || e152 || e153 || e154 || e155 || e156 || e157 || e158 || e159 AccessTools.Field(typeof(Hero), "Name").SetValue(hero, new TextObject("TestHero")); -#elif e1510 || e160 || e161 +#elif e1510 || e160 || e161 || e162 AccessTools.Property(typeof(Hero), "Name").SetValue(hero, new TextObject("TestHero")); #else #error ConstGameVersionWithPrefix is not handled! diff --git a/tests/Bannerlord.ButterLib.ObjectSystem.Test/TestCampaignBehavior.cs b/tests/Bannerlord.ButterLib.ObjectSystem.Test/TestCampaignBehavior.cs index f5d78b62..6b7feb63 100644 --- a/tests/Bannerlord.ButterLib.ObjectSystem.Test/TestCampaignBehavior.cs +++ b/tests/Bannerlord.ButterLib.ObjectSystem.Test/TestCampaignBehavior.cs @@ -57,7 +57,7 @@ private void OnBeforeSave() #if e143 || e150 || e151 || e152 || e153 || e154 || e155 || e156 || e157 || e158 || e159 || e1510 foreach (var h in Hero.All) -#elif e160 || e161 +#elif e160 || e161 || e162 foreach (var h in Hero.AllAliveHeroes) #else #error ConstGameVersionWithPrefix is not handled! @@ -88,7 +88,7 @@ private void OnGameLoaded(CampaignGameStarter starter) #if e143 || e150 || e151 || e152 || e153 || e154 || e155 || e156 || e157 || e158 || e159 || e1510 foreach (var h in Hero.All) -#elif e160 || e161 +#elif e160 || e161 || e162 foreach (var h in Hero.AllAliveHeroes) #else #error ConstGameVersionWithPrefix is not handled! From 110f55176ae0c89f12286e710e9c74cacd70ca93 Mon Sep 17 00:00:00 2001 From: Alexey Chernyshov Date: Sat, 21 Aug 2021 13:42:29 +0300 Subject: [PATCH 38/38] Fixed exception catching --- changelog.txt | 1 + .../ExceptionHandler/ExceptionHandlerSubSystem.cs | 8 ++------ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/changelog.txt b/changelog.txt index 5f908050..4b57b2a9 100644 --- a/changelog.txt +++ b/changelog.txt @@ -3,6 +3,7 @@ Version: 1.0.28 Game Versions: e1.4.3,e1.5.0,e1.5.1,e1.5.2,e1.5.3,e1.5.4,e1.5.5,e1.5.6,e1.5.7,e1.5.8,e1.5.9,e1.5.10,e1.6.0,e1.6.1,e1.6.2 * Compatibility with e1.6.2 * Improvements to mod order validation +* Improved stability for exception catching --------------------------------------------------------------------------------------------------- Version: 1.0.27 Game Versions: e1.4.3,e1.5.0,e1.5.1,e1.5.2,e1.5.3,e1.5.4,e1.5.5,e1.5.6,e1.5.7,e1.5.8,e1.5.9,e1.5.10,e1.6.0,e1.6.1 diff --git a/src/Bannerlord.ButterLib/ExceptionHandler/ExceptionHandlerSubSystem.cs b/src/Bannerlord.ButterLib/ExceptionHandler/ExceptionHandlerSubSystem.cs index 543f3d55..0340fe8a 100644 --- a/src/Bannerlord.ButterLib/ExceptionHandler/ExceptionHandlerSubSystem.cs +++ b/src/Bannerlord.ButterLib/ExceptionHandler/ExceptionHandlerSubSystem.cs @@ -1,5 +1,4 @@ -using Bannerlord.ButterLib.Common.Helpers; -using Bannerlord.ButterLib.SubSystems; +using Bannerlord.ButterLib.SubSystems; using HarmonyLib; @@ -38,10 +37,7 @@ public void Enable() AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException; - if (BUTR.Shared.Helpers.ModuleInfoHelper.GetLoadedModules().Any(m => string.Equals(m.Id, "BetterExceptionWindow", StringComparison.InvariantCultureIgnoreCase))) - { - BEWPatch.Enable(Harmony); - } + BEWPatch.Enable(Harmony); // re-enable BetterExceptionWindow and keep it as it is. It has now features we have yet to match. if (BUTR.Shared.Helpers.ModuleInfoHelper.GetLoadedModules().Any(m => string.Equals(m.Id, "BetterExceptionWindow", StringComparison.InvariantCultureIgnoreCase)))