Merge branch 'master' into feature/rajas-of-asia-support

.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

.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
@@ -70,10 +71,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
       # Make sure it builds self-contained, because for the dev build we're not building the InnoSetup installer.

.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: |

.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

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"
 		);
 	}

ImperatorToCK3.UnitTests/ImperatorToCK3.UnitTests.csproj

@@ -19,7 +19,7 @@
     <PackageReference Include="FluentAssertions" Version="8.0.0-alpha.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
     <PackageReference Include="xunit" Version="2.9.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="3.0.0-pre.49">
+    <PackageReference Include="xunit.runner.visualstudio" Version="3.0.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

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",
 			{

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...

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
 

ImperatorToCK3/ImperatorToCK3.csproj

@@ -37,15 +37,15 @@
         <PackageReference Include="CWTools" Version="0.5.0-alpha" />
         <PackageReference Include="DotLiquid" Version="2.3.0" />
         <PackageReference Include="FSharp.Core" Version="9.0.100" /> <!-- Needed for CWTools -->
-        <PackageReference Include="Magick.NET-Q16-AnyCPU" Version="14.2.0"/>
-        <PackageReference Include="Meziantou.Analyzer" Version="2.0.182">
+        <PackageReference Include="Magick.NET-Q16-AnyCPU" Version="14.3.0"/>
+        <PackageReference Include="Meziantou.Analyzer" Version="2.0.184">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
         <PackageReference Include="PGCG.commonItems" Version="15.1.2" />
         <PackageReference Include="PGCG.commonItems.SourceGenerators" Version="1.0.7"/>
         <PackageReference Include="Polly" Version="8.5.0" />
-        <PackageReference Include="Roslynator.Analyzers" Version="4.12.9">
+        <PackageReference Include="Roslynator.Analyzers" Version="4.12.10">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>

global.json

@@ -2,6 +2,6 @@
   "sdk": {
     "version": "9.0.100",
     "allowPrerelease": true,
-    "rollForward": "latestPatch"
+    "rollForward": "disable"
   }
 }