Merge branch 'main' into microbuild

Author: AArnott

.github/prompts/template-release-notes.md

@@ -2,3 +2,11 @@
 
 This file will describe significant changes in Library.Template as they are introduced, especially if they require special consideration when merging updates into existing repos.
 This file is referenced by update-library-template.prompt.md and should remain in place to facilitate future merges, whether done manually or by AI.
+
+## Solution rename
+
+Never leave a Library.slnx file in the repository.
+You might even see one there even though this particular merge didn't bring it in.
+This can be an artifact of having renamed Library.sln to Library.slnx in the template repo, but ultimately the receiving repo should have only one .sln or .slnx file, with a better name than `Library`.
+If you can confidently do so, go ahead and migrate their `.sln` to an `.slnx` with their original name.
+If you can't, just delete `Library.slnx` anyway.

.github/prompts/update-library-template.prompt.md

@@ -20,6 +20,8 @@ For example the template uses MTPv2 for test projects, but a repo might have cho
 When resolving merge conflicts, consider whether it looks like the relevant code file is older than it should be given the changes the template is bringing in.
 Ask the user when in doubt as to whether the conflict should be resolved in favor of 'catching up' with the template or keeping the current changes.
 
+Use #runSubagent to analyze and resolve merge conflicts across files in parallel.
+
 ### Keep Current files
 
 Conflicts in the following files should always be resolved by keeping the current version (i.e. discard incoming changes):
@@ -47,6 +49,11 @@ Use #runSubagent for each step.
 While these validations are described using `dotnet` CLI commands, some repos require using full msbuild.exe.
 You can detect this by checking the `azure-pipelines/dotnet.yml` or `.github/workflows/build.yml` files for use of one or the other tool.
 
+You are *not* responsible for fixing issues that the merge did not cause.
+If validation fails for reasons that seem unrelated to the changes brought in by the merge, advise the user and ask how they'd like you to proceed.
+That said, sometimes merges will bring in SDK or dependency updates that can cause breaks in seemingly unrelated areas.
+In such cases, you should investigate and solve the issues as needed.
+
 ## Committing your changes
 
 If you have to make any changes for validations to pass, consider whether they qualify as a bad merge conflict resolution or more of a novel change that you're making to work with the Library.Template update.