From 56fbcfe6dfd3a73dd40e311fcf7ba3205ef63775 Mon Sep 17 00:00:00 2001
From: Marco Minerva <marco.minerva@gmail.com>
Date: Mon, 23 Sep 2024 12:19:30 +0200
Subject: [PATCH] Update .csproj files for packaging and build improvements

Update .csproj files to include IncludeProjectReferenceDlls target and suppress NU5131 warning.
Modify ProjectReference elements to include PrivateAssets="all".
Add ItemGroup to include ref folder in the package.
Add IncludeProjectReferenceDlls target to include project reference DLLs in build output.
---
 .../MinimalHelpers.FluentValidation.csproj      | 17 +++++++++++++++--
 ...inimalHelpers.Validation.Abstractions.csproj |  2 +-
 .../MinimalHelpers.Validation.csproj            | 17 +++++++++++++++--
 3 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/src/MinimalHelpers.FluentValidation/MinimalHelpers.FluentValidation.csproj b/src/MinimalHelpers.FluentValidation/MinimalHelpers.FluentValidation.csproj
index 2d71259..60438a9 100644
--- a/src/MinimalHelpers.FluentValidation/MinimalHelpers.FluentValidation.csproj
+++ b/src/MinimalHelpers.FluentValidation/MinimalHelpers.FluentValidation.csproj
@@ -18,7 +18,9 @@
         <RepositoryType>git</RepositoryType>
         <RepositoryUrl>https://github.com/marcominerva/MinimalHelpers.git</RepositoryUrl>
         <RepositoryBranch>master</RepositoryBranch>
-        <PackageReadmeFile>README.md</PackageReadmeFile>        
+        <PackageReadmeFile>README.md</PackageReadmeFile>
+        <TargetsForTfmSpecificBuildOutput>$(TargetsForTfmSpecificBuildOutput);IncludeProjectReferenceDlls</TargetsForTfmSpecificBuildOutput>
+        <NoWarn>$(NoWarn);NU5131</NoWarn>
     </PropertyGroup>
 
     <ItemGroup>
@@ -42,6 +44,17 @@
     </ItemGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\MinimalHelpers.Validation.Abstractions\MinimalHelpers.Validation.Abstractions.csproj" />
+      <ProjectReference Include="..\MinimalHelpers.Validation.Abstractions\MinimalHelpers.Validation.Abstractions.csproj" PrivateAssets="all" />
     </ItemGroup>
+
+    <ItemGroup>
+        <!-- Add a ref folder to the package which only exposes the library so that the referenced class library doesn't get exposed. -->
+        <None Include="$(TargetPath)" PackagePath="ref/$(TargetFramework)" Pack="true" Condition="'$(TargetFramework)' != ''" />
+    </ItemGroup>
+
+    <Target Name="IncludeProjectReferenceDlls" DependsOnTargets="BuildOnlySettings;ResolveReferences">
+        <ItemGroup>
+            <BuildOutputInPackage Include="@(ReferenceCopyLocalPaths->WithMetadataValue('ReferenceSourceTarget', 'ProjectReference')->WithMetadataValue('PrivateAssets', 'All'))"/>
+        </ItemGroup>
+    </Target>
 </Project>
diff --git a/src/MinimalHelpers.Validation.Abstractions/MinimalHelpers.Validation.Abstractions.csproj b/src/MinimalHelpers.Validation.Abstractions/MinimalHelpers.Validation.Abstractions.csproj
index ffdf355..3d5dcce 100644
--- a/src/MinimalHelpers.Validation.Abstractions/MinimalHelpers.Validation.Abstractions.csproj
+++ b/src/MinimalHelpers.Validation.Abstractions/MinimalHelpers.Validation.Abstractions.csproj
@@ -19,7 +19,7 @@
         <RepositoryType>git</RepositoryType>
         <RepositoryUrl>https://github.com/marcominerva/MinimalHelpers.git</RepositoryUrl>
         <RepositoryBranch>master</RepositoryBranch>
-        <PackageReadmeFile>README.md</PackageReadmeFile>        
+        <PackageReadmeFile>README.md</PackageReadmeFile>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/src/MinimalHelpers.Validation/MinimalHelpers.Validation.csproj b/src/MinimalHelpers.Validation/MinimalHelpers.Validation.csproj
index 8c05179..61af228 100644
--- a/src/MinimalHelpers.Validation/MinimalHelpers.Validation.csproj
+++ b/src/MinimalHelpers.Validation/MinimalHelpers.Validation.csproj
@@ -18,7 +18,9 @@
         <RepositoryType>git</RepositoryType>
         <RepositoryUrl>https://github.com/marcominerva/MinimalHelpers.git</RepositoryUrl>
         <RepositoryBranch>master</RepositoryBranch>
-        <PackageReadmeFile>README.md</PackageReadmeFile>        
+        <PackageReadmeFile>README.md</PackageReadmeFile>
+        <TargetsForTfmSpecificBuildOutput>$(TargetsForTfmSpecificBuildOutput);IncludeProjectReferenceDlls</TargetsForTfmSpecificBuildOutput>
+        <NoWarn>$(NoWarn);NU5131</NoWarn>
     </PropertyGroup>
 
     <ItemGroup>
@@ -42,6 +44,17 @@
     </ItemGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\MinimalHelpers.Validation.Abstractions\MinimalHelpers.Validation.Abstractions.csproj" />
+      <ProjectReference Include="..\MinimalHelpers.Validation.Abstractions\MinimalHelpers.Validation.Abstractions.csproj" PrivateAssets="all" />
     </ItemGroup>
+
+    <ItemGroup>
+        <!-- Add a ref folder to the package which only exposes the library so that the referenced class library doesn't get exposed. -->
+        <None Include="$(TargetPath)" PackagePath="ref/$(TargetFramework)" Pack="true" Condition="'$(TargetFramework)' != ''" />
+    </ItemGroup>
+
+    <Target Name="IncludeProjectReferenceDlls" DependsOnTargets="BuildOnlySettings;ResolveReferences">
+        <ItemGroup>
+            <BuildOutputInPackage Include="@(ReferenceCopyLocalPaths->WithMetadataValue('ReferenceSourceTarget', 'ProjectReference')->WithMetadataValue('PrivateAssets', 'All'))"/>
+        </ItemGroup>
+    </Target>
 </Project>