Merge in 'release/2.1' changes

Author: dotnet-bot

buildpipeline/DotNet-Trusted-Publish.json

@@ -671,7 +671,7 @@
     "type": "TfsGit",
     "name": "DotNet-BuildPipeline",
     "url": "https://devdiv.visualstudio.com/DevDiv/_git/DotNet-BuildPipeline",
-    "defaultBranch": "refs/heads/master",
+    "defaultBranch": "refs/heads/main",
     "clean": "true",
     "checkoutSubmodules": false
   },