Merge to Live #35764
Merge to Live #35764
Conversation
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
This change adds more detail and consolidates existing topics to create a more prescriptive and helpful set of options for developers looking to migration their ASP.NET Framework to Core applications. Main things included in this update are: - Consolidated a topics that were logically connected into a single document - Added some basic decision trees for developers to understand what is most likely to be useful to them - Updated the initial landing page to provide a better overview of what challenges they may encounter as they start a migration - Updated the setup instructions to align with the current state of things
Fixed date to required format with two digits.
Fixed ms.date format which requires 2 digit month
Just updated ms.date to current since file was significantly updated.
Co-authored-by: Wade Pickett <[email protected]>
Co-authored-by: Wade Pickett <[email protected]>
Co-authored-by: Wade Pickett <[email protected]>
Co-authored-by: Wade Pickett <[email protected]>
Co-authored-by: Wade Pickett <[email protected]>
Co-authored-by: Wade Pickett <[email protected]>
Co-authored-by: Wade Pickett <[email protected]>
Co-authored-by: Wade Pickett <[email protected]>
Co-authored-by: Wade Pickett <[email protected]>
Co-authored-by: Wade Pickett <[email protected]>
Co-authored-by: Wade Pickett <[email protected]>
Co-authored-by: Wade Pickett <[email protected]>
Co-authored-by: Wade Pickett <[email protected]>
Co-authored-by: Wade Pickett <[email protected]>
Expand ASP.NET Framework to Core migration
|
This merge to live failure seems odd. I only see warnings related to some blazor PR's that you were likely on, and then just suggestions for one I helped review for migration: Details on link below. Any thoughts on which was tripping up the live merge? cc: @tdykstra |
|
Probably unrelated but it's worth mentioning again, you didn't squash Taylor's PR before merging it to main. Merging without squashing clutters the repo's history and can make it hard to see where content was modified. Theoretically, it can make it more difficult to track down or manage commit problems. Let's try closing and re-opening first. I'll do that now, which I expect will fail. Next, I'd suggest reverting Taylor's PR, which seems to have introduced the problem. If that works, try to troubleshoot the build of that PR, and perhaps squashing it will help. Anyway ... let's see what happens with a close/open here first ............... |
|
That went about how I expected! 😆 I'll go revert Taylor's PR now. Stand-by ......... |
It was worth mentioning again. I completely forgot about squashing his PR after I finished fixing a few things! |
|
FYI you can set branch policies to force squash merges to specific branches. |
|
@danroth27 said he was going to do that for the main branch. It's probably also a good idea to prevent squashing for the live branch at the same time. |
|
squashing from prs->main is a good idea. I think you'll cause problems if you squash main->live |
|
That's been the rule here from day one of the repo. Wade is new and still getting the hang of our 10,000 repo rules and conventions. 😆 |
|
No 🎲🎲! ... but that's ok. It looks like the broken API cross-links are the problem. I sent an internal email on it. I think at this point, we need to hear back on where that API went. I don't think it's actually bad API (i.e., bad cross-refs/xrefs). I think that API was inadvertently knocked out. |
@twsouthwick I haven't found a way to do this for specific branches. If you could show me how, that would be great! |
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
|
Even better, @danroth27 ... It's built in now. The following screenshot is from the Blazor sample repo settings .... 
Only select squash ...
... and then the live branch only gets the "Merge" option with a separate rule. |
|
All of the warnings are focused on the MIA API now, which are under discussion offline. I'll go ahead and merge this. |
[AUTOMATED]
Internal previews