Skip to content

Commit 6bd3585

Browse files
SimaTianSimaTian
authored
Merge branch 'main' into dev/erarndt/threadUtilization
2 parents bcd24d8 + aff5455 commit 6bd3585

File tree

120 files changed

+3132
-1955
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

120 files changed

+3132
-1955
lines changed

‎.config/1espt/PipelineAutobaseliningConfig.yml

Lines changed: 38 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
1-
## DO NOT MODIFY THIS FILE MANUALLY. This is part of auto-baselining from 1ES Pipeline Templates. Go to [https://aka.ms/1espt-autobaselining] for more details.
2-
3-
pipelines:
4-
9434:
5-
retail:
6-
source:
7-
credscan:
8-
lastModifiedDate: 2024-03-14
9-
eslint:
10-
lastModifiedDate: 2024-03-14
11-
psscriptanalyzer:
12-
lastModifiedDate: 2024-03-14
13-
armory:
14-
lastModifiedDate: 2024-03-14
1+
## DO NOT MODIFY THIS FILE MANUALLY. This is part of auto-baselining from 1ES Pipeline Templates. Go to [https://aka.ms/1espt-autobaselining] for more details.
2+
3+
pipelines:
4+
9434:
5+
retail:
6+
source:
7+
credscan:
8+
lastModifiedDate: 2024-03-14
9+
eslint:
10+
lastModifiedDate: 2024-03-14
11+
psscriptanalyzer:
12+
lastModifiedDate: 2024-03-14
13+
armory:
14+
lastModifiedDate: 2024-03-14
1515
policheck:
1616
lastModifiedDate: 2024-10-09
17-
binary:
18-
credscan:
19-
lastModifiedDate: 2024-03-14
20-
binskim:
17+
binary:
18+
credscan:
19+
lastModifiedDate: 2024-03-14
20+
binskim:
2121
lastModifiedDate: 2024-11-27
2222
spotbugs:
23-
lastModifiedDate: 2024-03-14
23+
lastModifiedDate: 2024-03-14
2424
24295:
2525
retail:
2626
source:
@@ -37,5 +37,23 @@ pipelines:
3737
lastModifiedDate: 2024-11-06
3838
binskim:
3939
lastModifiedDate: 2024-11-21
40-
spotbugs:
40+
spotbugs:
4141
lastModifiedDate: 2024-11-06
42+
24263:
43+
retail:
44+
source:
45+
credscan:
46+
lastModifiedDate: 2024-12-19
47+
eslint:
48+
lastModifiedDate: 2024-12-19
49+
psscriptanalyzer:
50+
lastModifiedDate: 2024-12-19
51+
armory:
52+
lastModifiedDate: 2024-12-19
53+
binary:
54+
credscan:
55+
lastModifiedDate: 2024-12-19
56+
binskim:
57+
lastModifiedDate: 2024-12-19
58+
spotbugs:
59+
lastModifiedDate: 2024-12-19

‎.config/git-merge-flow-config.jsonc

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,23 +10,19 @@
1010
"vs17.0": {
1111
"MergeToBranch": "vs17.3"
1212
},
13-
// Automate opening PRs to merge msbuild's vs17.3 (SDK 6.0.4xx) into vs17.6 (VS until 1/2025)
13+
// Automate opening PRs to merge msbuild's vs17.3 (SDK 6.0.4xx) into vs17.8 (SDK 8.0.1xx, VS until 7/2025)
1414
"vs17.3": {
15-
"MergeToBranch": "vs17.6"
16-
},
17-
// Automate opening PRs to merge msbuild's vs17.6 into vs17.8 (VS until 7/2025)
18-
"vs17.6": {
1915
"MergeToBranch": "vs17.8"
2016
},
21-
// Automate opening PRs to merge msbuild's vs17.8 (SDK 8.0.1xx) into vs17.10 (SDK 8.0.3xx)
17+
// Automate opening PRs to merge msbuild's vs17.8 (SDK 8.0.1xx) into vs17.10 (SDK 8.0.3xx, VS until 1/2026)
2218
"vs17.8": {
2319
"MergeToBranch": "vs17.10"
2420
},
2521
// Automate opening PRs to merge msbuild's vs17.10 (SDK 8.0.3xx) into vs17.11 (SDK 8.0.4xx)
2622
"vs17.10": {
2723
"MergeToBranch": "vs17.11"
2824
},
29-
// Automate opening PRs to merge msbuild's vs17.11 (SDK 8.0.4xx) into vs17.12 (SDK 9.0.1xx)
25+
// Automate opening PRs to merge msbuild's vs17.11 (SDK 8.0.4xx) into vs17.12 (SDK 9.0.1xx, VS until 7/2026)
3026
"vs17.11": {
3127
"MergeToBranch": "vs17.12"
3228
},

‎.config/guardian/.gdnbaselines

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,9 @@
6060
],
6161
"tool": "credscan",
6262
"ruleId": "CSCAN-GENERAL0020",
63-
"createdDate": "2024-11-06 10:51:54Z",
64-
"expirationDate": "2025-04-25 11:21:52Z",
65-
"justification": "This error is baselined with an expiration date of 180 days from 2024-11-06 11:21:52Z"
63+
"createdDate": "2024-12-19 06:42:54Z",
64+
"expirationDate": "2025-06-07 07:02:56Z",
65+
"justification": "This error is baselined with an expiration date of 180 days from 2024-12-19 07:02:56Z"
6666
}
6767
}
6868
}

‎.exp-insertions.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ jobs:
152152
command: restore
153153
feedsToUse: config
154154
restoreSolution: '$(Build.SourcesDirectory)\eng\common\internal\Tools.csproj'
155-
nugetConfigPath: '$(Build.SourcesDirectory)\NuGet.config'
155+
nugetConfigPath: '$(Build.SourcesDirectory)\eng\common\internal\NuGet.config'
156156
restoreDirectory: '$(Build.SourcesDirectory)\.packages'
157157

158158
# https://eng.ms/docs/cloud-ai-platform/devdiv/one-engineering-system-1es/1es-docs/1es-security-configuration/configuration-guides/pat-burndown-guidance#authentication-from-pipelines

‎.vsts-dotnet-ci.yml

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,16 @@ trigger:
33
- exp/*
44
- vs*
55

6+
variables:
7+
- ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
8+
- group: AzureDevOps-Artifact-Feeds-Pats
9+
- name: cfsNugetWarnLevel
10+
value: warn
11+
- name: nugetMultiFeedWarnLevel
12+
value: none
13+
- name: NugetSecurityAnalysisWarningLevel
14+
value: none
15+
616
jobs:
717
- job: CheckVersionBumpOnReleaseBranches
818
displayName: "Check Version Bump On Release Branches"
@@ -65,6 +75,14 @@ jobs:
6575
pool:
6676
vmImage: 'windows-2022'
6777
steps:
78+
- ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
79+
- task: PowerShell@2
80+
displayName: Setup Private Feeds Credentials
81+
inputs:
82+
filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1
83+
arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token
84+
env:
85+
Token: $(dn-bot-dnceng-artifact-feeds-rw)
6886
- task: BatchScript@1
6987
displayName: cibuild_bootstrapped_msbuild.cmd
7088
inputs:
@@ -136,6 +154,14 @@ jobs:
136154
pool:
137155
vmImage: 'windows-2022'
138156
steps:
157+
- ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
158+
- task: PowerShell@2
159+
displayName: Setup Private Feeds Credentials
160+
inputs:
161+
filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1
162+
arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token
163+
env:
164+
Token: $(dn-bot-dnceng-artifact-feeds-rw)
139165
- task: BatchScript@1
140166
displayName: cibuild_bootstrapped_msbuild.cmd
141167
inputs:
@@ -191,6 +217,14 @@ jobs:
191217
name: VSEngSS-MicroBuild2022-1ES
192218
demands: agent.os -equals Windows_NT
193219
steps:
220+
- ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
221+
- task: PowerShell@2
222+
displayName: Setup Private Feeds Credentials
223+
inputs:
224+
filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1
225+
arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token
226+
env:
227+
Token: $(dn-bot-dnceng-artifact-feeds-rw)
194228
- task: BatchScript@1
195229
displayName: cibuild.cmd
196230
inputs:
@@ -265,6 +299,14 @@ jobs:
265299
pool:
266300
vmImage: 'ubuntu-latest'
267301
steps:
302+
- ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
303+
- task: Bash@3
304+
displayName: Setup Private Feeds Credentials
305+
inputs:
306+
filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh
307+
arguments: $(Build.SourcesDirectory)/NuGet.config $Token
308+
env:
309+
Token: $(dn-bot-dnceng-artifact-feeds-rw)
268310
- bash: . 'eng/cibuild_bootstrapped_msbuild.sh' --onlyDocChanged $(onlyDocChanged)
269311
displayName: CI Build
270312
- task: PublishTestResults@2
@@ -322,6 +364,14 @@ jobs:
322364
pool:
323365
vmImage: 'macOS-latest'
324366
steps:
367+
- ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
368+
- task: Bash@3
369+
displayName: Setup Private Feeds Credentials
370+
inputs:
371+
filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh
372+
arguments: $(Build.SourcesDirectory)/NuGet.config $Token
373+
env:
374+
Token: $(dn-bot-dnceng-artifact-feeds-rw)
325375
- bash: . 'eng/cibuild_bootstrapped_msbuild.sh' --onlyDocChanged $(onlyDocChanged)
326376
displayName: CI Build
327377
- task: PublishTestResults@2

‎.vsts-dotnet.yml

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,13 @@ variables:
3737
value: true # Enable loc for vs17.14
3838
- name: Codeql.Enabled
3939
value: true
40+
- group: AzureDevOps-Artifact-Feeds-Pats
41+
- name: cfsNugetWarnLevel
42+
value: warn
43+
- name: nugetMultiFeedWarnLevel
44+
value: none
45+
- name: NugetSecurityAnalysisWarningLevel
46+
value: none
4047

4148
resources:
4249
repositories:
@@ -120,13 +127,21 @@ extends:
120127
- task: NuGetToolInstaller@1
121128
displayName: 'Install NuGet.exe'
122129

130+
- task: PowerShell@2
131+
displayName: Setup Private Feeds Credentials
132+
inputs:
133+
filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1
134+
arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token
135+
env:
136+
Token: $(dn-bot-dnceng-artifact-feeds-rw)
137+
123138
- task: NuGetCommand@2
124139
displayName: Restore internal tools
125140
inputs:
126141
command: restore
127142
feedsToUse: config
128143
restoreSolution: 'eng\common\internal\Tools.csproj'
129-
nugetConfigPath: 'NuGet.config'
144+
nugetConfigPath: 'eng\common\internal\NuGet.config'
130145
restoreDirectory: '$(Build.SourcesDirectory)\.packages'
131146

132147
- task: ms-vseng.MicroBuildTasks.30666190-6959-11e5-9f96-f56098202fef.MicroBuildSigningPlugin@1

‎azure-pipelines/vs-insertion.yml

Lines changed: 28 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
# To achieve insertion automation, this pipeline definition yml has to be on servicing branches and main.
33

44

5-
# Runs in 3 modes:
5+
# Runs in 3 modes:
66
# 1. daily main insertion from latest main CI.
7-
# - can be disabled in the UI by adding a custom schedule for any branch.
7+
# - can be disabled in the UI by adding a custom schedule for any branch.
88
# 2. trigger insert as a followup to a servicing CI run.
99
# - can be disabled in the UI by adding a custom CI trigger.
1010
# 3. manual insertion - select manually the TargetBranch and inserted CI run.
@@ -44,6 +44,7 @@ parameters:
4444
values:
4545
- auto
4646
- main
47+
- rel/d17.14
4748
- rel/d17.13
4849
- rel/d17.12
4950
- rel/d17.11
@@ -56,11 +57,17 @@ parameters:
5657
default: 183
5758
type: number
5859
displayName: 'Drop Retention Days (do not set to < 90)'
60+
- name: SkipUploadingPackages
61+
default: false
62+
type: boolean
63+
displayName: 'Skip uploading packages (set to true if inserting the same version multiple times)'
5964

6065
variables:
6166
# `auto` should work every time and selecting a branch in parameters is likely to fail due to incompatible versions in MSBuild and VS
6267
- name: AutoInsertTargetBranch
63-
${{ if eq(variables['Build.SourceBranchName'], 'vs17.13') }}:
68+
${{ if eq(variables['Build.SourceBranchName'], 'vs17.14') }}:
69+
value: 'rel/d17.14'
70+
${{ elseif eq(variables['Build.SourceBranchName'], 'vs17.13') }}:
6471
value: 'rel/d17.13'
6572
${{ elseif eq(variables['Build.SourceBranchName'], 'vs17.12') }}:
6673
value: 'rel/d17.12'
@@ -95,8 +102,8 @@ variables:
95102
value: $(resources.pipeline.MSBuild.sourceCommit)
96103
- name: ArtifactPackagesPath
97104
value: $(Build.ArtifactStagingDirectory)/PackageArtifacts
98-
99-
- name: MSBuildPackagePattern
105+
106+
- name: MSBuildPackagePattern
100107
value: '$(ArtifactPackagesPath)/Microsoft.Build.*.nupkg'
101108
- name: StringToolsPackagePattern
102109
value: '$(ArtifactPackagesPath)/Microsoft.NET.StringTools*.nupkg'
@@ -200,7 +207,6 @@ extends:
200207
$MicrosoftNETStringToolsPackageVersion = $packageFile.BaseName.TrimStart("Microsoft.NET.StringTools")
201208
Write-Host "Setting MicrosoftNETStringToolsPackageVersion to '$MicrosoftNETStringToolsPackageVersion'"
202209
Write-Host "##vso[task.setvariable variable=MicrosoftNETStringToolsPackageVersion]$($MicrosoftNETStringToolsPackageVersion)"
203-
204210
$props = @(
205211
"VS.ExternalAPIs.MSBuild=$MSBuild_ExtApisPackageVersion",
206212
"Microsoft.Build=$MicrosoftNETStringToolsPackageVersion",
@@ -221,26 +227,38 @@ extends:
221227
$propsValue = $props -join ";"
222228
Write-Host "Setting InsertPackagePropsValues to '$propsValue'"
223229
Write-Host "##vso[task.setvariable variable=InsertPackagePropsValues]$($propsValue)"
230+
231+
# autocomplete main
232+
$autocomplete = "false"
233+
if ("$(InsertTargetBranch)" -eq "main")
234+
{
235+
$autocomplete = "true"
236+
}
237+
Write-Host "Setting AutoCompleteEnabled to '$autocomplete'"
238+
Write-Host "##vso[task.setvariable variable=AutoCompleteEnabled]$($autocomplete)"
239+
224240
- task: 1ES.PublishNuGet@1
225241
displayName: 'Push MSBuild CoreXT packages'
242+
condition: ${{ eq(parameters.SkipUploadingPackages, false) }}
226243
inputs:
227244
packageParentPath: '$(Build.ArtifactStagingDirectory)'
228245
packagesToPush: $(MSBuildPackagePattern);$(StringToolsPackagePattern);$(ExternalAPIsPackagePattern)
229246
nuGetFeedType: internal
230247
publishVstsFeed: VS
231-
allowPackageConflicts: true
248+
allowPackageConflicts: false
232249
- template: /azure-pipelines/WIFtoPATauth.yml@self
233250
parameters:
234251
wifServiceConnectionName: azure-public/vside package push
235252
deadPATServiceConnectionId: 42175e93-c771-4a4f-a132-3cca78f44b3b
236253
- task: 1ES.PublishNuGet@1
254+
condition: ${{ eq(parameters.SkipUploadingPackages, false) }}
237255
displayName: 'Push MSBuild packages to VSSDK'
238256
inputs:
239257
packageParentPath: '$(Build.ArtifactStagingDirectory)'
240258
packagesToPush: $(MSBuildPackagePattern);$(StringToolsPackagePattern)
241259
nuGetFeedType: external
242260
publishFeedCredentials: azure-public/vssdk
243-
allowPackageConflicts: true
261+
allowPackageConflicts: false
244262
- task: PowerShell@2
245263
name: PrintTargetBranch
246264
inputs:
@@ -262,6 +280,6 @@ extends:
262280
DefaultConfigValues: $(InsertConfigValues)
263281
InsertionReviewers: MSBuild,VS ProTools
264282
CustomScriptExecutionCommand: $(InsertCustomScriptExecutionCommand)
265-
AutoCompletePR: true
283+
AutoCompletePR: $(AutoCompleteEnabled)
266284
AutoCompleteMergeStrategy: Squash
267-
InsertionBuildPolicy: Request Perf DDRITs
285+
InsertionBuildPolicy: Request Perf DDRITs

0 commit comments

Comments
 (0)