fix: Publish Database package (#202)

skarllot · Apr 24, 2024 · 36956fa · 36956fa
1 parent e5da42e
commit 36956fa
Show file tree

Hide file tree

Showing 8 changed files with 53 additions and 29 deletions.
diff --git a/samples/Helpdesk.Relational.Tests/packages.lock.json b/samples/Helpdesk.Relational.Tests/packages.lock.json
@@ -171,8 +171,8 @@
       },
       "Microsoft.Extensions.Logging.Abstractions": {
         "type": "Transitive",
-        "resolved": "6.0.0",
-        "contentHash": "/HggWBbTwy8TgebGSX5DBZ24ndhzi93sHUBDvP1IxbZD7FDokYzdAr6+vbWGjw2XAfR2EJ1sfKUotpjHnFWPxA=="
+        "resolved": "6.0.4",
+        "contentHash": "K14wYgwOfKVELrUh5eBqlC8Wvo9vvhS3ZhIvcswV2uS/ubkTRPSQsN557EZiYUSSoZNxizG+alN4wjtdyLdcyw=="
       },
       "Microsoft.Extensions.Options": {
         "type": "Transitive",
@@ -387,10 +387,17 @@
       "Raiqub.Expressions": {
         "type": "Project"
       },
+      "Raiqub.Expressions.Database": {
+        "type": "Project",
+        "dependencies": {
+          "Microsoft.Extensions.Logging.Abstractions": "[6.0.4, )"
+        }
+      },
       "Raiqub.Expressions.EntityFrameworkCore": {
         "type": "Project",
         "dependencies": {
           "Microsoft.EntityFrameworkCore.Relational": "[6.0.29, )",
+          "Raiqub.Expressions.Database": "[1.0.0, )",
           "Raiqub.Expressions.Writing": "[1.0.0, )"
         }
       },

diff --git a/samples/Helpdesk.Relational/packages.lock.json b/samples/Helpdesk.Relational/packages.lock.json
@@ -143,8 +143,8 @@
       },
       "Microsoft.Extensions.Logging.Abstractions": {
         "type": "Transitive",
-        "resolved": "6.0.0",
-        "contentHash": "/HggWBbTwy8TgebGSX5DBZ24ndhzi93sHUBDvP1IxbZD7FDokYzdAr6+vbWGjw2XAfR2EJ1sfKUotpjHnFWPxA=="
+        "resolved": "6.0.4",
+        "contentHash": "K14wYgwOfKVELrUh5eBqlC8Wvo9vvhS3ZhIvcswV2uS/ubkTRPSQsN557EZiYUSSoZNxizG+alN4wjtdyLdcyw=="
       },
       "Microsoft.Extensions.Options": {
         "type": "Transitive",
@@ -226,10 +226,17 @@
       "Raiqub.Expressions": {
         "type": "Project"
       },
+      "Raiqub.Expressions.Database": {
+        "type": "Project",
+        "dependencies": {
+          "Microsoft.Extensions.Logging.Abstractions": "[6.0.4, )"
+        }
+      },
       "Raiqub.Expressions.EntityFrameworkCore": {
         "type": "Project",
         "dependencies": {
           "Microsoft.EntityFrameworkCore.Relational": "[6.0.29, )",
+          "Raiqub.Expressions.Database": "[1.0.0, )",
           "Raiqub.Expressions.Writing": "[1.0.0, )"
         }
       },

diff --git a/src/Expressions.Database/Expressions.Database.csproj b/src/Expressions.Database/Expressions.Database.csproj
@@ -3,7 +3,6 @@
   <PropertyGroup>
     <TargetFrameworks>net8.0;net6.0;netstandard2.0;netstandard2.1</TargetFrameworks>
     <RootNamespace>Raiqub.Expressions</RootNamespace>
-    <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
@@ -27,4 +26,8 @@
     <InternalsVisibleTo Include="Raiqub.Expressions.Marten" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Include="README.md" Pack="true" PackagePath="." />
+  </ItemGroup>
+
 </Project>
diff --git a/src/Expressions.Database/README.md b/src/Expressions.Database/README.md
@@ -0,0 +1,15 @@
+# Raiqub Expressions - Database
+
+_Provides common code for implementations of sessions and factories (not used directly)_
+
+[![Build status](https://github.com/skarllot/Expressions/actions/workflows/dotnet.yml/badge.svg?branch=main)](https://github.com/skarllot/Expressions/actions)
+[![NuGet](https://buildstats.info/nuget/Raiqub.Expressions.Database)](https://www.nuget.org/packages/Raiqub.Expressions.Database/)
+[![Code coverage](https://codecov.io/gh/skarllot/Expressions/branch/main/graph/badge.svg)](https://codecov.io/gh/skarllot/Expressions)
+[![Mutation testing badge](https://img.shields.io/endpoint?style=flat&url=https%3A%2F%2Fbadge-api.stryker-mutator.io%2Fgithub.com%2Fskarllot%2FExpressions%2Fmain)](https://dashboard.stryker-mutator.io/reports/github.com/skarllot/Expressions/main)
+[![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg?style=flat)](https://raw.githubusercontent.com/skarllot/Expressions/master/LICENSE)
+
+## Documentation and Samples
+Documentation, and samples, for using Raiqub Expressions can be found in the repository's [README](https://github.com/skarllot/Expressions#readme) and [documentation](https://fgodoy.me/Expressions/).
+
+## Release Notes
+See [GitHub Releases](https://github.com/skarllot/Expressions/releases) for release notes.
diff --git a/src/Expressions.EntityFrameworkCore/Expressions.EntityFrameworkCore.csproj b/src/Expressions.EntityFrameworkCore/Expressions.EntityFrameworkCore.csproj
@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Expressions.Database\Expressions.Database.csproj" PrivateAssets="all" />
+    <ProjectReference Include="..\Expressions.Database\Expressions.Database.csproj" />
     <ProjectReference Include="..\Expressions.Writing\Expressions.Writing.csproj" />
   </ItemGroup>
 
@@ -33,15 +33,4 @@
     <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
@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Expressions.Database\Expressions.Database.csproj" PrivateAssets="all" />
+    <ProjectReference Include="..\Expressions.Database\Expressions.Database.csproj" />
     <ProjectReference Include="..\Expressions.Writing\Expressions.Writing.csproj" />
   </ItemGroup>
 
@@ -21,15 +21,4 @@
     <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/tests/Expressions.EntityFrameworkCore.Tests/packages.lock.json b/tests/Expressions.EntityFrameworkCore.Tests/packages.lock.json
@@ -689,10 +689,17 @@
       "Raiqub.Expressions": {
         "type": "Project"
       },
+      "Raiqub.Expressions.Database": {
+        "type": "Project",
+        "dependencies": {
+          "Microsoft.Extensions.Logging.Abstractions": "[6.0.4, )"
+        }
+      },
       "Raiqub.Expressions.EntityFrameworkCore": {
         "type": "Project",
         "dependencies": {
           "Microsoft.EntityFrameworkCore.Relational": "[8.0.4, )",
+          "Raiqub.Expressions.Database": "[1.0.0, )",
           "Raiqub.Expressions.Writing": "[1.0.0, )"
         }
       },

diff --git a/tests/Expressions.Marten.Tests/packages.lock.json b/tests/Expressions.Marten.Tests/packages.lock.json
@@ -954,10 +954,17 @@
       "Raiqub.Expressions": {
         "type": "Project"
       },
+      "Raiqub.Expressions.Database": {
+        "type": "Project",
+        "dependencies": {
+          "Microsoft.Extensions.Logging.Abstractions": "[6.0.4, )"
+        }
+      },
       "Raiqub.Expressions.Marten": {
         "type": "Project",
         "dependencies": {
           "Marten": "[7.8.0, )",
+          "Raiqub.Expressions.Database": "[1.0.0, )",
           "Raiqub.Expressions.Writing": "[1.0.0, )"
         }
       },