-
Notifications
You must be signed in to change notification settings - Fork 4.7k
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
Conversation
...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
Tagging subscribers to 'arch-wasm': @lewing |
...nuget/Microsoft.NET.Sdk.WebAssembly.Pack/build/Microsoft.NET.Sdk.WebAssembly.Browser.targets
Outdated
Show resolved
Hide resolved
…oft.NET.Sdk.WebAssembly.Browser.targets
...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
Show resolved
Hide resolved
/backport to release/9.0 |
Started backporting to release/9.0: https://github.com/dotnet/runtime/actions/runs/11235453611 |
@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! |
@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. |
This change makes the
blazor.boot.json
file configurable from msbuild, usingWasmBootConfigFileName
.