-
Notifications
You must be signed in to change notification settings - Fork 236
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
fix AccountLayout, also MSBuildProjectService for blazor projects. #3113
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Copilot reviewed 3 out of 6 changed files in this pull request and generated no suggestions.
Files not reviewed (3)
- eng/Versions.DotNetScaffold.props: Language not supported
- scripts/install-scaffold-all.cmd: Language not supported
- src/dotnet-scaffolding/dotnet-scaffold-aspnet/Templates/BlazorIdentity/Shared/AccountLayout.tt: Language not supported
Comments skipped due to low confidence (1)
src/dotnet-scaffolding/dotnet-scaffold-aspnet/Templates/BlazorIdentity/Shared/AccountLayout.cs:126
- [nitpick] The error message should be clear and concise. Consider rephrasing to: 'The type of the parameter 'Model' did not match the expected type 'Microsoft.DotNet.Tools.Scaffold.AspNet.Models.IdentityModel'.'
this.Error("The type 'Microsoft.DotNet.Tools.Scaffold.AspNet.Models.IdentityModel' of the parameter 'Model' did not match the type of the data passed to the template.");
src/dotnet-scaffolding/Microsoft.DotNet.Scaffolding.Roslyn/Services/MSBuildProjectService.cs
Show resolved
Hide resolved
/backport to release/9.0 |
Started backporting to release/9.0: https://github.com/dotnet/Scaffolding/actions/runs/12402292852 |
@deepchoudhery 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: fix AccountLayout, also MSBuildProjectService for blazor projects.
Using index info to reconstruct a base tree...
M eng/Versions.DotNetScaffold.props
M scripts/install-scaffold-all.cmd
Falling back to patching base and 3-way merge...
Auto-merging scripts/install-scaffold-all.cmd
CONFLICT (content): Merge conflict in scripts/install-scaffold-all.cmd
Auto-merging eng/Versions.DotNetScaffold.props
CONFLICT (content): Merge conflict in eng/Versions.DotNetScaffold.props
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 0001 fix AccountLayout, also MSBuildProjectService for blazor projects.
Error: The process '/usr/bin/git' failed with exit code 128 Please backport manually! |
AccountLayout had an incorrect
@layout
reference. Fixing that reference.@layout
reference toIdentityModel.IdentityLayoutNamespace
and initializing this property correctly.