Merge pull request #17337 from dotnet-maestro-bot/merge/release/3.1-to-master

[automated] Merge branch 'release/3.1' => 'master'

.azure/pipelines/ci.yml

@@ -703,7 +703,7 @@ stages:
       publishInstallersAndChecksums: true
       # This is to enable SDL runs part of Post-Build Validation Stage
       SDLValidationParameters:
-        enable: false
+        enable: true
         continueOnError: false
         params: ' -SourceToolsList @("policheck","credscan")
         -TsaInstanceURL $(_TsaInstanceURL)
@@ -714,4 +714,5 @@ stages:
         -TsaIterationPath $(_TsaIterationPath)
         -TsaRepositoryName "AspNetCore"
         -TsaCodebaseName "AspNetCore"
-        -TsaPublish $True'
+        -TsaPublish $True
+        -PoliCheckAdditionalRunConfigParams @("UserExclusionPath < $(Build.SourcesDirectory)/eng/PoliCheckExclusions.xml")'

.azure/pipelines/jobs/default-build.yml

@@ -58,7 +58,7 @@ parameters:
   installTar: true
   installNodeJs: true
   installJdk: true
-  timeoutInMinutes: 270
+  timeoutInMinutes: 180
 
   # We need longer than the default amount of 5 minutes to upload our logs/artifacts. (We currently take around 5 mins in the best case).
   # This makes sure we have time to upload everything in the case of a build timeout - really important for investigating a build

eng/PoliCheckExclusions.xml

@@ -0,0 +1,3 @@
+<PoliCheckExclusions>
+	<Exclusion Type="FolderPathFull">LINUX_TEST_RESULTS|MACOS_TEST_RESULTS|WINDOWS_TEST_RESULTS</Exclusion>
+</PoliCheckExclusions>

eng/Version.Details.xml

@@ -433,4 +433,4 @@
       <Sha>3c865821f2864393a0ff7fe22c92ded6d51a546c</Sha>
     </Dependency>
   </ToolsetDependencies>
-</Dependencies>
+</Dependencies>