Skip to content

Commit 3741c1a

Browse files
GangWang01GangWang01
authored
Merge branch 'vs17.13' into merge/vs17.12-to-vs17.13
2 parents 8314f8f + 90ed697 commit 3741c1a

File tree

931 files changed

+9995
-202850
lines changed

Some content is hidden

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

931 files changed

+9995
-202850
lines changed

‎.config/1espt/PipelineAutobaseliningConfig.yml

+21-1
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,30 @@ pipelines:
1212
lastModifiedDate: 2024-03-14
1313
armory:
1414
lastModifiedDate: 2024-03-14
15+
policheck:
16+
lastModifiedDate: 2024-10-09
1517
binary:
1618
credscan:
1719
lastModifiedDate: 2024-03-14
1820
binskim:
21+
lastModifiedDate: 2024-11-27
22+
spotbugs:
1923
lastModifiedDate: 2024-03-14
24+
24295:
25+
retail:
26+
source:
27+
credscan:
28+
lastModifiedDate: 2024-11-06
29+
eslint:
30+
lastModifiedDate: 2024-11-06
31+
psscriptanalyzer:
32+
lastModifiedDate: 2024-11-06
33+
armory:
34+
lastModifiedDate: 2024-11-06
35+
binary:
36+
credscan:
37+
lastModifiedDate: 2024-11-06
38+
binskim:
39+
lastModifiedDate: 2024-11-21
2040
spotbugs:
21-
lastModifiedDate: 2024-03-14
41+
lastModifiedDate: 2024-11-06

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

+5-1
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,12 @@
2626
"vs17.10": {
2727
"MergeToBranch": "vs17.11"
2828
},
29-
// MSBuild latest release to main
29+
// Automate opening PRs to merge msbuild's vs17.11 (SDK 8.0.4xx) into vs17.12 (SDK 9.0.1xx)
3030
"vs17.11": {
31+
"MergeToBranch": "vs17.12"
32+
},
33+
// MSBuild latest release to main
34+
"vs17.12": {
3135
"MergeToBranch": "main"
3236
}
3337
}

‎.config/guardian/.gdnbaselines

+68-54
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,68 @@
1-
{
2-
"properties": {
3-
"helpUri": "https://eng.ms/docs/microsoft-security/security/azure-security/cloudai-security-fundamentals-engineering/security-integration/guardian-wiki/microsoft-guardian/general/baselines"
4-
},
5-
"version": "1.0.0",
6-
"baselines": {
7-
"default": {
8-
"name": "default",
9-
"createdDate": "2024-03-14 11:30:33Z",
10-
"lastUpdatedDate": "2024-03-14 11:30:33Z"
11-
}
12-
},
13-
"results": {
14-
"24491acb7bf0f8b072d9fbd2f6efcf1bdf6e9506ff3f7a9f9c803445c55b7bd9": {
15-
"signature": "24491acb7bf0f8b072d9fbd2f6efcf1bdf6e9506ff3f7a9f9c803445c55b7bd9",
16-
"alternativeSignatures": [
17-
"2dc3f5f5423a151deb6a74413f2798ade061c1f50519daeed42acfd2caebed03"
18-
],
19-
"target": ".packages/drop.app/18.165.29912-buildid11693003/lib/net45/ContentStoreApp.Full/x64/BuildXLAria.dll",
20-
"memberOf": [
21-
"default"
22-
],
23-
"tool": "binskim",
24-
"ruleId": "BA2008",
25-
"createdDate": "2024-06-19 17:22:41Z"
26-
},
27-
"1dc1a6797e20d1319df1cb8d4df5c6f6194ce4e87151bf801fb9bf2d038ccfaf": {
28-
"signature": "1dc1a6797e20d1319df1cb8d4df5c6f6194ce4e87151bf801fb9bf2d038ccfaf",
29-
"alternativeSignatures": [
30-
"f52bc24a2feebdcb7b1192ac2debea8da9ca5d012a6719e905b16f979711ceca"
31-
],
32-
"target": ".packages/drop.app/18.165.29912-buildid11693003/lib/net45/ContentStoreApp.Full/x64/BuildXLNatives.dll",
33-
"memberOf": [
34-
"default"
35-
],
36-
"tool": "binskim",
37-
"ruleId": "BA2008",
38-
"createdDate": "2024-06-19 17:22:41Z"
39-
},
40-
"5bf3f552d54adcae12d7f1e79d47b5a9392c774f03943793cd1a0f7bb2eef28b": {
41-
"signature": "5bf3f552d54adcae12d7f1e79d47b5a9392c774f03943793cd1a0f7bb2eef28b",
42-
"alternativeSignatures": [
43-
"ea4d59d18cbff7ffab4bb678927fc6fee763539a51cfbf5aae60ae1b8123a6ba"
44-
],
45-
"target": ".packages/drop.app/18.165.29912-buildid11693003/lib/net45/ContentStoreApp.Full/x64/ClientTelemetry.dll",
46-
"memberOf": [
47-
"default"
48-
],
49-
"tool": "binskim",
50-
"ruleId": "BA2007",
51-
"createdDate": "2024-06-19 17:22:41Z"
52-
}
53-
}
54-
}
1+
{
2+
"properties": {
3+
"helpUri": "https://eng.ms/docs/microsoft-security/security/azure-security/cloudai-security-fundamentals-engineering/security-integration/guardian-wiki/microsoft-guardian/general/baselines"
4+
},
5+
"version": "1.0.0",
6+
"baselines": {
7+
"default": {
8+
"name": "default",
9+
"createdDate": "2024-03-14 11:30:33Z",
10+
"lastUpdatedDate": "2024-03-14 11:30:33Z"
11+
}
12+
},
13+
"results": {
14+
"24491acb7bf0f8b072d9fbd2f6efcf1bdf6e9506ff3f7a9f9c803445c55b7bd9": {
15+
"signature": "24491acb7bf0f8b072d9fbd2f6efcf1bdf6e9506ff3f7a9f9c803445c55b7bd9",
16+
"alternativeSignatures": [
17+
"2dc3f5f5423a151deb6a74413f2798ade061c1f50519daeed42acfd2caebed03"
18+
],
19+
"target": ".packages/drop.app/18.165.29912-buildid11693003/lib/net45/ContentStoreApp.Full/x64/BuildXLAria.dll",
20+
"memberOf": [
21+
"default"
22+
],
23+
"tool": "binskim",
24+
"ruleId": "BA2008",
25+
"createdDate": "2024-06-19 17:22:41Z"
26+
},
27+
"1dc1a6797e20d1319df1cb8d4df5c6f6194ce4e87151bf801fb9bf2d038ccfaf": {
28+
"signature": "1dc1a6797e20d1319df1cb8d4df5c6f6194ce4e87151bf801fb9bf2d038ccfaf",
29+
"alternativeSignatures": [
30+
"f52bc24a2feebdcb7b1192ac2debea8da9ca5d012a6719e905b16f979711ceca"
31+
],
32+
"target": ".packages/drop.app/18.165.29912-buildid11693003/lib/net45/ContentStoreApp.Full/x64/BuildXLNatives.dll",
33+
"memberOf": [
34+
"default"
35+
],
36+
"tool": "binskim",
37+
"ruleId": "BA2008",
38+
"createdDate": "2024-06-19 17:22:41Z"
39+
},
40+
"5bf3f552d54adcae12d7f1e79d47b5a9392c774f03943793cd1a0f7bb2eef28b": {
41+
"signature": "5bf3f552d54adcae12d7f1e79d47b5a9392c774f03943793cd1a0f7bb2eef28b",
42+
"alternativeSignatures": [
43+
"ea4d59d18cbff7ffab4bb678927fc6fee763539a51cfbf5aae60ae1b8123a6ba"
44+
],
45+
"target": ".packages/drop.app/18.165.29912-buildid11693003/lib/net45/ContentStoreApp.Full/x64/ClientTelemetry.dll",
46+
"memberOf": [
47+
"default"
48+
],
49+
"tool": "binskim",
50+
"ruleId": "BA2007",
51+
"createdDate": "2024-06-19 17:22:41Z"
52+
},
53+
"1757d0179485ad6618415e151de2453f25d5484071f7bae328fa9ca9d4d54688": {
54+
"signature": "1757d0179485ad6618415e151de2453f25d5484071f7bae328fa9ca9d4d54688",
55+
"alternativeSignatures": [],
56+
"target": "src/Tasks.UnitTests/TestResources/mycert.pfx",
57+
"line": 1,
58+
"memberOf": [
59+
"default"
60+
],
61+
"tool": "credscan",
62+
"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"
66+
}
67+
}
68+
}

‎.config/tsaoptions.json

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"instanceUrl": "https://devdiv.visualstudio.com/",
3+
"template": "TFSDEVDIV",
4+
"projectName": "DEVDIV",
5+
"areaPath": "DevDiv\\NET Tools\\MSBuild",
6+
"iterationPath": "DevDiv",
7+
"notificationAliases": [ "msbtm@microsoft.com" ],
8+
"repositoryName": "MSBuild",
9+
"codebaseName": "MSBuild"
10+
}

‎.github/CODEOWNERS

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
# Users referenced in this file will automatically be requested as reviewers for PRs that modify the given paths.
22
# See https://help.github.com/articles/about-code-owners/
33

4-
/eng/SourceBuild* @dotnet/source-build-internal
4+
/eng/DotNetBuild.props @dotnet/product-construction
5+
/eng/SourceBuild* @dotnet/source-build
56
/eng/ @dotnet/kitten
67
/.github/ @dotnet/kitten
78
/global.json @dotnet/kitten

‎.github/ISSUE_TEMPLATE/01_bugreport.yml

+9-10
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
name: 🐞 Bug Report
22
description: Report a bug to help us improve MSBuild.
3-
title: "[Bug]: "
4-
labels: ["bug"]
3+
type: 'Bug'
54
body:
65
- type: textarea
76
attributes:
@@ -12,17 +11,17 @@ body:
1211
- type: textarea
1312
attributes:
1413
label: Steps to Reproduce
15-
description: |
16-
Include as much of the following as possible:
17-
* a minimal sample project that reproduces the issue,
18-
* your zipped project,
19-
* IDE / CLI steps to create the project and reproduce the behaviour,
14+
description: |
15+
Include as much of the following as possible:
16+
* a minimal sample project that reproduces the issue,
17+
* your zipped project,
18+
* IDE / CLI steps to create the project and reproduce the behaviour,
2019
* your command line invocation.
21-
20+
2221
If providing steps to reproduce the issue proves difficult, consider attaching a binlog:
2322
* [Details on sharing binary logs](https://aka.ms/msbuild/binlog)
2423
* [More information on binary logs](https://github.com/dotnet/msbuild/blob/main/documentation/wiki/Binary-Log.md)
25-
24+
2625
NOTE: Binary logs capture environment information. Ensure it does not include any information you don't want to be public before you attach one.
2726
If you want to share one just with Microsoft, you can [report a problem through Visual Studio](https://developercommunity.visualstudio.com/report) and share it privately with Microsoft.
2827
validations:
@@ -49,4 +48,4 @@ body:
4948
description: |
5049
In a Visual Studio developer command prompt, run `msbuild -version` and paste the output here.
5150
If applicable, include the version of the tool that invokes MSBuild (Visual Studio, dotnet CLI, etc).
52-
Post any other relevant configuration settings here: OS, architecture, etc.
51+
Post any other relevant configuration settings here: OS, architecture, etc.

‎.github/ISSUE_TEMPLATE/02_performanceissue.yml

+9-8
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ name: 📉 Performance Issue
22
description: Report a performance issue or regression.
33
title: "[Performance]: "
44
labels: ["performance"]
5+
type: 'Bug'
56
body:
67
- type: textarea
78
attributes:
@@ -12,17 +13,17 @@ body:
1213
- type: textarea
1314
attributes:
1415
label: Steps to Reproduce
15-
description: |
16-
Include as much of the following as possible:
17-
* a minimal sample project that reproduces the issue,
18-
* your zipped project,
19-
* IDE / CLI steps to create the project and reproduce the behaviour,
16+
description: |
17+
Include as much of the following as possible:
18+
* a minimal sample project that reproduces the issue,
19+
* your zipped project,
20+
* IDE / CLI steps to create the project and reproduce the behaviour,
2021
* your command line invocation.
21-
22+
2223
If providing steps to reproduce the issue proves difficult, consider attaching a binlog:
2324
* [Details on sharing binary logs](https://aka.ms/msbuild/binlog)
2425
* [More information on binary logs](https://github.com/dotnet/msbuild/blob/main/documentation/wiki/Binary-Log.md)
25-
26+
2627
NOTE: Binary logs capture environment information. Ensure it does not include any information you don't want to be public before you attach one.
2728
If you want to share one just with Microsoft, you can [report a problem through Visual Studio](https://developercommunity.visualstudio.com/report) and share it privately with Microsoft.
2829
validations:
@@ -64,4 +65,4 @@ body:
6465
attributes:
6566
label: Regression Details
6667
description: |
67-
Please provide details on regression: what version of MSBuild or VS were you using before the regression?
68+
Please provide details on regression: what version of MSBuild or VS were you using before the regression?

‎.github/ISSUE_TEMPLATE/05_unhandledexception.yml

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: 😱 Unhandled Exception
22
description: Reporting holes in our bug reporting system
33
title: "[Unhandled Exception]: "
4-
labels: ["bug"]
4+
type: 'Bug'
55
body:
66
- type: textarea
77
attributes:
@@ -12,17 +12,17 @@ body:
1212
- type: textarea
1313
attributes:
1414
label: Steps to Reproduce
15-
description: |
16-
Include as much of the following as possible:
17-
* a minimal sample project that reproduces the issue,
18-
* your zipped project,
19-
* IDE / CLI steps to create the project and reproduce the behaviour,
15+
description: |
16+
Include as much of the following as possible:
17+
* a minimal sample project that reproduces the issue,
18+
* your zipped project,
19+
* IDE / CLI steps to create the project and reproduce the behaviour,
2020
* your command line invocation.
21-
21+
2222
If providing steps to reproduce the issue proves difficult, consider attaching a binlog:
2323
* [Details on sharing binary logs](https://aka.ms/msbuild/binlog)
2424
* [More information on binary logs](https://github.com/dotnet/msbuild/blob/main/documentation/wiki/Binary-Log.md)
25-
25+
2626
NOTE: Binary logs capture environment information. Ensure it does not include any information you don't want to be public before you attach one.
2727
If you want to share one just with Microsoft, you can [report a problem through Visual Studio](https://developercommunity.visualstudio.com/report) and share it privately with Microsoft.
2828
validations:
@@ -44,4 +44,4 @@ body:
4444
description: |
4545
In a Visual Studio developer command prompt, run `msbuild -version` and paste the output here.
4646
If applicable, include the version of the tool that invokes MSBuild (Visual Studio, dotnet CLI, etc).
47-
Post any other relevant configuration settings here: OS, architecture, etc.
47+
Post any other relevant configuration settings here: OS, architecture, etc.

‎.github/ISSUE_TEMPLATE/06_feature_request.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
name: 💡 Feature Request
22
description: Suggest an idea for this project.
3-
title: "[Feature Request]: "
4-
labels: ["Feature Request"]
3+
type: 'Feature'
54
body:
65
- type: textarea
76
attributes:

‎.github/ISSUE_TEMPLATE/07_buildchecksuggestion.yml

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ name: 💡 BuildCheck Suggestion
22
description: Suggesting a diagnostic check (AKA [BuildCheck](https://github.com/dotnet/msbuild/blob/main/documentation/specs/BuildCheck/BuildCheck.md)) that MSBuild could provide.
33
title: "[BuildCheck Suggestion]: "
44
labels: ["BuildCheck Suggestion", "Area: BuildCheck"]
5+
type: 'Feature'
56
body:
67
- type: textarea
78
attributes:

‎.vsts-dotnet.yml

+7-18
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,9 @@ variables:
3434
- name: SourceBranch
3535
value: ''
3636
- name: EnableReleaseOneLocBuild
37-
value: false # Disable loc for vs17.12
37+
value: true # Enable loc for vs17.13
3838
- name: Codeql.Enabled
3939
value: true
40-
- group: DotNet-MSBuild-SDLValidation-Params
4140
- group: AzureDevOps-Artifact-Feeds-Pats
4241
- name: cfsNugetWarnLevel
4342
value: warn
@@ -61,6 +60,11 @@ extends:
6160
name: VSEngSS-MicroBuild2022-1ES
6261
os: windows
6362
sdl:
63+
policheck:
64+
enabled: true
65+
exclusionsFile: $(Build.SourcesDirectory)\eng\policheck_exclusions.xml
66+
tsa:
67+
enabled: true
6468
# We generate SBOM ourselves, so don't need steps injected by 1ES.
6569
sbom:
6670
enabled: false
@@ -115,7 +119,7 @@ extends:
115119
- name: VisualStudio.MajorVersion
116120
value: 17
117121
- name: VisualStudio.ChannelName
118-
value: 'int.d17.12' # MSBuild's vs17.12 branch corresponds to this VS channel
122+
value: 'int.d17.13' # MSBuild's vs17.13 branch corresponds to this VS channel
119123
- name: VisualStudio.DropName
120124
value: Products/$(System.TeamProject)/$(Build.Repository.Name)/$(Build.SourceBranchName)/$(Build.BuildNumber)
121125

@@ -324,18 +328,3 @@ extends:
324328
enableSymbolValidation: true
325329
enableSourceLinkValidation: false
326330
enableNugetValidation: false
327-
SDLValidationParameters:
328-
enable: true
329-
continueOnError: false
330-
params: ' -SourceToolsList @("policheck","credscan")
331-
-TsaInstanceURL "$(_TsaInstanceURL)"
332-
-TsaProjectName "$(_TsaProjectName)"
333-
-TsaNotificationEmail "$(_TsaNotificationEmail)"
334-
-TsaCodebaseAdmin "$(_TsaCodebaseAdmin)"
335-
-TsaBugAreaPath "$(_TsaBugAreaPath)"
336-
-TsaIterationPath "$(_TsaIterationPath)"
337-
-TsaRepositoryName "dotnet-msbuild"
338-
-TsaCodebaseName "dotnet-msbuild"
339-
-TsaPublish $True
340-
-CrScanAdditionalRunConfigParams @("SuppressionsPath < $(Build.SourcesDirectory)\eng\CredScanSuppressions.json")
341-
-PoliCheckAdditionalRunConfigParams @("UserExclusionPath < $(Build.SourcesDirectory)\eng\policheck_exclusions.xml")'

0 commit comments

Comments
 (0)