Merge branch 'merge/vs17.11-to-vs17.12' of https://github.com/dotnet/msbuild into merge/vs17.11-to-vs17.12

Author: YuliiaKovalova

.vsts-dotnet.yml

@@ -40,7 +40,7 @@ variables:
     - name: SourceBranch
       value: ''
   # Override SkipApplyOptimizationData to true when disabling OptProf data collection
-  - ${{ if eq(parameters.EnableOptProf, false) }}:
+  - ${{ if eq(parameters.enableOptProf, false) }}:
     - name: SkipApplyOptimizationData
       value: true
   - name: EnableReleaseOneLocBuild
@@ -122,26 +122,15 @@ extends:
       displayName: Build
       jobs:
       - template: /azure-pipelines/.vsts-dotnet-build-jobs.yml@self
+        parameters:
+          isExperimental: false
+          enableComponentGovernance: true
+          enableOptProf: ${{ parameters.enableOptProf }}
 
     - template: /eng/common/templates-official/post-build/post-build.yml@self
       parameters:
         publishingInfraVersion: 3
         enableSymbolValidation: true
         enableSourceLinkValidation: false
         enableNugetValidation: false
-        enableSigningValidation: ${{ parameters.enableSigningValidation }}
-        SDLValidationParameters:
-          enable: true
-          continueOnError: false
-          params: ' -SourceToolsList @("policheck","credscan")
-          -TsaInstanceURL "$(_TsaInstanceURL)"
-          -TsaProjectName "$(_TsaProjectName)"
-          -TsaNotificationEmail "$(_TsaNotificationEmail)"
-          -TsaCodebaseAdmin "$(_TsaCodebaseAdmin)"
-          -TsaBugAreaPath "$(_TsaBugAreaPath)"
-          -TsaIterationPath "$(_TsaIterationPath)"
-          -TsaRepositoryName "dotnet-msbuild"
-          -TsaCodebaseName "dotnet-msbuild"
-          -TsaPublish $True
-          -CrScanAdditionalRunConfigParams @("SuppressionsPath < $(Build.SourcesDirectory)\eng\CredScanSuppressions.json")
-          -PoliCheckAdditionalRunConfigParams @("UserExclusionPath < $(Build.SourcesDirectory)\eng\policheck_exclusions.xml")'
+        enableSigningValidation: ${{ parameters.enableSigningValidation }}

azure-pipelines/.vsts-dotnet-build-jobs.yml

@@ -26,7 +26,7 @@ jobs:
   - name: VisualStudio.MajorVersion
     value: 17
   - name: VisualStudio.ChannelName
-    value: 'int.d17.12' # MSBuild's vs17.12 branch corresponds to this VS channel
+    value: 'int.d17.14' # MSBuild's vs17.14 branch corresponds to this VS channel
   - name: VisualStudio.DropName
     value: Products/$(System.TeamProject)/$(Build.Repository.Name)/$(Build.SourceBranchName)/$(Build.BuildNumber)