Merge pull request #3483 from MicrosoftDocs/master

4/5 AM Publishing

Author: v-alje

docs/build/arm-exception-handling.md

@@ -188,29 +188,32 @@ When the packed unwind format is insufficient to describe the unwinding of a fun
 The `.xdata` record is designed so that it is possible to fetch the first 8 bytes and compute the full size of the record, not including the length of the variable-sized exception data that follows. This code snippet computes the record size:
 
 ```cpp
-ULONG Comput`.xdata`Size(PULONG `.xdata`)
+ULONG ComputeXdataSize(PULONG Xdata)
 {
-    ULONG EpilogueScopes;
     ULONG Size;
+    ULONG EpilogueScopes;
     ULONG UnwindWords;
 
-    if (`.xdata`[0] >> 23) != 0) {
+    if ((Xdata[0] >> 23) != 0) {
         Size = 4;
-        EpilogueScopes = `.xdata`[0] >> 23) & 0x1f;
-        UnwindWords = `.xdata`[0] >> 28) & 0x0f;
+        EpilogueScopes = (Xdata[0] >> 23) & 0x1f;
+        UnwindWords = (Xdata[0] >> 28) & 0x0f;
     } else {
         Size = 8;
-        EpilogueScopes =`.xdata`[1] & 0xffff;
-        UnwindWords = `.xdata`[1] >> 16) & 0xff;
+        EpilogueScopes = Xdata[1] & 0xffff;
+        UnwindWords = (Xdata[1] >> 16) & 0xff;
     }
 
-    if (!`.xdata`[0] & (1 << 21))) {
+    if (!(Xdata[0] & (1 << 21))) {
         Size += 4 * EpilogueScopes;
     }
+
     Size += 4 * UnwindWords;
-    if `.xdata`[0] & (1 << 20)) {
-        Size += 4;
+
+    if (Xdata[0] & (1 << 20)) {
+        Size += 4;  // Exception handler RVA
     }
+
     return Size;
 }
 ```

docs/build/arm64-exception-handling.md

@@ -237,27 +237,32 @@ This data is broken into four sections:
 The .xdata record is designed so it's possible to fetch the first 8 bytes, and use them to compute the full size of the record, minus the length of the variable-sized exception data that follows. The following code snippet computes the record size:
 
 ```cpp
-ULONG ComputeXdataSize(PULONG *Xdata)
+ULONG ComputeXdataSize(PULONG Xdata)
 {
-    ULONG EpilogScopes;
     ULONG Size;
+    ULONG EpilogScopes;
     ULONG UnwindWords;
 
-    if ((Xdata[0] >> 27) != 0) {
+    if ((Xdata[0] >> 22) != 0) {
         Size = 4;
         EpilogScopes = (Xdata[0] >> 22) & 0x1f;
-        UnwindWords = (Xdata[0] >> 27) & 0x0f;
+        UnwindWords = (Xdata[0] >> 27) & 0x1f;
     } else {
         Size = 8;
         EpilogScopes = Xdata[1] & 0xffff;
         UnwindWords = (Xdata[1] >> 16) & 0xff;
     }
 
-    Size += 4 * EpilogScopes;
+    if (!(Xdata[0] & (1 << 21))) {
+        Size += 4 * EpilogScopes;
+    }
+
     Size += 4 * UnwindWords;
+
     if (Xdata[0] & (1 << 20)) {
-        Size += 4;        // exception handler RVA
+        Size += 4;  // Exception handler RVA
     }
+
     return Size;
 }
 ```

docs/build/reference/clr-common-language-runtime-compilation.md

@@ -23,9 +23,13 @@ One or more of the following comma-separated arguments.
 
    With no options, **`/clr`** creates metadata for the component. The metadata can be consumed by other CLR applications, and enables the component to consume types and data in the metadata of other CLR components. For more information, see [Mixed (Native and Managed) Assemblies](../../dotnet/mixed-native-and-managed-assemblies.md).
 
-- **`NetCore`**
+::: moniker range="msvc-160"
 
-   **`/clr:NetCore`** creates metadata and code for the component using the latest cross-platform .NET framework, also known as .NET Core. The metadata can be consumed by other .NET Core applications. And, the option enables the component to consume types and data in the metadata of other .NET Core components.
+- **`netcore`**
+
+   Available starting in Visual Studio 2019 version 16.4, **`/clr:netcore`** creates metadata and code for the component using the latest cross-platform .NET framework, also known as .NET Core. The metadata can be consumed by other .NET Core applications. And, the option enables the component to consume types and data in the metadata of other .NET Core components.
+
+::: moniker-end
 
 - **`nostdlib`**
 

docs/sanitizers/asan-known-issues.md

@@ -61,6 +61,12 @@ The AddressSanitizer runtime doesn't release memory back to the OS during execut
 
 The *`clang_rt.asan*.dll`* runtime files are installed next to the compilers in *`%VSINSTALLDIR%\VC\Tools\MSVC\<version>\bin\<host-arch>\<target-arch>\`*. These locations are on the path in debugging sessions, and in Visual Studio developer command prompts. These files are never placed in *`C:\Windows\System32`* or *`C:\Windows\SysWOW64`*.
 
+## Custom property sheet support
+
+The Property Manager window in the Visual Studio IDE allows you to add custom *`.props`* files to your projects. Even though the **Enable Address Sanitizer** property (`<EnableASAN>`) is shown, it's not honored by the build. That's because the custom *`.props`* files get included after *`Microsoft.cpp.props`*, which uses the `<EnableASAN>` value to set other properties.
+
+As a workaround, you can create a *`Directory.Build.props`* file in the root of your project to define the `<EnableASAN>` property. For more information, see [Customize C++ builds](/visualstudio/msbuild/customize-your-build#customize-c-builds).
+
 ## See also
 
 [AddressSanitizer overview](./asan.md)\