From b63f8f40733944415e6a80c9be4f6c31b2a4480d Mon Sep 17 00:00:00 2001
From: IhateTrains <IhateTrains@users.noreply.github.com>
Date: Fri, 27 Dec 2024 03:38:09 +0000
Subject: [PATCH] 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"
   }
 }