Skip to content

Commit 70df276

Browse files
authoredFeb 25, 2025··
Merge branch 'vs17.12' into merge/vs17.11-to-vs17.12
2 parents b4a2592 + 8c9f84e commit 70df276

File tree

659 files changed

+22256
-12014
lines changed

Some content is hidden

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

659 files changed

+22256
-12014
lines changed
 

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

+34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
// IMPORTANT: This file is read by the merge flow from main branch only.
2+
{
3+
"merge-flow-configurations": {
4+
// MSBuild servicing chain from oldest supported through currently-supported to main
5+
// Automate opening PRs to merge msbuild's vs16.11 (VS until 4/2029) into vs17.0 (SDK 6.0.1xx)
6+
"vs16.11": {
7+
"MergeToBranch": "vs17.0"
8+
},
9+
// Automate opening PRs to merge msbuild's vs17.0 (SDK 6.0.1xx) into vs17.3 (SDK 6.0.4xx)
10+
"vs17.0": {
11+
"MergeToBranch": "vs17.3"
12+
},
13+
// Automate opening PRs to merge msbuild's vs17.3 (SDK 6.0.4xx) into vs17.6 (VS until 1/2025)
14+
"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": {
19+
"MergeToBranch": "vs17.8"
20+
},
21+
// Automate opening PRs to merge msbuild's vs17.8 (SDK 8.0.1xx) into vs17.10 (SDK 8.0.3xx)
22+
"vs17.8": {
23+
"MergeToBranch": "vs17.10"
24+
},
25+
// Automate opening PRs to merge msbuild's vs17.10 (SDK 8.0.3xx) into vs17.11 (SDK 8.0.4xx)
26+
"vs17.10": {
27+
"MergeToBranch": "vs17.11"
28+
},
29+
// MSBuild latest release to main
30+
"vs17.11": {
31+
"MergeToBranch": "main"
32+
}
33+
}
34+
}

‎.config/guardian/.gdnbaselines

-42
Original file line numberDiff line numberDiff line change
@@ -11,48 +11,6 @@
1111
}
1212
},
1313
"results": {
14-
"1757d0179485ad6618415e151de2453f25d5484071f7bae328fa9ca9d4d54688": {
15-
"signature": "1757d0179485ad6618415e151de2453f25d5484071f7bae328fa9ca9d4d54688",
16-
"alternativeSignatures": [],
17-
"target": "src/Tasks.UnitTests/TestResources/mycert.pfx",
18-
"line": 1,
19-
"memberOf": [
20-
"default"
21-
],
22-
"tool": "credscan",
23-
"ruleId": "CSCAN-GENERAL0020",
24-
"createdDate": "2024-03-14 11:30:33Z",
25-
"expirationDate": "2024-08-31 12:48:32Z",
26-
"justification": "This error is baselined with an expiration date of 180 days from 2024-03-14 12:48:32Z"
27-
},
28-
"60d4d52e838e08dc19d3ac2b43b7c809b080db55f9c754b80bd60f30624e9687": {
29-
"signature": "60d4d52e838e08dc19d3ac2b43b7c809b080db55f9c754b80bd60f30624e9687",
30-
"alternativeSignatures": [],
31-
"target": "artifacts/bin/Microsoft.Build.Tasks.UnitTests/Release/net472/TestResources/mycert.pfx",
32-
"line": 1,
33-
"memberOf": [
34-
"default"
35-
],
36-
"tool": "credscan",
37-
"ruleId": "CSCAN-GENERAL0020",
38-
"createdDate": "2024-03-14 12:01:14Z",
39-
"expirationDate": "2024-08-31 12:48:32Z",
40-
"justification": "This error is baselined with an expiration date of 180 days from 2024-03-14 12:48:32Z"
41-
},
42-
"7cb5d42a8744e4a214149aa27d3d8a1b7989914d1a2fee8cea13287368cbafff": {
43-
"signature": "7cb5d42a8744e4a214149aa27d3d8a1b7989914d1a2fee8cea13287368cbafff",
44-
"alternativeSignatures": [],
45-
"target": "artifacts/bin/Microsoft.Build.Tasks.UnitTests/Release/net8.0/TestResources/mycert.pfx",
46-
"line": 1,
47-
"memberOf": [
48-
"default"
49-
],
50-
"tool": "credscan",
51-
"ruleId": "CSCAN-GENERAL0020",
52-
"createdDate": "2024-03-14 12:01:14Z",
53-
"expirationDate": "2024-08-31 12:48:32Z",
54-
"justification": "This error is baselined with an expiration date of 180 days from 2024-03-14 12:48:32Z"
55-
},
5614
"24491acb7bf0f8b072d9fbd2f6efcf1bdf6e9506ff3f7a9f9c803445c55b7bd9": {
5715
"signature": "24491acb7bf0f8b072d9fbd2f6efcf1bdf6e9506ff3f7a9f9c803445c55b7bd9",
5816
"alternativeSignatures": [

0 commit comments

Comments
 (0)
Please sign in to comment.