diff --git a/Common.props b/Common.props
index b5798b98f6..b740be61c9 100644
--- a/Common.props
+++ b/Common.props
@@ -9,6 +9,8 @@
 		<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
 		<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
 		<ContinuousIntegrationBuild Condition=" '$(GITLAB_CI)' != '' Or '$(APPVEYOR)' != '' ">true</ContinuousIntegrationBuild>
+		<DebugSymbols>true</DebugSymbols>
+		<DebugType>portable</DebugType>
 		<EnableNETAnalyzers>true</EnableNETAnalyzers>
 		<ErrorReport>prompt</ErrorReport>
 		<Features>strict</Features>
@@ -19,8 +21,6 @@
 		<Nullable>enable</Nullable>
 		<PlatformTarget>AnyCPU</PlatformTarget>
 		<RunAnalyzersDuringBuild>true</RunAnalyzersDuringBuild>
-		<DebugType>embedded</DebugType>
-		<DebugSymbols>true</DebugSymbols>
 	</PropertyGroup>
 	<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
 		<DefineConstants>DEBUG;TRACE</DefineConstants>
diff --git a/src/MainSlnCommon.props b/src/MainSlnCommon.props
index a50ff4824e..86a82668ab 100644
--- a/src/MainSlnCommon.props
+++ b/src/MainSlnCommon.props
@@ -2,6 +2,7 @@
 	<Import Project="../Common.props" />
 	<PropertyGroup>
 		<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+		<DebugType>embedded</DebugType>
 		<DefineConstants>$(DefineConstants);AVI_SUPPORT</DefineConstants>
 		<DocumentationFile>$(MSBuildProjectDirectory)/bin/doc_comments.xml</DocumentationFile>
 		<NoWarn>$(NoWarn);CS1573;CS1591;NU1702</NoWarn>