Merge dotnet/main into feature/consolidations

dotnet · Jul 12, 2021 · 41247ad · 41247ad
2 parents b152d62 + 7d518fe
commit 41247ad
Show file tree

Hide file tree

Showing 470 changed files with 30,378 additions and 5,884 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -15,7 +15,7 @@
       ]
     },
     "microsoft.dotnet.xharness.cli": {
-      "version": "1.0.0-prerelease.21330.2",
+      "version": "1.0.0-prerelease.21357.4",
       "commands": [
         "xharness"
       ]

diff --git a/docs/area-owners.md b/docs/area-owners.md
@@ -79,6 +79,7 @@ Note: Editing this file doesn't update the mapping used by the `@msftbot` issue
 | area-System.Diagnostics-mono                   | @lewing       | @thaystg  @radical                                  |                                                                                                                                                                                                                                                                                           |
 | area-System.Diagnostics.Activity               | @tommcdon     | @tarekgh                                            |                                                                                                                                                                                                                                                                                           |
 | area-System.Diagnostics.EventLog               | @ericstj      | @Anipik @ViktorHofer                                |                                                                                                                                                                                                                                                                                           |
+| area-System.Diagnostics.Metric                 | @tommcdon     | @noahfalk                                           |                                                                                                                                                                                                                                                                                           |
 | area-System.Diagnostics.PerformanceCounter     | @ericstj      | @Anipik @ViktorHofer                                |                                                                                                                                                                                                                                                                                           |
 | area-System.Diagnostics.Process                | @jeffhandley  | @adamsitnik @carlossanlop @jozkee                   |                                                                                                                                                                                                                                                                                           |
 | area-System.Diagnostics.Tracing                | @tommcdon     | @noahfalk @tommcdon @Anipik @ViktorHofer @tarekgh   | Included: <ul><li>System.Diagnostics.DiagnosticSource</li><li>System.Diagnostics.TraceSource</li></ul>                                                                                                                                                                                    |

diff --git a/docs/workflow/testing/using-your-build.md b/docs/workflow/testing/using-your-build.md
@@ -16,9 +16,9 @@ assume use of a dogfood build of the .NET SDK.
 
 ## Acquire the latest nightly .NET SDK
 
-- [Win 64-bit Latest](https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-latest-win-x64.zip)
-- [macOS 64-bit Latest](https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-latest-osx-x64.tar.gz)
-- [Others](https://github.com/dotnet/cli/blob/master/README.md#installers-and-binaries)
+- [Win 64-bit Latest](https://aka.ms/dotnet/6.0/daily/dotnet-sdk-win-x64.zip)
+- [macOS 64-bit Latest](https://aka.ms/dotnet/6.0/daily/dotnet-sdk-osx-x64.tar.gz)
+- [Others](https://github.com/dotnet/installer#installers-and-binaries)
 
 To setup the SDK download the zip and extract it somewhere and add the root folder to your [path](../requirements/windows-requirements.md#adding-to-the-default-path-variable)
 or always fully qualify the path to dotnet in the root of this folder for all the instructions in this document.
@@ -73,8 +73,7 @@ dotnet publish
     <!--To inherit the global NuGet package sources remove the <clear/> line below -->
     <clear />
     <add key="nuget" value="https://api.nuget.org/v3/index.json" />
-    <add key="dotnetcore-feed" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
-    <add key="aspnetcore" value="https://dotnetfeed.blob.core.windows.net/aspnet-aspnetcore/index.json" />
+    <add key="dotnet6" value="https://dnceng.pkgs.visualstudio.com/public/_packaging/dotnet6/nuget/v3/index.json" />
  </packageSources>
 </configuration>
 ```