From e5da42eb817a7217e4f79854db8b6cfe54772386 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabr=C3=ADcio=20Godoy?= <skarllot@users.noreply.github.com>
Date: Wed, 24 Apr 2024 13:24:13 -0300
Subject: [PATCH] fix: include database DLL in package (#201)

---
 .../Expressions.EntityFrameworkCore.csproj    | 23 +++++++++----------
 .../Expressions.Marten.csproj                 | 19 ++++++++-------
 2 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/src/Expressions.EntityFrameworkCore/Expressions.EntityFrameworkCore.csproj b/src/Expressions.EntityFrameworkCore/Expressions.EntityFrameworkCore.csproj
index 21e098f0..eed3170f 100644
--- a/src/Expressions.EntityFrameworkCore/Expressions.EntityFrameworkCore.csproj
+++ b/src/Expressions.EntityFrameworkCore/Expressions.EntityFrameworkCore.csproj
@@ -13,18 +13,6 @@
     <ProjectReference Include="..\Expressions.Writing\Expressions.Writing.csproj" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
-    <None Include="$(OutputPath)\Raiqub.Expressions.Database.dll" Pack="true" PackagePath="lib/net8.0" Visible="true" />
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
-    <None Include="$(OutputPath)\Raiqub.Expressions.Database.dll" Pack="true" PackagePath="lib/net6.0" Visible="true" />
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1'">
-    <None Include="$(OutputPath)\Raiqub.Expressions.Database.dll" Pack="true" PackagePath="lib/netstandard2.1" Visible="true" />
-  </ItemGroup>
-
   <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
     <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.4" />
   </ItemGroup>
@@ -45,4 +33,15 @@
     <None Include="README.md" Pack="true" PackagePath="." />
   </ItemGroup>
 
+  <PropertyGroup>
+    <TargetsForTfmSpecificBuildOutput>
+      $(TargetsForTfmSpecificBuildOutput);PackReferencedProjectOutputs
+    </TargetsForTfmSpecificBuildOutput>
+  </PropertyGroup>
+  <Target Name="PackReferencedProjectOutputs" DependsOnTargets="BuildOnlySettings;ResolveReferences">
+    <ItemGroup>
+      <BuildOutputInPackage Include="@(ReferenceCopyLocalPaths->WithMetadataValue('ReferenceSourceTarget', 'ProjectReference')->WithMetadataValue('PrivateAssets', 'All'))" />
+    </ItemGroup>
+  </Target>
+
 </Project>
diff --git a/src/Expressions.Marten/Expressions.Marten.csproj b/src/Expressions.Marten/Expressions.Marten.csproj
index 901f75ba..e84a9efd 100644
--- a/src/Expressions.Marten/Expressions.Marten.csproj
+++ b/src/Expressions.Marten/Expressions.Marten.csproj
@@ -13,14 +13,6 @@
     <ProjectReference Include="..\Expressions.Writing\Expressions.Writing.csproj" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
-    <None Include="$(OutputPath)\Raiqub.Expressions.Database.dll" Pack="true" PackagePath="lib/net8.0" Visible="true" />
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
-    <None Include="$(OutputPath)\Raiqub.Expressions.Database.dll" Pack="true" PackagePath="lib/net6.0" Visible="true" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="Marten" Version="7.8.0" />
   </ItemGroup>
@@ -29,4 +21,15 @@
     <None Include="README.md" Pack="true" PackagePath="." />
   </ItemGroup>
 
+  <PropertyGroup>
+    <TargetsForTfmSpecificBuildOutput>
+      $(TargetsForTfmSpecificBuildOutput);PackReferencedProjectOutputs
+    </TargetsForTfmSpecificBuildOutput>
+  </PropertyGroup>
+  <Target Name="PackReferencedProjectOutputs" DependsOnTargets="BuildOnlySettings;ResolveReferences">
+    <ItemGroup>
+      <BuildOutputInPackage Include="@(ReferenceCopyLocalPaths->WithMetadataValue('ReferenceSourceTarget', 'ProjectReference')->WithMetadataValue('PrivateAssets', 'All'))" />
+    </ItemGroup>
+  </Target>
+
 </Project>