squash (#8)

* Update macos.yml

* Update linux.yml

* Update windows.yml

* Create pull.yml

* Update linux.yml

* Update MPN Code for Memory changes

* fix config crash

* Source

* Update pull.yml

* Update windows.yml

* Update windows.yml

* Update windows.yml (#7)

* Update windows.yml

* Update windows.yml

* Update windows.yml

* Update windows.yml

* Update windows.yml

* Update windows.yml

.github/pull.yml

@@ -0,0 +1,10 @@
+version: "1"
+rules:                      # Array of rules
+  - base: master            # Required. Target branch
+    upstream: dolphin-emu:master    # Required. Must be in the same fork network.
+    mergeMethod: hardreset  # Optional, one of [none, merge, squash, rebase, hardreset], Default: none.
+    mergeUnstable: false    # Optional, merge pull request even when the mergeable_state is not clean. Default: false
+    conflictReviewers:      # Optional, on merge conflict assign a reviewer
+      - EndangeredNayla
+label: ":arrow_heading_down: pull"  # Optional
+conflictLabel: "merge-conflict"     # Optional, on merge conflict assign a custom label, Default: merge-conflict

.github/workflows/linux.yml

@@ -6,9 +6,7 @@ name: Linux CI
 # events but only for the master branch
 on:
   push:
-    branches: [ master ]
   pull_request:
-    branches: [ master ]
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
@@ -30,13 +28,13 @@ jobs:
       run: git submodule update --init --recursive
     # Setup Packages
     - name: Setup Packages
-      run: sudo apt update && sudo apt upgrade && sudo apt install curl ffmpeg git libao-dev libasound-dev libavcodec-dev libavformat-dev libbluetooth-dev libevdev-dev libgtk2.0-dev libhidapi-dev libmbedtls-dev libminiupnpc-dev libopenal-dev libpangocairo-1.0-0 libpulse-dev libsfml-dev libswscale-dev libudev-dev libusb-1.0-0-dev libxrandr-dev qt5-default qtbase5-private-dev 
+      run: sudo apt update && sudo apt upgrade && sudo apt install build-essential git cmake ffmpeg libavcodec-dev libavformat-dev libavutil-dev libswscale-dev libevdev-dev libusb-1.0-0-dev libxrandr-dev libxi-dev libpangocairo-1.0-0 qt6-base-private-dev libbluetooth-dev libasound2-dev libpulse-dev libgl1-mesa-dev libudev-dev libsystemd-dev dpkg-dev
     # Run CMake
     - name: Run CMake
-      run: mkdir build && cd build && cmake .. -G Ninja -DLINUX_LOCAL_DEV=true
+      run: mkdir build && cd build && cmake .. -G Ninja -DLINUX_LOCAL_DEV=true -DCPACK_PACKAGE_CONTACT="Mario Party Netplay"
     # Build Project
     - name: Run Make
-      run: cd build && ninja -j4
+      run: cd build && ninja -j$(nproc)
     # Configure Dolphin
     - name: Configure Dolphin
       run: cd build && cp -r ../Data/Sys/ Binaries/ && cp -r ../Data/User/ Binaries/ && cp -r ../Data/dolphin-emu.png Binaries/ && touch Binaries/portable.txt
@@ -45,4 +43,4 @@ jobs:
       uses: actions/upload-artifact@v2
       with:
         name: DolphinMPN-Linux
-        path: /home/runner/work/dolphin-mpn-advanced-src/dolphin-mpn-advanced-src/build/Binaries/
+        path: /home/runner/work/dolphin-mpn-src/dolphin-mpn-src/build/Binaries/

.github/workflows/macos.yml

@@ -6,9 +6,7 @@ name: macOS CI
 # events but only for the master branch
 on:
   push:
-    branches: [ master ]
   pull_request:
-    branches: [ master ]
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
@@ -27,7 +25,7 @@ jobs:
         platform: mac
     # Setup Packages
     - name: Setup Packages
-      run: brew install qt5 pkgconfig
+      run: brew install qt6 pkgconfig
     # Use Static ZSTD
     - name: Remove ZSTD
       run: brew uninstall zstd curl php --force --ignore-dependencies
@@ -36,7 +34,7 @@ jobs:
       run: git submodule update --init --recursive
     # Run CMake
     - name: Run CMake
-      run: mkdir -p build && cd build && cmake .. -G Ninja -DCMAKE_CXX_FLAGS="-Xclang -fcolor-diagnostics" -DCMAKE_PREFIX_PATH=$(brew --prefix qt5)
+      run: mkdir -p build && cd build && cmake .. -G Ninja -DCMAKE_CXX_FLAGS="-Xclang -fcolor-diagnostics" -DCMAKE_PREFIX_PATH=$(brew --prefix qt6)
     # Build Project
     - name: Run Ninja
       run: cd build && ninja -j4
@@ -48,4 +46,4 @@ jobs:
       uses: actions/upload-artifact@v2
       with:
         name: DolphinMPN-macOS
-        path: /Users/runner/work/dolphin-mpn-advanced-src/dolphin-mpn-advanced-src/build/Binaries/
+        path: /Users/runner/work/dolphin-mpn-src/dolphin-mpn-src/build/Binaries/

.github/workflows/windows.yml

@@ -19,6 +19,12 @@ jobs:
     steps:
     # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
     - uses: actions/checkout@v2
+    # Install 7zip
+    - name: Install 7zip
+      run: choco install 7zip
+    # Install Visual Studio Update
+    - name: Install Visual Studio Update
+      run: vs_installershell.exe update --passive --norestart --force --installpath "C:\Program Files\Microsoft Visual Studio\2022\Community"
     # Submoudle
     - name: Checkout Submodles
       run: git submodule update --init --recursive
@@ -29,10 +35,19 @@ jobs:
         vs-version: '16.6.2'
     # Run MSBuild
     - name: Build Solution
-      run: msbuild "D:\a\dolphin-mpn-src\dolphin-src\Source\dolphin-emu.sln" /verbosity:minimal /property:Configuration=Release  /property:Platform=x64
+      run: msbuild "D:\a\dolphin-mpn-src\dolphin-mpn-src\Source\dolphin-emu.sln" /verbosity:minimal /property:Configuration=Release  /property:Platform=x64
     # Upload Artifact
     - name: Upload Build Artifact
       uses: actions/upload-artifact@v2
       with:
         name: DolphinMPN-win32
-        path: D:\a\dolphin-mpn-src\dolphin-mpn-advanced-src\Binary\x64
+        path: D:\a\dolphin-mpn-src\dolphin-mpn-src\Binary\x64
+    # Zip Artifact
+    - name: Zip Artifact
+      run: 7z a D:/DolphinMPN-win32 D:/a/dolphin-mpn-src/dolphin-mpn-src/Binary/x64/*
+    # New Release
+    - name: New Release
+      uses: softprops/action-gh-release@v1
+      if: startsWith(github.ref, 'refs/tags/')
+      with:
+        files: D:/DolphinMPN-win32.7z

Externals/Bochs_disasm/Bochs_disasm.vcxproj

@@ -4,6 +4,7 @@
   <Import Project="$(VSPropsDir)Base.Targets.props" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>{8ADA04D7-6DB1-4DA4-AB55-64FB12A0997B}</ProjectGuid>
+    <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="$(VSPropsDir)Configuration.StaticLibrary.props" />

Externals/FatFs/FatFs.vcxproj

@@ -4,6 +4,7 @@
   <Import Project="$(VSPropsDir)Base.Targets.props" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>{3F17D282-A77D-4931-B844-903AD0809A5E}</ProjectGuid>
+    <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="$(VSPropsDir)Configuration.StaticLibrary.props" />

Externals/FreeSurround/FreeSurround.vcxproj

@@ -4,6 +4,7 @@
   <Import Project="$(VSPropsDir)Base.Targets.props" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>{8498F2FA-5CA6-4169-9971-DE5B1FE6132C}</ProjectGuid>
+    <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="$(VSPropsDir)Configuration.StaticLibrary.props" />

Externals/LZO/LZO.vcxproj

@@ -4,6 +4,7 @@
   <Import Project="$(VSPropsDir)Base.Targets.props" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>{AB993F38-C31D-4897-B139-A620C42BC565}</ProjectGuid>
+    <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="$(VSPropsDir)Configuration.StaticLibrary.props" />

Externals/SDL/SDL2.vcxproj

@@ -4,6 +4,7 @@
   <Import Project="$(VSPropsDir)Base.Targets.props" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>{8DC244EE-A0BD-4038-BAF7-CFAFA5EB2BAA}</ProjectGuid>
+    <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="$(VSPropsDir)Configuration.StaticLibrary.props" />

Externals/SFML/build/vc2010/SFML_Network.vcxproj

@@ -4,6 +4,7 @@
   <Import Project="$(VSPropsDir)Base.Targets.props" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>{93D73454-2512-424E-9CDA-4BB357FE13DD}</ProjectGuid>
+    <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="$(VSPropsDir)Configuration.StaticLibrary.props" />

Externals/bzip2/bzip2.vcxproj

@@ -4,6 +4,7 @@
   <Import Project="$(VSPropsDir)Base.Targets.props" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>{1D8C51D2-FFA4-418E-B183-9F42B6A6717E}</ProjectGuid>
+    <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="$(VSPropsDir)Configuration.StaticLibrary.props" />

Externals/cpp-optparse/cpp-optparse.vcxproj

@@ -4,6 +4,7 @@
   <Import Project="$(VSPropsDir)Base.Targets.props" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>{C636D9D1-82FE-42B5-9987-63B7D4836341}</ProjectGuid>
+    <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="$(VSPropsDir)Configuration.StaticLibrary.props" />

Externals/cubeb/msvc/cubeb.vcxproj

@@ -4,6 +4,7 @@
   <Import Project="$(VSPropsDir)Base.Targets.props" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>{8EA11166-6512-44FC-B7A5-A4D1ECC81170}</ProjectGuid>
+    <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="$(VSPropsDir)Configuration.StaticLibrary.props" />

Externals/cubeb/msvc/cubeb.vcxproj.filters

@@ -6,7 +6,6 @@
     <ClInclude Include="..\cubeb\src\cubeb_assert.h" />
     <ClInclude Include="..\cubeb\src\cubeb_log.h" />
     <ClInclude Include="..\cubeb\src\cubeb_mixer.h" />
-    <ClInclude Include="..\cubeb\src\cubeb_panner.h" />
     <ClInclude Include="..\cubeb\src\cubeb_resampler.h" />
     <ClInclude Include="..\cubeb\src\cubeb_resampler_internal.h" />
     <ClInclude Include="..\cubeb\src\cubeb_ring_array.h" />
@@ -17,41 +16,30 @@
     <ClInclude Include="..\cubeb\src\cubeb_utils_win.h" />
     <ClInclude Include="..\cubeb\src\cubeb-internal.h" />
     <ClInclude Include="..\cubeb\src\cubeb-speex-resampler.h" />
-    <ClInclude Include="..\cubeb\src\speex\arch.h">
-      <Filter>speex</Filter>
-    </ClInclude>
-    <ClInclude Include="..\cubeb\src\speex\fixed_generic.h">
-      <Filter>speex</Filter>
-    </ClInclude>
-    <ClInclude Include="..\cubeb\src\speex\resample_neon.h">
-      <Filter>speex</Filter>
-    </ClInclude>
-    <ClInclude Include="..\cubeb\src\speex\resample_sse.h">
-      <Filter>speex</Filter>
-    </ClInclude>
-    <ClInclude Include="..\cubeb\src\speex\speex_config_types.h">
-      <Filter>speex</Filter>
-    </ClInclude>
-    <ClInclude Include="..\cubeb\src\speex\speex_resampler.h">
-      <Filter>speex</Filter>
-    </ClInclude>
-    <ClInclude Include="..\cubeb\src\speex\stack_alloc.h">
-      <Filter>speex</Filter>
-    </ClInclude>
     <ClInclude Include="..\msvc\cubeb_export.h" />
+    <ClInclude Include="..\cubeb\src\cubeb_android.h" />
+    <ClInclude Include="..\cubeb\src\cubeb_osx_run_loop.h" />
+    <ClInclude Include="..\cubeb\src\cubeb_tracing.h" />
+    <ClInclude Include="..\cubeb\src\cubeb-jni.h" />
+    <ClInclude Include="..\cubeb\src\cubeb-jni-instances.h" />
+    <ClInclude Include="..\cubeb\subprojects\speex\arch.h" />
+    <ClInclude Include="..\cubeb\subprojects\speex\fixed_generic.h" />
+    <ClInclude Include="..\cubeb\subprojects\speex\resample_neon.h" />
+    <ClInclude Include="..\cubeb\subprojects\speex\resample_sse.h" />
+    <ClInclude Include="..\cubeb\subprojects\speex\speex_config_types.h" />
+    <ClInclude Include="..\cubeb\subprojects\speex\speex_resampler.h" />
+    <ClInclude Include="..\cubeb\subprojects\speex\stack_alloc.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\cubeb\src\cubeb.c" />
     <ClCompile Include="..\cubeb\src\cubeb_log.cpp" />
     <ClCompile Include="..\cubeb\src\cubeb_mixer.cpp" />
-    <ClCompile Include="..\cubeb\src\cubeb_panner.cpp" />
     <ClCompile Include="..\cubeb\src\cubeb_resampler.cpp" />
     <ClCompile Include="..\cubeb\src\cubeb_strings.c" />
     <ClCompile Include="..\cubeb\src\cubeb_wasapi.cpp" />
     <ClCompile Include="..\cubeb\src\cubeb_winmm.c" />
-    <ClCompile Include="..\cubeb\src\speex\resample.c">
-      <Filter>speex</Filter>
-    </ClCompile>
+    <ClCompile Include="..\cubeb\src\cubeb_utils.cpp" />
+    <ClCompile Include="..\cubeb\subprojects\speex\resample.c" />
   </ItemGroup>
   <ItemGroup>
     <Filter Include="speex">

Externals/curl/curl.vcxproj

@@ -4,6 +4,7 @@
   <Import Project="$(VSPropsDir)Base.Targets.props" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>{BB00605C-125F-4A21-B33B-7BF418322DCB}</ProjectGuid>
+    <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="$(VSPropsDir)Configuration.StaticLibrary.props" />

Externals/discord-rpc/src/discord-rpc.vcxproj

@@ -4,6 +4,7 @@
   <Import Project="$(VSPropsDir)Base.Targets.props" />
   <PropertyGroup Label="Globals">
     <ProjectGUID>{4482FD2A-EC43-3FFB-AC20-2E5C54B05EAD}</ProjectGUID>
+    <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="$(VSPropsDir)Configuration.StaticLibrary.props" />

Externals/ed25519/ed25519.vcxproj

@@ -4,6 +4,7 @@
   <Import Project="$(VSPropsDir)Base.Targets.props" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>{5BDF4B91-1491-4FB0-BC27-78E9A8E97DC3}</ProjectGuid>
+    <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="$(VSPropsDir)Configuration.StaticLibrary.props" />

Externals/enet/enet.vcxproj

@@ -4,6 +4,7 @@
   <Import Project="$(VSPropsDir)Base.Targets.props" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>{CBC76802-C128-4B17-BF6C-23B08C313E5E}</ProjectGuid>
+    <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="$(VSPropsDir)Configuration.StaticLibrary.props" />

Externals/fmt/fmt.vcxproj

@@ -4,6 +4,7 @@
   <Import Project="$(VSPropsDir)Base.Targets.props" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>{4BC5A148-0AB3-440F-A980-A29B4B999190}</ProjectGuid>
+    <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="$(VSPropsDir)Configuration.StaticLibrary.props" />

Externals/glslang/glslang.vcxproj

@@ -4,6 +4,7 @@
   <Import Project="$(VSPropsDir)Base.Targets.props" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>{D178061B-84D3-44F9-BEED-EFD18D9033F0}</ProjectGuid>
+    <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="$(VSPropsDir)Configuration.StaticLibrary.props" />

Externals/glslang/glslang.vcxproj.filters

@@ -133,9 +133,6 @@
     <ClCompile Include="SPIRV\SPVRemapper.cpp">
       <Filter>SPIRV</Filter>
     </ClCompile>
-    <ClCompile Include="StandAlone\ResourceLimits.cpp">
-      <Filter>StandAlone</Filter>
-    </ClCompile>
     <ClCompile Include="OGLCompilersDLL\InitializeDll.cpp">
       <Filter>OGLCompilersDLL</Filter>
     </ClCompile>
@@ -145,11 +142,9 @@
     <ClCompile Include="glslang\MachineIndependent\ParseContextBase.cpp">
       <Filter>glslang\MachineIndependant</Filter>
     </ClCompile>
+    <ClCompile Include="StandAlone\ResourceLimits.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="StandAlone\ResourceLimits.h">
-      <Filter>StandAlone</Filter>
-    </ClInclude>
     <ClInclude Include="glslang\Include\ShHandle.h">
       <Filter>glslang\Include</Filter>
     </ClInclude>
@@ -273,6 +268,9 @@
     <ClInclude Include="glslang\MachineIndependent\LiveTraverser.h">
       <Filter>glslang\MachineIndependant</Filter>
     </ClInclude>
+    <ClInclude Include="glslang\Include\revision.h" />
+    <ClInclude Include="glslang\Include\SpirvIntrinsics.h" />
+    <ClInclude Include="StandAlone\ResourceLimits.h" />
   </ItemGroup>
   <ItemGroup>
     <Filter Include="glslang">

Externals/imgui/imgui.vcxproj

@@ -4,6 +4,7 @@
   <Import Project="$(VSPropsDir)Base.Targets.props" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>{4C3B2264-EA73-4A7B-9CFE-65B0FD635EBB}</ProjectGuid>
+    <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="$(VSPropsDir)Configuration.StaticLibrary.props" />

Externals/implot/implot.vcxproj

@@ -4,6 +4,7 @@
   <Import Project="$(VSPropsDir)Base.Targets.props" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>{A608225E-AE0A-4D1A-9B55-97F57C862391}</ProjectGuid>
+    <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="$(VSPropsDir)Configuration.StaticLibrary.props" />

Externals/liblzma/liblzma.vcxproj

@@ -4,6 +4,7 @@
   <Import Project="$(VSPropsDir)Base.Targets.props" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>{055A775F-B4F5-4970-9240-F6CF7661F37B}</ProjectGuid>
+    <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="$(VSPropsDir)Configuration.StaticLibrary.props" />

Externals/libspng/spng.vcxproj

@@ -4,6 +4,7 @@
   <Import Project="$(VSPropsDir)Base.Targets.props" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>{447B7B1E-1D74-4AEF-B2B9-6EB41C5D5313}</ProjectGuid>
+    <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="$(VSPropsDir)Configuration.StaticLibrary.props" />

Externals/libusb/libusb-1.0.vcxproj

@@ -4,6 +4,7 @@
   <Import Project="$(VSPropsDir)Base.Targets.props" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>{349EE8F9-7D25-4909-AAF5-FF3FADE72187}</ProjectGuid>
+    <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="$(VSPropsDir)Configuration.StaticLibrary.props" />

Externals/mGBA/mgba.vcxproj

@@ -4,6 +4,7 @@
   <Import Project="$(VSPropsDir)Base.Targets.props" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>{864C4C8E-296D-3DBC-AD83-F1D5CB6E8EC6}</ProjectGuid>
+    <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="$(VSPropsDir)Configuration.StaticLibrary.props" />

Externals/mbedtls/mbedTLS.vcxproj

@@ -4,6 +4,7 @@
   <Import Project="$(VSPropsDir)Base.Targets.props" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>{BDB6578B-0691-4E80-A46C-DF21639FD3B8}</ProjectGuid>
+    <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="$(VSPropsDir)Configuration.StaticLibrary.props" />

Externals/miniupnpc/miniupnpc.vcxproj

@@ -4,6 +4,7 @@
   <Import Project="$(VSPropsDir)Base.Targets.props" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>{31643FDB-1BB8-4965-9DE7-000FC88D35AE}</ProjectGuid>
+    <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="$(VSPropsDir)Configuration.StaticLibrary.props" />

Externals/minizip/minizip.vcxproj

@@ -4,6 +4,7 @@
   <Import Project="$(VSPropsDir)Base.Targets.props" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>{23114507-079A-4418-9707-CFA81A03CA99}</ProjectGuid>
+    <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="$(VSPropsDir)Configuration.StaticLibrary.props" />

Externals/picojson/picojson.vcxproj

@@ -4,6 +4,7 @@
   <Import Project="$(VSPropsDir)Base.Targets.props" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>{2C0D058E-DE35-4471-AD99-E68A2CAF9E18}</ProjectGuid>
+    <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="$(VSPropsDir)Configuration.StaticLibrary.props" />

Externals/pugixml/pugixml.vcxproj

@@ -4,6 +4,7 @@
   <Import Project="$(VSPropsDir)Base.Targets.props" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>{38FEE76F-F347-484B-949C-B4649381CFFB}</ProjectGuid>
+    <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="$(VSPropsDir)Configuration.StaticLibrary.props" />

Externals/rcheevos/rcheevos.vcxproj

@@ -4,6 +4,7 @@
   <Import Project="$(VSPropsDir)Base.Targets.props" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>{CC99A910-3752-4465-95AA-7DC240D92A99}</ProjectGuid>
+    <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="$(VSPropsDir)Configuration.StaticLibrary.props" />

Externals/soundtouch/SoundTouch.vcxproj

@@ -4,6 +4,7 @@
   <Import Project="$(VSPropsDir)Base.Targets.props" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>{EC082900-B4D8-42E9-9663-77F02F6936AE}</ProjectGuid>
+    <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="$(VSPropsDir)Configuration.StaticLibrary.props" />

Externals/spirv_cross/spirv_cross.vcxproj

@@ -4,6 +4,7 @@
   <Import Project="$(VSPropsDir)Base.Targets.props" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>{3d780617-ec8c-4721-b9fd-dfc9bb658c7c}</ProjectGuid>
+    <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="$(VSPropsDir)Configuration.StaticLibrary.props" />

Externals/xxhash/xxhash.vcxproj

@@ -4,6 +4,7 @@
   <Import Project="$(VSPropsDir)Base.Targets.props" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>{677EA016-1182-440C-9345-DC88D1E98C0C}</ProjectGuid>
+    <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="$(VSPropsDir)Configuration.StaticLibrary.props" />

Externals/zlib-ng/zlib-ng.vcxproj

@@ -4,6 +4,7 @@
   <Import Project="$(VSPropsDir)Base.Targets.props" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>{F6EA7144-8D64-4EBB-A13E-76DFBD911EAE}</ProjectGuid>
+    <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="$(VSPropsDir)Configuration.StaticLibrary.props" />

Externals/zstd/zstd.vcxproj

@@ -4,6 +4,7 @@
   <Import Project="$(VSPropsDir)Base.Targets.props" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>{1BEA10F3-80CE-4BC4-9331-5769372CDF99}</ProjectGuid>
+    <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="$(VSPropsDir)Configuration.StaticLibrary.props" />

Languages/Languages.vcxproj

@@ -4,6 +4,7 @@
   <Import Project="$(VSPropsDir)Base.Targets.props" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>{0E033BE3-2E08-428E-9AE9-BC673EFA12B5}</ProjectGuid>
+    <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="$(VSPropsDir)Configuration.Utility.props" />
@@ -25,7 +26,7 @@
     <MoFilesDst Include="@(MoFiles -> '$(BinaryOutputDir)Languages\%(Filename)%(Extension)')" />
   </ItemGroup>
   <Target Name="MsgFmtCompile" BeforeTargets="BuildGenerateSources" Inputs="@(PoFiles)" Outputs="@(MoFiles)">
-    <Exec Command='$(msgfmt) -o "$(OutDir)%(PoFiles.Filename).mo" "@(PoFiles)"' />
+    <Exec Command="$(msgfmt) -o &quot;$(OutDir)%(PoFiles.Filename).mo&quot; &quot;@(PoFiles)&quot;" />
   </Target>
   <Target Name="MsgFmtCopy" AfterTargets="MsgFmtCompile" Inputs="@(MoFiles)" Outputs="@(MoFilesDst)">
     <Copy SourceFiles="@(MoFiles)" DestinationFiles="@(MoFilesDst)" SkipUnchangedFiles="true" />

Source/Core/Common/SCMRevGen.vcxproj

@@ -4,6 +4,7 @@
   <Import Project="$(VSPropsDir)Base.Targets.props" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>{41279555-F94F-4EBC-99DE-AF863C10C5C4}</ProjectGuid>
+    <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="$(VSPropsDir)Configuration.Utility.props" />

Source/Core/Core/MarioPartyNetplay/8Player.h

@@ -1,28 +0,0 @@
-#ifndef MPN_8PLAYER_H
-#define MPN_8PLAYER_H
-
-#include <stdlib.h>
-#include "InputCommon/GCPadStatus.h"
-
-#define MPN_TEAM_ACTIVE  (1 << 0)
-#define MPN_TEAM_L_READY (1 << 1)
-#define MPN_TEAM_R_READY (1 << 2)
-
-typedef struct mpn_team_t
-{
-  uint8_t     Flags;
-  GCPadStatus LeftPad;
-  GCPadStatus RightPad;
-} mpn_team_t;
-
-bool mpn_8p_active                ();
-GCPadStatus mpn_8p_combined_input (uint8_t Port);
-void mpn_8p_free                  ();
-void mpn_8p_init                  ();
-bool mpn_8p_port_ready            (uint8_t Port);
-void mpn_8p_push_back_input       (GCPadStatus* Pad, uint8_t Port);
-void mpn_8p_set_port_active       (uint8_t Port, bool Active);
-
-extern mpn_team_t* Teams;
-
-#endif

Source/Core/Core/MarioPartyNetplay/Discord.cpp

@@ -4,8 +4,8 @@
 
 bool mpn_update_discord()
 {
-  if (!Memory::IsInitialized())
-    return false;
+  //if (!Memory::IsInitialized())
+  //  return false;
 
   DiscordRichPresence RichPresence = {};
 

Source/Core/Core/MarioPartyNetplay/Gamestate.cpp

@@ -1,10 +1,14 @@
 #include "Gamestate.h"
+#include "Core/System.h"
 
 mpn_state_t CurrentState;
 
+
 bool mpn_init_state()
 {
-  if (!Memory::IsInitialized())
+  auto& system = Core::System::GetInstance();
+  auto& memory = system.GetMemory();
+  if (!memory.IsInitialized())
     return false;
 
   switch (mpn_read_value(0x00000000, 4))
@@ -120,7 +124,9 @@ bool mpn_update_state()
 {
   if (CurrentState.Scenes == NULL && !mpn_init_state())
     return false;
-  if (!Memory::IsInitialized())
+  auto& system = Core::System::GetInstance();
+  auto& memory = system.GetMemory();
+  if (!memory.IsInitialized())
     return false;
 
   CurrentState.PreviousSceneId = CurrentState.CurrentSceneId;
@@ -186,9 +192,10 @@ void mpn_per_frame()
 uint32_t mpn_read_value(uint32_t Address, uint8_t Size)
 {
   uint32_t Value = 0;
-
+  auto& system = Core::System::GetInstance();
+  auto& memory = system.GetMemory();
   for (int8_t i = 0; i < Size; i++)
-    Value += Memory::m_pRAM[Address + i] * pow(256, Size - i - 1);
+    Value += memory.GetRAM()[Address + i] * pow(256, Size - i - 1);
 
   return Value;
 }

Source/Core/DolphinLib.vcxproj

@@ -4,6 +4,7 @@
   <Import Project="$(VSPropsDir)Base.Targets.props" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>{d79392f7-06d6-4b4b-a39f-4d587c215d3a}</ProjectGuid>
+    <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="$(VSPropsDir)Configuration.StaticLibrary.props" />
@@ -77,20 +78,16 @@
   <ItemGroup>
     <Text Include="$(BuildInfoTemplate)" />
   </ItemGroup>
-  <UsingTask TaskName="GetProductVersion"
-    TaskFactory="CodeTaskFactory"
-    AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.Core.dll">
+  <UsingTask TaskName="GetProductVersion" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.Core.dll">
     <ParameterGroup>
       <Path ParameterType="System.String" Required="true" />
       <ProductVersion ParameterType="System.String" Output="true" />
     </ParameterGroup>
     <Task>
       <Using Namespace="System.Diagnostics" />
-      <Code Type="Fragment" Language="cs">
-        <![CDATA[
+      <Code Type="Fragment" Language="cs"><![CDATA[
           ProductVersion = FileVersionInfo.GetVersionInfo(Path).ProductVersion;
-        ]]>
-      </Code>
+        ]]></Code>
     </Task>
   </UsingTask>
   <Target Name="WriteBuildInfo" AfterTargets="Build" Inputs="$(BuildInfoTemplate)" Outputs="$(BuildInfoOutput)">
@@ -98,10 +95,6 @@
       <Output PropertyName="VCToolsProductVersion" TaskParameter="ProductVersion" />
     </GetProductVersion>
     <Message Text="VCToolsProductVersion $(VCToolsProductVersion)" Importance="High" />
-    <WriteLinesToFile
-      File="$(BuildInfoOutput)"
-      Lines="$([System.IO.File]::ReadAllText($(BuildInfoTemplate)).Replace('${VC_TOOLS_VERSION}', $(VCToolsProductVersion)))"
-      Overwrite="true"
-    />
+    <WriteLinesToFile File="$(BuildInfoOutput)" Lines="$([System.IO.File]::ReadAllText($(BuildInfoTemplate)).Replace('${VC_TOOLS_VERSION}', $(VCToolsProductVersion)))" Overwrite="true" />
   </Target>
 </Project>

Source/Core/DolphinNoGUI/DolphinNoGUI.vcxproj

@@ -4,6 +4,7 @@
   <Import Project="$(VSPropsDir)Base.Targets.props" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>{974E563D-23F8-4E8F-9083-F62876B04E08}</ProjectGuid>
+    <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="$(VSPropsDir)Configuration.Application.props" />

Source/Core/DolphinQt/DolphinQt.vcxproj

@@ -5,6 +5,7 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>{FA3FA62B-6F58-4B86-9453-4D149940A066}</ProjectGuid>
     <ProjectName>Dolphin</ProjectName>
+    <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="$(VSPropsDir)Configuration.Application.props" />
@@ -37,10 +38,8 @@
       <AdditionalIncludeDirectories>$(ProjectDir)Settings;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalIncludeDirectories>$(ProjectDir)TAS;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalIncludeDirectories>$(ProjectDir)VideoInterface;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-
       <!--Qt 6.3.0 headers use std::aligned_storage instead of alignas-->
       <PreprocessorDefinitions>_SILENCE_CXX23_ALIGNED_STORAGE_DEPRECATION_WARNING;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-
       <!--Jump through some hoops to generate a pch file local to this project-->
       <AdditionalIncludeDirectories>$(SourceDir)PCH;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PrecompiledHeader>Use</PrecompiledHeader>
@@ -450,6 +449,7 @@
     <DataSysFiles Include="$(DolphinRootDir)Data\**\Sys\**\*.*" />
     <DataUserFiles Include="$(DolphinRootDir)Data\**\User\**\*.*" />
     <DataTxtFiles Include="$(DolphinRootDir)Data\license.txt" />
+    <DataTxtFiles Include="$(DolphinRootDir)Data\portable.txt" />
     <BinaryFiles Include="$(TargetPath)" />
     <AllInputFiles Include="@(DataSysFiles);@(DataUserFiles);@(DataTxtFiles);@(BinaryFiles)" />
   </ItemGroup>

Source/Core/DolphinQt/Settings/GeneralPane.cpp

@@ -99,14 +99,6 @@ void GeneralPane::ConnectLayout()
   connect(m_checkbox_discord_presence, &QCheckBox::toggled, this, &GeneralPane::OnSaveConfig);
 #endif
 
-  if (AutoUpdateChecker::SystemSupportsAutoUpdates())
-  {
-    connect(m_combobox_update_track, qOverload<int>(&QComboBox::currentIndexChanged), this,
-            &GeneralPane::OnSaveConfig);
-    connect(&Settings::Instance(), &Settings::AutoUpdateTrackChanged, this,
-            &GeneralPane::LoadConfig);
-  }
-
   // Advanced
   connect(m_combobox_speedlimit, qOverload<int>(&QComboBox::currentIndexChanged), [this]() {
     Config::SetBaseOrCurrent(Config::MAIN_EMULATION_SPEED,
@@ -218,18 +210,6 @@ void GeneralPane::LoadConfig()
   const QSignalBlocker blocker(this);
 
   if (AutoUpdateChecker::SystemSupportsAutoUpdates())
-  {
-    const auto track = Settings::Instance().GetAutoUpdateTrack().toStdString();
-
-    // If the track doesn't match any known value, set to "beta" which is the
-    // default config value on Dolphin release builds.
-    if (track == AUTO_UPDATE_DISABLE_STRING)
-      SignalBlocking(m_combobox_update_track)->setCurrentIndex(AUTO_UPDATE_DISABLE_INDEX);
-    else if (track == AUTO_UPDATE_DEV_STRING)
-      SignalBlocking(m_combobox_update_track)->setCurrentIndex(AUTO_UPDATE_DEV_INDEX);
-    else
-      SignalBlocking(m_combobox_update_track)->setCurrentIndex(AUTO_UPDATE_BETA_INDEX);
-  }
 
 #if defined(USE_ANALYTICS) && USE_ANALYTICS
   SignalBlocking(m_checkbox_enable_analytics)

Source/Core/DolphinTool/DolphinTool.vcxproj

@@ -4,6 +4,7 @@
   <Import Project="$(VSPropsDir)Base.Targets.props" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>{8F91523C-5C5E-4B22-A1F1-67560B6DC714}</ProjectGuid>
+    <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="$(VSPropsDir)Configuration.Application.props" />

Source/Core/UICommon/AutoUpdate.cpp

@@ -194,7 +194,6 @@ void AutoUpdateChecker::CheckForUpdate(std::string_view update_track,
   std::string url = fmt::format("{}/update/check/v1/{}/{}/{}", GetUpdateServerUrl(), update_track,
                                 version_hash, GetPlatformID());
 
-  const bool is_manual_check = check_type == CheckType::Manual;
 }
 
 void AutoUpdateChecker::TriggerUpdate(const AutoUpdateChecker::NewVersionInformation& info,

Source/Core/UICommon/UICommon.cpp

@@ -339,11 +339,60 @@ void SetUserDirectory(std::string custom_path)
 
   local = local != 0 || File::Exists(File::GetExeDirectory() + DIR_SEP "portable.txt");
 
-  // Get Documents path in case we need it.
-  // TODO: Maybe use WIL when it's available?
-  PWSTR my_documents = nullptr;
+  // Attempt to check if the old User directory exists in Documents.
+  wil::unique_cotaskmem_string documents;
+  bool documents_found = SUCCEEDED(
+      SHGetKnownFolderPath(FOLDERID_Documents, KF_FLAG_DEFAULT, nullptr, documents.put()));
 
-  user_path = File::GetExeDirectory() + DIR_SEP USERDATA_DIR DIR_SEP;
+  std::optional<std::string> old_user_folder;
+  if (documents_found)
+  {
+    old_user_folder = TStrToUTF8(documents.get()) + DIR_SEP NORMAL_USER_DIR DIR_SEP;
+  }
+
+  if (local)  // Case 1-2
+  {
+    user_path = File::GetExeDirectory() + DIR_SEP PORTABLE_USER_DIR DIR_SEP;
+  }
+  else if (configPath)  // Case 3
+  {
+    user_path = TStrToUTF8(configPath.get());
+  }
+  else if (old_user_folder && File::Exists(old_user_folder.value()))  // Case 4
+  {
+    user_path = old_user_folder.value();
+  }
+  else if (appdata_found)  // Case 5
+  {
+    user_path = TStrToUTF8(appdata.get()) + DIR_SEP NORMAL_USER_DIR DIR_SEP;
+
+    // Set the UserConfigPath value in the registry for backwards compatibility with older Dolphin
+    // builds, which will look for the default User directory in Documents. If we set this key,
+    // they will use this as the User directory instead.
+    // (If we're in this case, then this key doesn't exist, so it's OK to set it.)
+    std::wstring wstr_path = UTF8ToWString(user_path);
+    RegSetKeyValueW(HKEY_CURRENT_USER, TEXT("Software\\Dolphin Emulator"), TEXT("UserConfigPath"),
+                    REG_SZ, wstr_path.c_str(),
+                    static_cast<DWORD>((wstr_path.size() + 1) * sizeof(wchar_t)));
+  }
+  else  // Case 6
+  {
+    user_path = File::GetExeDirectory() + DIR_SEP PORTABLE_USER_DIR DIR_SEP;
+  }
+#else  // ifndef STEAM
+  if (File::Exists(File::GetExeDirectory() + DIR_SEP "portable.txt"))  // Case 1
+  {
+    user_path = File::GetExeDirectory() + DIR_SEP PORTABLE_USER_DIR DIR_SEP;
+  }
+  else if (appdata_found)  // Case 2
+  {
+    user_path = TStrToUTF8(appdata.get()) + DIR_SEP NORMAL_USER_DIR DIR_SEP;
+  }
+  else  // Case 3
+  {
+    user_path = File::GetExeDirectory() + DIR_SEP PORTABLE_USER_DIR DIR_SEP;
+  }
+#endif
 
 #else
   if (File::IsDirectory(ROOT_DIR DIR_SEP EMBEDDED_USER_DIR))

Source/Core/WinUpdater/WinUpdater.vcxproj

@@ -4,6 +4,7 @@
   <Import Project="$(VSPropsDir)Base.Targets.props" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>{E4BECBAB-9C6E-41AB-BB56-F9D70AB6BE03}</ProjectGuid>
+    <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="$(VSPropsDir)Configuration.Application.props" />

Source/Core/WinUpdater/WinUpdater.vcxproj.filters

@@ -3,8 +3,15 @@
   <ItemGroup>
     <ClCompile Include="Main.cpp" />
     <ClCompile Include="WinUI.cpp" />
+    <ClCompile Include="..\UpdaterCommon\UpdaterCommon.cpp" />
+    <ClCompile Include="Platform.cpp" />
   </ItemGroup>
   <ItemGroup>
     <Manifest Include="Updater.exe.manifest" />
   </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\UpdaterCommon\Platform.h" />
+    <ClInclude Include="..\UpdaterCommon\UI.h" />
+    <ClInclude Include="..\UpdaterCommon\UpdaterCommon.h" />
+  </ItemGroup>
 </Project>

Source/DSPTool/DSPTool.vcxproj

@@ -4,6 +4,7 @@
   <Import Project="$(VSPropsDir)Base.Targets.props" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>{1970D175-3DE8-4738-942A-4D98D1CDBF64}</ProjectGuid>
+    <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="$(VSPropsDir)Configuration.Application.props" />

Source/DSPTool/DSPTool.vcxproj.filters

@@ -5,20 +5,6 @@
       <UniqueIdentifier>{0b70242b-1d98-432f-a60e-d4ca0674852e}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="Testdata\dsp_test.bin">
-      <Filter>TestData</Filter>
-    </None>
-    <None Include="Testdata\dsp_test.S">
-      <Filter>TestData</Filter>
-    </None>
-    <None Include="Testdata\hermes.bin">
-      <Filter>TestData</Filter>
-    </None>
-    <None Include="Testdata\hermes.s">
-      <Filter>TestData</Filter>
-    </None>
-  </ItemGroup>
   <ItemGroup>
     <ClCompile Include="DSPTool.cpp" />
     <ClCompile Include="StubHost.cpp" />

Source/PCH/pch.vcxproj

@@ -4,6 +4,7 @@
   <Import Project="$(VSPropsDir)Base.Targets.props" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>{76563A7F-1011-4EAD-B667-7BB18D09568E}</ProjectGuid>
+    <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="$(VSPropsDir)Configuration.StaticLibrary.props" />

Source/UnitTests/UnitTests.vcxproj

@@ -4,6 +4,7 @@
   <Import Project="$(VSPropsDir)Base.Targets.props" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>{474661E7-C73A-43A6-AFEE-EE1EC433D49E}</ProjectGuid>
+    <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="$(VSPropsDir)Configuration.Application.props" />