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

fix AccountLayout, also MSBuildProjectService for blazor projects. #3113

Merged
merged 1 commit into from
Dec 10, 2024

Conversation

deepchoudhery
Copy link
Member

AccountLayout had an incorrect @layout reference. Fixing that reference.

  • adding a try catch to MSBuildProjectService.Initialize. Loading MSBuild projects fails for blazor projects with no real solution afaik so will dig into this later. The MSBuildProjectService is nullable friendly so no issues.
  • fixed @layout reference to IdentityModel.IdentityLayoutNamespace and initializing this property correctly.
  • updated version from 9.0.0 to 9.0.1.

@deepchoudhery deepchoudhery self-assigned this Dec 10, 2024

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.");
@deepchoudhery deepchoudhery merged commit 9f58eeb into main Dec 10, 2024
8 checks passed
@deepchoudhery deepchoudhery deleted the dev/decho/fix-blazor-layout branch December 10, 2024 19:54
@deepchoudhery
Copy link
Member Author

/backport to release/9.0

Copy link

Started backporting to release/9.0: https://github.com/dotnet/Scaffolding/actions/runs/12402292852

Copy link

@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!

deepchoudhery added a commit that referenced this pull request Dec 18, 2024
* fix AccountLayout, also MSBuildProjectService for blazor projects. (#3113)

* pin dotnet-scaffold to 9.0.1
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants