Merge pull request #75382 from dotnet/merges/release/dev17.11-to-rele…

…ase/dev17.12 Merge release/dev17.11 to release/dev17.12
dotnet · Oct 4, 2024 · 3ff6919 · 3ff6919
2 parents cd40e9b + 1774597
commit 3ff6919
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/azure-pipelines-official.yml b/azure-pipelines-official.yml
@@ -384,6 +384,7 @@ extends:
             publishDataURI: "https://dev.azure.com/dnceng/internal/_apis/git/repositories/dotnet-roslyn/items?path=eng/config/PublishData.json&api-version=6.0"
             publishDataAccessToken: "$(System.AccessToken)"
             dropPath: '$(Pipeline.Workspace)\VSSetup'
+            updateXamlRoslynVersion: false
 
     - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
       - template: /eng/common/templates-official/post-build/post-build.yml@self

diff --git a/eng/pipelines/insert.yml b/eng/pipelines/insert.yml
@@ -46,6 +46,9 @@ parameters:
   - name: dropPath
     type: string
     default: ''
+  - name: updateXamlRoslynVersion
+    type: boolean
+    default: true
 
 steps:
   - checkout: none
@@ -208,6 +211,7 @@ steps:
         -visualStudioBranchName "$(Template.VSBranchName)" `
         -writePullRequest "prid.txt" `
         -queueSpeedometerValidation "${{ parameters.queueSpeedometerValidation }}"
+        -updatexamlroslynversion "${{ parameters.updateXamlRoslynVersion }}"
     displayName: 'Run OneOffInsertion.ps1'
 
   - script: 'echo. && echo. && type "prid.txt" && echo. && echo.'