Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

<ItemGroup>
<ProjectReference Include="..\..\..\src\Dapr.Workflow\Dapr.Workflow.csproj" />
<ProjectReference Include="..\..\..\src\Dapr.Workflow.Abstractions\Dapr.Workflow.Abstractions.csproj" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<ProjectReference Include="..\..\..\src\Dapr.AspNetCore\Dapr.AspNetCore.csproj" />
<ProjectReference Include="..\..\..\src\Dapr.Client\Dapr.Client.csproj" />
<ProjectReference Include="..\..\..\src\Dapr.Workflow\Dapr.Workflow.csproj" />
<ProjectReference Include="..\..\..\src\Dapr.Workflow.Abstractions\Dapr.Workflow.Abstractions.csproj" />
</ItemGroup>

<PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

<ItemGroup>
<ProjectReference Include="..\..\..\src\Dapr.Workflow\Dapr.Workflow.csproj" />
<ProjectReference Include="..\..\..\src\Dapr.Workflow.Abstractions\Dapr.Workflow.Abstractions.csproj" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

<ItemGroup>
<ProjectReference Include="..\..\..\src\Dapr.Workflow\Dapr.Workflow.csproj" />
<ProjectReference Include="..\..\..\src\Dapr.Workflow.Abstractions\Dapr.Workflow.Abstractions.csproj" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

<ItemGroup>
<ProjectReference Include="..\..\..\src\Dapr.Workflow\Dapr.Workflow.csproj" />
<ProjectReference Include="..\..\..\src\Dapr.Workflow.Abstractions\Dapr.Workflow.Abstractions.csproj" />
</ItemGroup>

</Project>
1 change: 1 addition & 0 deletions examples/Workflow/WorkflowMonitor/WorkflowMonitor.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

<ItemGroup>
<ProjectReference Include="..\..\..\src\Dapr.Workflow\Dapr.Workflow.csproj" />
<ProjectReference Include="..\..\..\src\Dapr.Workflow.Abstractions\Dapr.Workflow.Abstractions.csproj" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

<ItemGroup>
<ProjectReference Include="..\..\..\src\Dapr.Workflow\Dapr.Workflow.csproj" />
<ProjectReference Include="..\..\..\src\Dapr.Workflow.Abstractions\Dapr.Workflow.Abstractions.csproj" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

<ItemGroup>
<ProjectReference Include="..\..\..\src\Dapr.Workflow\Dapr.Workflow.csproj" />
<ProjectReference Include="..\..\..\src\Dapr.Workflow.Abstractions\Dapr.Workflow.Abstractions.csproj" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

<ItemGroup>
<ProjectReference Include="..\..\..\src\Dapr.Workflow\Dapr.Workflow.csproj" />
<ProjectReference Include="..\..\..\src\Dapr.Workflow.Abstractions\Dapr.Workflow.Abstractions.csproj" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

<ItemGroup>
<ProjectReference Include="..\..\..\src\Dapr.Workflow\Dapr.Workflow.csproj" />
<ProjectReference Include="..\..\..\src\Dapr.Workflow.Abstractions\Dapr.Workflow.Abstractions.csproj" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
<PackageId>Dapr.Workflow.Abstractions</PackageId>
<Title>Dapr Workflow Abstractions</Title>
<Description>Provides abstractions for the Dapr Workflow SDK implementation.</Description>
<!-- This assembly ships bundled inside the Dapr.Workflow NuGet package; it is not published as a standalone package. -->
<IsPackable>false</IsPackable>
</PropertyGroup>

<ItemGroup>
Expand Down
3 changes: 3 additions & 0 deletions src/Dapr.Workflow.Analyzers/Dapr.Workflow.Analyzers.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@
<!-- Do not include the generator as a lib dependency -->
<IncludeBuildOutput>false</IncludeBuildOutput>

<!-- This analyzer assembly ships bundled inside the Dapr.Workflow NuGet package; it is not published as a standalone package. -->
<IsPackable>false</IsPackable>

<!-- Additional NuGet package properties. -->
<Description>This package contains analyzers for interacting with Dapr workflows.</Description>
<NoWarn>$(NoWarn);RS1038</NoWarn>
Expand Down
2 changes: 2 additions & 0 deletions src/Dapr.Workflow.Grpc/Dapr.Workflow.Grpc.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
<PackageId>Dapr.Workflow.Grpc</PackageId>
<Title>Dapr Workflow gRPC protocol definitions</Title>
<Description>The gRPC protocol definitions for Dapr Workflows.</Description>
<!-- This assembly ships bundled inside the Dapr.Workflow NuGet package; it is not published as a standalone package. -->
<IsPackable>false</IsPackable>
</PropertyGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
<PropertyGroup>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<!-- This assembly ships bundled inside the Dapr.Workflow NuGet package; it is not published as a standalone package. -->
<IsPackable>false</IsPackable>
</PropertyGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
<PropertyGroup>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<!-- This assembly ships bundled inside the Dapr.Workflow NuGet package; it is not published as a standalone package. -->
<IsPackable>false</IsPackable>
</PropertyGroup>

<ItemGroup>
Expand Down
50 changes: 36 additions & 14 deletions src/Dapr.Workflow/Dapr.Workflow.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -20,30 +20,49 @@
_CollectWorkflowChildOutputsForCurrentTFM;
_AddWorkflowAnalyzerOnce
</TargetsForTfmSpecificContentInPackage>

<!-- One-shot outer-build hook to build the source generators -->
<TargetsForPack>$(TargetsForPack);_BuildWorkflowGeneratorsOnce</TargetsForPack>
</PropertyGroup>

<!-- Normal (compile-time + transitive) project references -->
<ItemGroup>
<ProjectReference Include="..\Dapr.Common\Dapr.Common.csproj" />
<ProjectReference Include="..\Dapr.Workflow.Abstractions\Dapr.Workflow.Abstractions.csproj" />
<ProjectReference Include="..\Dapr.Workflow.Grpc\Dapr.Workflow.Grpc.csproj" />
</ItemGroup>

<!-- Child projects whose outputs are bundled into this package but are NOT NuGet dependencies -->
<!-- Child projects whose outputs are bundled into this package but are NOT NuGet dependencies.
Dapr.Workflow ships as a single meta-package on NuGet; every Dapr.Workflow.* sibling
assembly is embedded here rather than published as its own package. -->
<ItemGroup>
<_WorkflowChildLib Include="..\Dapr.Workflow.Abstractions\Dapr.Workflow.Abstractions.csproj" />
<_WorkflowChildLib Include="..\Dapr.Workflow.Grpc\Dapr.Workflow.Grpc.csproj" />
<_WorkflowChildLib Include="..\Dapr.Workflow.Versioning.Abstractions\Dapr.Workflow.Versioning.Abstractions.csproj" />
<_WorkflowChildLib Include="..\Dapr.Workflow.Versioning.Runtime\Dapr.Workflow.Versioning.Runtime.csproj" />

<ProjectReference Include="@(_WorkflowChildLib)"
PrivateAssets="all"
ReferenceOutputAssembly="true" />

<!-- Source-generator child projects: referenced privately solely so the build system
restores and builds them as part of this project. Their assemblies are embedded
into the package under analyzers/dotnet/cs/ via the _AddWorkflowAnalyzerOnce target. -->
<ProjectReference Include="..\Dapr.Workflow.Analyzers\Dapr.Workflow.Analyzers.csproj"
PrivateAssets="all"
ReferenceOutputAssembly="false"
SetTargetFramework="TargetFramework=netstandard2.0" />
<ProjectReference Include="..\Dapr.Workflow.Versioning.Generators\Dapr.Workflow.Versioning.Generators.csproj"
PrivateAssets="all"
ReferenceOutputAssembly="false"
SetTargetFramework="TargetFramework=netstandard2.0" />
</ItemGroup>

<!-- Package references. These include the transitive runtime dependencies that used to flow
from Dapr.Workflow.Abstractions and Dapr.Workflow.Grpc when they were public ProjectReferences;
they must remain visible to consumers of the Dapr.Workflow NuGet package now that those
siblings are bundled privately. -->
<ItemGroup>
<PackageReference Include="Google.Protobuf" />
<PackageReference Include="Grpc.Net.Client" />
<PackageReference Include="Grpc.Net.ClientFactory" />
<PackageReference Include="Microsoft.Extensions.Hosting" />
<PackageReference Include="Microsoft.Extensions.Http" />
</ItemGroup>

<!-- ── Build child lib projects for the current TFM ── -->
Expand Down Expand Up @@ -91,21 +110,24 @@
</ItemGroup>
</Target>

<!-- ── Build both source-generator projects once (outer build, before Pack) ── -->
<Target Name="_BuildWorkflowGeneratorsOnce">
<MSBuild Projects="..\Dapr.Workflow.Analyzers\Dapr.Workflow.Analyzers.csproj;..\Dapr.Workflow.Versioning.Generators\Dapr.Workflow.Versioning.Generators.csproj"
Targets="Build"
Properties="Configuration=$(Configuration);TargetFramework=netstandard2.0" />
</Target>
<!-- ── Build and embed both source generators under analyzers/dotnet/cs/ (once, on first TFM) ── -->
<ItemGroup>
<_WorkflowGeneratorProj Include="..\Dapr.Workflow.Analyzers\Dapr.Workflow.Analyzers.csproj" />
<_WorkflowGeneratorProj Include="..\Dapr.Workflow.Versioning.Generators\Dapr.Workflow.Versioning.Generators.csproj" />
</ItemGroup>

<!-- ── Resolve and embed both source generators under analyzers/dotnet/cs/ (once, on first TFM) ── -->
<Target Name="_AddWorkflowAnalyzerOnce">
<PropertyGroup>
<_WorkflowIsFirstTfm Condition="'$(TargetFramework)' == 'net8.0'">true</_WorkflowIsFirstTfm>
</PropertyGroup>

<MSBuild Condition="'$(_WorkflowIsFirstTfm)' == 'true'"
Projects="..\Dapr.Workflow.Analyzers\Dapr.Workflow.Analyzers.csproj;..\Dapr.Workflow.Versioning.Generators\Dapr.Workflow.Versioning.Generators.csproj"
Projects="@(_WorkflowGeneratorProj)"
Targets="Build"
Properties="Configuration=$(Configuration);TargetFramework=netstandard2.0" />

<MSBuild Condition="'$(_WorkflowIsFirstTfm)' == 'true'"
Projects="@(_WorkflowGeneratorProj)"
Targets="GetTargetPath"
Properties="Configuration=$(Configuration);TargetFramework=netstandard2.0">
<Output TaskParameter="TargetOutputs" ItemName="_WorkflowAnalyzerOut" />
Expand Down
1 change: 1 addition & 0 deletions test/Dapr.E2E.Test.App/Dapr.E2E.Test.App.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
<ProjectReference Include="..\..\src\Dapr.Actors.AspNetCore\Dapr.Actors.AspNetCore.csproj" />
<ProjectReference Include="..\Dapr.E2E.Test.Actors\Dapr.E2E.Test.Actors.csproj" />
<ProjectReference Include="..\..\src\Dapr.Workflow\Dapr.Workflow.csproj" />
<ProjectReference Include="..\..\src\Dapr.Workflow.Abstractions\Dapr.Workflow.Abstractions.csproj" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

<ItemGroup>
<ProjectReference Include="..\..\src\Dapr.Workflow\Dapr.Workflow.csproj" />
<ProjectReference Include="..\..\src\Dapr.Workflow.Abstractions\Dapr.Workflow.Abstractions.csproj" />
<ProjectReference Include="..\..\src\Dapr.Workflow.Versioning.Abstractions\Dapr.Workflow.Versioning.Abstractions.csproj" />
</ItemGroup>

Expand Down
2 changes: 2 additions & 0 deletions test/Dapr.Workflow.Test/Dapr.Workflow.Test.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@

<ItemGroup>
<ProjectReference Include="..\..\src\Dapr.Workflow\Dapr.Workflow.csproj" />
<ProjectReference Include="..\..\src\Dapr.Workflow.Abstractions\Dapr.Workflow.Abstractions.csproj" />
<ProjectReference Include="..\..\src\Dapr.Workflow.Grpc\Dapr.Workflow.Grpc.csproj" />
<ProjectReference Include="..\..\src\Dapr.Workflow.Versioning.Abstractions\Dapr.Workflow.Versioning.Abstractions.csproj" />
<ProjectReference Include="..\..\src\Dapr.Testcontainers.Xunit\Dapr.Testcontainers.Xunit.csproj" />
</ItemGroup>
Expand Down
Loading