Merge pull request #4643 from MicrosoftDocs/repo_sync_working_branch

Confirm merge from repo_sync_working_branch to master to sync with https://github.com/MicrosoftDocs/visualstudio-docs (branch master)

Author: gewarren

docs/msbuild/common-msbuild-project-properties.md

@@ -62,6 +62,7 @@ The following table lists frequently used properties that are defined in the Vis
 | FileAlignment | Specifies, in bytes, where to align the sections of the output file. Valid values are 512, 1024, 2048, 4096, 8192. This property is equivalent to the `/filealignment` compiler switch. |
 | FrameworkPathOverride | Specifies the location of *mscorlib.dll* and *microsoft.visualbasic.dll*. This parameter is equivalent to the `/sdkpath` switch of the *vbc.exe* compiler. |
 | GenerateDocumentation | (Visual Basic only) A boolean parameter that indicates whether documentation is generated by the build. If `true`, the build generates documentation information and puts it in an *.xml* file together with the name of the executable file or library that the build task created. |
+| GenerateSerializationAssemblies | Indicates whether XML serialization assemblies should be generated by *SGen.exe*, which can be set to on, auto, or off. This property is used for assemblies that target .NET Framework only. To generate XML serialization assemblies for .NET Standard or .NET Core assemblies, reference the *Microsoft.XmlSerializer.Generator* NuGet package. |
 | IntermediateOutputPath | The full intermediate output path as derived from `BaseIntermediateOutputPath`, if no path is specified. For example, *\obj\debug\\*. |
 | KeyContainerName | The name of the strong-name key container. |
 | KeyOriginatorFile | The name of the strong-name key file. |
@@ -85,8 +86,8 @@ The following table lists frequently used properties that are defined in the Vis
 | ProduceReferenceAssembly | A boolean value that when set to `true` enables production of [reference assemblies](https://github.com/dotnet/roslyn/blob/master/docs/features/refout.md) for the current assembly. `Deterministic` should be `true` when using this feature. This property corresponds to the `/refout` switch of the *vbc.exe* and *csc.exe* compilers. |
 | ProduceOnlyReferenceAssembly | A boolean value that instructs the compiler to emit only a reference assembly rather than compiled code. Cannot be used in conjunction with `ProduceReferenceAssembly`.  This property corresponds to the `/refonly` switch of the *vbc.exe* and *csc.exe* compilers. |
 | RemoveIntegerChecks | A boolean value that indicates whether to disable integer overflow error checks. The default value is `false`. This property is equivalent to the `/removeintchecks` switch of the *vbc.exe* compiler. |
-| SGenUseProxyTypes | A boolean value that indicates whether proxy types should be generated by *SGen.exe*.<br /><br /> The SGen target uses this property to set the UseProxyTypes flag. This property defaults to true, and there is no UI to change this. To generate the serialization assembly for non-webservice types, add this property to the project file and set it to false before importing the *Microsoft.Common.Targets* or the *C#/VB.targets*. |
-| SGenToolPath | An optional tool path that indicates where to obtain *SGen.exe* when the current version of *SGen.exe* is overridden. |
+| SGenUseProxyTypes | A boolean value that indicates whether proxy types should be generated by *SGen.exe*. This applies only when *GenerateSerializationAssemblies* is set to on, and for .NET Framework only.<br /><br /> The SGen target uses this property to set the UseProxyTypes flag. This property defaults to true, and there is no UI to change this. To generate the serialization assembly for non-webservice types, add this property to the project file and set it to false before importing the *Microsoft.Common.Targets* or the *C#/VB.targets*. |
+| SGenToolPath | An optional tool path that indicates where to obtain *SGen.exe* when the current version of *SGen.exe* is overridden. This property is used for .NET Framework only.|
 | StartupObject | Specifies the class or module that contains the Main method or Sub Main procedure. This property is equivalent to the `/main` compiler switch. |
 | ProcessorArchitecture | The processor architecture that is used when assembly references are resolved. Valid values are "msil," "x86," "amd64," or "ia64." |
 | RootNamespace | The root namespace to use when you name an embedded resource. This namespace is part of the embedded resource manifest name. |

docs/msbuild/custombuild-task.md

@@ -20,7 +20,8 @@ ms.workload:
 ---
 # CustomBuild task
 
-Wraps the Visual C++ compiler tool, cmd.exe.
+Wraps the Visual C++ compiler tool, cmd.exe. This class derives from [TrackedVCToolTask](../msbuild/trackedvctooltask-base-class.md), but does not use file tracking to discover file dependencies. All dependencies should be explicitly specified as AdditionalDependencies for incremental build working properly.
+
 
 ## Parameters
 
@@ -34,4 +35,4 @@ The following table describes the parameters of the **CustomBuild** task.
 
 ## See also
 
-[Task reference](../msbuild/msbuild-task-reference.md)
+[Task reference](../msbuild/msbuild-task-reference.md)