From 1bded467b3a77400de973b5d5562f45f64e85cd9 Mon Sep 17 00:00:00 2001
From: YoshiRulz <OSSYoshiRulz@gmail.com>
Date: Sun, 3 May 2020 11:05:26 +1000
Subject: [PATCH] Replace $(SolutionDir) with $(ProjectDir) in src/

---
 .../BizHawk.BizInvoke.csproj                  |  8 ++--
 .../BizHawk.Bizware.BizwareGL.csproj          |  8 ++--
 .../BizHawk.Client.Common.csproj              | 14 +++---
 .../BizHawk.Client.DiscoHawk.csproj           | 16 +++----
 .../BizHawk.Client.EmuHawk.csproj             | 46 +++++++++----------
 src/BizHawk.Common/BizHawk.Common.csproj      |  8 ++--
 .../BizHawk.Emulation.Common.csproj           |  8 ++--
 .../BizHawk.Emulation.Cores.csproj            | 16 +++----
 .../BizHawk.Emulation.DiscSystem.csproj       |  8 ++--
 .../BizHawk.WinForms.Controls.csproj          |  8 ++--
 src/CommonResourceGen.props                   | 10 ++--
 src/CommonStyleCopAnalyzer.props              |  6 +--
 src/MainSlnCommon.props                       |  8 ++--
 13 files changed, 82 insertions(+), 82 deletions(-)

diff --git a/src/BizHawk.BizInvoke/BizHawk.BizInvoke.csproj b/src/BizHawk.BizInvoke/BizHawk.BizInvoke.csproj
index bcdb7c7bac..27cd26dcd0 100644
--- a/src/BizHawk.BizInvoke/BizHawk.BizInvoke.csproj
+++ b/src/BizHawk.BizInvoke/BizHawk.BizInvoke.csproj
@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
-	<Import Project="$(SolutionDir)src/MainSlnCommon.props" />
+	<Import Project="../MainSlnCommon.props" />
 	<PropertyGroup>
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 		<TargetFramework>net48</TargetFramework>
 	</PropertyGroup>
 	<ItemGroup>
 		<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All" />
-		<ProjectReference Include="$(SolutionDir)src/BizHawk.Common/BizHawk.Common.csproj" />
-		<Compile Include="$(SolutionDir)src/Version/svnrev.cs" />
-		<Compile Include="$(SolutionDir)src/Version/VersionInfo.cs" />
+		<ProjectReference Include="$(ProjectDir)../BizHawk.Common/BizHawk.Common.csproj" />
+		<Compile Include="$(ProjectDir)../Version/svnrev.cs" />
+		<Compile Include="$(ProjectDir)../Version/VersionInfo.cs" />
 	</ItemGroup>
 </Project>
diff --git a/src/BizHawk.Bizware.BizwareGL/BizHawk.Bizware.BizwareGL.csproj b/src/BizHawk.Bizware.BizwareGL/BizHawk.Bizware.BizwareGL.csproj
index 2ce23b903b..f27556ed7e 100644
--- a/src/BizHawk.Bizware.BizwareGL/BizHawk.Bizware.BizwareGL.csproj
+++ b/src/BizHawk.Bizware.BizwareGL/BizHawk.Bizware.BizwareGL.csproj
@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-	<Import Project="$(SolutionDir)src/MainSlnCommon.props" />
+	<Import Project="../MainSlnCommon.props" />
 	<PropertyGroup>
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 		<TargetFrameworks>netstandard2.0;netcoreapp3.1</TargetFrameworks>
@@ -8,9 +8,9 @@
 		<PackageReference Include="Microsoft.CSharp" Version="4.7.0" PrivateAssets="All" />
 		<PackageReference Include="System.Drawing.Common" Version="4.7.0" PrivateAssets="All" />
 		<PackageReference Include="OpenTK" Version="3.0.1" PrivateAssets="All" />
-		<ProjectReference Include="$(SolutionDir)src/BizHawk.Common/BizHawk.Common.csproj" />
-		<Compile Include="$(SolutionDir)src/Version/svnrev.cs" />
-		<Compile Include="$(SolutionDir)src/Version/VersionInfo.cs" />
+		<ProjectReference Include="$(ProjectDir)../BizHawk.Common/BizHawk.Common.csproj" />
+		<Compile Include="$(ProjectDir)../Version/svnrev.cs" />
+		<Compile Include="$(ProjectDir)../Version/VersionInfo.cs" />
 	</ItemGroup>
 	<ItemGroup>
 		<Compile Update="IGuiRenderer.cs" SubType="Code" />
diff --git a/src/BizHawk.Client.Common/BizHawk.Client.Common.csproj b/src/BizHawk.Client.Common/BizHawk.Client.Common.csproj
index 3d626f7915..4fa5d69997 100644
--- a/src/BizHawk.Client.Common/BizHawk.Client.Common.csproj
+++ b/src/BizHawk.Client.Common/BizHawk.Client.Common.csproj
@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-	<Import Project="$(SolutionDir)src/MainSlnCommon.props" />
+	<Import Project="../MainSlnCommon.props" />
 	<PropertyGroup>
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 		<TargetFramework>netstandard2.0</TargetFramework><!-- some NuGet packages aren't for Standard, and are only loaded at runtime because EmuHawk is still Framework. More work will be required to move to Core. -->
@@ -8,18 +8,18 @@
 		<PackageReference Include="Microsoft.CSharp" Version="4.7.0" PrivateAssets="All" /><!-- for (extra?) dynamic type support -->
 		<Reference Include="System.Data.SQLite, Version=1.0.105.2, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=AMD64"
 			SpecificVersion="False"
-			HintPath="$(SolutionDir)References/x64/SQLite/System.Data.SQLite.dll" />
+			HintPath="$(ProjectDir)../../References/x64/SQLite/System.Data.SQLite.dll" />
 		<PackageReference Include="System.Drawing.Common" Version="4.7.0" PrivateAssets="All" />
 		<PackageReference Include="Newtonsoft.Json" Version="12.0.3" PrivateAssets="All" />
 		<Reference Include="NLua"
-			HintPath="$(SolutionDir)output/dll/nlua/NLua.dll"
+			HintPath="$(ProjectDir)../../output/dll/nlua/NLua.dll"
 			Private="False" />
 		<PackageReference Include="SharpCompress" Version="0.24.0" PrivateAssets="All" />
 		<PackageReference Include="SharpZipLib" Version="1.1.0" PrivateAssets="All" />
-		<ProjectReference Include="$(SolutionDir)src/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj" />
-		<ProjectReference Include="$(SolutionDir)src/BizHawk.Bizware.BizwareGL/BizHawk.Bizware.BizwareGL.csproj" />
-		<Compile Include="$(SolutionDir)src/Version/svnrev.cs" />
-		<Compile Include="$(SolutionDir)src/Version/VersionInfo.cs" />
+		<ProjectReference Include="$(ProjectDir)../BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj" />
+		<ProjectReference Include="$(ProjectDir)../BizHawk.Bizware.BizwareGL/BizHawk.Bizware.BizwareGL.csproj" />
+		<Compile Include="$(ProjectDir)../Version/svnrev.cs" />
+		<Compile Include="$(ProjectDir)../Version/VersionInfo.cs" />
 	</ItemGroup>
 	<ItemGroup>
 		<Compile Update="movie/bk2/Bk2Movie.HeaderApi.cs" DependentUpon="Bk2Movie.cs" />
diff --git a/src/BizHawk.Client.DiscoHawk/BizHawk.Client.DiscoHawk.csproj b/src/BizHawk.Client.DiscoHawk/BizHawk.Client.DiscoHawk.csproj
index 05fd1f700e..99be8ade06 100644
--- a/src/BizHawk.Client.DiscoHawk/BizHawk.Client.DiscoHawk.csproj
+++ b/src/BizHawk.Client.DiscoHawk/BizHawk.Client.DiscoHawk.csproj
@@ -20,7 +20,7 @@
 		<MapFileExtensions>true</MapFileExtensions>
 		<NoWin32Manifest>true</NoWin32Manifest>
 		<OldToolsVersion>3.5</OldToolsVersion>
-		<OutputPath>$(SolutionDir)output</OutputPath>
+		<OutputPath>$(ProjectDir)../../output</OutputPath>
 		<OutputType>Exe</OutputType>
 		<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
 		<PlatformTarget>AnyCPU</PlatformTarget>
@@ -71,8 +71,8 @@
 			<Install>true</Install>
 		</BootstrapperPackage>
 	</ItemGroup>
-	<Import Project="$(SolutionDir)src/CommonStyleCopAnalyzer.props" />
-	<Import Project="$(SolutionDir)src/CommonRefAssemblies.props" Condition=" '$(OS)' != 'Windows_NT' " />
+	<Import Project="../CommonStyleCopAnalyzer.props" />
+	<Import Project="../CommonRefAssemblies.props" Condition=" '$(OS)' != 'Windows_NT' " />
 	<ItemGroup>
 		<Reference Include="System" />
 		<!--<Reference Include="System.Core" RequiredTargetFramework="3.5" />-->
@@ -83,17 +83,17 @@
 		<!--<Reference Include="System.Xml" />-->
 	</ItemGroup>
 	<ItemGroup>
-		<ProjectReference Include="$(SolutionDir)src/BizHawk.Common/BizHawk.Common.csproj"
+		<ProjectReference Include="$(ProjectDir)../BizHawk.Common/BizHawk.Common.csproj"
 			Name="BizHawk.Common"
 			Project="{866F8D13-0678-4FF9-80A4-A3993FD4D8A3}" />
-		<ProjectReference Include="$(SolutionDir)src/BizHawk.Emulation.DiscSystem/BizHawk.Emulation.DiscSystem.csproj"
+		<ProjectReference Include="$(ProjectDir)../BizHawk.Emulation.DiscSystem/BizHawk.Emulation.DiscSystem.csproj"
 			Name="BizHawk.Emulation.DiscSystem"
 			Project="{f51946ea-827f-4d82-b841-1f2f6d060312}" />
 	</ItemGroup>
 	<ItemGroup>
 		<Compile Include="**/*.cs" />
-		<Compile Include="$(SolutionDir)src/Version/svnrev.cs" Link="svnrev.cs" />
-		<Compile Include="$(SolutionDir)src/Version/VersionInfo.cs" Link="VersionInfo.cs" />
+		<Compile Include="$(ProjectDir)../Version/svnrev.cs" Link="svnrev.cs" />
+		<Compile Include="$(ProjectDir)../Version/VersionInfo.cs" Link="VersionInfo.cs" />
 		<Content Include="discohawk.ico" />
 		<EmbeddedResource Include="**/*.resx" />
 		<None Include="app.config" />
@@ -110,5 +110,5 @@
 		<EmbeddedResource Update="MainDiscoForm.resx" DependentUpon="MainDiscoForm.cs" SubType="Designer" />
 	</ItemGroup>
 	<Import Project="$(MSBuildToolsPath)/Microsoft.CSharp.targets" />
-	<Import Project="$(SolutionDir)src/CommonResourceGen.props" Condition=" '$(MSBuildRuntimeType)' == 'Core' " />
+	<Import Project="../CommonResourceGen.props" Condition=" '$(MSBuildRuntimeType)' == 'Core' " />
 </Project>
diff --git a/src/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj b/src/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
index 1bb1d87717..d1e7669ff7 100644
--- a/src/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
+++ b/src/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
@@ -21,7 +21,7 @@
 		<LangVersion>8.0</LangVersion>
 		<MapFileExtensions>true</MapFileExtensions>
 		<OldToolsVersion>3.5</OldToolsVersion>
-		<OutputPath>$(SolutionDir)output</OutputPath>
+		<OutputPath>$(ProjectDir)../../output</OutputPath>
 		<OutputType>WinExe</OutputType>
 		<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
 		<PlatformTarget>AnyCPU</PlatformTarget>
@@ -89,40 +89,40 @@
 			<Install>true</Install>
 		</BootstrapperPackage>
 	</ItemGroup>
-	<Import Project="$(SolutionDir)src/CommonStyleCopAnalyzer.props" />
-	<Import Project="$(SolutionDir)src/CommonRefAssemblies.props" Condition=" '$(OS)' != 'Windows_NT' " />
+	<Import Project="../CommonStyleCopAnalyzer.props" />
+	<Import Project="../CommonRefAssemblies.props" Condition=" '$(OS)' != 'Windows_NT' " />
 	<Import Project="ProjectPkgRefs.props" Condition=" '$(OS)' != 'Windows_NT' " />
 	<ItemGroup Condition=" '$(OS)' == 'Windows_NT' ">
 		<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed"
-			HintPath="$(SolutionDir)packages/Newtonsoft.Json.12.0.3/lib/net45/Newtonsoft.Json.dll"
+			HintPath="$(ProjectDir)../../packages/Newtonsoft.Json.12.0.3/lib/net45/Newtonsoft.Json.dll"
 			Private="true" />
 		<Reference Include="OpenTK.GLControl, Version=3.0.1.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4"
-			HintPath="$(SolutionDir)packages/OpenTK.GLControl.3.0.1/lib/net20/OpenTK.GLControl.dll"
+			HintPath="$(ProjectDir)../../packages/OpenTK.GLControl.3.0.1/lib/net20/OpenTK.GLControl.dll"
 			Private="true" />
 		<Reference Include="ICSharpCode.SharpZipLib, Version=1.1.0.145, Culture=neutral, PublicKeyToken=1b03e6acf1164f73"
-			HintPath="$(SolutionDir)packages/SharpZipLib.1.1.0/lib/net45/ICSharpCode.SharpZipLib.dll"
+			HintPath="$(ProjectDir)../../packages/SharpZipLib.1.1.0/lib/net45/ICSharpCode.SharpZipLib.dll"
 			Private="true" />
 		<Reference Include="System.Drawing.Common, Version=4.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51"
-			HintPath="$(SolutionDir)packages/System.Drawing.Common.4.7.0/lib/net461/System.Drawing.Common.dll"
+			HintPath="$(ProjectDir)../../packages/System.Drawing.Common.4.7.0/lib/net461/System.Drawing.Common.dll"
 			Private="true" />
 	</ItemGroup>
 	<ItemGroup>
 		<Reference Include="GongShell"
-			HintPath="$(SolutionDir)References/GongShell.dll"
+			HintPath="$(ProjectDir)../../References/GongShell.dll"
 			Private="true" />
 		<Reference Include="NLua, Version=1.3.2.0, Culture=neutral, processorArchitecture=MSIL"
-			HintPath="$(SolutionDir)output/dll/nlua/NLua.dll"
+			HintPath="$(ProjectDir)../../output/dll/nlua/NLua.dll"
 			Private="true"
 			SpecificVersion="false" />
 		<Reference Include="OpenTK, Version=1.1.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL"
-			HintPath="$(SolutionDir)References/OpenTK.dll"
+			HintPath="$(ProjectDir)../../References/OpenTK.dll"
 			Private="true"
 			SpecificVersion="false" />
 		<Reference Include="SlimDX"
-			HintPath="$(SolutionDir)References/x64/SlimDX.dll"
+			HintPath="$(ProjectDir)../../References/x64/SlimDX.dll"
 			Private="true" />
 		<Reference Include="System.ComponentModel.Annotations, Version=4.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
-			HintPath="$(SolutionDir)References/System.ComponentModel.Annotations.dll"
+			HintPath="$(ProjectDir)../../References/System.ComponentModel.Annotations.dll"
 			Private="true" />
 	</ItemGroup>
 	<ItemGroup>
@@ -144,30 +144,30 @@
 		<!--<Reference Include="WindowsBase" />-->
 	</ItemGroup>
 	<ItemGroup>
-		<ProjectReference Include="$(SolutionDir)src/BizHawk.Client.Common/BizHawk.Client.Common.csproj"
+		<ProjectReference Include="$(ProjectDir)../BizHawk.Client.Common/BizHawk.Client.Common.csproj"
 			Name="BizHawk.Client.Common"
 			Project="{24A0AA3C-B25F-4197-B23D-476D6462DBA0}" />
-		<ProjectReference Include="$(SolutionDir)src/BizHawk.Common/BizHawk.Common.csproj"
+		<ProjectReference Include="$(ProjectDir)../BizHawk.Common/BizHawk.Common.csproj"
 			Name="BizHawk.Common"
 			Project="{866F8D13-0678-4FF9-80A4-A3993FD4D8A3}" />
-		<ProjectReference Include="$(SolutionDir)src/BizHawk.Emulation.Common/BizHawk.Emulation.Common.csproj"
+		<ProjectReference Include="$(ProjectDir)../BizHawk.Emulation.Common/BizHawk.Emulation.Common.csproj"
 			Name="BizHawk.Emulation.Common"
 			Project="{e1a23168-b571-411c-b360-2229e7225e0e}" />
-		<ProjectReference Include="$(SolutionDir)src/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj"
+		<ProjectReference Include="$(ProjectDir)../BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj"
 			Name="BizHawk.Emulation.Cores"
 			Project="{197D4314-8A9F-49BA-977D-54ACEFAEB6BA}" />
-		<ProjectReference Include="$(SolutionDir)src/BizHawk.WinForms.Controls/BizHawk.WinForms.Controls.csproj"
+		<ProjectReference Include="$(ProjectDir)../BizHawk.WinForms.Controls/BizHawk.WinForms.Controls.csproj"
 			Name="BizHawk.WinForms.Controls"
 			Project="{B5A2214B-3CB0-48C4-8DB1-98B38D48AC4A}" />
-		<ProjectReference Include="$(SolutionDir)src/BizHawk.Bizware.BizwareGL/BizHawk.Bizware.BizwareGL.csproj"
+		<ProjectReference Include="$(ProjectDir)../BizHawk.Bizware.BizwareGL/BizHawk.Bizware.BizwareGL.csproj"
 			Name="BizHawk.Bizware.BizwareGL"
 			Project="{9F84A0B2-861E-4EF4-B89B-5E2A3F38A465}" />
 	</ItemGroup>
 	<ItemGroup>
 		<Compile Include="**/*.cs" />
-		<Compile Include="$(SolutionDir)src/BizHawk.Common/OSTailoredCode.cs" Link="OSTailoredCode.cs" />
-		<Compile Include="$(SolutionDir)src/Version/svnrev.cs" Link="svnrev.cs" />
-		<Compile Include="$(SolutionDir)src/Version/VersionInfo.cs" Link="VersionInfo.cs" />
+		<Compile Include="$(ProjectDir)../BizHawk.Common/OSTailoredCode.cs" Link="OSTailoredCode.cs" />
+		<Compile Include="$(ProjectDir)../Version/svnrev.cs" Link="svnrev.cs" />
+		<Compile Include="$(ProjectDir)../Version/VersionInfo.cs" Link="VersionInfo.cs" />
 		<Compile Remove="Properties/Settings.Designer.cs" />
 		<Content Include="images/logo.ico" />
 		<EmbeddedResource Include="**/*.resx" />
@@ -694,10 +694,10 @@
 		<Compile Update="UpdateChecker.cs" SubType="Code" />
 	</ItemGroup>
 	<Import Project="$(MSBuildBinPath)/Microsoft.CSharp.targets" />
-	<Import Project="$(SolutionDir)src/CommonResourceGen.props" Condition=" '$(MSBuildRuntimeType)' == 'Core' " />
+	<Import Project="../CommonResourceGen.props" Condition=" '$(MSBuildRuntimeType)' == 'Core' " />
 	<Target Name="AfterBuild">
 		<ItemGroup>
-			<AssetFiles Include="$(SolutionDir)Assets/**/*.*" Exclude="$(SolutionDir)Assets/**/.gitempty;$(SolutionDir)Assets/**/.gitignore" />
+			<AssetFiles Include="$(ProjectDir)../../Assets/**/*.*" Exclude="$(ProjectDir)../../Assets/**/.gitempty;$(ProjectDir)../../Assets/**/.gitignore" />
 		</ItemGroup>
 		<Copy SourceFiles="@(AssetFiles)" DestinationFolder="$(OutDir)%(RecursiveDir)" SkipUnchangedFiles="true" />
 	</Target>
diff --git a/src/BizHawk.Common/BizHawk.Common.csproj b/src/BizHawk.Common/BizHawk.Common.csproj
index 43a4b74c7c..da4256ccb5 100644
--- a/src/BizHawk.Common/BizHawk.Common.csproj
+++ b/src/BizHawk.Common/BizHawk.Common.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
-	<Import Project="$(SolutionDir)src/MainSlnCommon.props" />
-	<Import Project="$(SolutionDir)CommonNullable.props" />
+	<Import Project="../MainSlnCommon.props" />
+	<Import Project="../../CommonNullable.props" />
 	<PropertyGroup>
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 		<TargetFrameworks>netstandard2.0;netcoreapp3.1</TargetFrameworks>
@@ -12,7 +12,7 @@
 			Condition=" '$(MachineRunAnalyzersDuringBuild)' != '' " />
 		<PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.164"
 			Condition=" '$(MachineRunAnalyzersDuringBuild)' != '' " />
-		<Compile Include="$(SolutionDir)src/Version/svnrev.cs" />
-		<Compile Include="$(SolutionDir)src/Version/VersionInfo.cs" />
+		<Compile Include="$(ProjectDir)../Version/svnrev.cs" />
+		<Compile Include="$(ProjectDir)../Version/VersionInfo.cs" />
 	</ItemGroup>
 </Project>
diff --git a/src/BizHawk.Emulation.Common/BizHawk.Emulation.Common.csproj b/src/BizHawk.Emulation.Common/BizHawk.Emulation.Common.csproj
index 8ab2008806..df3e9155a6 100644
--- a/src/BizHawk.Emulation.Common/BizHawk.Emulation.Common.csproj
+++ b/src/BizHawk.Emulation.Common/BizHawk.Emulation.Common.csproj
@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
-	<Import Project="$(SolutionDir)src/MainSlnCommon.props" />
+	<Import Project="../MainSlnCommon.props" />
 	<PropertyGroup>
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 		<TargetFrameworks>netstandard2.0;netcoreapp3.1</TargetFrameworks>
 	</PropertyGroup>
 	<ItemGroup>
 		<PackageReference Include="Newtonsoft.Json" Version="12.0.3" PrivateAssets="All" />
-		<ProjectReference Include="$(SolutionDir)src/BizHawk.Common/BizHawk.Common.csproj" />
-		<Compile Include="$(SolutionDir)src/Version/svnrev.cs" />
-		<Compile Include="$(SolutionDir)src/Version/VersionInfo.cs" />
+		<ProjectReference Include="$(ProjectDir)../BizHawk.Common/BizHawk.Common.csproj" />
+		<Compile Include="$(ProjectDir)../Version/svnrev.cs" />
+		<Compile Include="$(ProjectDir)../Version/VersionInfo.cs" />
 	</ItemGroup>
 </Project>
diff --git a/src/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj b/src/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj
index abba201b7b..3b9ae1eb37 100644
--- a/src/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj
+++ b/src/BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj
@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-	<Import Project="$(SolutionDir)src/MainSlnCommon.props" />
+	<Import Project="../MainSlnCommon.props" />
 	<PropertyGroup>
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 		<TargetFrameworks>netstandard2.0;netcoreapp3.1</TargetFrameworks>
@@ -8,13 +8,13 @@
 		<PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" PrivateAssets="All" />
 		<PackageReference Include="Newtonsoft.Json" Version="12.0.3" PrivateAssets="All" />
 		<PackageReference Include="OpenTK" Version="3.0.1" PrivateAssets="All" />
-		<Reference Include="PeNet" HintPath="$(SolutionDir)References/PeNet.dll" Private="true" />
-		<Reference Include="Virtu" HintPath="$(SolutionDir)References/Virtu.dll" Private="true" />
-		<ProjectReference Include="$(SolutionDir)src/BizHawk.BizInvoke/BizHawk.BizInvoke.csproj" />
-		<ProjectReference Include="$(SolutionDir)src/BizHawk.Emulation.Common/BizHawk.Emulation.Common.csproj" />
-		<ProjectReference Include="$(SolutionDir)src/BizHawk.Emulation.DiscSystem/BizHawk.Emulation.DiscSystem.csproj" />
-		<Compile Include="$(SolutionDir)src/Version/svnrev.cs" />
-		<Compile Include="$(SolutionDir)src/Version/VersionInfo.cs" />
+		<Reference Include="PeNet" HintPath="$(ProjectDir)../../References/PeNet.dll" Private="true" />
+		<Reference Include="Virtu" HintPath="$(ProjectDir)../../References/Virtu.dll" Private="true" />
+		<ProjectReference Include="$(ProjectDir)../BizHawk.BizInvoke/BizHawk.BizInvoke.csproj" />
+		<ProjectReference Include="$(ProjectDir)../BizHawk.Emulation.Common/BizHawk.Emulation.Common.csproj" />
+		<ProjectReference Include="$(ProjectDir)../BizHawk.Emulation.DiscSystem/BizHawk.Emulation.DiscSystem.csproj" />
+		<Compile Include="$(ProjectDir)../Version/svnrev.cs" />
+		<Compile Include="$(ProjectDir)../Version/VersionInfo.cs" />
 		<EmbeddedResource Include="Resources/**/*" />
 	</ItemGroup>
 	<ItemGroup>
diff --git a/src/BizHawk.Emulation.DiscSystem/BizHawk.Emulation.DiscSystem.csproj b/src/BizHawk.Emulation.DiscSystem/BizHawk.Emulation.DiscSystem.csproj
index f387cab4bf..094f9dc902 100644
--- a/src/BizHawk.Emulation.DiscSystem/BizHawk.Emulation.DiscSystem.csproj
+++ b/src/BizHawk.Emulation.DiscSystem/BizHawk.Emulation.DiscSystem.csproj
@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
-	<Import Project="$(SolutionDir)src/MainSlnCommon.props" />
+	<Import Project="../MainSlnCommon.props" />
 	<PropertyGroup>
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 		<TargetFrameworks>netstandard2.0;netcoreapp3.1</TargetFrameworks>
 	</PropertyGroup>
 	<ItemGroup>
-		<ProjectReference Include="$(SolutionDir)src/BizHawk.Common/BizHawk.Common.csproj" />
-		<Compile Include="$(SolutionDir)src/Version/svnrev.cs" />
-		<Compile Include="$(SolutionDir)src/Version/VersionInfo.cs" />
+		<ProjectReference Include="$(ProjectDir)../BizHawk.Common/BizHawk.Common.csproj" />
+		<Compile Include="$(ProjectDir)../Version/svnrev.cs" />
+		<Compile Include="$(ProjectDir)../Version/VersionInfo.cs" />
 	</ItemGroup>
 </Project>
diff --git a/src/BizHawk.WinForms.Controls/BizHawk.WinForms.Controls.csproj b/src/BizHawk.WinForms.Controls/BizHawk.WinForms.Controls.csproj
index fafe52e509..ee90bcf271 100644
--- a/src/BizHawk.WinForms.Controls/BizHawk.WinForms.Controls.csproj
+++ b/src/BizHawk.WinForms.Controls/BizHawk.WinForms.Controls.csproj
@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
-	<Import Project="$(SolutionDir)src/MainSlnCommon.props" />
-	<Import Project="$(SolutionDir)CommonNullable.props" />
+	<Import Project="../MainSlnCommon.props" />
+	<Import Project="../../CommonNullable.props" />
 	<PropertyGroup>
 		<TargetFramework>net48</TargetFramework>
 	</PropertyGroup>
 	<ItemGroup>
 		<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All" />
 		<Reference Include="System.Windows.Forms" />
-		<Compile Include="$(SolutionDir)src/Version/svnrev.cs" />
-		<Compile Include="$(SolutionDir)src/Version/VersionInfo.cs" />
+		<Compile Include="$(ProjectDir)../Version/svnrev.cs" />
+		<Compile Include="$(ProjectDir)../Version/VersionInfo.cs" />
 	</ItemGroup>
 </Project>
diff --git a/src/CommonResourceGen.props b/src/CommonResourceGen.props
index fcdc3fc9b7..c56f15c0ed 100644
--- a/src/CommonResourceGen.props
+++ b/src/CommonResourceGen.props
@@ -6,14 +6,14 @@
 	</PropertyGroup>
 	<ItemGroup>
 		<Reference Include="System.Buffers"
-			HintPath="$(SolutionDir)References/System.Buffers.dll" />
+			HintPath="$(ProjectDir)../../References/System.Buffers.dll" />
 		<Reference Include="System.Memory"
-			HintPath="$(SolutionDir)References/System.Memory.dll" />
+			HintPath="$(ProjectDir)../../References/System.Memory.dll" />
 		<Reference Include="System.Numerics.Vectors"
-			HintPath="$(SolutionDir)References/System.Numerics.Vectors.dll" />
+			HintPath="$(ProjectDir)../../References/System.Numerics.Vectors.dll" />
 		<Reference Include="System.Resources.Extensions"
-			HintPath="$(SolutionDir)References/System.Resources.Extensions.dll" />
+			HintPath="$(ProjectDir)../../References/System.Resources.Extensions.dll" />
 		<Reference Include="System.Runtime.CompilerServices.Unsafe"
-			HintPath="$(SolutionDir)References/System.Runtime.CompilerServices.Unsafe.dll" />
+			HintPath="$(ProjectDir)../../References/System.Runtime.CompilerServices.Unsafe.dll" />
 	</ItemGroup>
 </Project>
diff --git a/src/CommonStyleCopAnalyzer.props b/src/CommonStyleCopAnalyzer.props
index e6b54ebf0e..8f55672002 100644
--- a/src/CommonStyleCopAnalyzer.props
+++ b/src/CommonStyleCopAnalyzer.props
@@ -1,9 +1,9 @@
 <Project>
 	<PropertyGroup>
-		<CodeAnalysisRuleSet>$(SolutionDir)Common.ruleset</CodeAnalysisRuleSet>
+		<CodeAnalysisRuleSet>$(ProjectDir)../../Common.ruleset</CodeAnalysisRuleSet>
 	</PropertyGroup>
 	<ItemGroup>
-		<AdditionalFiles Include="$(SolutionDir).stylecop.json" />
-		<Analyzer Include="$(SolutionDir)packages/StyleCop.Analyzers.Unstable.1.2.0.164/analyzers/dotnet/cs/*.dll" /><!-- already restored by first transitive dep (BizHawk.Common) -->
+		<AdditionalFiles Include="$(ProjectDir)../../.stylecop.json" />
+		<Analyzer Include="$(ProjectDir)../../packages/StyleCop.Analyzers.Unstable.1.2.0.164/analyzers/dotnet/cs/*.dll" /><!-- already restored by first transitive dep (BizHawk.Common) -->
 	</ItemGroup>
 </Project>
diff --git a/src/MainSlnCommon.props b/src/MainSlnCommon.props
index c29da2b58f..ecc533604c 100644
--- a/src/MainSlnCommon.props
+++ b/src/MainSlnCommon.props
@@ -1,11 +1,11 @@
 <Project>
-	<Import Project="$(SolutionDir)Common.props" />
+	<Import Project="../Common.props" />
 	<PropertyGroup>
-		<CodeAnalysisRuleSet>$(SolutionDir)Common.ruleset</CodeAnalysisRuleSet>
+		<CodeAnalysisRuleSet>$(ProjectDir)../../Common.ruleset</CodeAnalysisRuleSet>
 		<NoWarn>NU1701</NoWarn><!-- can't use .ruleset, and NU1702 can't be silenced at all (see https://github.com/NuGet/Home/issues/8797) -->
-		<OutputPath>$(SolutionDir)output/dll</OutputPath>
+		<OutputPath>$(ProjectDir)../../output/dll</OutputPath>
 	</PropertyGroup>
 	<ItemGroup>
-		<AdditionalFiles Include="$(SolutionDir).stylecop.json" />
+		<AdditionalFiles Include="$(ProjectDir)../../.stylecop.json" />
 	</ItemGroup>
 </Project>