From 2f75cd30fb56294150a03d66e4ecd5a9fdf79a11 Mon Sep 17 00:00:00 2001
From: "David G. Moore, Jr" <david@dgmjr.io>
Date: Sun, 8 Oct 2023 20:02:22 -0400
Subject: [PATCH] Modify Directory.Build.props and SlnGen.props to pull in the
 global.json and Directory.Build.* files when generating a solution.

---
 src/Build/SlnGen.props              |  8 ++++++++
 src/Build/SourceCodeReference.props | 17 -----------------
 src/Directory.Build.props           |  1 -
 3 files changed, 8 insertions(+), 18 deletions(-)
 delete mode 100755 src/Build/SourceCodeReference.props

diff --git a/src/Build/SlnGen.props b/src/Build/SlnGen.props
index c782914..c3aa792 100644
--- 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
deleted file mode 100755
index 6b10db6..0000000
--- a/src/Build/SourceCodeReference.props
+++ /dev/null
@@ -1,17 +0,0 @@
-<!--
- CodeGeneration.props
- 
-   Created: 2022-10-21-11:40:42
-   Modified: 2022-10-29-02:47:07
- 
-   Author: David G. Moore, Jr. <david@dgmjr.io>
-   
-   Copyright © 2022-2023 David G. Moore, Jr., All Rights Reserved
-      License: MIT (https://opensource.org/licenses/MIT)
--->
-
-<Project>
-	<ItemDefinitionGroup>
-		<SourceCodeReference />
-	</ItemDefinitionGroup>
-</Project>
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 35c5b6c..61fb1fc 100644
--- 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" />