Merge branch '3.6.0' into 4.0.0

diff --cc build/steps/build-windows.yml
index 6d128f5,d1fbd3c..9a4eed6
--- 1/build/steps/build-windows.yml
--- 2/build/steps/build-windows.yml
+++ b/build/steps/build-windows.yml
@@@ -126,9 -158,9 +161,9 @@@ jobs
            Microsoft.XamlStandard/bin/$(BuildConfiguration)/**/*.pdb
            **/*.binlog
  
-         TargetFolder: '$(Build.ArtifactStagingDirectory)'
+         TargetFolder: ${{ parameters.artifactsTargetFolder }}
  
      - task: PublishBuildArtifacts@1
-       displayName: 'Publish Artifact: win_build'
+       displayName: 'Publish Artifact: ${{ parameters.artifactsName }}'
        inputs:
-         ArtifactName: 'win_build'
 -        ArtifactName: ${{ parameters.artifactsName }}
++        ArtifactName: ${{ parameters.artifactsName }}