From bc9b5bd1f689225d20f8bf1d6effc9f4b67df2c5 Mon Sep 17 00:00:00 2001 From: "David G. Moore, Jr" Date: Mon, 6 Nov 2023 10:24:39 -0500 Subject: [PATCH] ADDED - Changes Tracked by Git: - the of the BuildSource property the Build/BuildFromSource.props file. - Updated value of the BuildFromSource property in the Build/BuildFromSource a and ProjectReferenceAndAfterCentralPackageVersions.props file. -CustomBeforeAndAfterCentralPackageVersions.props file. - Updated the value of the CustomAfterCentralPackageVersionsPackageVersions the value ofBeforeVersionsTargets property the BuildCustomBeforeAndAfterCentral.targets new CustomVersions property theCustomPackage file Updated valueAfterCentral property inCustomCentral- Updated value the CustomBeforeNoTargets property in the BuildNo. to check forTargetsProps in BuildCustomAndNoTargets.props file. - the value of CustomAfterNoTargetsProps property the Build/CustomAfterTargets file. - Updated the value of the CustomBeforeNoTargets property the Build/AfterNoTargets- a to for existence the property BuildCustom.targets file. of the CustomAfterNoTargets property in the Build/CustomBeforeNoTargets.targets file. value of property Build/CustomBeforeTraversal file- Added a condition to check for the ofProps theBeforeAndTraversal file Updated value of the CustomTraversal property the/CustomBeforeAndAfterTraversal.props file. - Updated the value of the CustomBeforeTraversalTargets property in the Build/CustomBeforeAndAfterTraversal.targets file. - Added condition to for the ofBefore property/.targets file. the property the Build/CustomBeforeAndAfterTraversal file- Updated the Build/ItemDefinitionGroups.props file valueTo property Build/DefinitionGroups file. Updated the of the SetConfiguration property the Build/ItemDefinitionGroups.props file. - Updated the value of the ReferenceOutputAssembly property in the Build/ItemDefinitionGroups.props file. - Updated the value of the OutputItemType property in the Build/ItemGroups file. a new Name element each itemItem- of the Package. --- src/Build/BuildFromSource.props | 4 +- src/Build/BuildFromSource.targets | 4 +- .../CustomBeforeCentralpackageVersions.props | 61 ------------------- ...BeforeAndAfterCentralPackageVersions.props | 9 ++- ...foreAndAfterCentralPackageVersions.targets | 12 ++-- src/Build/CustomBeforeAndAfterNoTargets.props | 8 +-- .../CustomBeforeAndAfterNoTargets.targets | 8 +-- src/Build/CustomBeforeAndAfterTraversal.props | 16 ++--- .../CustomBeforeAndAfterTraversal.targets | 16 ++--- src/Build/ItemDefinitionGroups.props | 3 + src/Build/ProjectTypeInfo.props | 2 +- 11 files changed, 44 insertions(+), 99 deletions(-) delete mode 100644 src/Build/Custom/CustomBeforeCentralpackageVersions.props diff --git a/src/Build/BuildFromSource.props b/src/Build/BuildFromSource.props index 195fc60..f1499bd 100644 --- a/src/Build/BuildFromSource.props +++ b/src/Build/BuildFromSource.props @@ -12,7 +12,8 @@ - true + true + imported @@ -22,6 +23,5 @@ $([System.IO.Path]::GetTempFileName()) $(TempFile).props $(TempFile).targets - false diff --git a/src/Build/BuildFromSource.targets b/src/Build/BuildFromSource.targets index 748f282..f732361 100644 --- a/src/Build/BuildFromSource.targets +++ b/src/Build/BuildFromSource.targets @@ -21,7 +21,7 @@ - - + + diff --git a/src/Build/Custom/CustomBeforeCentralpackageVersions.props b/src/Build/Custom/CustomBeforeCentralpackageVersions.props deleted file mode 100644 index b267546..0000000 --- a/src/Build/Custom/CustomBeforeCentralpackageVersions.props +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - true - true - Native;BuildTransitive;BuildMultitargeting;ContentFiles;Compile;Runtime - Analyzers;Build - true - All - - - - - - - true - Always - Always - true - Analyzer - true - false - Configuration=$(Configuration) - Restore;Build;Pack - - - - - - true - Analyzers;Runtime;Native - true - ContentFiles;Build;BuildTransitive;BuildMultitargeting - true - All - - - - - - - ContentFiles;Native;Analyzers - Build;BuildTransitive;BuildMultitargeting;Runtime;Compile - None - - - - diff --git a/src/Build/CustomBeforeAndAfterCentralPackageVersions.props b/src/Build/CustomBeforeAndAfterCentralPackageVersions.props index 95eaa04..580b400 100755 --- a/src/Build/CustomBeforeAndAfterCentralPackageVersions.props +++ b/src/Build/CustomBeforeAndAfterCentralPackageVersions.props @@ -14,14 +14,13 @@ $(CustomBeforeCentralPackageVersionsProps); - $(MSBuildThisFileDirectory)Custom/CustomBeforeCentralpackageVersions.props; - - $([MSBuild]::GetPathOfFileAbove("Directory.CustomBeforeCentralPackageVersions.props")) + + $([MSBuild]::GetPathOfFileAbove("Directory.CustomBeforeCentralPackageVersions.props", "$(MSBuildProjectDirectory)")) - + $(CustomAfterCentralPackageVersionsProps); - $([MSBuild]::GetPathOfFileAbove("Directory.CustomAfterCentralPackageVersions.props")) + $([MSBuild]::GetPathOfFileAbove("Directory.CustomAfterCentralPackageVersions.props", "$(MSBuildProjectDirectory)")) diff --git a/src/Build/CustomBeforeAndAfterCentralPackageVersions.targets b/src/Build/CustomBeforeAndAfterCentralPackageVersions.targets index 59469c9..28fa087 100755 --- a/src/Build/CustomBeforeAndAfterCentralPackageVersions.targets +++ b/src/Build/CustomBeforeAndAfterCentralPackageVersions.targets @@ -12,13 +12,17 @@ - + + $(CustomBeforeCentralPackageVersionsTargets); + $(MSBuildThisFileDirectory)Custom/BeforeCentralpackageVersions.targets; + + $(CustomBeforeCentralPackageVersionsTargets); - $([MSBuild]::GetPathOfFileAbove("Directory.CustomBeforeCentralPackageVersions.targets")) + $([MSBuild]::GetPathOfFileAbove("Directory.CustomBeforeCentralPackageVersions.targets", "$(MSBuildProjectDirectory)")) - + $(CustomAfterCentralPackageVersionsTargets); - $([MSBuild]::GetPathOfFileAbove("Directory.CustomAfterCentralPackageVersions.targets")) + $([MSBuild]::GetPathOfFileAbove("Directory.CustomAfterCentralPackageVersions.targets", "$(MSBuildProjectDirectory)")) diff --git a/src/Build/CustomBeforeAndAfterNoTargets.props b/src/Build/CustomBeforeAndAfterNoTargets.props index 12d6d0a..9f235fa 100755 --- a/src/Build/CustomBeforeAndAfterNoTargets.props +++ b/src/Build/CustomBeforeAndAfterNoTargets.props @@ -12,13 +12,13 @@ - + $(CustomBeforeNoTargetsProps); - $([MSBuild]::GetPathOfFileAbove("Directory.CustomBeforeNoTargets.props")) + $([MSBuild]::GetPathOfFileAbove("Directory.CustomBeforeNoTargets.props", "$(MSBuildProjectDirectory)")) - + $(CustomAfterNoTargetsProps); - $([MSBuild]::GetPathOfFileAbove("Directory.CustomAfterNoTargets.props")) + $([MSBuild]::GetPathOfFileAbove("Directory.CustomAfterNoTargets.props", "$(MSBuildProjectDirectory)")) diff --git a/src/Build/CustomBeforeAndAfterNoTargets.targets b/src/Build/CustomBeforeAndAfterNoTargets.targets index 721847a..3cc15a6 100755 --- a/src/Build/CustomBeforeAndAfterNoTargets.targets +++ b/src/Build/CustomBeforeAndAfterNoTargets.targets @@ -12,14 +12,14 @@ - + $(CustomAfterNoTargets); - $([MSBuild]::GetPathOfFileAbove("Directory.CustomBeforeNoTargets.targets")); + $([MSBuild]::GetPathOfFileAbove("Directory.CustomBeforeNoTargets.targets", "$(MSBuildProjectDirectory)")); $(MSBuildThisFileDirectory)Custom/CustomBeforeNoTargets.targets - + $(CustomAfterNoTargets); - $([MSBuild]::GetPathOfFileAbove("Directory.CustomAfterNoTargets.targets")) + $([MSBuild]::GetPathOfFileAbove("Directory.CustomAfterNoTargets.targets", "$(MSBuildProjectDirectory)")) diff --git a/src/Build/CustomBeforeAndAfterTraversal.props b/src/Build/CustomBeforeAndAfterTraversal.props index 691bbb8..035373f 100755 --- a/src/Build/CustomBeforeAndAfterTraversal.props +++ b/src/Build/CustomBeforeAndAfterTraversal.props @@ -1,24 +1,24 @@ - - + + $(CustomBeforeTraversalProps); - $([MSBuild]::GetPathOfFileAbove("Directory.CustomBeforeTraversal.props")) + $([MSBuild]::GetPathOfFileAbove("Directory.CustomBeforeTraversal.props", "$(MSBuildProjectDirectory)")) - + $(CustomAfterTraversalProps); - $([MSBuild]::GetPathOfFileAbove("Directory.CustomAfterTraversal.props")) + $([MSBuild]::GetPathOfFileAbove("Directory.CustomAfterTraversal.props", "$(MSBuildProjectDirectory)")) diff --git a/src/Build/CustomBeforeAndAfterTraversal.targets b/src/Build/CustomBeforeAndAfterTraversal.targets index 3d58544..4072dd1 100755 --- a/src/Build/CustomBeforeAndAfterTraversal.targets +++ b/src/Build/CustomBeforeAndAfterTraversal.targets @@ -1,24 +1,24 @@ - - + + $(CustomAfterTraversal); - $([MSBuild]::GetPathOfFileAbove("Directory.CustomBeforeTraversal.targets")) + $([MSBuild]::GetPathOfFileAbove("Directory.CustomBeforeTraversal.targets", "$(MSBuildProjectDirectory)")) - + $(CustomAfterTraversal); - $([MSBuild]::GetPathOfFileAbove("Directory.CustomAfterTraversal.targets")) + $([MSBuild]::GetPathOfFileAbove("Directory.CustomAfterTraversal.targets", "$(MSBuildProjectDirectory)")) diff --git a/src/Build/ItemDefinitionGroups.props b/src/Build/ItemDefinitionGroups.props index 2517b9f..df9cfbd 100755 --- a/src/Build/ItemDefinitionGroups.props +++ b/src/Build/ItemDefinitionGroups.props @@ -47,6 +47,9 @@ Always Always Configuration=$(Configuration) + true + true + @(ProjectReference->'%(Filename)') diff --git a/src/Build/ProjectTypeInfo.props b/src/Build/ProjectTypeInfo.props index 7907665..ae4761c 100644 --- a/src/Build/ProjectTypeInfo.props +++ b/src/Build/ProjectTypeInfo.props @@ -18,6 +18,6 @@ - +