Merge with main.

Author: ilonatommy

.config/dotnet-tools.json

@@ -15,7 +15,7 @@
       ]
     },
     "microsoft.dotnet.xharness.cli": {
-      "version": "1.0.0-prerelease.21602.2",
+      "version": "1.0.0-prerelease.21613.2",
       "commands": [
         "xharness"
       ]

.editorconfig

@@ -12,11 +12,8 @@ indent_style = space
 indent_size = 4
 trim_trailing_whitespace = true
 
-[project.json]
-indent_size = 2
-
 # Generated code
-[*{_AssemblyInfo.cs,.notsupported.cs}]
+[*{_AssemblyInfo.cs,.notsupported.cs,AsmOffsets.cs}]
 generated_code = true
 
 # C# files

.github/CODEOWNERS

@@ -10,8 +10,12 @@
 /src/coreclr/inc/corinfo.h @dotnet/jit-contrib
 /src/coreclr/inc/corjit.h @dotnet/jit-contrib
 /src/coreclr/jit/ @dotnet/jit-contrib
+/src/coreclr/nativeaot @MichalStrehovsky
 /src/coreclr/tools/Common @dotnet/crossgen-contrib @MichalStrehovsky
 /src/coreclr/tools/aot @dotnet/crossgen-contrib
+/src/coreclr/tools/aot/ILCompiler.Compiler @MichalStrehovsky
+/src/coreclr/tools/aot/ILCompiler.RyuJit @MichalStrehovsky
+/src/coreclr/tools/aot/ILCompiler.MetadataTransform @MichalStrehovsky
 
 # Mono Code Owners