[browser] Make boot json file name configurable #108281
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
maraf
reviewed
Sep 27, 2024
...nuget/Microsoft.NET.Sdk.WebAssembly.Pack/build/Microsoft.NET.Sdk.WebAssembly.Browser.targets
Outdated
Show resolved
Hide resolved
...nuget/Microsoft.NET.Sdk.WebAssembly.Pack/build/Microsoft.NET.Sdk.WebAssembly.Browser.targets
Outdated
Show resolved
Hide resolved
...nuget/Microsoft.NET.Sdk.WebAssembly.Pack/build/Microsoft.NET.Sdk.WebAssembly.Browser.targets
Outdated
Show resolved
Hide resolved
Contributor
|
Tagging subscribers to 'arch-wasm': @lewing |
Open
3 tasks
maraf
reviewed
Oct 3, 2024
...nuget/Microsoft.NET.Sdk.WebAssembly.Pack/build/Microsoft.NET.Sdk.WebAssembly.Browser.targets
Outdated
Show resolved
Hide resolved
…oft.NET.Sdk.WebAssembly.Browser.targets
This was referenced Oct 3, 2024
Closed
maraf
reviewed
Oct 4, 2024
...nuget/Microsoft.NET.Sdk.WebAssembly.Pack/build/Microsoft.NET.Sdk.WebAssembly.Browser.targets
Outdated
Show resolved
Hide resolved
maraf
reviewed
Oct 7, 2024
...nuget/Microsoft.NET.Sdk.WebAssembly.Pack/build/Microsoft.NET.Sdk.WebAssembly.Browser.targets
Outdated
Show resolved
Hide resolved
maraf
approved these changes
Oct 8, 2024
pavelsavara
approved these changes
Oct 8, 2024
...nuget/Microsoft.NET.Sdk.WebAssembly.Pack/build/Microsoft.NET.Sdk.WebAssembly.Browser.targets
Show resolved
Hide resolved
Member
|
/backport to release/9.0 |
Contributor
|
Started backporting to release/9.0: https://github.com/dotnet/runtime/actions/runs/11235453611 |
Contributor
|
@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 128Please backport manually! |
Contributor
|
@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. |
4 tasks
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This change makes the
blazor.boot.jsonfile configurable from msbuild, usingWasmBootConfigFileName.