Merge from upstream

.github/CODEOWNERS

@@ -143,10 +143,15 @@
 /docs/standard/asynchronous-programming-patterns/ @BillWagner
 # Attributes
 /docs/standard/attributes/ @tdykstra
+# Character encoding
+/docs/standard/base-types/character-encoding/ @tdykstra
+/docs/standard/base-types/character-encoding-introduction/ @tdykstra
 # Base types
 /docs/standard/base-types/ @adegeo
 # Collections
 /docs/standard/collections/ @IEvangelist
+# System.CommandLine
+/docs/standard/commandline/ @tdykstra
 # Data
 /docs/standard/data/ @gewarren
 # Data - SQLite

.github/workflows/build-validation.yml

@@ -40,7 +40,7 @@ jobs:
         echo "Downloading dotnet-install.ps1"
         Invoke-WebRequest https://raw.githubusercontent.com/dotnet/install-scripts/master/src/dotnet-install.ps1 -OutFile dotnet-install.ps1
         echo "Installing dotnet version ${{ env.DOTNET_INSTALLER_CHANNEL }}"
-        .\dotnet-install.ps1 -InstallDir "c:\program files\dotnet" -Channel "${{ env.DOTNET_INSTALLER_CHANNEL }}"
+        .\dotnet-install.ps1 -InstallDir "c:\program files\dotnet" -Channel "${{ env.DOTNET_INSTALLER_CHANNEL }}" -Quality preview
 
     # Print dotnet info
     - name: Display .NET info

.openpublishing.publish.config.json

@@ -55,7 +55,7 @@
     {
       "path_to_root": "_csharpstandard",
       "url": "https://github.com/dotnet/csharpstandard",
-      "branch": "draft-v6",
+      "branch": "draft-v7",
       "include_in_build": true,
       "branch_mapping": {}
     },
@@ -118,6 +118,7 @@
     ".openpublishing.redirection.fsharp.json",
     ".openpublishing.redirection.fundamentals.json",
     ".openpublishing.redirection.machine-learning.json",
+    ".openpublishing.redirection.orleans.json",
     ".openpublishing.redirection.standard.json",
     ".openpublishing.redirection.visual-basic.json"
   ],

.openpublishing.redirection.csharp.json

@@ -1,5 +1,17 @@
 {
     "redirections": [
+        {
+            "source_path_from_root": "/_csharplang/proposals/csharp-7.0/binary-literals.md",
+            "redirect_url": "/dotnet/csharp/language-reference/language-specification/lexical-structure#6453-integer-literals"
+        },
+        {
+            "source_path_from_root": "/_csharplang/proposals/csharp-7.0/digit-separators.md",
+            "redirect_url": "/dotnet/csharp/language-reference/language-specification/lexical-structure#6453-integer-literals"
+        },
+        {
+            "source_path_from_root": "/_csharplang/proposals/csharp-7.3/leading-digit-separator.md",
+            "redirect_url": "/dotnet/csharp/language-reference/language-specification/lexical-structure#6453-integer-literals"
+        },
         {
             "source_path_from_root": "/docs/csharp/basic-types.md",
             "redirect_url": "/dotnet/csharp/fundamentals/types"
@@ -151,6 +163,10 @@
             "source_path_from_root": "/docs/csharp/lambda-expressions.md",
             "redirect_url": "/dotnet/csharp/language-reference/operators/lambda-expressions"
         },
+        {
+            "source_path_from_root": "/docs/csharp/language-reference/compiler-messages/cs8892.md",
+            "redirect_url": "/dotnet/csharp/language-reference/compiler-messages/warning-waves#cs8892"
+        },
         {
             "source_path_from_root": "/docs/csharp/language-reference/compiler-options/addmodule-compiler-option.md",
             "redirect_url": "/dotnet/csharp/language-reference/compiler-options/inputs"
@@ -851,6 +867,10 @@
             "source_path_from_root": "/docs/csharp/language-reference/operators/right-shift-operator.md",
             "redirect_url": "/dotnet/csharp/language-reference/operators/bitwise-and-shift-operators#right-shift-operator-"
         },
+        {
+            "source_path_from_root": "/docs/csharp/language-reference/operators/null-parameter-check.md",
+            "redirect_url": "/dotnet/csharp/language-reference/operators"
+        },
         {
             "source_path_from_root": "/docs/csharp/language-reference/operators/subtraction-assignment-operator.md",
             "redirect_url": "/dotnet/csharp/language-reference/operators/arithmetic-operators#compound-assignment"

.openpublishing.redirection.json

@@ -79,10 +79,6 @@
     {
         "source_path_from_root": "/docs/tutorials/index.md",
         "redirect_url": "/dotnet/samples-and-tutorials/"
-    },
-    {
-        "source_path_from_root": "/docs/orleans/whats-new/whats-new-in-orleans.md",
-        "redirect_url": "https://github.com/dotnet/orleans/releases"
     }
     ]
 }

.openpublishing.redirection.orleans.json

@@ -0,0 +1,12 @@
+{
+    "redirections": [
+        {
+            "source_path_from_root": "/docs/orleans/whats-new/whats-new-in-orleans.md",
+            "redirect_url": "https://github.com/dotnet/orleans/releases"
+        },
+        {
+            "source_path_from_root": "/docs/orleans/deployment/azure-web-apps-with-azure-cloud-services.md",
+            "redirect_url": "/dotnet/orleans/deployment/deploy-to-azure-app-service"
+        }
+    ]
+}

.repoman.yml

@@ -67,6 +67,13 @@ issues:
     # New issue opened, add Not Triaged  
     - labels-add: [":watch: Not Triaged"]
 
+    # Dependabot opened issue, label it
+    - check:
+        - type: query
+          value: "Issue.user.login == 'dependabot'"
+      pass:
+        - labels-add: ["dependencies"]
+
     # If breaking change issue metadata, add labels
     - check:
         - type: metadata-comment

docfx.json

@@ -39,10 +39,13 @@
                     "inactive/**",
                     "rejected/**",
                     "csharp-6.0/enum-base-type.md",
+                    "csharp-7.0/binary-literals.md",
+                    "csharp-7.0/digit-separators.md",
                     "csharp-7.0/expression-bodied-everything.md",
                     "csharp-7.0/ref-locals-returns.md",
                     "csharp-7.0/tuples.md",
                     "csharp-7.0/value-task.md",
+                    "csharp-7.2/leading-separator.md",
                     "csharp-7.2/readonly-struct.md",
                     "csharp-7.2/ref-extension-methods.md",
                     "csharp-7.2/ref-struct-and-span.md",
@@ -359,7 +362,6 @@
                 "docs/orleans/**/*.*": "dapine",
                 "docs/core/**/**.md": "dotnetcontent",
                 "docs/core/compatibility/**/**.md": "gewarren",
-                "docs/core/compatibility/aspnet-core/**/**.md": "kirklarkin",
                 "docs/core/deploying/**/**.md": "adegeo",
                 "docs/core/diagnostics/**/**.md": "tommcdon",
                 "docs/core/extensions/**/**.md": "dapine",

docs/architecture/blazor-for-web-forms-developers/components.md

@@ -557,7 +557,7 @@ To capture a component reference in Blazor, use the `@ref` directive attribute.
 <MyLoginDialog @ref="loginDialog" ... />
 
 @code {
-    MyLoginDialog loginDialog;
+    MyLoginDialog loginDialog = default!;
 
     void OnSomething()
     {

docs/architecture/blazor-for-web-forms-developers/data.md

@@ -130,7 +130,7 @@ Whenever you need to access data from GitHub, create a client with a name of `gi
 }
 ```
 
-This method returns the string describing the collection of issues in the *dotnet/docs* GitHub repository. It returns content in JSON format and is deserialized into appropriate GitHub issue objects. There are many ways that you can configure the `HttpClientFactory` to deliver preconfigured `HttpClient` objects. Try configuring multiple `HttpClient` instances with different names and endpoints for the various web services you work with. This approach will make your interactions with those services easier to work with on each page. For more details, read [the documentation for the IHttpClientFactory](/aspnet/core/fundamentals/http-requests).
+This method returns the string describing the collection of issues in the *dotnet/docs* GitHub repository. It returns content in JSON format and is deserialized into appropriate GitHub issue objects. There are many ways that you can configure the `HttpClientFactory` to deliver preconfigured `HttpClient` objects. Try configuring multiple `HttpClient` instances with different names and endpoints for the various web services you work with. This approach will make your interactions with those services easier to work with on each page. For more information, see [Make HTTP requests using IHttpClientFactory](/aspnet/core/fundamentals/http-requests).
 
 >[!div class="step-by-step"]
 >[Previous](forms-validation.md)

docs/architecture/cloud-native/application-resiliency-patterns.md

@@ -11,7 +11,7 @@ ms.date: 04/06/2022
 
 The first line of defense is application resiliency.
 
-While you could invest considerable time writing your own resiliency framework, such products already exist. [Polly](https://dotnetfoundation.org/projects/polly) is a comprehensive .NET resilience and transient-fault-handling library that allows developers to express resiliency policies in a fluent and thread-safe manner. Polly targets applications built with either the .NET Framework or .NET 6. The following table describes the resiliency features, called `policies`, available in the Polly Library. They can be applied individually or grouped together.
+While you could invest considerable time writing your own resiliency framework, such products already exist. [Polly](https://dotnetfoundation.org/projects/polly) is a comprehensive .NET resilience and transient-fault-handling library that allows developers to express resiliency policies in a fluent and thread-safe manner. Polly targets applications built with either .NET Framework or .NET 6. The following table describes the resiliency features, called `policies`, available in the Polly Library. They can be applied individually or grouped together.
 
 | Policy | Experience |
 | :-------- | :-------- |

docs/architecture/cloud-native/elastic-search-in-azure.md

@@ -55,8 +55,6 @@ This chapter presented a detailed look at data in cloud-native systems. We start
 
 - [Getting Behind the 9-Ball: Cosmos DB Consistency Levels Explained](https://blog.jeremylikness.com/blog/2018-03-23_getting-behind-the-9ball-cosmosdb-consistency-levels/)
 
-- [Exploring the different types of NoSQL Databases Part II](https://www.3pillarglobal.com/insights/exploring-the-different-types-of-nosql-databases)
-
 - [On RDBMS, NoSQL and NewSQL databases. Interview with John Ryan](http://www.odbms.org/blog/2018/03/on-rdbms-nosql-and-newsql-databases-interview-with-john-ryan/)
 
 - [SQL vs NoSQL vs NewSQL: The Full Comparison](https://www.xenonstack.com/blog/sql-vs-nosql-vs-newsql/)

docs/architecture/cloud-native/infrastructure-as-code.md

@@ -74,7 +74,7 @@ provider "azurerm" {
   version = "=1.28.0"
 }
 
-resource "azurerm_resource_group" "test" {
+resource "azurerm_resource_group" "testrg" {
   name     = "production"
   location = "West US"
 }

docs/architecture/cloud-native/infrastructure-resiliency-azure.md

@@ -45,7 +45,7 @@ To architect redundancy, you need to identify the critical paths in your applica
 
 - *Leveraging a load balancer.* Load-balancing distributes your application's requests to healthy service instances and automatically removes unhealthy instances from rotation. When deploying to Kubernetes, load balancing can be specified in the Kubernetes manifest file in the Services section.
 
-- *Plan for multiregion deployment.* If you deploy your application to a single region, and that region becomes unavailable, your application will also become unavailable. This may be unacceptable under the terms of your application's service level agreements. Instead, consider deploying your application and its services across multiple regions. For example, an Azure Kubernetes Service (AKS) cluster is deployed to a single region. To protect your system from a regional failure, you might deploy your application to multiple AKS clusters across different regions and use the [Paired Regions](https://buildazure.com/2017/01/06/azure-region-pairs-explained/) feature to coordinate platform updates and prioritize recovery efforts.
+- *Plan for multiregion deployment.* If you deploy your application to a single region, and that region becomes unavailable, your application will also become unavailable. This may be unacceptable under the terms of your application's service level agreements. Instead, consider deploying your application and its services across multiple regions. For example, an Azure Kubernetes Service (AKS) cluster is deployed to a single region. To protect your system from a regional failure, you might deploy your application to multiple AKS clusters across different regions and use the [Paired Regions](/azure/virtual-machines/regions#region-pairs) feature to coordinate platform updates and prioritize recovery efforts.
 
 - *Enable [geo-replication](/azure/sql-database/sql-database-active-geo-replication).* Geo-replication for services such as Azure SQL Database and Cosmos DB will create secondary replicas of your data across multiple regions. While both services will automatically replicate data within the same region, geo-replication protects you against a regional outage by enabling you to fail over to a secondary region. Another best practice for geo-replication centers around storing container images. To deploy a service in AKS, you need to store and pull the image from a repository. Azure Container Registry integrates with AKS and can securely store container images. To improve performance and availability, consider geo-replicating your images to a registry in each region where you have an AKS cluster. Each AKS cluster then pulls container images from the local container registry in its region as shown in Figure 6-4:
 

docs/architecture/cloud-native/summary.md

@@ -1,6 +1,7 @@
 ---
 title: Summary - Architecting cloud-native .NET apps for Azure
-description: A summary of key conclusions from the Architecting Cloud-Native .NET Apps for Azure guide/e-book.
+description: Learn the key conclusions about Cloud Native applications that are fully developed in the Architecting Cloud-Native .NET Apps for Azure guide/e-book.
+ms.custom: kr2b-contr-experiment
 ms.date: 04/06/2022
 ---
 

docs/architecture/containerized-lifecycle/design-develop-containerized-apps/common-container-design-principles.md

@@ -11,7 +11,7 @@ Ahead of getting into the development process there are a few basic concepts wor
 
 ## Container equals a process
 
-In the container model, a container represents a single process. By defining a container as a process boundary, you begin to create the primitives used to scale, or batch-off, processes. When you run a Docker container, you'll see an [ENTRYPOINT](https://docs.docker.com/engine/reference/builder/#entrypoint) definition. This defines the process and the lifetime of the container. When the process completes, the container life-cycle ends. There are long-running processes, such as web servers, and short-lived processes, such as batch jobs, which might have been implemented as Microsoft Azure [WebJobs](https://azure.microsoft.com/documentation/articles/websites-webjobs-resources/). If the process fails, the container ends, and the orchestrator takes over. If the orchestrator was instructed to keep five instances running and one fails, the orchestrator will create another container to replace the failed process. In a batch job, the process is started with parameters. When the process completes, the work is complete.
+In the container model, a container represents a single process. By defining a container as a process boundary, you begin to create the primitives used to scale, or batch-off, processes. When you run a Docker container, you'll see an [ENTRYPOINT](https://docs.docker.com/engine/reference/builder/#entrypoint) definition. This defines the process and the lifetime of the container. When the process completes, the container life-cycle ends. There are long-running processes, such as web servers, and short-lived processes, such as batch jobs, which might have been implemented as Microsoft Azure [WebJobs](https://github.com/Azure/azure-webjobs-sdk/wiki). If the process fails, the container ends, and the orchestrator takes over. If the orchestrator was instructed to keep five instances running and one fails, the orchestrator will create another container to replace the failed process. In a batch job, the process is started with parameters. When the process completes, the work is complete.
 
 You might find a scenario in which you want multiple processes running in a single container. In any architecture document, there's never a "never," nor is there always an "always." For scenarios requiring multiple processes, a common pattern is to use [Supervisor](http://supervisord.org/).
 

docs/architecture/containerized-lifecycle/design-develop-containerized-apps/docker-apps-inner-loop-workflow.md

@@ -292,7 +292,7 @@ Visual Studio Code supports debugging Docker if you're using Node.js and other p
 You also can debug .NET or .NET Framework containers in Docker when using Visual Studio for Windows or Mac, as described in the next section.
 
 > [!TIP]
-> To learn more about debugging Node.js Docker containers, see <https://blog.docker.com/2016/07/live-debugging-docker/> and [https://docs.microsoft.com/archive/blogs/user_ed/visual-studio-code-new-features-13-big-debugging-updates-rich-object-hover-conditional-breakpoints-node-js-mono-more](/archive/blogs/user_ed/visual-studio-code-new-features-13-big-debugging-updates-rich-object-hover-conditional-breakpoints-node-js-mono-more).
+> To learn more about debugging Node.js Docker containers, see <https://www.docker.com/blog/live-debugging-docker/> and [https://docs.microsoft.com/archive/blogs/user_ed/visual-studio-code-new-features-13-big-debugging-updates-rich-object-hover-conditional-breakpoints-node-js-mono-more](/archive/blogs/user_ed/visual-studio-code-new-features-13-big-debugging-updates-rich-object-hover-conditional-breakpoints-node-js-mono-more).
 
 > [!div class="step-by-step"]
 > [Previous](docker-apps-development-environment.md)

docs/architecture/containerized-lifecycle/design-develop-containerized-apps/orchestrate-high-scalability-availability.md

@@ -59,7 +59,7 @@ Figure 4-7 shows the structure of a Kubernetes cluster where a master node (VM)
 
 ## Development environment for Kubernetes
 
-In the development environment that [Docker announced in July 2018](https://blog.docker.com/2018/07/kubernetes-is-now-available-in-docker-desktop-stable-channel/), Kubernetes can also run in a single development machine (Windows 10 or macOS) by just installing [Docker Desktop](https://www.docker.com/products/docker-desktop). You can later deploy to the cloud (AKS) for further integration tests, as shown in figure 4-8.
+In the development environment that Docker announced in July 2018, Kubernetes can also run in a single development machine (Windows 10 or macOS) by just installing [Docker Desktop](https://www.docker.com/products/docker-desktop). You can later deploy to the cloud (AKS) for further integration tests, as shown in figure 4-8.
 
 ![Diagram showing Kubernetes on a dev machine then deployed to AKS.](./media/orchestrate-high-scalability-availability/kubernetes-development-environment.png)
 

docs/architecture/dapr-for-net-developers/reference-application.md

@@ -381,7 +381,7 @@ public class CatalogService : ICatalogService
 }
 ```
 
-Notice how no Dapr specific code is required to make the service invocation call. All communication is done using the standard HttpClient object.
+Notice how no Dapr-specific code is required to make the service invocation call. All communication is done using the standard HttpClient object.
 
 The Dapr HttpClient is configured for the `CatalogService` class on program startup:
 

docs/architecture/devops-for-aspnet-developers/actions-vs-pipelines.md

@@ -39,7 +39,7 @@ GitHub Workflows execute on *runners*. The runner code is essentially a fork of
 Hosted agents (Azure Pipelines) and hosted runners (GitHub) are agents that are spun up and managed by Azure DevOps or GitHub respectively. You don't need to maintain any build infrastructure. When a pipeline triggers that targets a hosted agent, an instance of the specified agent image is created. The job is run by the agent on the instance, and once the job completes, the instance is destroyed. The same applies for hosted runners running GitHub workflows.
 
 > [!NOTE]
-> The list of software installed on Azure Pipeline images is listed in [this repository](https://github.com/actions/virtual-environments/tree/main/images). You can select the platform folder and examine the *README.md* files. You can find information on [GitHub hosted runners](https://docs.github.com/actions/reference/specifications-for-github-hosted-runners).
+> The list of software installed on Azure Pipelines images is listed in [this repository](https://github.com/actions/virtual-environments/tree/main/images). You can select the platform folder and examine the *README.md* files. You can find information on [GitHub hosted runners](https://docs.github.com/actions/reference/specifications-for-github-hosted-runners).
 
 ### Private agents and self-hosted runners