updates for razor pages crud and blazor crud templates #3086
Conversation
This file contains 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
tlmii
reviewed
Nov 19, 2024
src/Scaffolding/VS.Web.CG.Mvc/Templates/RazorPageGenerator/Bootstrap5/Edit.cshtml
Outdated
Show resolved
Hide resolved
MackinnonBuck
approved these changes
Nov 19, 2024
deepchoudhery
deleted the
dev/decho/crud-template-accessibility-updates
branch
|
/backport to release/9.0 |
|
/backport to release/8.0 |
|
Started backporting to release/9.0: https://github.com/dotnet/Scaffolding/actions/runs/11923802063 |
|
@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: updates for razor pages crud and blazor crud templates
.git/rebase-apply/patch:122: trailing whitespace.
<<#= inputTypeName #> id="<#= modelPropertyNameLowercase #>" @bind-Value="<#= modelName #>.<#= modelPropertyName #>" class="<#= inputClass #>" <#= ariaRequiredAttributeHtml #>/>
.git/rebase-apply/patch:353: trailing whitespace.
<<#= inputTypeName #> id="<#= modelPropertyNameLowercase #>" @bind-Value="<#= modelName #>.<#= modelPropertyName #>" class="<#= inputClass #>" <#= ariaRequiredAttributeHtml #>/>
warning: 2 lines add whitespace errors.
Using index info to reconstruct a base tree...
M eng/Versions.DotNetScaffold.props
M eng/Versions.props
Falling back to patching base and 3-way merge...
Auto-merging eng/Versions.props
CONFLICT (content): Merge conflict in eng/Versions.props
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 updates for razor pages crud and blazor crud templates
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
|
@deepchoudhery 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. |
|
Started backporting to release/8.0: https://github.com/dotnet/Scaffolding/actions/runs/11923803759 |
|
@deepchoudhery backporting to release/8.0 failed, the patch most likely resulted in conflicts: $ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: updates for razor pages crud and blazor crud templates
.git/rebase-apply/patch:122: trailing whitespace.
<<#= inputTypeName #> id="<#= modelPropertyNameLowercase #>" @bind-Value="<#= modelName #>.<#= modelPropertyName #>" class="<#= inputClass #>" <#= ariaRequiredAttributeHtml #>/>
.git/rebase-apply/patch:353: trailing whitespace.
<<#= inputTypeName #> id="<#= modelPropertyNameLowercase #>" @bind-Value="<#= modelName #>.<#= modelPropertyName #>" class="<#= inputClass #>" <#= ariaRequiredAttributeHtml #>/>
warning: 2 lines add whitespace errors.
Using index info to reconstruct a base tree...
A eng/Versions.DotNetScaffold.props
M eng/Versions.props
M scripts/install-aspnet-codegenerator.cmd
A scripts/install-scaffold-all.cmd
M src/Scaffolding/VS.Web.CG.Mvc/Templates/RazorPageGenerator/Bootstrap5/Create.cshtml
M src/Scaffolding/VS.Web.CG.Mvc/Templates/RazorPageGenerator/Bootstrap5/Edit.cshtml
A src/dotnet-scaffolding/dotnet-scaffold-aspnet/Templates/BlazorCrud/Create.cs
A src/dotnet-scaffolding/dotnet-scaffold-aspnet/Templates/BlazorCrud/Create.tt
A src/dotnet-scaffolding/dotnet-scaffold-aspnet/Templates/BlazorCrud/Edit.cs
A src/dotnet-scaffolding/dotnet-scaffold-aspnet/Templates/BlazorCrud/Edit.tt
A src/dotnet-scaffolding/dotnet-scaffold-aspnet/Templates/RazorPages/Create.cs
A src/dotnet-scaffolding/dotnet-scaffold-aspnet/Templates/RazorPages/Create.tt
A src/dotnet-scaffolding/dotnet-scaffold-aspnet/Templates/RazorPages/Edit.cs
A src/dotnet-scaffolding/dotnet-scaffold-aspnet/Templates/RazorPages/Edit.tt
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): src/dotnet-scaffolding/dotnet-scaffold-aspnet/Templates/RazorPages/Edit.tt deleted in HEAD and modified in updates for razor pages crud and blazor crud templates. Version updates for razor pages crud and blazor crud templates of src/dotnet-scaffolding/dotnet-scaffold-aspnet/Templates/RazorPages/Edit.tt left in tree.
CONFLICT (modify/delete): src/dotnet-scaffolding/dotnet-scaffold-aspnet/Templates/RazorPages/Create.tt deleted in HEAD and modified in updates for razor pages crud and blazor crud templates. Version updates for razor pages crud and blazor crud templates of src/dotnet-scaffolding/dotnet-scaffold-aspnet/Templates/RazorPages/Create.tt left in tree.
CONFLICT (modify/delete): src/dotnet-scaffolding/dotnet-scaffold-aspnet/Templates/BlazorCrud/Edit.tt deleted in HEAD and modified in updates for razor pages crud and blazor crud templates. Version updates for razor pages crud and blazor crud templates of src/dotnet-scaffolding/dotnet-scaffold-aspnet/Templates/BlazorCrud/Edit.tt left in tree.
CONFLICT (modify/delete): src/dotnet-scaffolding/dotnet-scaffold-aspnet/Templates/BlazorCrud/Create.tt deleted in HEAD and modified in updates for razor pages crud and blazor crud templates. Version updates for razor pages crud and blazor crud templates of src/dotnet-scaffolding/dotnet-scaffold-aspnet/Templates/BlazorCrud/Create.tt left in tree.
Auto-merging src/Scaffolding/VS.Web.CG.Mvc/Templates/RazorPageGenerator/Bootstrap5/Edit.cshtml
CONFLICT (content): Merge conflict in src/Scaffolding/VS.Web.CG.Mvc/Templates/RazorPageGenerator/Bootstrap5/Edit.cshtml
Auto-merging src/Scaffolding/VS.Web.CG.Mvc/Templates/RazorPageGenerator/Bootstrap5/Create.cshtml
CONFLICT (content): Merge conflict in src/Scaffolding/VS.Web.CG.Mvc/Templates/RazorPageGenerator/Bootstrap5/Create.cshtml
Auto-merging src/Scaffolding/VS.Web.CG.Mvc/Templates/BlazorIdentity/Shared/ShowRecoveryCodes.cs
CONFLICT (content): Merge conflict in src/Scaffolding/VS.Web.CG.Mvc/Templates/BlazorIdentity/Shared/ShowRecoveryCodes.cs
Auto-merging src/Scaffolding/VS.Web.CG.Mvc/Templates/BlazorIdentity/Pages/Manage/DeletePersonalData.cs
CONFLICT (content): Merge conflict in src/Scaffolding/VS.Web.CG.Mvc/Templates/BlazorIdentity/Pages/Manage/DeletePersonalData.cs
Auto-merging src/Scaffolding/VS.Web.CG.Mvc/Templates/Blazor/Details.cs
CONFLICT (content): Merge conflict in src/Scaffolding/VS.Web.CG.Mvc/Templates/Blazor/Details.cs
Auto-merging src/Scaffolding/VS.Web.CG.Mvc/Templates/Blazor/Delete.cs
CONFLICT (content): Merge conflict in src/Scaffolding/VS.Web.CG.Mvc/Templates/Blazor/Delete.cs
CONFLICT (modify/delete): scripts/install-scaffold-all.cmd deleted in HEAD and modified in updates for razor pages crud and blazor crud templates. Version updates for razor pages crud and blazor crud templates of scripts/install-scaffold-all.cmd left in tree.
Auto-merging scripts/install-aspnet-codegenerator.cmd
CONFLICT (content): Merge conflict in scripts/install-aspnet-codegenerator.cmd
Auto-merging eng/Versions.props
CONFLICT (content): Merge conflict in eng/Versions.props
Auto-merging eng/Versions.MSIdentity.props
CONFLICT (content): Merge conflict in eng/Versions.MSIdentity.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 updates for razor pages crud and blazor crud templates
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
|
@deepchoudhery an error occurred while backporting to release/8.0, please check the run log for details! Error: git am failed, most likely due to a merge conflict. |
deepchoudhery
added a commit
that referenced
this pull request
Dec 5, 2024
* updates for razor pages crud and blazor crud templates * PR fixes
deepchoudhery
added a commit
that referenced
this pull request
Dec 5, 2024
* updates for razor pages crud and blazor crud templates * PR fixes
deepchoudhery
added a commit
that referenced
this pull request
Dec 5, 2024
deepchoudhery
added a commit
that referenced
this pull request
Dec 5, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
addressing missing content after fixing #2899 and #2891
Blazor-CRUD changes :
*alongside the label for required properties in the Create and Edit razor files (similar to Razor pages now)Razor pages CRUD changes :
required aria-required="true"to input, select, and textarea blocks in Create and Edit cshtml pages (similar to the blazor crud scenario).@MackinnonBuck need some feedback here pls.