Skip to content

Commit 8a5ec78

Browse files
authored
More dependency fixes (#58)
More dependency fixes.
1 parent 887047c commit 8a5ec78

3 files changed

Lines changed: 48 additions & 3 deletions

File tree

src/Dapper/Dapper.Impl.csproj

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,18 @@
2222
</PropertyGroup>
2323

2424
<ItemGroup>
25-
<ProjectReference Include="..\DB.Shared\DB.Shared.csproj" />
25+
<ProjectReference Include="..\DB.Shared\DB.Shared.csproj" PrivateAssets="All" />
2626
<ProjectReference Include="..\Ulid\Impl.csproj" />
2727
</ItemGroup>
2828

2929
<ItemGroup>
3030
<PackageReference Include="Dapper" Version="2.0.4" />
3131
</ItemGroup>
3232

33+
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
34+
<PackageReference Include="Microsoft.Bcl.Memory" Version="10.0.10" />
35+
</ItemGroup>
36+
3337
<ItemGroup>
3438
<None Include="$(MSBuildThisFileDirectory)..\..\assets\logo_ulid_dapper.png" Pack="true" PackagePath="\" Visible="false" />
3539
<None Include="PACKAGE.md">
@@ -38,4 +42,15 @@
3842
</None>
3943
</ItemGroup>
4044

45+
<PropertyGroup>
46+
<!-- Hook custom target to bundle referenced project DLLs into lib/ folders -->
47+
<TargetsForTfmSpecificBuildOutput>$(TargetsForTfmSpecificBuildOutput);IncludeReferencedProjectInPackage</TargetsForTfmSpecificBuildOutput>
48+
</PropertyGroup>
49+
50+
<Target Name="IncludeReferencedProjectInPackage">
51+
<ItemGroup>
52+
<BuildOutputInPackage Include="$(TargetDir)ByteAether.Ulid.DB.Shared.dll" />
53+
</ItemGroup>
54+
</Target>
55+
4156
</Project>

src/EFCore/EFCore.Impl.csproj

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
</PropertyGroup>
2323

2424
<ItemGroup>
25-
<ProjectReference Include="..\DB.Shared\DB.Shared.csproj" />
25+
<ProjectReference Include="..\DB.Shared\DB.Shared.csproj" PrivateAssets="All" />
2626
<ProjectReference Include="..\Ulid\Impl.csproj" />
2727
</ItemGroup>
2828

@@ -32,6 +32,10 @@
3232
</PackageReference>
3333
</ItemGroup>
3434

35+
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
36+
<PackageReference Include="Microsoft.Bcl.Memory" Version="10.0.10" />
37+
</ItemGroup>
38+
3539
<ItemGroup>
3640
<None Include="$(MSBuildThisFileDirectory)..\..\assets\logo_ulid_efcore.png" Pack="true" PackagePath="\" Visible="false" />
3741
<None Include="PACKAGE.md">
@@ -40,4 +44,15 @@
4044
</None>
4145
</ItemGroup>
4246

47+
<PropertyGroup>
48+
<!-- Hook custom target to bundle referenced project DLLs into lib/ folders -->
49+
<TargetsForTfmSpecificBuildOutput>$(TargetsForTfmSpecificBuildOutput);IncludeReferencedProjectInPackage</TargetsForTfmSpecificBuildOutput>
50+
</PropertyGroup>
51+
52+
<Target Name="IncludeReferencedProjectInPackage">
53+
<ItemGroup>
54+
<BuildOutputInPackage Include="$(TargetDir)ByteAether.Ulid.DB.Shared.dll" />
55+
</ItemGroup>
56+
</Target>
57+
4358
</Project>

src/LinqToDB/LinqToDB.Impl.csproj

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
</PropertyGroup>
2222

2323
<ItemGroup>
24-
<ProjectReference Include="..\DB.Shared\DB.Shared.csproj" />
24+
<ProjectReference Include="..\DB.Shared\DB.Shared.csproj" PrivateAssets="All" />
2525
<ProjectReference Include="..\Ulid\Impl.csproj" />
2626
</ItemGroup>
2727

@@ -31,6 +31,10 @@
3131
</PackageReference>
3232
</ItemGroup>
3333

34+
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
35+
<PackageReference Include="Microsoft.Bcl.Memory" Version="10.0.10" />
36+
</ItemGroup>
37+
3438
<ItemGroup>
3539
<None Include="$(MSBuildThisFileDirectory)..\..\assets\logo_ulid_linq2db.png" Pack="true" PackagePath="\" Visible="false" />
3640
<None Include="PACKAGE.md">
@@ -39,4 +43,15 @@
3943
</None>
4044
</ItemGroup>
4145

46+
<PropertyGroup>
47+
<!-- Hook custom target to bundle referenced project DLLs into lib/ folders -->
48+
<TargetsForTfmSpecificBuildOutput>$(TargetsForTfmSpecificBuildOutput);IncludeReferencedProjectInPackage</TargetsForTfmSpecificBuildOutput>
49+
</PropertyGroup>
50+
51+
<Target Name="IncludeReferencedProjectInPackage">
52+
<ItemGroup>
53+
<BuildOutputInPackage Include="$(TargetDir)ByteAether.Ulid.DB.Shared.dll" />
54+
</ItemGroup>
55+
</Target>
56+
4257
</Project>

0 commit comments

Comments
 (0)