Modify Directory.Build.props and SlnGen.props to pull in the global.j…

…son and Directory.Build.* files when generating a solution.
dgmjr-io · Oct 9, 2023 · 2f75cd3 · 2f75cd3
1 parent 5b4acf9
commit 2f75cd3
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 18 deletions.
diff --git a/src/Build/SlnGen.props b/src/Build/SlnGen.props
@@ -15,6 +15,9 @@
 		<IncludeInSolutionFile>$('$(MSBuildProjectExtension)' != '.csproj')</IncludeInSolutionFile>
     <SlnGenLaunchVisualStudio>false</SlnGenLaunchVisualStudio>
     <SlnGenProjectName>$(MSbuildProjectName)</SlnGenProjectName>
+    <DirectoryBuildProps>$([MSBuild]::EnsureTrailingSlash($([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), "Directory.Build.props"))))Directory.Build.props</DirectoryBuildProps>
+    <DirectoryBuildTargets>$([MSBuild]::EnsureTrailingSlash($([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), "Directory.Build.targets"))))Directory.Build.targets</DirectoryBuildTargets>
+    <GlobalJson>$([MSBuild]::EnsureTrailingSlash($([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), "global.json"))))global.json</GlobalJson>
 	</PropertyGroup>
   <ItemGroup>
     <SlnGenCustomProjectTypeGuid Include=".aproj" ProjectTypeGuid="4cd4fd5b-0f23-4623-ba3f-b31cc4ab93ef" />
@@ -46,6 +49,11 @@
     <SlnGenCustomProjectTypeGuid Include=".xcodeproj" ProjectTypeGuid="98925c4f-9b71-41de-bc6a-267f44ff1f4a" />
     <SlnGenCustomProjectTypeGuid Include=".xsproj" ProjectTypeGuid="60ca03d9-d475-4da7-85b4-dbe70d7f5ae1" />
   </ItemGroup>
+  <ItemGroup>
+    <SlnGenSolutionItem Include="$(DirectoryBuildProps)" />
+    <SlnGenSolutionItem Include="$(DirectoryBuildTargets)" />
+    <SlnGenSolutionItem Include="$(GlobalJson)" />
+  </ItemGroup>
   <PropertyGroup>
     <SlnGenFolders>true</SlnGenFolders>
     <SlnGenSolutionFolder Condition="'$(IsTestProject)' == 'true'">tests</SlnGenSolutionFolder>

diff --git a/src/Build/SourceCodeReference.props b/src/Build/SourceCodeReference.props
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -40,7 +40,6 @@
     <Import Project="./Build/ProjectMetadata.props" />
     <Import Project="./Build/ProjectTypeInfo.props" />
     <Import Project="./Build/SlnGen.props" />
-    <Import Project="./Build/SourceCodeReference.props" />
     <Import Project="./Build/SourceLinkPatch.props" />
     <Import Project="./Build/TargetFrameworks.props" />
     <Import Project="./Build/Testing.props" />