Skip to content

Commit 3b1bde2

Browse files
authored
Merge branch 'main' into transform-select-to-sar-add
2 parents f6e57c0 + 9f85e5d commit 3b1bde2

646 files changed

Lines changed: 21568 additions & 5068 deletions

File tree

Some content is hidden

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

.CodeQL.yml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,27 @@ queries:
3131
# APIs. Those call sites are well-reviewed and don't benefit from extra alerts regarding
3232
# the possibility of loading malicious code.
3333
- "cs/deserialization-unexpected-subtypes"
34+
#
35+
# Don't warn about usage of non-compliant crypto within our own implementations or interop code,
36+
# since the rule would noisily try to warn us about *ourselves*. These exclusions are scoped
37+
# to just the crypto code itself. We still want alerts when consumers of crypto (even within this
38+
# repo) try to use non-compliant primitives; those call sites must be manually inspected
39+
# and suppressed if appropriate.
40+
#
41+
- exclude:
42+
queryid:
43+
- "cs/ecb-encryption"
44+
- "cs/encryption-with-vulnerable-cipher-mode"
45+
- "cs/weak-symmetric-algorithm"
46+
- "cs/obsolete-password-key-derivation"
47+
- "cs/cryptography/unapproved-usage-of-dsa"
48+
- "cs/weak-crypto"
49+
- "cs/weak-hmacs"
50+
- "java/weak-crypto-algorithm-or-hash"
51+
path:
52+
- "src/libraries/Common/src/Interop/Windows/BCrypt/**"
53+
- "src/libraries/Common/src/System/Security/Cryptography/**"
54+
- "src/libraries/Microsoft.Bcl.Cryptography/**"
55+
- "src/libraries/System.Security.Cryptography/**"
56+
- "src/libraries/System.Security.Cryptography.*/**"
57+
- "src/native/libs/System.Security.Cryptography.*/**"

.config/dotnet-tools.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
]
1616
},
1717
"microsoft.dotnet.xharness.cli": {
18-
"version": "11.0.0-prerelease.26064.3",
18+
"version": "11.0.0-prerelease.26160.2",
1919
"commands": [
2020
"xharness"
2121
]

.editorconfig

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,10 @@ csharp_space_between_square_brackets = false
165165
# License header
166166
file_header_template = Licensed to the .NET Foundation under one or more agreements.\nThe .NET Foundation licenses this file to you under the MIT license.
167167

168+
# xUnit1051: recommends TestContext.Current.CancellationToken (v3 pattern) which
169+
# is not yet adopted; suppress until a full v3 migration is performed.
170+
dotnet_diagnostic.xUnit1051.severity = none
171+
168172
[src/libraries/System.Net.Http/src/System/Net/Http/{SocketsHttpHandler/Http3RequestStream.cs,BrowserHttpHandler/BrowserHttpHandler.cs}]
169173
# disable CA2025, the analyzer throws a NullReferenceException when processing this file: https://github.com/dotnet/roslyn-analyzers/issues/7652
170174
dotnet_diagnostic.CA2025.severity = none

.github/copilot-instructions.md

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@ You MUST make your best effort to ensure any code changes satisfy those criteria
88

99
If you make code changes, do not complete without checking the relevant code builds and relevant tests still pass after the last edits you make. Do not simply assume that your changes fix test failures you see, actually build and run those tests again to confirm.
1010

11-
Before completing, use the `code-review` skill to review your code changes. Any issues flagged as errors or warnings should be addressed before completing.
11+
When running under CCA and before completing, use the `code-review` skill to review your code changes. Any issues flagged as errors or warnings should be addressed before the task is considered complete.
12+
13+
When NOT running under CCA, skip the `code-review` skill if the user has stated they will review the changes themselves.
1214

1315
Before making changes to a directory, search for `README.md` files in that directory and its parent directories up to the repository root. Read any you find — they contain conventions, patterns, and architectural context relevant to your work.
1416

@@ -38,6 +40,13 @@ In addition to the rules enforced by `.editorconfig`, you SHOULD:
3840
- For markdown (`.md`) files, ensure there is no trailing whitespace at the end of any line.
3941
- When adding XML documentation to APIs, follow the guidelines at [`docs.prompt.md`](/.github/prompts/docs.prompt.md).
4042

43+
When NOT running under CCA, guidance for creating commits and pushing changes:
44+
45+
- Never squash and force push unless explicitly instructed. Always push incremental commits on top of previous PR changes.
46+
- Never push to an active PR without being explicitly asked, even in autopilot/yolo mode. Always wait for explicit instruction to push.
47+
- Never chain commit and push in the same command. Always commit first, report what was committed, then wait for an explicit push instruction. This creates a mandatory decision point.
48+
- Prefer creating a new commit rather than amending an existing one. Exceptions: (1) explicitly asked to amend, or (2) the existing commit is obviously broken with something minor (e.g., typo or comment fix) and hasn't been pushed yet.
49+
4150
---
4251

4352
# Building & Testing in dotnet/runtime

THIRD-PARTY-NOTICES.TXT

Lines changed: 34 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ License notice for ASP.NET
1212
-------------------------------
1313

1414
Copyright (c) .NET Foundation. All rights reserved.
15-
Licensed under the Apache License, Version 2.0.
15+
Licensed under the MIT License (MIT)
1616

1717
Available at
1818
https://github.com/dotnet/aspnetcore/blob/main/LICENSE.txt
@@ -1424,3 +1424,36 @@ NIST-developed software is expressly provided "AS IS." NIST MAKES NO WARRANTY OF
14241424

14251425
You are solely responsible for determining the appropriateness of using and distributing the software and you assume all risks associated with its use, including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and the unavailability or interruption of operation. This software is not intended to be used in any situation where a failure could cause risk of injury or damage to property. The software developed by NIST employees is not subject to copyright protection within the United States.
14261426

1427+
License notice for ANTLR 4
1428+
-------------------------------
1429+
1430+
https://github.com/antlr/antlr4
1431+
1432+
Copyright (c) 2012-2022 The ANTLR Project. All rights reserved.
1433+
1434+
Redistribution and use in source and binary forms, with or without
1435+
modification, are permitted provided that the following conditions
1436+
are met:
1437+
1438+
1. Redistributions of source code must retain the above copyright
1439+
notice, this list of conditions and the following disclaimer.
1440+
1441+
2. Redistributions in binary form must reproduce the above copyright
1442+
notice, this list of conditions and the following disclaimer in the
1443+
documentation and/or other materials provided with the distribution.
1444+
1445+
3. Neither name of copyright holders nor the names of its contributors
1446+
may be used to endorse or promote products derived from this software
1447+
without specific prior written permission.
1448+
1449+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
1450+
``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
1451+
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
1452+
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR
1453+
CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
1454+
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
1455+
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
1456+
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
1457+
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
1458+
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
1459+
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

docs/design/coreclr/botr/clr-abi.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@ To return `Continuation` we use a volatile/calee-trash register that cannot be u
116116
| arm | r2 |
117117
| arm64 | x2 |
118118
| risc-v | a2 |
119+
| loongarch64 | a2 |
119120

120121
### Passing `Continuation` argument
121122
The `Continuation` parameter is passed at the same position as generic instantiation parameter or immediately after, if both present. For x86 the argument order is reversed.

0 commit comments

Comments
 (0)