Merge pull request #27168 from dotnet/publish-19037

Merge main into live

Author: IEvangelist

.editorconfig

@@ -162,6 +162,9 @@ csharp_space_between_method_declaration_parameter_list_parentheses = false
 csharp_space_between_parentheses = false
 csharp_space_between_square_brackets = false
 
+# Namespace preference
+csharp_style_namespace_declarations = file_scoped
+
 # Types: use keywords instead of BCL types, and permit var only when the type is clear
 csharp_style_var_for_built_in_types = false:suggestion
 csharp_style_var_when_type_is_apparent = false:none

.github/workflows/build-validation.yml

@@ -4,7 +4,7 @@ name: 'Snippets 5000'
 # Controls when the action will run. Triggers the workflow on push or pull request
 # events on the main branch only.
 on:
-  pull_request_target:
+  pull_request:
     branches: [ main ]
     types: [opened, synchronize, reopened]
 

.github/workflows/markdownlint.yml

@@ -9,7 +9,7 @@ on:
       - ".markdownlint.json"
       - ".github/workflows/markdownlint.yml"
       - ".github/workflows/markdownlint-problem-matcher.json"
-  pull_request_target:
+  pull_request:
     paths:
       - "**/*.md"
       - ".markdownlint.json"

.openpublishing.redirection.json

@@ -989,12 +989,11 @@
         },
         {
             "source_path": "docs/csharp/csharp-6.md",
-            "redirect_url": "/dotnet/csharp/whats-new/csharp-7"
+            "redirect_url": "/dotnet/csharp/whats-new/csharp-version-history#c-version-60"
         },
         {
             "source_path": "docs/csharp/csharp-7.md",
-            "redirect_url": "/dotnet/csharp/whats-new/csharp-7",
-            "redirect_document_id": true
+            "redirect_url": "/dotnet/csharp/whats-new/csharp-version-history#c-version-70"
         },
         {
             "source_path": "docs/csharp/csharp.md",
@@ -1079,7 +1078,7 @@
         },
         {
             "source_path": "docs/csharp/getting-started/whats-new.md",
-            "redirect_url": "/dotnet/csharp/whats-new/csharp-9"
+            "redirect_url": "/dotnet/csharp/whats-new/csharp-10"
         },
         {
             "source_path": "docs/csharp/getting-started/with-visual-studio-2017.md",
@@ -3591,7 +3590,7 @@
         },
         {
             "source_path": "docs/csharp/tutorials/exploration/csharp-7.yml",
-            "redirect_url": "/dotnet/csharp/whats-new/csharp-7"
+            "redirect_url": "/dotnet/csharp/whats-new/csharp-version-history#c-version-70"
         },
         {
             "source_path": "docs/csharp/tutorials/exploration/patterns-objects.md",
@@ -3683,19 +3682,23 @@
         },
         {
             "source_path": "docs/csharp/whats-new/csharp-6.md",
-            "redirect_url": "/dotnet/csharp/whats-new/csharp-9"
+            "redirect_url": "/dotnet/csharp/whats-new/csharp-version-history#c-version-60"
+        },
+        {
+            "source_path": "docs/csharp/whats-new/csharp-7.md",
+            "redirect_url": "/dotnet/csharp/whats-new/csharp-version-history#c-version-70"
         },
         {
             "source_path": "docs/csharp/whats-new/csharp-7-1.md",
-            "redirect_url": "/dotnet/csharp/whats-new/csharp-7"
+            "redirect_url": "/dotnet/csharp/whats-new/csharp-version-history#c-version-71"
         },
         {
             "source_path": "docs/csharp/whats-new/csharp-7-2.md",
-            "redirect_url": "/dotnet/csharp/whats-new/csharp-7"
+            "redirect_url": "/dotnet/csharp/whats-new/csharp-version-history#c-version-72"
         },
         {
             "source_path": "docs/csharp/whats-new/csharp-7-3.md",
-            "redirect_url": "/dotnet/csharp/whats-new/csharp-7"
+            "redirect_url": "/dotnet/csharp/whats-new/csharp-version-history#c-version-73"
         },
         {
             "source_path": "docs/csharp/whats-new.md",

api/index.md

@@ -3,13 +3,15 @@ description: "Learn more about: .NET API browser"
 layout: ApiBrowserPage
 hide_bc: true
 title: .NET API browser
-quickFilterColumn1: net-5.0,netcore-3.1,netstandard-2.1,netframework-4.8
-quickFilterColumn2: xamarin-forms,aspnetcore-3.1,efcore-3.1,roslyn-dotnet
+quickFilterColumn1: net-6.0,netframework-4.8,netstandard-2.1
+quickFilterColumn2: aspnetcore-6.0,efcore-5.0,xamarin-forms
 quickFilterColumn3: azure-dotnet,ml-dotnet,spark-dotnet
 ms.topic: landing-page
 ms.custom: "updateeachrelease"
-ms.date: "01/24/2020"
+ms.date: 11/17/2021
 ---
 # .NET API browser
 
-Welcome to the .NET API browser – your one-stop shop for all .NET-based APIs from Microsoft. Start searching for any managed APIs by typing in the box below. You can learn more about the API browser [in our blog post](/teamblog/announcing-unified-dotnet-experience-on-docs). If you have any feedback, create a new issue in the [MicrosoftDocs/feedback repository on GitHub](https://github.com/MicrosoftDocs/feedback/issues).
+Welcome to the .NET API browser – your one-stop shop for all .NET-based APIs from Microsoft. Start searching for any managed APIs by typing in the box below.
+
+You can learn more about the API browser [in our blog post](/teamblog/announcing-unified-dotnet-experience-on-docs). If you have any feedback, create a new issue in the [MicrosoftDocs/feedback repository on GitHub](https://github.com/MicrosoftDocs/feedback/issues).

docs/architecture/porting-existing-aspnet-apps/strategies-migrating-in-production.md

@@ -45,7 +45,7 @@ Eventually, the entire facade layer corresponds to the new, modern implementatio
 
 Multi-targeting is recommended for large apps that will be migrated over time and for teams applying the Strangler pattern approach. This approach can address `BindingRedirect` and package restoration challenges that surface from mixing [PackageReference](/nuget/consume-packages/package-references-in-project-files) and [packages.config](/nuget/reference/packages-config) restore styles. There are two options available for code that must run in both .NET Framework and .NET Core environments.
 
-* Preprocessor [`#if` in C#](../../csharp/language-reference/preprocessor-directives.md#conditional-compilation) (or [`#If` in Visual Basic]([preprocessor `#if`](/dotnet/visual-basic/reference/language-specification/preprocessing-directives#conditional-compilation)) directives allow you to implement different functionality or use different dependencies when run in .NET Framework versus .NET Core.
+* Preprocessor directives ([#if in C#](../../csharp/language-reference/preprocessor-directives.md#conditional-compilation) or [#If in Visual Basic](/dotnet/visual-basic/reference/language-specification/preprocessing-directives#conditional-compilation)) allow you to implement different functionality or use different dependencies when run in .NET Framework versus .NET Core.
 
 * Project files can use conditional [globbing patterns](../../core/project-sdk/overview.md#default-includes-and-excludes), such as `*.core.cs`, to include different sets of files based on which framework is being targeted.
 

docs/azure/includes/dotnet-all.md

@@ -470,7 +470,7 @@
 | Management - Automanage | NuGet [0.1.0-preview](https://www.nuget.org/packages/Microsoft.Azure.Management.Automanage/0.1.0-preview) |  |  |
 | Management - Automation | NuGet [3.8.3-preview](https://www.nuget.org/packages/Microsoft.Azure.Management.Automation/3.8.3-preview) | [docs](/dotnet/api/overview/azure/automation) | GitHub [3.8.3-preview](https://github.com/Azure/azure-sdk-for-net/tree/main/sdk/automation/Microsoft.Azure.Management.Automation) |
 | Management - Azure Stack HCI | NuGet [1.0.0](https://www.nuget.org/packages/Microsoft.Azure.Management.AzureStackHCI/1.0.0) |  | GitHub [1.0.0](https://github.com/Azure/azure-sdk-for-net/tree/Microsoft.Azure.Management.AzureStackHCI_1.0.0/sdk/azurestackhci/Microsoft.Azure.Management.AzureStackHCI/) |
-| Management - Azure VMware Solution | NuGet [2.0.0](https://www.nuget.org/packages/Microsoft.Azure.Management.Avs/2.0.0) |  | GitHub [2.0.0](https://github.com/Azure/azure-sdk-for-net/tree/Microsoft.Azure.Management.Avs_2.0.0/sdk/avs/Microsoft.Azure.Management.Avs/) |
+| Management - Azure VMware Solution | NuGet [3.0.0](https://www.nuget.org/packages/Microsoft.Azure.Management.Avs/3.0.0) |  | GitHub [3.0.0](https://github.com/Azure/azure-sdk-for-net/tree/Microsoft.Azure.Management.Avs_3.0.0/sdk/avs/Microsoft.Azure.Management.Avs/) |
 | Management - Backup Services | NuGet [1.0.5-preview](https://www.nuget.org/packages/Microsoft.Azure.Management.BackupServices/1.0.5-preview) |  |  |
 | Management - Batch | NuGet [14.0.0](https://www.nuget.org/packages/Microsoft.Azure.Management.Batch/14.0.0) | [docs](/dotnet/api/overview/azure/batch) | GitHub [14.0.0](https://github.com/Azure/azure-sdk-for-net/tree/Microsoft.Azure.Management.Batch_14.0.0/sdk/batch/Microsoft.Azure.Management.Batch/) |
 | Management - Batch AI | NuGet [2.0.0](https://www.nuget.org/packages/Microsoft.Azure.Management.BatchAI/2.0.0) | [docs](/dotnet/api/overview/azure/batchai) | GitHub [2.0.0](https://github.com/Azure/azure-sdk-for-net/tree/main/sdk/batchai/Microsoft.Azure.Management.BatchAI) |

docs/core/compatibility/6.0.md

@@ -118,6 +118,7 @@ If you're migrating an app to .NET 6, the breaking changes listed here might aff
 | - | - | - | - |
 | [`-p` option for `dotnet run` is deprecated](sdk/6.0/deprecate-p-option-dotnet-run.md) | ✔️ | ❌ | Preview 6 |
 | [C# code in templates not supported by earlier versions](sdk/6.0/csharp-template-code.md) | ✔️ | ✔️ | Preview 7 |
+| [EditorConfig files implicitly included](sdk/6.0/editorconfig-additional-files.md) | ✔️ | ❌ | |
 | [Generate apphost for macOS](sdk/6.0/apphost-generated-for-macos.md) | ✔️ | ❌ | Preview 6 |
 | [Generate error for duplicate files in publish output](sdk/6.0/duplicate-files-in-output.md) | ❌ | ✔️ | Preview 1 |
 | [GetTargetFrameworkProperties and GetNearestTargetFramework removed from ProjectReference protocol](sdk/6.0/gettargetframeworkproperties-and-getnearesttargetframework-removed.md) | ❌ | ✔️ | Preview 1 |

docs/core/compatibility/sdk/6.0/editorconfig-additional-files.md

@@ -0,0 +1,39 @@
+---
+title: "Breaking change: EditorConfig files implicitly included"
+description: Learn about the breaking change in .NET 6 where .editorconfig files can no longer be AdditionalFiles items.
+ms.date: 11/17/2021
+---
+# EditorConfig files implicitly included
+
+Roslyn analyzers added support for parsing and respecting *.editorconfig* file options before the compiler added support for these files. To work around this limitation, *.editorconfig* files had to be included as `AdditionalFiles` project items. Now that the compiler implicitly includes *.editorconfig* files in a project, you'll get an error if you include them as *AdditionalFiles* project items.
+
+## Version introduced
+
+.NET 6
+
+## Previous behavior
+
+*.editorconfig* files could be included as `AdditionalFiles` project items.
+
+## New behavior
+
+Starting with the .NET 6 SDK, you'll get the following error at compile time if you include an *.editorconfig* file as an `AdditionalFiles` project item:
+
+**error AD0001: Analyzer [...] threw an exception of type 'System.InvalidOperationException' with message 'Passing '.editorconfig' files as additional files is no longer needed. It will be implicitly discovered (if the file is in the project's directory or any ancestor directory), or it should be converted into a 'globalconfig'.**
+
+## Change category
+
+This change may affect [source compatibility](../../categories.md#source-compatibility).
+
+## Reason for change
+
+The compiler now supports *.editorconfig* files, and they're implicitly included in a project if the file is in the project directory or an ancestor directory.
+
+## Recommended action
+
+- If the *.editorconfig* file is in the project directory or an ancestor directory, remove the `<AdditionalFiles>` item for the *.editorconfig* file from your project file.
+- Otherwise, convert the *.editorconfig* file to a [Global AnalyzerConfig](../../../../fundamentals/code-analysis/configuration-files.md#global-analyzerconfig) file, and change the `AdditionalFiles` item to a `GlobalAnalyzerConfigFiles` item in your project file.
+
+## Affected APIs
+
+N/A

docs/core/compatibility/toc.yml

@@ -159,6 +159,8 @@ items:
           href: sdk/6.0/deprecate-p-option-dotnet-run.md
         - name: C# code in templates not supported by earlier versions
           href: sdk/6.0/csharp-template-code.md
+        - name: EditorConfig files implicitly included
+          href: sdk/6.0/editorconfig-additional-files.md
         - name: Generate apphost for macOS
           href: sdk/6.0/apphost-generated-for-macos.md
         - name: Generate error for duplicate files in publish output
@@ -841,6 +843,8 @@ items:
           href: sdk/6.0/deprecate-p-option-dotnet-run.md
         - name: C# code in templates not supported by earlier versions
           href: sdk/6.0/csharp-template-code.md
+        - name: EditorConfig files implicitly included
+          href: sdk/6.0/editorconfig-additional-files.md
         - name: Generate apphost for macOS
           href: sdk/6.0/apphost-generated-for-macos.md
         - name: Generate error for duplicate files in publish output