Skip to content

FIx for Dapr.Common not being transiently referenced by project #1852

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
WhitWaldo merged 9 commits into from
Jun 15, 2026
Merged

FIx for Dapr.Common not being transiently referenced by project #1852

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
48037cc
FIx for Dapr.Common not being transiently referenced by project
WhitWaldo Jun 14, 2026
458f378
Adding regression testing against packing issues
WhitWaldo Jun 14, 2026
8e538e0
Addressing similar issues on other packages
WhitWaldo Jun 14, 2026
8320161
Adding several tests to increasingly validate that outputs are packag…
WhitWaldo Jun 14, 2026
e1d9da0
Merge branch 'master' into dapr-common-transitive-install
WhitWaldo Jun 14, 2026
8a50c7e
More test changes
WhitWaldo Jun 14, 2026
b4d6d66
Merge remote-tracking branch 'origin/dapr-common-transitive-install' …
WhitWaldo Jun 14, 2026
d6cfa25
More test fixes
WhitWaldo Jun 15, 2026
29eae9f
Fix for flaky integration test
WhitWaldo Jun 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions all.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,6 +310,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Dapr.Metadata.Test", "test\
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Dapr.IntegrationTests.Metadata", "test\Dapr.IntegrationTests.Metadata\Dapr.IntegrationTests.Metadata.csproj", "{2A1AC4BF-25B1-4901-9E8D-B59BCE8950D7}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Dapr.Packaging.Test", "test\Dapr.Packaging.Test\Dapr.Packaging.Test.csproj", "{6C51B34B-F254-4972-A643-492FAE712D2C}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -1844,6 +1846,18 @@ Global
{2A1AC4BF-25B1-4901-9E8D-B59BCE8950D7}.Release|x64.Build.0 = Release|Any CPU
{2A1AC4BF-25B1-4901-9E8D-B59BCE8950D7}.Release|x86.ActiveCfg = Release|Any CPU
{2A1AC4BF-25B1-4901-9E8D-B59BCE8950D7}.Release|x86.Build.0 = Release|Any CPU
{6C51B34B-F254-4972-A643-492FAE712D2C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6C51B34B-F254-4972-A643-492FAE712D2C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6C51B34B-F254-4972-A643-492FAE712D2C}.Debug|x64.ActiveCfg = Debug|Any CPU
{6C51B34B-F254-4972-A643-492FAE712D2C}.Debug|x64.Build.0 = Debug|Any CPU
{6C51B34B-F254-4972-A643-492FAE712D2C}.Debug|x86.ActiveCfg = Debug|Any CPU
{6C51B34B-F254-4972-A643-492FAE712D2C}.Debug|x86.Build.0 = Debug|Any CPU
{6C51B34B-F254-4972-A643-492FAE712D2C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6C51B34B-F254-4972-A643-492FAE712D2C}.Release|Any CPU.Build.0 = Release|Any CPU
{6C51B34B-F254-4972-A643-492FAE712D2C}.Release|x64.ActiveCfg = Release|Any CPU
{6C51B34B-F254-4972-A643-492FAE712D2C}.Release|x64.Build.0 = Release|Any CPU
{6C51B34B-F254-4972-A643-492FAE712D2C}.Release|x86.ActiveCfg = Release|Any CPU
{6C51B34B-F254-4972-A643-492FAE712D2C}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -1995,6 +2009,7 @@ Global
{FDB10D1D-E614-4271-B747-F8D6991C2EFE} = {27C5D71D-0721-4221-9286-B94AB07B58CF}
{632C7482-8CEB-457F-9D4C-1EE41E05C0CC} = {0AF0FE8D-C234-4F04-8514-32206ACE01BD}
{2A1AC4BF-25B1-4901-9E8D-B59BCE8950D7} = {8462B106-175A-423A-BA94-BE0D39D0BD8E}
{6C51B34B-F254-4972-A643-492FAE712D2C} = {DD020B34-460F-455F-8D17-CF4A949F100B}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {65220BF2-EAE1-4CB2-AA58-EBE80768CB40}
Expand Down
33 changes: 21 additions & 12 deletions src/Dapr.Metadata/Dapr.Metadata.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.Build.NoTargets/3.7.0">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<IsPackable>true</IsPackable>
Expand All @@ -11,10 +11,7 @@
<!-- This aggregator produces no own binaries -->
<IncludeBuildOutput>false</IncludeBuildOutput>

<!-- We embed children; do NOT emit dependency groups -->
<SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>

<!-- Aggregator package has lib assets but no dependencies -->
<!-- Aggregator package has lib assets from bundled child projects -->
<NoWarn>$(NoWarn);NU5128</NoWarn>

<!-- Avoid creating an empty .snupkg -->
Expand All @@ -38,18 +35,30 @@
</Target>

<ItemGroup>
<!-- Build children but do NOT turn them into NuGet dependencies -->
<ProjectReference Include="..\Dapr.Metadata.Abstractions\Dapr.Metadata.Abstractions.csproj"
PrivateAssets="all"
ReferenceOutputAssembly="false" />
<ProjectReference Include="..\Dapr.Metadata.Runtime\Dapr.Metadata.Runtime.csproj"
<!-- Child projects whose outputs are bundled into this package but are NOT NuGet dependencies. -->
<_MetadataChildLib Include="..\Dapr.Metadata.Abstractions\Dapr.Metadata.Abstractions.csproj" />
<_MetadataChildLib Include="..\Dapr.Metadata.Runtime\Dapr.Metadata.Runtime.csproj" />

<ProjectReference Include="@(_MetadataChildLib)"
PrivateAssets="all"
ReferenceOutputAssembly="false" />

<!-- Dapr.Common remains a visible dependency because the bundled assemblies expose and use
its public types, and consumers need it as a compile/runtime asset. -->
<ProjectReference Include="..\Dapr.Common\Dapr.Common.csproj" />
</ItemGroup>

<!-- Package references required by the bundled runtime assembly. These must remain visible to
consumers because the runtime project is bundled privately instead of published separately. -->
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" />
<PackageReference Include="Microsoft.Extensions.Http" />
</ItemGroup>

<!-- Build child libs for the current TFM -->
<Target Name="_BuildChildrenForCurrentTFM">
<MSBuild Projects="@(ProjectReference)"
<MSBuild Projects="@(_MetadataChildLib)"
Targets="Build"
Properties="TargetFramework=$(TargetFramework);Configuration=$(Configuration)"
BuildInParallel="true" />
Expand All @@ -58,7 +67,7 @@
<!-- Create per-TFM content items mapped to lib/<tfm>/ -->
<Target Name="_CollectChildOutputsForCurrentTFM" DependsOnTargets="_BuildChildrenForCurrentTFM">
<!-- Ask children for their TargetPath for THIS TFM -->
<MSBuild Projects="@(ProjectReference)"
<MSBuild Projects="@(_MetadataChildLib)"
Targets="GetTargetPath"
Properties="TargetFramework=$(TargetFramework);Configuration=$(Configuration)">
<Output TaskParameter="TargetOutputs" ItemName="_BuiltChildOutputs" />
Expand Down
33 changes: 22 additions & 11 deletions src/Dapr.SecretsManagement/Dapr.SecretsManagement.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.Build.NoTargets/3.7.0">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<IsPackable>true</IsPackable>
Expand All @@ -11,10 +11,7 @@
<!-- This aggregator produces no own binaries -->
<IncludeBuildOutput>false</IncludeBuildOutput>

<!-- We embed children; do NOT emit dependency groups -->
<SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>

<!-- Aggregator package has lib assets but no dependencies -->
<!-- Aggregator package has lib assets from bundled child projects -->
<NoWarn>$(NoWarn);NU5128</NoWarn>

<!-- Avoid creating an empty .snupkg -->
Expand Down Expand Up @@ -42,16 +39,30 @@
</Target>

<ItemGroup>
<!-- Build children but do NOT turn them into NuGet dependencies -->
<ProjectReference Include="..\Dapr.SecretsManagement.Abstractions\Dapr.SecretsManagement.Abstractions.csproj"
PrivateAssets="all" ReferenceOutputAssembly="false" />
<ProjectReference Include="..\Dapr.SecretsManagement.Runtime\Dapr.SecretsManagement.Runtime.csproj"
<!-- Child projects whose outputs are bundled into this package but are NOT NuGet dependencies. -->
<_SecretsManagementChildLib Include="..\Dapr.SecretsManagement.Abstractions\Dapr.SecretsManagement.Abstractions.csproj" />
<_SecretsManagementChildLib Include="..\Dapr.SecretsManagement.Runtime\Dapr.SecretsManagement.Runtime.csproj" />

<ProjectReference Include="@(_SecretsManagementChildLib)"
PrivateAssets="all" ReferenceOutputAssembly="false" />

<!-- Dapr.Common remains a visible dependency because the bundled assemblies expose and use
its public types, and consumers need it as a compile/runtime asset. -->
<ProjectReference Include="..\Dapr.Common\Dapr.Common.csproj" />
</ItemGroup>

<!-- Package references required by the bundled runtime assembly. These must remain visible to
consumers because the runtime project is bundled privately instead of published separately. -->
<ItemGroup>
<PackageReference Include="Google.Protobuf" />
<PackageReference Include="Grpc.Net.Client" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
<PackageReference Include="Microsoft.Extensions.Http" />
</ItemGroup>

<!-- Build child libs for the current TFM -->
<Target Name="_BuildChildrenForCurrentTFM">
<MSBuild Projects="@(ProjectReference)"
<MSBuild Projects="@(_SecretsManagementChildLib)"
Targets="Build"
Properties="TargetFramework=$(TargetFramework);Configuration=$(Configuration)"
BuildInParallel="true" />
Expand All @@ -61,7 +72,7 @@

<Target Name="_CollectChildOutputsForCurrentTFM" DependsOnTargets="_BuildChildrenForCurrentTFM">
<!-- Ask children for their TargetPath for THIS TFM -->
<MSBuild Projects="@(ProjectReference)"
<MSBuild Projects="@(_SecretsManagementChildLib)"
Targets="GetTargetPath"
Properties="TargetFramework=$(TargetFramework);Configuration=$(Configuration)">
<Output TaskParameter="TargetOutputs" ItemName="_BuiltChildOutputs" />
Expand Down
33 changes: 22 additions & 11 deletions src/Dapr.StateManagement/Dapr.StateManagement.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.Build.NoTargets/3.7.0">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<IsPackable>true</IsPackable>
Expand All @@ -11,10 +11,7 @@
<!-- This aggregator produces no own binaries -->
<IncludeBuildOutput>false</IncludeBuildOutput>

<!-- We embed children; do NOT emit dependency groups -->
<SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>

<!-- Aggregator package has lib assets but no dependencies -->
<!-- Aggregator package has lib assets from bundled child projects -->
<NoWarn>$(NoWarn);NU5128</NoWarn>

<!-- Avoid creating an empty .snupkg -->
Expand Down Expand Up @@ -43,16 +40,30 @@
</Target>

<ItemGroup>
<!-- Build children but do NOT turn them into NuGet dependencies -->
<ProjectReference Include="..\Dapr.StateManagement.Abstractions\Dapr.StateManagement.Abstractions.csproj"
PrivateAssets="all" ReferenceOutputAssembly="false" />
<ProjectReference Include="..\Dapr.StateManagement.Runtime\Dapr.StateManagement.Runtime.csproj"
<!-- Child projects whose outputs are bundled into this package but are NOT NuGet dependencies. -->
<_StateManagementChildLib Include="..\Dapr.StateManagement.Abstractions\Dapr.StateManagement.Abstractions.csproj" />
<_StateManagementChildLib Include="..\Dapr.StateManagement.Runtime\Dapr.StateManagement.Runtime.csproj" />

<ProjectReference Include="@(_StateManagementChildLib)"
PrivateAssets="all" ReferenceOutputAssembly="false" />

<!-- Dapr.Common remains a visible dependency because the bundled assemblies expose and use
its public types, and consumers need it as a compile/runtime asset. -->
<ProjectReference Include="..\Dapr.Common\Dapr.Common.csproj" />
</ItemGroup>

<!-- Package references required by the bundled child assemblies. These must remain visible to
consumers because the child projects are bundled privately instead of published separately. -->
<ItemGroup>
<PackageReference Include="Google.Protobuf" />
<PackageReference Include="Grpc.Net.Client" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
<PackageReference Include="Microsoft.Extensions.Http" />
</ItemGroup>

<!-- Build child libs for the current TFM -->
<Target Name="_BuildChildrenForCurrentTFM">
<MSBuild Projects="@(ProjectReference)"
<MSBuild Projects="@(_StateManagementChildLib)"
Targets="Build"
Properties="TargetFramework=$(TargetFramework);Configuration=$(Configuration)"
BuildInParallel="true" />
Expand All @@ -61,7 +72,7 @@
<!-- Collect per-TFM outputs and map them into lib/<tfm>/ in the package -->
<Target Name="_CollectChildOutputsForCurrentTFM" DependsOnTargets="_BuildChildrenForCurrentTFM">
<!-- Ask children for their TargetPath for THIS TFM -->
<MSBuild Projects="@(ProjectReference)"
<MSBuild Projects="@(_StateManagementChildLib)"
Targets="GetTargetPath"
Properties="TargetFramework=$(TargetFramework);Configuration=$(Configuration)">
<Output TaskParameter="TargetOutputs" ItemName="_BuiltChildOutputs" />
Expand Down
3 changes: 1 addition & 2 deletions test/Dapr.IntegrationTest.Workflow.Versioning/VersioningIntegrationTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,7 @@ public async Task ShouldFailWorkflowWhenVersionMissing()
}
}

var startedState = await client1.GetWorkflowStateAsync(instanceId, getInputsAndOutputs: false);
Assert.True(startedState?.Exists, "Expected workflow instance to exist before shutdown.");
await WaitForWorkflowExistsAsync(client1, instanceId, TimeSpan.FromMinutes(1));
}

await using (var appV2 = await StartNonVersionedAppAsync(componentsDirV2, environment, options))
Expand Down
Loading
Loading