From 97a361ee97e3ca78f6a59f8f5466c8867af83423 Mon Sep 17 00:00:00 2001
From: hmishra <hmishra@microsoft.com>
Date: Fri, 6 Sep 2024 10:25:47 +0530
Subject: [PATCH] Change file name and add tsa configs to pr pipeline

---
 azure-pipelines.yml                       | 2 +-
 eng/pipeline-pr.yml                       | 5 +++++
 eng/pipeline.yml                          | 2 +-
 eng/{tsa-options.json => tsaoptions.json} | 0
 4 files changed, 7 insertions(+), 2 deletions(-)
 rename eng/{tsa-options.json => tsaoptions.json} (100%)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 8199e9afd..902e1a2e4 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -43,7 +43,7 @@ extends:
         enabled: true
       tsa:
         enabled: true
-        configFile: '$(Build.SourcesDirectory)/eng/tsa-options.json'
+        configFile: '$(Build.SourcesDirectory)/eng/tsaoptions.json'
     featureFlags:
       autoBaseline: true
     pool:
diff --git a/eng/pipeline-pr.yml b/eng/pipeline-pr.yml
index 1da03c1a5..ee29e1b07 100644
--- a/eng/pipeline-pr.yml
+++ b/eng/pipeline-pr.yml
@@ -8,6 +8,7 @@ parameters:
   # Defaults to true
   runAsPublic: true
   repoName: dotnet/wpf
+  TSAEnabled: true
 
 jobs:
 - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(variables['Build.SourceBranch'], 'refs/heads/main')) }}:
@@ -53,6 +54,10 @@ jobs:
       variables:
         - name: Codeql.Enabled
           value: true
+        - name: Codeql.TSAEnabled
+          value: ${{ parameters.TSAEnabled }}
+        - name: Codeql.TSAOptionsPath
+          value: $(Build.SourcesDirectory)/eng/tsaoptions.json
         # needed for signing
         - name: _TeamName
           value: DotNetCore
diff --git a/eng/pipeline.yml b/eng/pipeline.yml
index 99c4d4cf0..2bbcc641a 100644
--- a/eng/pipeline.yml
+++ b/eng/pipeline.yml
@@ -49,7 +49,7 @@ jobs:
       - name: Codeql.TSAEnabled
         value: ${{ parameters.TSAEnabled }}
       - name: Codeql.TSAOptionsPath
-        value: $(Build.SourcesDirectory)/eng/tsa-options.json
+        value: $(Build.SourcesDirectory)/eng/tsaoptions.json
       - name: _TeamName
         value: DotNetCore
       - name: _SignType
diff --git a/eng/tsa-options.json b/eng/tsaoptions.json
similarity index 100%
rename from eng/tsa-options.json
rename to eng/tsaoptions.json