From 2d799789feb5756f1cd1246ee3a713f46c84e49f Mon Sep 17 00:00:00 2001
From: William Godbe <wigodbe@microsoft.com>
Date: Fri, 22 Nov 2019 13:19:14 -0800
Subject: [PATCH] Re-enable Policheck, Skip test logs, reset timeout to 3 hours
 (#17107)

---
 .azure/pipelines/ci.yml                 | 5 +++--
 .azure/pipelines/jobs/default-build.yml | 2 +-
 eng/PoliCheckExclusions.xml             | 3 +++
 3 files changed, 7 insertions(+), 3 deletions(-)
 create mode 100644 eng/PoliCheckExclusions.xml

diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml
index 0418caefef..651495cc9f 100644
--- a/.azure/pipelines/ci.yml
+++ b/.azure/pipelines/ci.yml
@@ -639,7 +639,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)
@@ -650,4 +650,5 @@ stages:
         -TsaIterationPath $(_TsaIterationPath)
         -TsaRepositoryName "AspNetCore"
         -TsaCodebaseName "AspNetCore"
-        -TsaPublish $True'
+        -TsaPublish $True
+        -PoliCheckAdditionalRunConfigParams @("UserExclusionPath < $(Build.SourcesDirectory)/eng/PoliCheckExclusions.xml")'
diff --git a/.azure/pipelines/jobs/default-build.yml b/.azure/pipelines/jobs/default-build.yml
index 18efdb3783..d218c44531 100644
--- a/.azure/pipelines/jobs/default-build.yml
+++ b/.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
diff --git a/eng/PoliCheckExclusions.xml b/eng/PoliCheckExclusions.xml
new file mode 100644
index 0000000000..73e3072f1c
--- /dev/null
+++ b/eng/PoliCheckExclusions.xml
@@ -0,0 +1,3 @@
+<PoliCheckExclusions>
+	<Exclusion Type="FolderPathFull">LINUX_TEST_RESULTS|MACOS_TEST_RESULTS|WINDOWS_TEST_RESULTS</Exclusion>
+</PoliCheckExclusions>
\ No newline at end of file