diff --git a/Common.props b/Common.props
index 4a4e6e5067..9acdc8cf68 100644
--- a/Common.props
+++ b/Common.props
@@ -10,6 +10,7 @@
 		<LangVersion>10.0</LangVersion>
 		<NoWarn>SA0001</NoWarn>
 		<Nullable>enable</Nullable>
+		<PathMap>$(MSBuildProjectDirectory)=${$(MSBuildProjectName)}/</PathMap>
 		<PlatformTarget>AnyCPU</PlatformTarget>
 		<RunAnalyzersDuringBuild>true</RunAnalyzersDuringBuild>
 		<RunCodeAnalysis>false</RunCodeAnalysis>
diff --git a/src/MainSlnCommon.props b/src/MainSlnCommon.props
index 001201a835..b2cc5af218 100644
--- a/src/MainSlnCommon.props
+++ b/src/MainSlnCommon.props
@@ -8,6 +8,7 @@
 		<MSBuildWarningsAsMessages>NU1702</MSBuildWarningsAsMessages>
 		<NoWarn>$(NoWarn);CS1573;CS1591</NoWarn>
 		<OutputPath>$(MSBuildProjectDirectory)/../../output/dll</OutputPath>
+		<PathMap>$(SolutionDir)=/</PathMap>
 		<ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
 	</PropertyGroup>
 	<PropertyGroup Condition=" '$(MachineRunAnalyzersDuringBuild)' == '' ">