Skip to content

Commit ca5ec7e

Browse files
eerhardteerhardt
committed
Merge remote-tracking branch 'upstream/main' into hosting-json-schema-configuration
2 parents 2873b02 + 9757b4f commit ca5ec7e

File tree

1,152 files changed

+37058
-7774
lines changed

Some content is hidden

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

1,152 files changed

+37058
-7774
lines changed

‎.config/1espt/PipelineAutobaseliningConfig.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ pipelines:
1010
lastModifiedDate: 2024-03-19
1111
armory:
1212
lastModifiedDate: 2024-03-19
13+
policheck:
14+
lastModifiedDate: 2024-07-12
1315
binary:
1416
credscan:
1517
lastModifiedDate: 2024-03-19

‎.config/CredScanSuppressions.json‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,14 @@
2424
{
2525
"placeholder": "thisIsAFakeSecret",
2626
"_justification": "This isn't a real secret, it's used in one of the playground applications for testing purposes."
27+
},
28+
{
29+
"file": "\\tests\\Shared\\TestCertificates\\eku.client.pfx",
30+
"_justification": "Legitimate UT certificate file with private key, from dotnet/aspnetcore"
31+
},
32+
{
33+
"file": "\\tests\\Shared\\TestCertificates\\testCert.pfx",
34+
"_justification": "Legitimate UT certificate file with private key, from dotnet/aspnetcore"
2735
}
2836
]
2937
}

‎.config/PoliCheckExclusions.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<PoliCheckExclusions>
2+
<!-- https://eng.ms/docs/experiences-devices/customer-success-engineering/global/language-as-a-service/validationservices/policheck-for-microsoft/policheckclient/features/features#false-positive-management -->
3+
<Exclusion Type="FileName">plotly-2.32.0.min.js</Exclusion>
4+
</PoliCheckExclusions>

‎.config/dotnet-tools.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"isRoot": true,
44
"tools": {
55
"dotnet-coverage": {
6-
"version": "17.11.3",
6+
"version": "17.11.5",
77
"commands": [
88
"dotnet-coverage"
99
]
@@ -15,7 +15,7 @@
1515
]
1616
},
1717
"PowerShell": {
18-
"version": "7.4.3",
18+
"version": "7.4.4",
1919
"commands": [
2020
"pwsh"
2121
]

‎.config/guardian/.gdnbaselines‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
],
2222
"tool": "credscan",
2323
"ruleId": "CSCAN-GENERAL0020",
24-
"createdDate": "2024-03-19 20:44:19Z",
25-
"expirationDate": "2024-09-05 22:14:02Z",
26-
"justification": "This error is baselined with an expiration date of 180 days from 2024-03-19 22:14:02Z"
24+
"createdDate": "2024-07-12 14:58:00Z",
25+
"expirationDate": "2024-12-29 17:24:51Z",
26+
"justification": "This error is baselined with an expiration date of 180 days from 2024-07-12 17:24:51Z"
2727
},
2828
"33c7907352345498ee4bb7f5e1e60f06f2720758aec6ff819c9d5dc6668f5c4a": {
2929
"signature": "33c7907352345498ee4bb7f5e1e60f06f2720758aec6ff819c9d5dc6668f5c4a",
@@ -35,9 +35,9 @@
3535
],
3636
"tool": "credscan",
3737
"ruleId": "CSCAN-GENERAL0020",
38-
"createdDate": "2024-03-19 20:44:19Z",
39-
"expirationDate": "2024-09-05 22:14:02Z",
40-
"justification": "This error is baselined with an expiration date of 180 days from 2024-03-19 22:14:02Z"
38+
"createdDate": "2024-07-12 14:58:00Z",
39+
"expirationDate": "2024-12-29 17:24:51Z",
40+
"justification": "This error is baselined with an expiration date of 180 days from 2024-07-12 17:24:51Z"
4141
}
4242
}
4343
}

‎.config/tsaoptions.json‎

Lines changed: 10 additions & 0 deletions
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\\ASP.NET Core\\Policy Violations",
6+
"iterationPath": "DevDiv",
7+
"notificationAliases": [ "[email protected]" ],
8+
"repositoryName": "aspire",
9+
"codebaseName": "aspire"
10+
}

‎.editorconfig‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -476,3 +476,6 @@ dotnet_diagnostic.IDE0005.severity = silent
476476
[{*.razor.cs,src/Aspire.Dashboard/Components/**.cs}]
477477
# CA2007: Consider calling ConfigureAwait on the awaited task
478478
dotnet_diagnostic.CA2007.severity = silent
479+
480+
[*.{cs,vb}]
481+
dotnet_diagnostic.ASPIREEVENTING001.severity = none

‎.github/dependabot.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,18 +29,11 @@ updates:
2929
AspNetCoreHealthChecks:
3030
patterns:
3131
- "AspNetCore.HealthChecks.*"
32-
AspNetCore:
33-
patterns:
34-
- "Microsoft.AspNetCore.*"
35-
- "Microsoft.Extensions.Features"
3632
AWS:
3733
patterns:
3834
- "AWS.*"
3935
- "AWSSDK.*"
4036
- "OpenTelemetry.*.AWS"
41-
MicrosoftExtensions:
42-
patterns:
43-
- "Microsoft.Extensions.*"
4437
EntityFrameworkCore:
4538
patterns:
4639
- "Microsoft.EntityFrameworkCore.*"
@@ -50,6 +43,13 @@ updates:
5043
OpenTelemetry:
5144
patterns:
5245
- "OpenTelemetry.*"
46+
Orleans:
47+
patterns:
48+
- "Microsoft.Orleans*"
49+
NetPlatform:
50+
patterns:
51+
- "Microsoft.AspNetCore.*"
52+
- "Microsoft.Extensions.*"
5353
Npgsql:
5454
patterns:
5555
- "Npgsql.*"

‎.github/pull_request_template.md‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
## Description
2+
3+
Please include a summary of the changes and the related issue. Please also include relevant motivation and context. List any dependencies that are required for this change.
4+
5+
Fixes # (issue)
6+
7+
## Checklist
8+
9+
- Is this feature complete?
10+
- [ ] Yes. Ready to ship.
11+
- [ ] No. Follow-up changes expected.
12+
- Are you including unit tests for the changes and scenario tests if relevant?
13+
- [ ] Yes
14+
- [ ] No
15+
- Did you add public API?
16+
- [ ] Yes
17+
- If yes, did you have an API Review for it?
18+
- [ ] Yes
19+
- [ ] No
20+
- Did you add `<remarks />` and `<code />` elements on your triple slash comments?
21+
- [ ] Yes
22+
- [ ] No
23+
- [ ] No
24+
- Does the change make any security assumptions or guarantees?
25+
- [ ] Yes
26+
- If yes, have you done a threat model and had a security review?
27+
- [ ] Yes
28+
- [ ] No
29+
- [ ] No
30+
- Does the change require an update in our Aspire docs?
31+
- [ ] Yes
32+
- Link to aspire-docs issue:
33+
- [ ] No

0 commit comments

Comments
 (0)