jamshedd · jamshedd · Jul 1, 2021 · Jul 2, 2021 · Jul 2, 2021 · Jul 2, 2021
diff --git a/docs/architecture/cloud-native/relational-vs-nosql-data.md b/docs/architecture/cloud-native/relational-vs-nosql-data.md
@@ -58,7 +58,7 @@ NoSQL databases typically support high availability and partition tolerance. The
 
 If data replicas were to lose connectivity in a "highly available" NoSQL database cluster, you could still complete a write operation to the database. The database cluster would allow the write operation and update each data replica as it becomes available. NoSQL databases that support multiple writable replicas can further strengthen high availability by avoiding the need for failover when optimizing recovery time objective.
 
-Moden NoSQL databases typically implement partitioning capabilities as a feature of their system design. Partition management is often built-in to the database, and routing is achieved through placement hints - often called partition keys. A flexible data models enables the NoSQL databases to lower the burden of schema management and improve availablity when deploying application updates that require data model changes.
+Modern NoSQL databases typically implement partitioning capabilities as a feature of their system design. Partition management is often built-in to the database, and routing is achieved through placement hints - often called partition keys. A flexible data models enables the NoSQL databases to lower the burden of schema management and improve availablity when deploying application updates that require data model changes.
 
 High availability and massive scalability are often more critical to the business than relational table joins and referential integrity. Developers can implement techniques and patterns such as Sagas, CQRS, and asynchronous messaging to embrace eventual consistency.
 

diff --git a/docs/azure/includes/dotnet-all.md b/docs/azure/includes/dotnet-all.md
@@ -448,7 +448,7 @@
 | Management - Container Instances Fluent | NuGet [1.37.1](https://www.nuget.org/packages/Microsoft.Azure.Management.ContainerInstance.Fluent/1.37.1) | [docs](/dotnet/api/overview/azure/containerinstance) |  |
 | Management - Container Registry | NuGet [5.0.0-preview.5](https://www.nuget.org/packages/Microsoft.Azure.Management.ContainerRegistry/5.0.0-preview.5) |  | GitHub [5.0.0-preview.5](https://github.com/Azure/azure-sdk-for-net/tree/Microsoft.Azure.Management.ContainerRegistry_5.0.0-preview.5/sdk/containerregistry/Microsoft.Azure.Management.ContainerRegistry/) |
 | Management - Container Registry Fluent | NuGet [1.37.1](https://www.nuget.org/packages/Microsoft.Azure.Management.ContainerRegistry.Fluent/1.37.1) |  |  |
-| Management - Container Service | NuGet [1.1.0](https://www.nuget.org/packages/Microsoft.Azure.Management.ContainerService/1.1.0) |  | GitHub [1.1.0](https://github.com/Azure/azure-sdk-for-net/tree/Microsoft.Azure.Management.ContainerService_1.1.0/sdk/containerservice/Microsoft.Azure.Management.ContainerService/) |
+| Management - Container Service | NuGet [1.2.0](https://www.nuget.org/packages/Microsoft.Azure.Management.ContainerService/1.2.0) |  | GitHub [1.2.0](https://github.com/Azure/azure-sdk-for-net/tree/Microsoft.Azure.Management.ContainerService_1.2.0/sdk/containerservice/Microsoft.Azure.Management.ContainerService/) |
 | Management - Container Service Fluent | NuGet [1.37.1](https://www.nuget.org/packages/Microsoft.Azure.Management.ContainerService.Fluent/1.37.1) |  |  |
 | Management - Content Delivery Network | NuGet [6.1.0](https://www.nuget.org/packages/Microsoft.Azure.Management.Cdn/6.1.0) |  | GitHub [6.1.0](https://github.com/Azure/azure-sdk-for-net/tree/Microsoft.Azure.Management.Cdn_6.1.0/sdk/cdn/Microsoft.Azure.Management.Cdn/) |
 | Management - Content Delivery Network Fluent | NuGet [1.37.1](https://www.nuget.org/packages/Microsoft.Azure.Management.Cdn.Fluent/1.37.1) | [docs](/dotnet/api/overview/azure/cdn) |  |
@@ -514,7 +514,7 @@
 | Management - Media Services | NuGet [4.0.0](https://www.nuget.org/packages/Microsoft.Azure.Management.Media/4.0.0) |  | GitHub [4.0.0](https://github.com/Azure/azure-sdk-for-net/tree/Microsoft.Azure.Management.Media_4.0.0/sdk/mediaservices/Microsoft.Azure.Management.Media/) |
 | Management - Migrate Resource Mover | NuGet [2.0.0](https://www.nuget.org/packages/Microsoft.Azure.Management.Migrate.ResourceMover/2.0.0) |  |  |
 | Management - Mixed Reality | NuGet [3.0.0](https://www.nuget.org/packages/Microsoft.Azure.Management.MixedReality/3.0.0) | [docs](/dotnet/api/overview/azure/mixed-reality) | GitHub [3.0.0](https://github.com/Azure/azure-sdk-for-net/tree/Microsoft.Azure.Management.MixedReality_3.0.0/sdk/mixedreality/Microsoft.Azure.Management.MixedReality/) |
-| Management - Monitor | NuGet [0.25.3-preview](https://www.nuget.org/packages/Microsoft.Azure.Management.Monitor/0.25.3-preview) |  | GitHub [0.25.3-preview](https://github.com/Azure/azure-sdk-for-net/tree/Microsoft.Azure.Management.Monitor_0.25.3-preview/sdk/monitor/Microsoft.Azure.Management.Monitor/) |
+| Management - Monitor | NuGet [0.25.4-preview](https://www.nuget.org/packages/Microsoft.Azure.Management.Monitor/0.25.4-preview) |  | GitHub [0.25.4-preview](https://github.com/Azure/azure-sdk-for-net/tree/Microsoft.Azure.Management.Monitor_0.25.4-preview/sdk/monitor/Microsoft.Azure.Management.Monitor/) |
 | Management - Monitor Fluent | NuGet [1.37.1](https://www.nuget.org/packages/Microsoft.Azure.Management.Monitor.Fluent/1.37.1) | [docs](/dotnet/api/overview/azure/monitor) |  |
 | Management - MySQL | NuGet [0.1.0-preview](https://www.nuget.org/packages/Microsoft.Azure.Management.MySQL/0.1.0-preview) |  |  |
 | Management - NetApp | NuGet [1.12.0](https://www.nuget.org/packages/Microsoft.Azure.Management.NetApp/1.12.0) |  | GitHub [1.12.0](https://github.com/Azure/azure-sdk-for-net/tree/Microsoft.Azure.Management.NetApp_1.12.0/sdk/netapp/Microsoft.Azure.Management.NetApp/) |

diff --git a/docs/breadcrumb/toc.yml b/docs/breadcrumb/toc.yml
@@ -439,27 +439,32 @@ items:
         - name: Compiler messages
           tocHref: /dotnet/csharp/language-reference/compiler-messages/
           topicHref: /dotnet/csharp/language-reference/compiler-messages/index
+        - name: Compiler messages
+          tocHref: /dotnet/csharp/misc
+          topicHref: /dotnet/csharp/language-reference/compiler-messages/index
+      - name: Specification
+        items:    
         - name: C# 6.0 draft specification
           tocHref: /dotnet/csharp/language-reference/language-specification/
           topicHref: /dotnet/csharp/language-reference/language-specification/index
-        - name: C# 7.0 language proposals
+        - name: C# 7.0 feature specifications
           tocHref: /dotnet/csharp/language-reference/proposals/csharp-7.0/
           topicHref: /dotnet/csharp/language-reference/proposals/csharp-7.0/index
-        - name: C# 7.1 language proposals
+        - name: C# 7.1 feature specifications
           tocHref: /dotnet/csharp/language-reference/proposals/csharp-7.1/
           topicHref: /dotnet/csharp/language-reference/proposals/csharp-7.1/index
-        - name: C# 7.2 language proposals
+        - name: C# 7.2 feature specifications
           tocHref: /dotnet/csharp/language-reference/proposals/csharp-7.2/
           topicHref: /dotnet/csharp/language-reference/proposals/csharp-7.2/index
-        - name: C# 7.3 language proposals
+        - name: C# 7.3 feature specifications
           tocHref: /dotnet/csharp/language-reference/proposals/csharp-7.3/
           topicHref: /dotnet/csharp/language-reference/proposals/csharp-7.3/index
-        - name: C# 8.0 language proposals
+        - name: C# 8.0 feature specifications
           tocHref: /dotnet/csharp/language-reference/proposals/csharp-8.0/
           topicHref: /dotnet/csharp/language-reference/proposals/csharp-8.0/index
-        - name: Compiler messages
-          tocHref: /dotnet/csharp/misc
-          topicHref: /dotnet/csharp/language-reference/compiler-messages/index
+        - name: C# 9.0 feature specifications
+          tocHref: /dotnet/csharp/language-reference/proposals/csharp-9.0/
+          topicHref: /dotnet/csharp/language-reference/proposals/csharp-9.0/index
     - name: F# guide
       tocHref: /dotnet/fsharp/
       topicHref: /dotnet/fsharp/index

diff --git a/docs/core/additional-tools/self-signed-certificates-guide.md b/docs/core/additional-tools/self-signed-certificates-guide.md
@@ -41,7 +41,7 @@ Navigate to the repository locally and open up the workspace in an editor.
 
 > [!NOTE]
 > If you're looking to use dotnet publish parameters to *trim* the deployment, you should make sure that the appropriate dependencies are included for supporting SSL certificates.
-Update the [dotnet-docker\samples\aspnetapp\aspnetapp.csproj](https://github.com/dotnet/dotnet-docker/blob/main/samples/aspnetapp/aspnetapp/aspnetapp.csproj) to ensure that the appropriate assemblies are included in the container. For reference, check how to update the .csproj file to [support ssl certificates](../deploying/trim-self-contained.md#support-for-ssl-certificates) when using trimming for self-contained deployments.
+Update the [dotnet-docker\samples\aspnetapp\aspnetapp.csproj](https://github.com/dotnet/dotnet-docker/blob/main/samples/aspnetapp/aspnetapp/aspnetapp.csproj) to ensure that the appropriate assemblies are included in the container. For reference, check how to update the .csproj file to [support ssl certificates](../deploying/trim-self-contained.md) when using trimming for self-contained deployments.
 
 Make sure the `aspnetapp.csproj` includes the appropriate target framework:
 
@@ -143,7 +143,7 @@ Make sure the `aspnetapp.csproj` includes the appropriate target framework:
 
 > [!NOTE]
 > If you want to use `dotnet publish` parameters to *trim* the deployment, make sure that the appropriate dependencies are included for supporting SSL certificates.
-Update the [dotnet-docker\samples\aspnetapp\aspnetapp.csproj](https://github.com/dotnet/dotnet-docker/blob/main/samples/aspnetapp/aspnetapp/aspnetapp.csproj) to ensure that the appropriate assemblies are included in the container. For reference, check how to update the .csproj file to [support ssl certificates](../deploying/trim-self-contained.md#support-for-ssl-certificates) when using trimming for self-contained deployments.
+Update the [dotnet-docker\samples\aspnetapp\aspnetapp.csproj](https://github.com/dotnet/dotnet-docker/blob/main/samples/aspnetapp/aspnetapp/aspnetapp.csproj) to ensure that the appropriate assemblies are included in the container. For reference, check how to update the .csproj file to [support ssl certificates](../deploying/trim-self-contained.md) when using trimming for self-contained deployments.
 
 Make sure you're pointing to the sample app.
 

diff --git a/docs/core/deploying/single-file.md b/docs/core/deploying/single-file.md
@@ -123,9 +123,9 @@ Here's a sample project file that specifies single-file publishing:
 
 These properties have the following functions:
 
-* `PublishSingleFile` - Enables single-file publishing.
+* `PublishSingleFile` - Enables single-file publishing. Also enables single-file warnings during `dotnet build`.
 * `SelfContained` - Determines whether the app will be self-contained or framework-dependent.
-* `RuntimeIdentifier` - Specifies the [OS and CPU type](../rid-catalog.md) you are targeting.
+* `RuntimeIdentifier` - Specifies the [OS and CPU type](../rid-catalog.md) you are targeting. Also sets `<SelfContained>true</SelfContained>` by default.
 * `PublishTrimmed` - Enables use of [assembly trimming](trim-self-contained.md), which is only supported for self-contained apps.
 * `PublishReadyToRun` - Enables [ahead-of-time (AOT) compilation](ready-to-run.md).
 
@@ -136,18 +136,29 @@ These properties have the following functions:
 
 ## Publish a single file app - CLI
 
-Publish a single file application using the [dotnet publish](../tools/dotnet-publish.md) command. When you publish your app, set the following properties:
+Publish a single file application using the [dotnet publish](../tools/dotnet-publish.md) command.
 
-- Publish for a specific runtime: `-r win-x64`
-- Publish as a single-file: `-p:PublishSingleFile=true`
+01. Add `<PublishSingleFile>true</PublishSingleFile>` to your project file.
 
-The following example publishes an app for Windows as a self-contained single file application.
+    This will produce a single-file app on self-contained publish. It also shows single-file compatibility warnings during build.
 
-```dotnetcli
-dotnet publish -r win-x64 -p:PublishSingleFile=true --self-contained true
-```
+    ```xml
+    <PropertyGroup>
+        <PublishSingleFile>true</PublishSingleFile>
+    </PropertyGroup>
+    ```
+
+01. Publish the app as for a specific runtime identifier using `dotnet publish -r <RID>`
+
+    The following example publishes the app for Windows as a self-contained single file application.
 
-The following example publishes an app for Linux as a framework dependent single file application.
+    `dotnet publish -r win-x64`
+
+    The following example publishes the app for Linux as a framework dependent single file application.
+
+    `dotnet publish -r linux-x64 --self-contained false`
+
+`<PublishSingleFile>` should be set in the project file to enable single-file analysis during build, but it is also possible to pass these options as `dotnet publish` arguments:
 
 ```dotnetcli
 dotnet publish -r linux-x64 -p:PublishSingleFile=true --self-contained false
@@ -159,6 +170,8 @@ For more information, see [Publish .NET Core apps with .NET Core CLI](deploy-wit
 
 Visual Studio creates reusable publishing profiles that control how your application is published.
 
+01. Add `<PublishSingleFile>true</PublishSingleFile>` to your project file.
+
 01. On the **Solution Explorer** pane, right-click on the project you want to publish. Select **Publish**.
 
     :::image type="content" source="media/single-file/visual-studio-solution-explorer.png" alt-text="Solution Explorer with a right-click menu highlighting the Publish option.":::

diff --git a/docs/core/deploying/trim-self-contained.md b/docs/core/deploying/trim-self-contained.md
@@ -36,72 +36,50 @@ When the code is indirectly referencing an assembly through reflection, you can
 </ItemGroup>
 ```
 
-### Support for SSL certificates
-
-If your app loads SSL certificates, such as in an ASP.NET Core app, you'll want to ensure that when trimming you prevent trimming assemblies that will help with loading SSL certificates.
+## Trim your app - CLI
 
-We can update our project file to include the following for ASP.NET Core 3.1:
+Trim your application using the [dotnet publish](../tools/dotnet-publish.md) command.
 
-```xml
-<Project Sdk="Microsoft.NET.Sdk.Web">
-  <PropertyGroup>...</PropertyGroup>
-  <!--Include the following for .aspnetcore 3.1-->
-  <ItemGroup>
-    <TrimmerRootAssembly Include="System.Net" />
-    <TrimmerRootAssembly Include="System.Net.Security" />
-    <TrimmerRootAssembly Include="System.Security" />
-  </ItemGroup>
-  ...
-</Project>
-```
+01. Add `<PublishTrimmed>true</PublishTrimmed>` to your project file.
 
-If we're using .Net 5.0, we can update our project file to include the following:
-
-```xml
-<Project Sdk="Microsoft.NET.Sdk.Web">
- <PropertyGroup>...</PropertyGroup>
- <!--Include the following for .net 5.0-->
- <ItemGroup>
-    <TrimmerRootAssembly Include="System.Net.Security" />
-    <TrimmerRootAssembly Include="System.Security" />
-  </ItemGroup>
-  ...
-</Project>
-```
+    This will produce a trimmed app on self-contained publish. It also turns off trim-incompatible features and shows trim compatibility warnings during build.
 
-## Trim your app - CLI
+    ```xml
+    <PropertyGroup>
+        <PublishTrimmed>true</PublishTrimmed>
+    </PropertyGroup>
+    ```
 
-Trim your application using the [dotnet publish](../tools/dotnet-publish.md) command. When you publish your app, set the following properties:
+01. Publish a self-contained app for a specific runtime identifier using `dotnet publish -r <RID>`
 
-- Publish as a self-contained app for a specific runtime: `-r win-x64`
-- Enable trimming: `/p:PublishTrimmed=true`
+    The following example publishes the app for Windows as trimmed self-contained application.
 
-The following example publishes an app for Windows as self-contained and trims the output.
+    `dotnet publish -r win-x64`
 
-```xml
-<PropertyGroup>
-    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
-    <PublishTrimmed>true</PublishTrimmed>
-</PropertyGroup>
-```
+    Note that trimming is only supported for self-contained apps.
 
-The following example publishes an app in the aggressive trim mode where unused code within assemblies will be trimmed and trimmer warnings enabled.
+The following example configures an app in the aggressive trim mode where unused code within assemblies will be trimmed and trimmer warnings enabled.
 
 ```xml
 <PropertyGroup>
-    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
     <PublishTrimmed>true</PublishTrimmed>
     <TrimMode>link</TrimMode>
     <SuppressTrimAnalysisWarnings>false</SuppressTrimAnalysisWarnings>
 </PropertyGroup>
 ```
 
+`<PublishTrimmed>` should be set in the project file so that trim-incompatible features are disabled during `dotnet build`, but it is also possible to pass these options as `dotnet publish` arguments:
+
+`dotnet publish -r win-x64 -p:PublishTrimmed=true`
+
 For more information, see [Publish .NET Core apps with .NET Core CLI](deploy-with-cli.md).
 
 ## Trim your app - Visual Studio
 
 Visual Studio creates reusable publishing profiles that control how your application is published.
 
+01. Add `<PublishTrimmed>true</PublishTrimmed>` to your project file.
+
 01. On the **Solution Explorer** pane, right-click on the project you want to publish. Select **Publish...**.
 
     :::image type="content" source="media/trim-self-contained/visual-studio-solution-explorer.png" alt-text="Solution Explorer with a right-click menu highlighting the Publish option.":::