Skip to content
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.

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

[browser] Make boot json file name configurable #108281

Merged
merged 7 commits into from
Oct 8, 2024

Conversation

jeromelaban
Copy link
Contributor

@jeromelaban jeromelaban commented Sep 26, 2024

This change makes the blazor.boot.json file configurable from msbuild, using WasmBootConfigFileName.

@jeromelaban jeromelaban marked this pull request as ready for review September 26, 2024 13:05
@dotnet-policy-service dotnet-policy-service bot added the community-contribution Indicates that the PR has been added by a community member label Sep 26, 2024
@jeromelaban jeromelaban changed the title feat: Make boot json file configurable [Wasm] feat: Make boot json file configurable Sep 26, 2024
@lewing lewing requested a review from maraf September 26, 2024 15:09
@maraf maraf added this to the 10.0.0 milestone Sep 27, 2024
@maraf maraf added arch-wasm WebAssembly architecture os-browser Browser variant of arch-wasm labels Sep 27, 2024
Copy link
Contributor

Tagging subscribers to 'arch-wasm': @lewing
See info in area-owners.md if you want to be subscribed.

@maraf maraf requested a review from ilonatommy as a code owner October 4, 2024 10:07
@maraf maraf changed the title [Wasm] feat: Make boot json file configurable [browser] Make boot json file name configurable Oct 8, 2024
@maraf maraf merged commit 445660f into dotnet:main Oct 8, 2024
24 checks passed
@maraf
Copy link
Member

maraf commented Oct 8, 2024

/backport to release/9.0

Copy link
Contributor

github-actions bot commented Oct 8, 2024

Started backporting to release/9.0: https://github.com/dotnet/runtime/actions/runs/11235453611

Copy link
Contributor

github-actions bot commented Oct 8, 2024

@maraf backporting to release/9.0 failed, the patch most likely resulted in conflicts:

$ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch

Applying: feat: Make boot json file configurable
Applying: chore: Adjust public properties names, fix missing publish names
Applying: Update src/mono/nuget/Microsoft.NET.Sdk.WebAssembly.Pack/build/Microsoft.NET.Sdk.WebAssembly.Browser.targets
Applying: Add test with custom config name
Using index info to reconstruct a base tree...
M	src/mono/wasm/Wasm.Build.Tests/AssertWasmSdkBundleOptions.cs
M	src/mono/wasm/Wasm.Build.Tests/Blazor/BlazorBuildOptions.cs
M	src/mono/wasm/Wasm.Build.Tests/Blazor/BlazorWasmProjectProvider.cs
M	src/mono/wasm/testassets/WasmBasicTestApp/App/wwwroot/main.js
Falling back to patching base and 3-way merge...
Auto-merging src/mono/wasm/testassets/WasmBasicTestApp/App/wwwroot/main.js
CONFLICT (content): Merge conflict in src/mono/wasm/testassets/WasmBasicTestApp/App/wwwroot/main.js
Auto-merging src/mono/wasm/Wasm.Build.Tests/Blazor/BlazorWasmProjectProvider.cs
Auto-merging src/mono/wasm/Wasm.Build.Tests/Blazor/BlazorBuildOptions.cs
Auto-merging src/mono/wasm/Wasm.Build.Tests/AssertWasmSdkBundleOptions.cs
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0004 Add test with custom config name
Error: The process '/usr/bin/git' failed with exit code 128

Please backport manually!

Copy link
Contributor

github-actions bot commented Oct 8, 2024

@maraf an error occurred while backporting to release/9.0, please check the run log for details!

Error: git am failed, most likely due to a merge conflict.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
arch-wasm WebAssembly architecture area-Build-mono community-contribution Indicates that the PR has been added by a community member os-browser Browser variant of arch-wasm
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants