Skip to content

Commit

Permalink
ADDED - Changes Tracked by Git:
Browse files Browse the repository at this point in the history
- 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.
  • Loading branch information
dgmjr committed Nov 6, 2023
1 parent 8a0de21 commit bc9b5bd
Show file tree
Hide file tree
Showing 11 changed files with 44 additions and 99 deletions.
4 changes: 2 additions & 2 deletions src/Build/BuildFromSource.props
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@

<Project Condition="'$(BuildFromSourceProps)' == ''">
<PropertyGroup>
<BuildFromSource Condition="'$(BuildFromSource)' == ''">true</BuildFromSource>
<BuildFromSource>true</BuildFromSource>
<BuildFromSourceProps>imported</BuildFromSourceProps>
</PropertyGroup>
<ItemGroup>
<PropsFile Include="$([System.String]::Copy(%(ProjectReference.FullPath)).Replace('.csproj', '.props'))" Condition="Exists($([System.String]::Copy(%(ProjectReference.FullPath)).Replace('.csproj', '.props')))" />
Expand All @@ -22,6 +23,5 @@
<TempFile>$([System.IO.Path]::GetTempFileName())</TempFile>
<TempPropsFile>$(TempFile).props</TempPropsFile>
<TempTargetsFile>$(TempFile).targets</TempTargetsFile>
<BuildFromSource>false</BuildFromSource>
</PropertyGroup>
</Project>
4 changes: 2 additions & 2 deletions src/Build/BuildFromSource.targets
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<Import Project="$(TempTargetsFile)" Condition="Exists($(TempTargetsFile))" />
<ItemGroup Condition="!$(BuildFromSource)">
<!-- remove all existing `ProjectReference`s and replace them with `PackageReference`s -->
<PackageReference Include="@(ProjectReference->'%(Filename)')" />
<ProjectReference Remove="@(ProjectReference)" />
<!-- <PackageReference Include="@(ProjectReference->'%(Filename)')" /> -->
<!-- <ProjectReference Remove="@(ProjectReference)" /> -->
</ItemGroup>
</Project>
61 changes: 0 additions & 61 deletions src/Build/Custom/CustomBeforeCentralpackageVersions.props

This file was deleted.

9 changes: 4 additions & 5 deletions src/Build/CustomBeforeAndAfterCentralPackageVersions.props
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,13 @@
<PropertyGroup>
<CustomBeforeCentralPackageVersionsProps>
$(CustomBeforeCentralPackageVersionsProps);
$(MSBuildThisFileDirectory)Custom/CustomBeforeCentralpackageVersions.props;
</CustomBeforeCentralPackageVersionsProps>
<CustomBeforeCentralPackageVersionsProps Condition="Exists($([MSBuild]::GetPathOfFileAbove('Directory.CustomBeforeCentralPackageVersions.props')))">
$([MSBuild]::GetPathOfFileAbove("Directory.CustomBeforeCentralPackageVersions.props"))
<CustomBeforeCentralPackageVersionsProps Condition="Exists($([MSBuild]::GetPathOfFileAbove('Directory.CustomBeforeCentralPackageVersions.props', '$(MSBuildProjectDirectory)')))">
$([MSBuild]::GetPathOfFileAbove("Directory.CustomBeforeCentralPackageVersions.props", "$(MSBuildProjectDirectory)"))
</CustomBeforeCentralPackageVersionsProps>
<CustomAfterCentralPackageVersionsProps Condition="Exists($([MSBuild]::GetPathOfFileAbove('Directory.CustomAfterCentralPackageVersions.props')))">
<CustomAfterCentralPackageVersionsProps Condition="Exists($([MSBuild]::GetPathOfFileAbove('Directory.CustomAfterCentralPackageVersions.props', '$(MSBuildProjectDirectory)')))">
$(CustomAfterCentralPackageVersionsProps);
$([MSBuild]::GetPathOfFileAbove("Directory.CustomAfterCentralPackageVersions.props"))
$([MSBuild]::GetPathOfFileAbove("Directory.CustomAfterCentralPackageVersions.props", "$(MSBuildProjectDirectory)"))
</CustomAfterCentralPackageVersionsProps>
</PropertyGroup>
</Project>
12 changes: 8 additions & 4 deletions src/Build/CustomBeforeAndAfterCentralPackageVersions.targets
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,17 @@

<Project>
<PropertyGroup>
<CustomBeforeCentralPackageVersionsTargets Condition="Exists($([MSBuild]::GetPathOfFileAbove('Directory.CustomBeforeCentralPackageVersions.targets')))">
<CustomBeforeCentralPackageVersionsTargets>
$(CustomBeforeCentralPackageVersionsTargets);
$(MSBuildThisFileDirectory)Custom/BeforeCentralpackageVersions.targets;
</CustomBeforeCentralPackageVersionsTargets>
<CustomBeforeCentralPackageVersionsTargets Condition="Exists($([MSBuild]::GetPathOfFileAbove('Directory.CustomBeforeCentralPackageVersions.targets', '$(MSBuildProjectDirectory)')))">
$(CustomBeforeCentralPackageVersionsTargets);
$([MSBuild]::GetPathOfFileAbove("Directory.CustomBeforeCentralPackageVersions.targets"))
$([MSBuild]::GetPathOfFileAbove("Directory.CustomBeforeCentralPackageVersions.targets", "$(MSBuildProjectDirectory)"))
</CustomBeforeCentralPackageVersionsTargets>
<CustomAfterCentralPackageVersionsTargets Condition="Exists($([MSBuild]::GetPathOfFileAbove('Directory.CustomAfterCentralPackageVersions.targets')))">
<CustomAfterCentralPackageVersionsTargets Condition="Exists($([MSBuild]::GetPathOfFileAbove('Directory.CustomAfterCentralPackageVersions.targets', '$(MSBuildProjectDirectory)')))">
$(CustomAfterCentralPackageVersionsTargets);
$([MSBuild]::GetPathOfFileAbove("Directory.CustomAfterCentralPackageVersions.targets"))
$([MSBuild]::GetPathOfFileAbove("Directory.CustomAfterCentralPackageVersions.targets", "$(MSBuildProjectDirectory)"))
</CustomAfterCentralPackageVersionsTargets>
</PropertyGroup>
</Project>
8 changes: 4 additions & 4 deletions src/Build/CustomBeforeAndAfterNoTargets.props
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@

<Project>
<PropertyGroup>
<CustomBeforeNoTargetsProps Condition="Exists($([MSBuild]::GetPathOfFileAbove('Directory.CustomBeforeNoTargets.props')))">
<CustomBeforeNoTargetsProps Condition="Exists($([MSBuild]::GetPathOfFileAbove('Directory.CustomBeforeNoTargets.props', '$(MSBuildProjectDirectory)')))">
$(CustomBeforeNoTargetsProps);
$([MSBuild]::GetPathOfFileAbove("Directory.CustomBeforeNoTargets.props"))
$([MSBuild]::GetPathOfFileAbove("Directory.CustomBeforeNoTargets.props", "$(MSBuildProjectDirectory)"))
</CustomBeforeNoTargetsProps>
<CustomAfterNoTargetsProps Condition="Exists($([MSBuild]::GetPathOfFileAbove('Directory.CustomAfterNoTargets.props')))">
<CustomAfterNoTargetsProps Condition="Exists($([MSBuild]::GetPathOfFileAbove('Directory.CustomAfterNoTargets.props', '$(MSBuildProjectDirectory)')))">
$(CustomAfterNoTargetsProps);
$([MSBuild]::GetPathOfFileAbove("Directory.CustomAfterNoTargets.props"))
$([MSBuild]::GetPathOfFileAbove("Directory.CustomAfterNoTargets.props", "$(MSBuildProjectDirectory)"))
</CustomAfterNoTargetsProps>
</PropertyGroup>
</Project>
8 changes: 4 additions & 4 deletions src/Build/CustomBeforeAndAfterNoTargets.targets
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@

<Project>
<PropertyGroup>
<CustomBeforeNoTargets Condition="Exists($([MSBuild]::GetPathOfFileAbove('Directory.CustomBeforeNoTargets.targets')))">
<CustomBeforeNoTargets Condition="Exists($([MSBuild]::GetPathOfFileAbove('Directory.CustomBeforeNoTargets.targets', '$(MSBuildProjectDirectory)')))">
$(CustomAfterNoTargets);
$([MSBuild]::GetPathOfFileAbove("Directory.CustomBeforeNoTargets.targets"));
$([MSBuild]::GetPathOfFileAbove("Directory.CustomBeforeNoTargets.targets", "$(MSBuildProjectDirectory)"));
$(MSBuildThisFileDirectory)Custom/CustomBeforeNoTargets.targets
</CustomBeforeNoTargets>
<CustomAfterNoTargets Condition="Exists($([MSBuild]::GetPathOfFileAbove('Directory.CustomAfterNoTargets.targets')))">
<CustomAfterNoTargets Condition="Exists($([MSBuild]::GetPathOfFileAbove('Directory.CustomAfterNoTargets.targets', '$(MSBuildProjectDirectory)')))">
$(CustomAfterNoTargets);
$([MSBuild]::GetPathOfFileAbove("Directory.CustomAfterNoTargets.targets"))
$([MSBuild]::GetPathOfFileAbove("Directory.CustomAfterNoTargets.targets", "$(MSBuildProjectDirectory)"))
</CustomAfterNoTargets>
</PropertyGroup>
</Project>
16 changes: 8 additions & 8 deletions src/Build/CustomBeforeAndAfterTraversal.props
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
<!--
CustomBeforeAndAfterTraversal.props
Created: 2022-10-21-11:40:42
Modified: 2022-10-29-02:47:42
Author: David G. Moore, Jr. <[email protected]>
Copyright © 2022-2023 David G. Moore, Jr., All Rights Reserved
License: MIT (https://opensource.org/licenses/MIT)
-->

<Project>
<PropertyGroup>
<CustomBeforeTraversalProps Condition="Exists($([MSBuild]::GetPathOfFileAbove('Directory.CustomBeforeTraversal.props')))">
<PropertyGroup>
<CustomBeforeTraversalProps Condition="Exists($([MSBuild]::GetPathOfFileAbove('Directory.CustomBeforeTraversal.props', '$(MSBuildProjectDirectory)')))">
$(CustomBeforeTraversalProps);
$([MSBuild]::GetPathOfFileAbove("Directory.CustomBeforeTraversal.props"))
$([MSBuild]::GetPathOfFileAbove("Directory.CustomBeforeTraversal.props", "$(MSBuildProjectDirectory)"))
</CustomBeforeTraversalProps>
<CustomAfterTraversalProps Condition="Exists($([MSBuild]::GetPathOfFileAbove('Directory.CustomAfterTraversal.props')))">
<CustomAfterTraversalProps Condition="Exists($([MSBuild]::GetPathOfFileAbove('Directory.CustomAfterTraversal.props', '$(MSBuildProjectDirectory)')))">
$(CustomAfterTraversalProps);
$([MSBuild]::GetPathOfFileAbove("Directory.CustomAfterTraversal.props"))
$([MSBuild]::GetPathOfFileAbove("Directory.CustomAfterTraversal.props", "$(MSBuildProjectDirectory)"))
</CustomAfterTraversalProps>
</PropertyGroup>
</Project>
16 changes: 8 additions & 8 deletions src/Build/CustomBeforeAndAfterTraversal.targets
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
<!--
CustomBeforeAndAfterTraversal.props
Created: 2022-10-21-11:40:42
Modified: 2022-10-29-02:47:42
Author: David G. Moore, Jr. <[email protected]>
Copyright © 2022-2023 David G. Moore, Jr., All Rights Reserved
License: MIT (https://opensource.org/licenses/MIT)
-->

<Project>
<PropertyGroup>
<CustomBeforeTraversalTargets Condition="Exists($([MSBuild]::GetPathOfFileAbove('Directory.CustomBeforeTraversal.targets')))">
<PropertyGroup>
<CustomBeforeTraversalTargets Condition="Exists($([MSBuild]::GetPathOfFileAbove('Directory.CustomBeforeTraversal.targets', '$(MSBuildProjectDirectory)')))">
$(CustomAfterTraversal);
$([MSBuild]::GetPathOfFileAbove("Directory.CustomBeforeTraversal.targets"))
$([MSBuild]::GetPathOfFileAbove("Directory.CustomBeforeTraversal.targets", "$(MSBuildProjectDirectory)"))
</CustomBeforeTraversalTargets>
<CustomAfterTraversalTargets Condition="Exists($([MSBuild]::GetPathOfFileAbove('Directory.CustomAfterTraversal.targets')))">
<CustomAfterTraversalTargets Condition="Exists($([MSBuild]::GetPathOfFileAbove('Directory.CustomAfterTraversal.targets', '$(MSBuildProjectDirectory)')))">
$(CustomAfterTraversal);
$([MSBuild]::GetPathOfFileAbove("Directory.CustomAfterTraversal.targets"))
$([MSBuild]::GetPathOfFileAbove("Directory.CustomAfterTraversal.targets", "$(MSBuildProjectDirectory)"))
</CustomAfterTraversalTargets>
</PropertyGroup>
</Project>
3 changes: 3 additions & 0 deletions src/Build/ItemDefinitionGroups.props
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<CopyToPublishDirectory>Always</CopyToPublishDirectory>
<SetConfiguration>Configuration=$(Configuration)</SetConfiguration>
<ReferenceOutputAssembly>true</ReferenceOutputAssembly>
<OutputItemType>true</OutputItemType>
<Name>@(ProjectReference->'%(Filename)')</Name>
</ProjectReference>
</ItemDefinitionGroup>
<ItemDefinitionGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Build/ProjectTypeInfo.props
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@
<ItemGroup Condition="$(IsTestProject)">
<Using Include="Xunit" />
<Using Include="FluentAssertions" />
<Usings Include="FluentAssertions.Usings" />
<PackageReference Include="FluentAssertions.Usings" IncludeAssets="Build;BuildTransitive;BuildMultitargeting;Runtime;Compile" ExcludeAssets="ContentFiles;Native;Analyzers" PrivateAssets="None" />
</ItemGroup>
</Project>

0 comments on commit bc9b5bd

Please sign in to comment.