Skip to content

Fix Windows bundle build: add Bundle.proj payload step to ADO pipeline #14650

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
davidfowl merged 1 commit into from
Feb 24, 2026
Merged

Fix Windows bundle build: add Bundle.proj payload step to ADO pipeline #14650

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 11 additions & 0 deletions eng/clipack/Common.projitems
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,17 @@
</Target>

<Target Name="_PublishProject">
<!--
Bundle payload flow:
1. Bundle.proj runs CreateLayout which produces a tar.gz archive (managed runtime, DCP, etc.)
2. Pipeline steps (BuildAndTest.yml, build_sign_native.yml, GitHub Actions) pass BundlePayloadPath to that archive
3. Common.projitems forwards BundlePayloadPath to the CLI publish via AdditionalProperties
4. Aspire.Cli.csproj embeds it as an EmbeddedResource with LogicalName="bundle.tar.gz"
5. BundleService.cs reads the resource at runtime via Assembly.GetManifestResourceStream and extracts with TarReader
-->
<PropertyGroup>
<BundlePayloadPath Condition="'$(BundlePayloadPath)' == ''">$(RepoRoot)artifacts/bundle/aspire-ci-bundlepayload-$(CliRuntime).tar.gz</BundlePayloadPath>
</PropertyGroup>
<ItemGroup>
<AdditionalProperties Include="RuntimeIdentifier=$(CliRuntime)" />
<AdditionalProperties Include="PublishDir=$(OutputPath)" />
Expand Down
14 changes: 14 additions & 0 deletions eng/pipelines/templates/BuildAndTest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,20 @@ parameters:
steps:
# Internal pipeline: Build with pack+sign
- ${{ if ne(parameters.runAsPublic, 'true') }}:
# Build bundle payload (aspire-managed) for each target RID before the main build
- ${{ each targetRid in parameters.targetRids }}:
- script: ${{ parameters.dotnetScript }}
msbuild
$(Build.SourcesDirectory)/eng/Bundle.proj
/restore
/p:Configuration=${{ parameters.buildConfig }}
/p:TargetRid=${{ targetRid }}
/p:BundleVersion=ci-bundlepayload
/p:SkipNativeBuild=true
/p:ContinuousIntegrationBuild=true
/bl:${{ parameters.repoLogPath }}/BundlePayload-${{ targetRid }}.binlog
displayName: 🟣Build bundle payload (${{ targetRid }})

- script: ${{ parameters.buildScript }}
-restore -build
-pack
Expand Down
Loading