Merge branch 'main-re' into upstream-merge

.github/workflows/pull-request.yml

@@ -1,7 +1,7 @@
 name: Pull Request Build
 
 on:
-  workflow_dispatch:
+  workflow_dispatch: 
   pull_request:
     types: [opened, reopened, synchronize]
     paths-ignore:
@@ -14,19 +14,24 @@ jobs:
     runs-on: windows-latest
     
     steps:
-      - name: Checkout
-        uses: actions/checkout@v6
+    - name: Checkout
+      uses: actions/checkout@v6
 
-      - name: Setup MSVC
-        uses: ilammy/msvc-dev-cmd@v1
+    - name: Setup MSVC
+      uses: ilammy/msvc-dev-cmd@v1
 
-      - name: Setup CMake
-        uses: lukka/get-cmake@latest
+    - name: Setup CMake
+      uses: lukka/get-cmake@latest
 
-      - name: Run CMake
-        uses: lukka/run-cmake@v10
-        env:
-          VCPKG_ROOT: "" # Disable vcpkg for CI builds
-        with:
-          configurePreset: windows64
-          buildPreset: windows64-debug
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v4
+      with:
+        global-json-file: global.json
+
+    - name: Run CMake
+      uses: lukka/run-cmake@v10
+      env:
+        VCPKG_ROOT: "" # Disable vcpkg for CI builds
+      with:
+        configurePreset: windows64
+        buildPreset: windows64-debug