diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index aa2ed30168685f763199e362bf0574138dd402d8..a2ba7a582537e3eb9a1d9319d439183e7edb4362 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -13,6 +13,9 @@
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
 
+	<!-- Ensures the .xr.xml files are generated in a proper layout folder -->
+	<GenerateLibraryLayout>true</GenerateLibraryLayout>
+
     <!-- Enables hard links for obj -> bin files (symlinks generally don't work there -->
     <CreateHardLinksForCopyFilesToOutputDirectoryIfPossible>true</CreateHardLinksForCopyFilesToOutputDirectoryIfPossible>