Change file name and add tsa configs to pr pipeline

himgoyalmicro · Sep 6, 2024 · 97a361e · 97a361e
1 parent 2c987ce
commit 97a361e
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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 → eng/tsaoptions.json b/eng/tsa-options.json → eng/tsaoptions.json