Sync with upstream changes and fix conflicts

.editorconfig

@@ -77,6 +77,9 @@ dotnet_style_prefer_auto_properties = true:suggestion
 dotnet_style_prefer_conditional_expression_over_assignment = true:refactoring
 dotnet_style_prefer_conditional_expression_over_return = true:refactoring
 
+# CA2208: Instantiate argument exceptions correctly
+dotnet_diagnostic.CA2208.severity = error
+
 # C# files
 [*.cs]
 # New line preferences

.github/CODEOWNERS

@@ -55,6 +55,9 @@
 # Azure Guide
 /docs/azure/ @CamSoper
 
+# Azure SDK package list
+/docs/azure/includes/ @dotnet/docs
+
 # IoT Guide
 /docs/iot/ @CamSoper
 
@@ -116,7 +119,7 @@
 # XAML Services
 /docs/framework/xaml-services/ @adegeo
 # ADO.NET
-/docs/framework/data/ @stevestein
+/docs/framework/data/ @mcleblanc
 # NCL
 /docs/framework/configure-apps/file-schema/network/ @karelz
 /docs/framework/network-programming/ @karelz

.github/workflows/build-validation.yml

@@ -25,8 +25,8 @@ on:
     branches: [ main ]
 
 env:
-  DOTNET_INSTALLER_CHANNEL: 'release/5.0.1xx'
-  DOTNET_DO_INSTALL: 'false'
+  DOTNET_INSTALLER_CHANNEL: '6.0'
+  DOTNET_DO_INSTALL: 'true'
   EnableNuGetPackageRestore: 'True'
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel

.github/workflows/check-for-build-warnings.yml

@@ -1,4 +1,4 @@
-name: 'Status checker'
+name: 'OPS status checker'
 
 on: 
   pull_request_target:
@@ -9,6 +9,6 @@ jobs:
     name: Look for build warnings
     runs-on: ubuntu-latest
     steps:
-    - uses: dotnet/samples/.github/actions/status-checker@main
+    - uses: dotnet/docs-actions/actions/status-checker@main
       with:
         repo-token: ${{ secrets.GITHUB_TOKEN }}