Skip to content

Commit

Permalink
Merged PR 27814: Correct src/submodules/ commits
Browse files Browse the repository at this point in the history
# Correct src/submodules/ commits

- fix dotnet/AspNetCore-ManualTests#1730
- update SHAs to match release/6.0 as of df39b2a

## Description

Incorrect commits merged into internal/release/6.0 branch in [internal commit 9675755](https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/commit/9675755502afcd4ad021243f92a03f0fffaf13de?refName=refs%2Fheads%2Finternal%2Frelease%2F6.0) included dotnet/spa-templates release/7.0 changes that are incompatible with code in dotnet/aspnetcore's release/6.0 branch. The template identities are incorrect e.g. `Microsoft.DotNet.Web.Spa.ProjectTemplates.React.CSharp.7.0`. And the contained code causes `NotSupportedException` at least when using the React template. In addition, `net6.0` is not offered as a target framework option when using either template (see https://devdiv.visualstudio.com/DevDiv/_workitems/edit/1686976).

Fixes dotnet/AspNetCore-ManualTests#1730

## Customer Impact

Unable to use the latest `ASP.NET Core with Angular` or `ASP.NET Core with React.js` 6.0 templates in a `net6.0` project.

## Regression?

- [x] Yes
- [ ] No

Regression from 6.0.11.

## Risk

- [ ] High
- [ ] Medium
- [x] Low

Only updates the submodule commits to match those we're currently using in GitHub's release/6.0 branch.

## Verification

- [ ] Manual (required)
- [ ] Automated

Not sure how to test this.

## Packaging changes reviewed?

- [ ] Yes
- [ ] No
- [x] N/A

----

## When servicing release/2.1

- [ ] Make necessary changes in eng/PatchConfig.props
  • Loading branch information
dougbu committed Nov 30, 2022
1 parent eb65e74 commit 45072d9
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/submodules/MessagePack-CSharp
2 changes: 1 addition & 1 deletion src/submodules/spa-templates
Submodule spa-templates updated 213 files

0 comments on commit 45072d9

Please sign in to comment.