Migrate solution file to new format

Author: YoshiRulz

.github/workflows/ci.yml

@@ -43,7 +43,7 @@ jobs:
           dotnet-version: "10"
 
       - name: Test
-        run: dotnet test BizHawk.sln -c Release -p:ContinuousIntegrationBuild=true -p:RunStyleCop=false
+        run: dotnet test BizHawk.slnx -c Release -p:ContinuousIntegrationBuild=true -p:RunStyleCop=false
         shell: pwsh
 
   package:

BizHawk.sln

@@ -0,0 +1,24 @@
+<Solution>
+	<Project Path="src/BizHawk.BizInvoke/BizHawk.BizInvoke.csproj" />
+	<Project Path="src/BizHawk.Bizware.Audio/BizHawk.Bizware.Audio.csproj" />
+	<Project Path="src/BizHawk.Bizware.Graphics.Controls/BizHawk.Bizware.Graphics.Controls.csproj" />
+	<Project Path="src/BizHawk.Bizware.Graphics/BizHawk.Bizware.Graphics.csproj" />
+	<Project Path="src/BizHawk.Bizware.Input/BizHawk.Bizware.Input.csproj" />
+	<Project Path="src/BizHawk.Common/BizHawk.Common.csproj" />
+	<Folder Name="/Client/">
+		<Project Path="src/BizHawk.Client.Common/BizHawk.Client.Common.csproj" />
+		<Project Path="src/BizHawk.Client.DiscoHawk/BizHawk.Client.DiscoHawk.csproj" />
+		<Project Path="src/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj" />
+		<Project Path="src/BizHawk.WinForms.Controls/BizHawk.WinForms.Controls.csproj" />
+	</Folder>
+	<Folder Name="/Emulation/">
+		<Project Path="src/BizHawk.Emulation.Common/BizHawk.Emulation.Common.csproj" />
+		<Project Path="src/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj" />
+		<Project Path="src/BizHawk.Emulation.DiscSystem/BizHawk.Emulation.DiscSystem.csproj" />
+	</Folder>
+	<Folder Name="/Tests/">
+		<Project Path="src/BizHawk.Tests.Client.Common/BizHawk.Tests.Client.Common.csproj" />
+		<Project Path="src/BizHawk.Tests.Common/BizHawk.Tests.Common.csproj" />
+		<Project Path="src/BizHawk.Tests.Emulation.Common/BizHawk.Tests.Emulation.Common.csproj" />
+	</Folder>
+</Solution>

BizHawk.slnx

@@ -1,6 +1,6 @@
 #!/bin/sh
 set -e
-if [ ! -e "BizHawk.sln" ]; then
+if [ ! -e "BizHawk.slnx" ]; then
 	printf "wrong cwd (ran manually)? exiting\n"
 	exit 1
 fi

Dist/.BuildInConfigX.sh

@@ -1,5 +1,5 @@
 #!/bin/sh
-if [ ! -e "BizHawk.sln" ]; then
+if [ ! -e "BizHawk.slnx" ]; then
 	printf "wrong cwd (ran manually)? exiting\n"
 	exit 1
 fi

Dist/.BuildTestInConfigX.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 set -e
-if [ ! -e "BizHawk.sln" ]; then
+if [ ! -e "BizHawk.slnx" ]; then
 	printf "wrong cwd (ran manually)? exiting\n"
 	exit 1
 fi
@@ -12,4 +12,4 @@ if [ -z "$NUGET_PACKAGES" ]; then export NUGET_PACKAGES="$HOME/.nuget/packages";
 printf "running 'dotnet %s' in %s configuration, extra args: %s\n" "$cmd" "$config" "$*"
 version=$(grep -Po "MainVersion = \"\K(.*)(?=\")" src/BizHawk.Common/VersionInfo.cs)
 git_hash="$(git rev-parse --verify HEAD 2>/dev/null || printf "0000000000000000000000000000000000000000")"
-dotnet "$cmd" BizHawk.sln -c "$config" -m -clp:NoSummary -p:Version="$version" -p:SourceRevisionId="$git_hash" "$@"
+dotnet "$cmd" BizHawk.slnx -c "$config" -m -clp:NoSummary -p:Version="$version" -p:SourceRevisionId="$git_hash" "$@"

Dist/.InvokeCLIOnMainSln.sh

@@ -9,7 +9,7 @@ if "%1"=="" (
 git --version > NUL
 @if errorlevel 1 goto MISSINGGIT
 
-dotnet build ..\BizHawk.sln -c Release --no-incremental
+dotnet build ..\BizHawk.slnx -c Release --no-incremental
 @if not errorlevel 0 goto DOTNETBUILDFAILED
 rem -p:Platform="Any CPU"
 

Dist/QuickTestBuildAndPackage.bat

@@ -81,7 +81,7 @@ nix-build --pure -A emuhawk.fetch-deps && ./result
 ```sh
 nix-shell # = `nix-shell -A emuhawk-latest`
 # (in shell):
-Dist/BuildDebug.sh # = `dotnet build -c Debug BizHawk.sln`
+Dist/BuildDebug.sh # = `dotnet build -c Debug BizHawk.slnx`
 emuhawk-monort-local # = `cd output && mono EmuHawk.exe`
 
 # if deps (besides NuGet packages) have changed, may need to do this instead, but it will do a slow copy of the repo to the Nix store

Dist/nix_expr_usage_docs.md

@@ -215,7 +215,7 @@ See the [contributor guidelines](https://github.com/TASEmulators/BizHawk/blob/ma
 
 tl;dr:
 - On Unix, run `Dist/BuildRelease.sh` (uses .NET SDK CLI). You can also use Rider or VS Code.
-- On Windows, run in [VS2022](https://visualstudio.microsoft.com/vs/community). You can also use the command-line (`dotnet build BizHawk.sln`), Rider, or VS Code.
+- On Windows, run in [VS2022](https://visualstudio.microsoft.com/vs/community). You can also use the command-line (`dotnet build BizHawk.slnx`), Rider, or VS Code.
 
 [to top](#bizhawk)
 

README.md

@@ -113,10 +113,10 @@ Uses C#; you will need the .NET SDK or an IDE which includes it. See the [.NET s
 Most projects target .NET Standard 2.0, with some targeting .NET Framework 4.8. It's written at the top of their project files, or you can check the [project graph](https://github.com/TASEmulators/BizHawk/wiki/Dependencies#main-solution).
 
 The source for EmuHawk, plus DiscoHawk and the supporting libraries, is in `/src`, with a few extra files used by the build system elsewhere.
-EmuHawk's project file `/src/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj` includes the other projects [in a tree](https://github.com/TASEmulators/BizHawk/wiki/Dependencies#main-solution), and they're all included in `/BizHawk.sln`.
+EmuHawk's project file `/src/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj` includes the other projects [in a tree](https://github.com/TASEmulators/BizHawk/wiki/Dependencies#main-solution), and they're all included in `/BizHawk.slnx`.
 
-In VS2022, open `BizHawk.sln`, then select the "BizHawk.Client.EmuHawk | Release" configuration to build and run.
-To build from the command-line on Windows, simply run `dotnet build BizHawk.sln` from the repository's root, and then `output\EmuHawk.exe` will be available. Alternatively, you can run one of the existing build scripts that apply additional checks and configurations, such as `Dist\QuickTestBuildAndPackage_Release.bat`.
+In VS2022, open `BizHawk.slnx`, then select the "BizHawk.Client.EmuHawk | Release" configuration to build and run.
+To build from the command-line on Windows, simply run `dotnet build BizHawk.slnx` from the repository's root, and then `output\EmuHawk.exe` will be available. Alternatively, you can run one of the existing build scripts that apply additional checks and configurations, such as `Dist\QuickTestBuildAndPackage_Release.bat`.
 To build from the command-line on Unix, run `Dist/BuildRelease.sh`, and then `output/EmuHawkMono.sh` will be available.
 
 There are 2 build configurations. Besides `Release` there is `Debug`, which *does not run* bytecode optimisations, *does not remove* debugging symbols, *enables* additional logging and assertions, and *enables* some features. On Windows, a `Debug` executable will spawn a console window for stdout. Note there is also a "stronger" release build in the form of `VersionInfo.DeveloperBuild == false`, which is only used by GitLab CI for preparing a release (during `Dist/UpdateVersionInfoForRelease.sh`).