diff --git a/build/SourceLink.props b/build/SourceLink.props
index 14f2eec..1bccdcc 100644
--- a/build/SourceLink.props
+++ b/build/SourceLink.props
@@ -2,7 +2,6 @@
 
     <PropertyGroup>
         <PublishRepositoryUrl>true</PublishRepositoryUrl>
-        <IncludeSymbols>false</IncludeSymbols>
         <EmbedUntrackedSources>true</EmbedUntrackedSources>
 
         <!-- By using EmbedAllSources we don't need SourceLink itself -->
@@ -10,11 +9,16 @@
         <EmbedAllSources>true</EmbedAllSources>
 
         <DebugSymbols>true</DebugSymbols>
-        <DebugType>Embedded</DebugType>
+        <DebugType>embedded</DebugType>
 
-        <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb;.xml;.axaml</AllowedOutputExtensionsInPackageBuildOutputFolder>
+        <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
     </PropertyGroup>
 
+    <ItemGroup>
+        <EmbeddedFiles Include="$(GeneratedAssemblyInfoFile)" />
+        <EmbeddedFiles Include="$(TargetFrameworkMonikerAssemblyAttributesPath)" />
+    </ItemGroup>
+
     <PropertyGroup Condition="'$(TF_BUILD)' == 'true'">
         <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
     </PropertyGroup>
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 5d5e7a6..7d0bfd9 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -25,6 +25,10 @@
         <DefineConstants>$(DefineConstants);AVALONIA</DefineConstants>
     </PropertyGroup>
 
+    <ItemGroup>
+        <SourceRoot Include="$(MSBuildThisFileDirectory)/" />
+    </ItemGroup>
+
     <Import Project="..\build\SignAssembly.props" />
     <Import Project="..\build\SourceLink.props" />
     <Import Project="..\build\SharedVersion.props" />