Merge pull request #139 from icarus-consulting/i138-include-dlls-in-n…

…uget-package Include dlls of other .csprojs in Yaapii.Http NuGet package
icarus-consulting · Mar 17, 2023 · ed94f30 · ed94f30
2 parents c695c99 + c4a73a4
commit ed94f30
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 4 deletions.
diff --git a/build.cake b/build.cake
@@ -8,7 +8,7 @@ var configuration           = "Release";
 ///////////////////////////////////////////////////////////////////////////////
 var buildArtifacts          = Directory("./artifacts");
 var deployment              = Directory("./artifacts/deployment");
-var version                 = "3.0.2";
+var version                 = "8.0.2";
 
 ///////////////////////////////////////////////////////////////////////////////
 // MODULES

diff --git a/src/Yaapii.Http.Mock/Yaapii.Http.Mock.csproj b/src/Yaapii.Http.Mock/Yaapii.Http.Mock.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <VersionPrefix>8.0.1</VersionPrefix>
+    <VersionPrefix>8.0.2</VersionPrefix>
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
     <Authors>ICARUS Consulting GmbH</Authors>
     <Description>Mock http server based on Yaapii.Http.</Description>

diff --git a/src/Yaapii.Http/Yaapii.Http.csproj b/src/Yaapii.Http/Yaapii.Http.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <VersionPrefix>8.0.1</VersionPrefix>
+    <VersionPrefix>8.0.2</VersionPrefix>
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
     <Authors>ICARUS Consulting GmbH</Authors>
     <Description>Object oriented http client.</Description>
@@ -36,13 +36,25 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Teronis.MSBuild.Packaging.ProjectBuildInPackage" Version="1.0.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="Yaapii.Atoms" Version="3.0.0" />
     <PackageReference Include="Yaapii.JSON" Version="13.3.3" />
     <PackageReference Include="Yaapii.Xml" Version="2.0.2" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\ThirdParty\AsyncEx\src\Nito.AsyncEx\Nito.AsyncEx.csproj" />
+    <ProjectReference Include="..\..\ThirdParty\AsyncEx\src\Nito.AsyncEx.Context\Nito.AsyncEx.Context.csproj" PrivateAssets="all" />
+    <ProjectReference Include="..\..\ThirdParty\AsyncEx\src\Nito.AsyncEx.Coordination\Nito.AsyncEx.Coordination.csproj" PrivateAssets="all" />
+    <ProjectReference Include="..\..\ThirdParty\AsyncEx\src\Nito.AsyncEx.Interop.WaitHandles\Nito.AsyncEx.Interop.WaitHandles.csproj" PrivateAssets="all" />
+    <ProjectReference Include="..\..\ThirdParty\AsyncEx\src\Nito.AsyncEx.Oop\Nito.AsyncEx.Oop.csproj" PrivateAssets="all" />
+    <ProjectReference Include="..\..\ThirdParty\AsyncEx\src\Nito.AsyncEx.Tasks\Nito.AsyncEx.Tasks.csproj" PrivateAssets="all" />
+    <ProjectReference Include="..\..\ThirdParty\AsyncEx\src\Nito.AsyncEx\Nito.AsyncEx.csproj" PrivateAssets="all" />
+    <ProjectReference Include="..\..\ThirdParty\Cancellation\src\Nito.Cancellation\Nito.Cancellation.csproj" PrivateAssets="all" />
+    <ProjectReference Include="..\..\ThirdParty\Deque\src\Nito.Collections.Deque\Nito.Collections.Deque.csproj" PrivateAssets="all" />
+    <ProjectReference Include="..\..\ThirdParty\Disposables\src\Nito.Disposables\Nito.Disposables.csproj" PrivateAssets="all" />
   </ItemGroup>
 
 </Project>
diff --git a/tests/Test.Yaapii.Http.Mock/Test.Yaapii.Http.Mock.csproj b/tests/Test.Yaapii.Http.Mock/Test.Yaapii.Http.Mock.csproj
@@ -16,6 +16,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\Yaapii.Http.Mock\Yaapii.Http.Mock.csproj" />
+    <ProjectReference Include="..\..\ThirdParty\AsyncEx\src\Nito.AsyncEx.Context\Nito.AsyncEx.Context.csproj" />
   </ItemGroup>
 
 </Project>