Skip to content

Commit c437bca

Browse files
SimaTianSimaTian
authored
Merge branch 'main' into msbuild-server-internal-dogfood
2 parents bbbc0ff + 74c74a2 commit c437bca

File tree

326 files changed

+8069
-4439
lines changed

Some content is hidden

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

326 files changed

+8069
-4439
lines changed

‎.config/1espt/PipelineAutobaseliningConfig.yml

+38-20
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

+3-7
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

+3-3
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

+1-1
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

+50
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:
@@ -193,6 +219,14 @@ jobs:
193219
name: VSEngSS-MicroBuild2022-1ES
194220
demands: agent.os -equals Windows_NT
195221
steps:
222+
- ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
223+
- task: PowerShell@2
224+
displayName: Setup Private Feeds Credentials
225+
inputs:
226+
filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1
227+
arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token
228+
env:
229+
Token: $(dn-bot-dnceng-artifact-feeds-rw)
196230
- task: BatchScript@1
197231
displayName: cibuild.cmd
198232
inputs:
@@ -267,6 +301,14 @@ jobs:
267301
pool:
268302
vmImage: 'ubuntu-latest'
269303
steps:
304+
- ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
305+
- task: Bash@3
306+
displayName: Setup Private Feeds Credentials
307+
inputs:
308+
filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh
309+
arguments: $(Build.SourcesDirectory)/NuGet.config $Token
310+
env:
311+
Token: $(dn-bot-dnceng-artifact-feeds-rw)
270312
- bash: . 'eng/cibuild_bootstrapped_msbuild.sh' --onlyDocChanged $(onlyDocChanged)
271313
displayName: CI Build
272314
env:
@@ -326,6 +368,14 @@ jobs:
326368
pool:
327369
vmImage: 'macOS-latest'
328370
steps:
371+
- ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
372+
- task: Bash@3
373+
displayName: Setup Private Feeds Credentials
374+
inputs:
375+
filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh
376+
arguments: $(Build.SourcesDirectory)/NuGet.config $Token
377+
env:
378+
Token: $(dn-bot-dnceng-artifact-feeds-rw)
329379
- bash: . 'eng/cibuild_bootstrapped_msbuild.sh' --onlyDocChanged $(onlyDocChanged)
330380
displayName: CI Build
331381
env:

‎.vsts-dotnet.yml

+19-1
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:
@@ -119,14 +126,25 @@ extends:
119126
steps:
120127
- task: NuGetToolInstaller@1
121128
displayName: 'Install NuGet.exe'
129+
- pwsh: Get-MpComputerStatus
130+
131+
- pwsh: Set-MpPreference -DisableRealtimeMonitoring $true
132+
133+
- task: PowerShell@2
134+
displayName: Setup Private Feeds Credentials
135+
inputs:
136+
filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1
137+
arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token
138+
env:
139+
Token: $(dn-bot-dnceng-artifact-feeds-rw)
122140

123141
- task: NuGetCommand@2
124142
displayName: Restore internal tools
125143
inputs:
126144
command: restore
127145
feedsToUse: config
128146
restoreSolution: 'eng\common\internal\Tools.csproj'
129-
nugetConfigPath: 'NuGet.config'
147+
nugetConfigPath: 'eng\common\internal\NuGet.config'
130148
restoreDirectory: '$(Build.SourcesDirectory)\.packages'
131149

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

‎NuGet.config

+7
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,13 @@
1313
<add key="dotnet8" value="https://dnceng.pkgs.visualstudio.com/public/_packaging/dotnet8/nuget/v3/index.json" />
1414
<add key="dotnet8-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8-transport/nuget/v3/index.json" />
1515
<add key="dotnet9" value="https://dnceng.pkgs.visualstudio.com/public/_packaging/dotnet9/nuget/v3/index.json" />
16+
<add key="vs-impl" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-impl/nuget/v3/index.json" />
17+
<!-- We don't want other than VS OpenTelemetry libraries from vs-impl -->
18+
<packageSourceMapping>
19+
<packageSource key="vs-impl">
20+
<package pattern="Microsoft.VisualStudio.OpenTelemetry*" />
21+
</packageSource>
22+
</packageSourceMapping>
1623
</packageSources>
1724
<disabledPackageSources>
1825
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->

‎THIRDPARTYNOTICES.txt

+37-8
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
MSBuild uses third-party material as listed below. The attached notices are
2-
provided for informational purposes only.
1+
MSBuild uses third-party material as listed below. The attached notices are
2+
provided for informational purposes only.
33

4-
Notice for LockCheck
4+
Notice for LockCheck
55
-------------------------------
66
The MIT License (MIT)
77

@@ -27,20 +27,49 @@ SOFTWARE.
2727

2828
-------------------------------
2929

30-
Notice for Samples for xUnit.net
30+
Notice for Samples for xUnit.net
3131
-------------------------------
3232

33-
Copyright (c) .NET Foundation and Contributors
33+
Copyright (c) .NET Foundation and Contributors
3434

35-
All Rights Reserved
35+
All Rights Reserved
3636

3737
Licensed under the Apache License, Version 2.0 (the "License"); you may not use
38-
this file except in compliance with the License.
38+
this file except in compliance with the License.
3939

40-
You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
40+
You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
4141

4242
Unless required by applicable law or agreed to in writing, software distributed
4343
under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
4444
CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
4545
language governing permissions and limitations under the License.
46+
47+
-------------------------------
48+
49+
Notice for OpenTelemetry .NET
50+
-------------------------------
51+
MSBuild.exe is distributed with OpenTelemetry .NET binaries.
52+
53+
Copyright (c) OpenTelemetry Authors
54+
Source: https://github.com/open-telemetry/opentelemetry-dotnet
55+
56+
Licensed under the Apache License, Version 2.0 (the "License");
57+
you may not use this file except in compliance with the License.
58+
You may obtain a copy of the License at
59+
60+
http://www.apache.org/licenses/LICENSE-2.0
61+
62+
Unless required by applicable law or agreed to in writing, software distributed
63+
under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
64+
CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
65+
language governing permissions and limitations under the License.
66+
67+
-------------------------------
68+
69+
Notice for Microsoft.VisualStudio.OpenTelemetry.*
4670
-------------------------------
71+
MSBuild.exe is distributed with Microsoft.VisualStudio.OpenTelemetry.* binaries.
72+
73+
Project: Microsoft.VisualStudio.OpenTelemetry
74+
Copyright: (c) Microsoft Corporation
75+
License: https://visualstudio.microsoft.com/license-terms/mt736442/

0 commit comments

Comments
 (0)