Merge remote-tracking branch 'dotnet/main' into InitialApiCompat

Author: safern

CODEOWNERS

@@ -5,41 +5,50 @@
 # the repo. Unless a later match takes precedence,
 # @dotnet/dotnet-cli  will be requested for
 # review when someone opens a pull request.
+# Issue/PR labels to use are listed before each section
 
+# Area-WebSDK
 /src/WebSdk/ @vijayrkn
 /src/Tests/Microsoft.NET.Sdk.Publish.Tasks.Tests/ @vijayrkn
 
+# Area-AspNetCore
 /src/BlazorWasmSdk/ @captainsafia, @pranavkm, @mkArtakMSFT
 /src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/ @captainsafia, @pranavkm, @mkArtakMSFT
 /src/Assets/TestProjects/BlazorHosted/ @captainsafia, @pranavkm, @mkArtakMSFT
 /src/Assets/TestProjects/BlazorHostedRID/ @captainsafia, @pranavkm, @mkArtakMSFT
 /src/Assets/TestProjects/BlazorWasmMinimal/ @captainsafia, @pranavkm, @mkArtakMSFT
 /src/Assets/TestProjects/BlazorWasmWithLibrary/ @captainsafia, @pranavkm, @mkArtakMSFT
 
+# Area-AspNetCore
 /src/RazorSdk/ @captainsafia, @pranavkm, @mkArtakMSFT
 /src/Tests/Microsoft.NET.Sdk.Razor.Tests/ @captainsafia, @pranavkm, @mkArtakMSFT
 /src/Tests/Microsoft.NET.Sdk.Razor.Tool.Tests/ @captainsafia, @pranavkm, @mkArtakMSFT
 /src/Assets/TestPackages/PackageLibraryDirectDependency/ @captainsafia, @pranavkm, @mkArtakMSFT
 /src/Assets/TestPackages/PackageLibraryTransitiveDependency/ @captainsafia, @pranavkm, @mkArtakMSFT
 /src/src/Assets/TestProjects/Razor*/ @captainsafia, @pranavkm, @mkArtakMSFT
 
+# Area-NuGet
 /src/Cli/dotnet/commands/dotnet-add/dotnet-add-package @dotnet/nuget-team
 /src/Tests/dotnet-add-package.Tests @dotnet/nuget-team
 /src/Cli/dotnet/commands/dotnet-nuget @dotnet/nuget-team
 /src/Tests/dotnet-nuget.UnitTests @dotnet/nuget-team
 
+# Area-FSharp
 /src/Cli/dotnet/commands/dotnet-fsi @dotnet/fsharp
 /src/Tests/dotnet-fsi.Tests @dotnet/fsharp
 
+# Area-DotNet Test
 /src/Cli/dotnet/commands/dotnet-test @dotnet/dotnet-test-templates-admin
 /src/Cli/dotnet/commands/dotnet-vstest @dotnet/dotnet-test-templates-admin
 /src/Tests/dotnet-test.Tests @dotnet/dotnet-test-templates-admin
 /src/Tests/dotnet-vstest.Tests @dotnet/dotnet-test-templates-admin
 
+# Area-Templates
 /src/Cli/dotnet/commands/dotnet-new @DonJoseLuis
 /src/Tests/dotnet-new.Tests @DonJoseLuis
 
 # ILLink and ReadyToRun targets and tasks owned by runtime team
+# Area-ILLink Area-ReadyToRun
 /src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.ILLink.targets clrappmodel@microsoft.com
 /src/Tasks/Microsoft.NET.Build.Tasks/PrepareForReadyToRunCompilation.cs @AntonLapounov
 /src/Tasks/Microsoft.NET.Build.Tasks/RunReadyToRunCompiler.cs @AntonLapounov
@@ -49,11 +58,13 @@
 /src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Publish.targets clrappmodel@microsoft.com @AntonLapounov @dotnet/dotnet-cli
 /src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.ClickOnce.targets @sujitnayak
 
+# Area-Watch
 /src/Assets/TestProjects/Watch*/     @captainsafia, @pranavkm, @mkArtakMSFT
 /src/Tests/dotnet-watch.Tests/       @captainsafia, @pranavkm, @mkArtakMSFT
 /src/Tests/Microsoft.AspNetCore.Watch.BrowserRefresh.Tests/       @captainsafia, @pranavkm, @mkArtakMSFT
 /src/BuiltInTools/   @captainsafia, @pranavkm, @mkArtakMSFT
 
 # Compatibility tools owned by runtime team
+# Area-Compatibility
 /src/Compatibility/ @Anipik, @safern, @ericstj
 /src/Tests/Microsoft.DotNet.ApiCompatibility/ @Anipik, @safern, @ericstj

documentation/project-docs/developer-guide.md

@@ -27,7 +27,7 @@ Run the following command from the root of the repository:
 build.cmd
 ```
 
-The build script will output a `dotnet` installation to `artifacts\tmp\Debug\dotnet` that will include any local changes to the .NET Core CLI.
+The build script will output a `dotnet` installation to `artifacts\bin\redist\Debug\dotnet` that will include any local changes to the .NET Core CLI.
 
 To open the solution in Visual Studio, be sure to build with `build.cmd` and run the generated `artifacts\sdk-build-env.bat`. Finally, open Visual Studio with `devenv sdk.sln`.
 
@@ -39,7 +39,7 @@ Run the following command from the root of the repository:
 ./build.sh
 ```
 
-The build script will output a .NET Core installation to `artifacts/tmp/Debug/dotnet` that will include any local changes to the .NET Core CLI.
+The build script will output a .NET Core installation to `artifacts\bin\redist\Debug\dotnet` that will include any local changes to the .NET Core CLI.
 
 ## Running tests
 
@@ -79,7 +79,7 @@ Ensure the `dotnet` being used is from the artifacts directory:
 where dotnet
 ```
 
-This should output `..\artifacts\tmp\Debug\dotnet\dotnet.exe`.
+This should output `..\artifacts\bin\redist\Debug\dotnet\dotnet.exe`.
 
 You can now run `dotnet` commands to test changes.
 
@@ -97,10 +97,14 @@ Ensure the `dotnet` being used is from the artifacts directory:
 which dotnet
 ```
 
-This should output `.../artifacts/tmp/Debug/dotnet/dotnet`.
+This should output `.../artifacts/bin/redist/Debug/dotnet/dotnet`.
 
 You can now run `dotnet` commands to test changes.
 
+### Debugging
+
+Run "dotnet --debug <command>" which will launch dotnet and pause waiting for user input. This will give you time to attach a debugger to the running dotnet process, set the breakpoints you want to stop at in your built copy of the sdk, and then you can hit enter for the dotnet command to continue.
+
 ## Run tests from the command line
 
 ```shell