Merge branch 'main' into microbuild

Author: AArnott

.github/renovate.json

@@ -17,6 +17,11 @@
 			"matchDepNames": ["dotnet-sdk", "mcr.microsoft.com/dotnet/sdk"],
 			"groupName": "Dockerfile and global.json updates"
 		},
+		{
+			"matchPackageNames": ["*"],
+			"allowedVersions": "!/-g[a-f0-9]+$/",
+			"groupName": "Ignore versions built from non-release branches"
+		},
 		{
 			"matchPackageNames": [
 				"System.Collections.Immutable",