Skip to content

[pull] main from dotnet:main #637

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 6 commits into from
Feb 5, 2026
Merged

[pull] main from dotnet:main #637

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
76f6d85
Remove unused method signatures from corelib and metasig headers (#12…
AaronRobinsonMSFT Feb 5, 2026
9995ebd
Fix indentation and formatting inconsistencies in .json files (#11946…
amritanand-py Feb 5, 2026
7cd3d5e
Reduce the amount of string copying and comparing when resolving asse…
elinor-fung Feb 5, 2026
3bce8ab
Sve2: Add ShiftRightLogicalNarrowingSaturate(Even|Odd) (#123888)
a74nh Feb 5, 2026
c8e2a61
[mono] read `$DOTNET_STARTUP_HOOKS` (#123964)
jonathanpeppers Feb 5, 2026
68edce3
[EventPipe] Add dotnet_ipc_created mapping (#123779)
mdh1418 Feb 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 17 additions & 17 deletions .config/CredScanSuppressions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
{
"tool": "Credential Scanner",
"suppressions": [
{
"_justification": "Suppression approved. Private key for testing purpose.",
"file": [
"src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/DSA/DSAKeyPemTests.cs",
"src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/EC/ECKeyPemTests.cs",
"src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/RSA/RSAKeyPemTests.cs",
"src/libraries/Common/tests/System/Security/Cryptography/X509Certificates/TestData.cs",
"src/libraries/System.Security.Cryptography/tests/X509Certificates/X509Certificate2PemTests.cs"
],
"placeholder": [
"-----BEGIN PRIVATE KEY-----",
"-----BEGIN * PRIVATE KEY-----"
]
}
]
"tool": "Credential Scanner",
"suppressions": [
{
"_justification": "Suppression approved. Private key for testing purpose.",
"file": [
"src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/DSA/DSAKeyPemTests.cs",
"src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/EC/ECKeyPemTests.cs",
"src/libraries/Common/tests/System/Security/Cryptography/AlgorithmImplementations/RSA/RSAKeyPemTests.cs",
"src/libraries/Common/tests/System/Security/Cryptography/X509Certificates/TestData.cs",
"src/libraries/System.Security.Cryptography/tests/X509Certificates/X509Certificate2PemTests.cs"
],
"placeholder": [
"-----BEGIN PRIVATE KEY-----",
"-----BEGIN * PRIVATE KEY-----"
]
}
]
}
26 changes: 13 additions & 13 deletions .github/workflows/markdownlint-problem-matcher.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
{
"problemMatcher": [
"problemMatcher": [
{
"owner": "markdownlint",
"pattern": [
{
"owner": "markdownlint",
"pattern": [
{
"regexp": "^([^:]*):(\\d+):?(\\d+)?\\s([\\w-\\/]*)\\s(.*)$",
"file": 1,
"line": 2,
"column": 3,
"code": 4,
"message": 5
}
]
"regexp": "^([^:]*):(\\d+):?(\\d+)?\\s([\\w-\\/]*)\\s(.*)$",
"file": 1,
"line": 2,
"column": 3,
"code": 4,
"message": 5
}
]
]
}
]
}
8 changes: 4 additions & 4 deletions .markdownlint.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"default": false,
"MD009": {
"br_spaces": 0
},
"default": false,
"MD009": {
"br_spaces": 0
}
}
36 changes: 18 additions & 18 deletions eng/native/signing/auth.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
{
"Version" : "1.0.0",
"AuthenticationType" : "AAD_MSI_WIF",
"TenantId" : "975f013f-7f24-47e8-a7d3-abc4752bf346",
"ClientId" : "22346933-af99-4e94-97d5-7fa1dcf4bba6",
"EsrpClientId": "22346933-af99-4e94-97d5-7fa1dcf4bba6",
"RequestSigningCert" :
{
"GetCertFromKeyVault" : true,
"KeyVaultName": "clrdiag-esrp-pme",
"KeyVaultCertName": "dac-dnceng-esrpclient-cert",
"SendX5c": false,
"WithAzureRegion": false,
"StoreLocation": null,
"StoreName": null,
"SubjectName": null
},
"OAuthToken": null,
"FederatedTokenData": {}
"Version": "1.0.0",
"AuthenticationType": "AAD_MSI_WIF",
"TenantId": "975f013f-7f24-47e8-a7d3-abc4752bf346",
"ClientId": "22346933-af99-4e94-97d5-7fa1dcf4bba6",
"EsrpClientId": "22346933-af99-4e94-97d5-7fa1dcf4bba6",
"RequestSigningCert":
{
"GetCertFromKeyVault": true,
"KeyVaultName": "clrdiag-esrp-pme",
"KeyVaultCertName": "dac-dnceng-esrpclient-cert",
"SendX5c": false,
"WithAzureRegion": false,
"StoreLocation": null,
"StoreName": null,
"SubjectName": null
},
"OAuthToken": null,
"FederatedTokenData": {}
}
8 changes: 4 additions & 4 deletions eng/native/signing/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"Version" : "1.0.0",
"MaxDegreeOfParallelism" : 50,
"ExponentialRetryCount" : 5,
"EsrpSessionTimeoutInSec" : 1800
"Version": "1.0.0",
"MaxDegreeOfParallelism": 50,
"ExponentialRetryCount": 5,
"EsrpSessionTimeoutInSec": 1800
}
65 changes: 32 additions & 33 deletions eng/native/signing/input.template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,36 +1,35 @@
{
"Version": "1.0.0",
"UseMinimatch" : false,
"SignBatches": [
{
"SigningInfo" : {
"Operations" : [
{
"keyCode": "CP-471322",
"operationCode": "SigntoolSign",
"parameters": {
"OpusName": "Microsoft",
"OpusInfo": "http://www.microsoft.com",
"PageHash": "/NPH",
"FileDigest": "/fd sha256",
"TimeStamp": "/tr \"http://rfc3161.gtm.corp.microsoft.com/TSS/HttpTspServer\" /td sha256"
},
"toolName": "sign",
"toolVersion": "1.0"
},
{
"KeyCode": "CP-471322",
"OperationCode": "SigntoolVerify",
"Parameters": {},
"ToolName": "sign",
"ToolVersion": "1.0"
}
]
"Version": "1.0.0",
"UseMinimatch": false,
"SignBatches": [
{
"SigningInfo": {
"Operations": [
{
"keyCode": "CP-471322",
"operationCode": "SigntoolSign",
"parameters": {
"OpusName": "Microsoft",
"OpusInfo": "http://www.microsoft.com",
"PageHash": "/NPH",
"FileDigest": "/fd sha256",
"TimeStamp": "/tr \"http://rfc3161.gtm.corp.microsoft.com/TSS/HttpTspServer\" /td sha256"
},
"SourceLocationType" : "UNC",
"DestinationLocationType": "UNC",
"SignRequestFiles" : [
]
}
]
"toolName": "sign",
"toolVersion": "1.0"
},
{
"KeyCode": "CP-471322",
"OperationCode": "SigntoolVerify",
"Parameters": {},
"ToolName": "sign",
"ToolVersion": "1.0"
}
]
},
"SourceLocationType": "UNC",
"DestinationLocationType": "UNC",
"SignRequestFiles": []
}
]
}
2 changes: 1 addition & 1 deletion eng/native/signing/policy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"Version": "1.0.0"
"Version": "1.0.0"
}
8 changes: 4 additions & 4 deletions eng/testing/xunit/xunit.runner.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"diagnosticMessages": true,
"longRunningTestSeconds": 120,
"shadowCopy": false,
"preEnumerateTheories": false
"diagnosticMessages": true,
"longRunningTestSeconds": 120,
"shadowCopy": false,
"preEnumerateTheories": false
}
2 changes: 2 additions & 0 deletions src/coreclr/jit/hwintrinsiclistarm64sve.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,6 +430,8 @@ HARDWARE_INTRINSIC(Sve2, ShiftRightArithmeticRoundedNarrowingSaturateUn
HARDWARE_INTRINSIC(Sve2, ShiftRightLogicalAdd, -1, 3, {INS_invalid, INS_sve_usra, INS_invalid, INS_sve_usra, INS_invalid, INS_sve_usra, INS_invalid, INS_sve_usra, INS_invalid, INS_invalid}, HW_Category_ShiftRightByImmediate, HW_Flag_Scalable|HW_Flag_HasImmediateOperand|HW_Flag_HasRMWSemantics)
HARDWARE_INTRINSIC(Sve2, ShiftRightLogicalNarrowingEven, -1, 2, {INS_sve_shrnb, INS_sve_shrnb, INS_sve_shrnb, INS_sve_shrnb, INS_sve_shrnb, INS_sve_shrnb, INS_invalid, INS_invalid, INS_invalid, INS_invalid}, HW_Category_ShiftRightByImmediate, HW_Flag_Scalable|HW_Flag_HasImmediateOperand)
HARDWARE_INTRINSIC(Sve2, ShiftRightLogicalNarrowingOdd, -1, 3, {INS_sve_shrnt, INS_sve_shrnt, INS_sve_shrnt, INS_sve_shrnt, INS_sve_shrnt, INS_sve_shrnt, INS_invalid, INS_invalid, INS_invalid, INS_invalid}, HW_Category_ShiftRightByImmediate, HW_Flag_Scalable|HW_Flag_HasImmediateOperand|HW_Flag_HasRMWSemantics)
HARDWARE_INTRINSIC(Sve2, ShiftRightLogicalNarrowingSaturateEven, -1, 2, {INS_invalid, INS_sve_uqshrnb, INS_invalid, INS_sve_uqshrnb, INS_invalid, INS_sve_uqshrnb, INS_invalid, INS_invalid, INS_invalid, INS_invalid}, HW_Category_ShiftRightByImmediate, HW_Flag_Scalable|HW_Flag_HasImmediateOperand)
HARDWARE_INTRINSIC(Sve2, ShiftRightLogicalNarrowingSaturateOdd, -1, 3, {INS_invalid, INS_sve_uqshrnt, INS_invalid, INS_sve_uqshrnt, INS_invalid, INS_sve_uqshrnt, INS_invalid, INS_invalid, INS_invalid, INS_invalid}, HW_Category_ShiftRightByImmediate, HW_Flag_Scalable|HW_Flag_HasImmediateOperand|HW_Flag_HasRMWSemantics)
HARDWARE_INTRINSIC(Sve2, ShiftRightLogicalRounded, -1, -1, {INS_invalid, INS_sve_urshr, INS_invalid, INS_sve_urshr, INS_invalid, INS_sve_urshr, INS_invalid, INS_sve_urshr, INS_invalid, INS_invalid}, HW_Category_ShiftRightByImmediate, HW_Flag_Scalable|HW_Flag_EmbeddedMaskedOperation|HW_Flag_LowMaskedOperation|HW_Flag_HasImmediateOperand|HW_Flag_HasRMWSemantics)
HARDWARE_INTRINSIC(Sve2, ShiftRightLogicalRoundedAdd, -1, 3, {INS_invalid, INS_sve_ursra, INS_invalid, INS_sve_ursra, INS_invalid, INS_sve_ursra, INS_invalid, INS_sve_ursra, INS_invalid, INS_invalid}, HW_Category_ShiftRightByImmediate, HW_Flag_Scalable|HW_Flag_HasImmediateOperand|HW_Flag_HasRMWSemantics)
HARDWARE_INTRINSIC(Sve2, ShiftRightLogicalRoundedNarrowingEven, -1, 2, {INS_sve_rshrnb, INS_sve_rshrnb, INS_sve_rshrnb, INS_sve_rshrnb, INS_sve_rshrnb, INS_sve_rshrnb, INS_invalid, INS_invalid, INS_invalid, INS_invalid}, HW_Category_ShiftRightByImmediate, HW_Flag_Scalable|HW_Flag_HasImmediateOperand)
Expand Down
7 changes: 0 additions & 7 deletions src/coreclr/vm/corelib.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,8 +321,6 @@ DEFINE_METHOD(VALUETASK_1, GET_RESULT, get_Result, NoSig)
DEFINE_METHOD(VALUETASK_1, AS_TASK_OR_NOTIFIER, AsTaskOrNotifier, IM_RetObj)

DEFINE_CLASS(VALUETASK, Tasks, ValueTask)
DEFINE_METHOD(VALUETASK, FROM_EXCEPTION, FromException, SM_Exception_RetValueTask)
DEFINE_METHOD(VALUETASK, FROM_EXCEPTION_1, FromException, GM_Exception_RetValueTaskOfT)
DEFINE_METHOD(VALUETASK, FROM_RESULT_T, FromResult, GM_T_RetValueTaskOfT)
DEFINE_METHOD(VALUETASK, GET_COMPLETED_TASK, get_CompletedTask, SM_RetValueTask)
DEFINE_METHOD(VALUETASK, GET_ISCOMPLETED, get_IsCompleted, NoSig)
Expand All @@ -332,8 +330,6 @@ DEFINE_METHOD(VALUETASK, AS_TASK_OR_NOTIFIER, AsTaskOrNotifier, IM_RetObj)
DEFINE_CLASS(TASK_1, Tasks, Task`1)

DEFINE_CLASS(TASK, Tasks, Task)
DEFINE_METHOD(TASK, FROM_EXCEPTION, FromException, SM_Exception_RetTask)
DEFINE_METHOD(TASK, FROM_EXCEPTION_1, FromException, GM_Exception_RetTaskOfT)
DEFINE_METHOD(TASK, FROM_RESULT_T, FromResult, GM_T_RetTaskOfT)
DEFINE_METHOD(TASK, GET_COMPLETED_TASK, get_CompletedTask, SM_RetTask)
DEFINE_METHOD(TASK, GET_ISCOMPLETED, get_IsCompleted, NoSig)
Expand Down Expand Up @@ -591,7 +587,6 @@ DEFINE_METHOD(MULTICAST_DELEGATE, CTOR_COLLECTIBLE_OPENED, CtorColl
DEFINE_METHOD(MULTICAST_DELEGATE, CTOR_COLLECTIBLE_VIRTUAL_DISPATCH, CtorCollectibleVirtualDispatch, IM_Obj_IntPtr_IntPtr_IntPtr_RetVoid)

DEFINE_CLASS(NULL, System, DBNull)
DEFINE_FIELD(NULL, VALUE, Value)

DEFINE_CLASS(NULLABLE, System, Nullable`1)

Expand Down Expand Up @@ -986,7 +981,6 @@ DEFINE_METHOD(AUTORELEASEPOOL, DRAINAUTORELEASEPOOL, DrainAutoreleasePool

DEFINE_CLASS(TYPE, System, Type)
DEFINE_METHOD(TYPE, GET_TYPE_FROM_HANDLE, GetTypeFromHandle, SM_RuntimeTypeHandle_RetType)
DEFINE_PROPERTY(TYPE, IS_IMPORT, IsImport, Bool)

DEFINE_CLASS(TYPE_DELEGATOR, Reflection, TypeDelegator)

Expand Down Expand Up @@ -1170,7 +1164,6 @@ DEFINE_METHOD(MNGD_REF_CUSTOM_MARSHALER, CLEAR_NATIVE, ClearNativ
DEFINE_METHOD(MNGD_REF_CUSTOM_MARSHALER, CLEAR_MANAGED, ClearManaged, SM_ICustomMarshaler_RefObj_PtrIntPtr_RetVoid)
DEFINE_METHOD(MNGD_REF_CUSTOM_MARSHALER, CONVERT_CONTENTS_TO_NATIVE_UCO, ConvertContentsToNative, SM_PtrICustomMarshaler_PtrObj_PtrIntPtr_PtrException_RetVoid)
DEFINE_METHOD(MNGD_REF_CUSTOM_MARSHALER, CONVERT_CONTENTS_TO_MANAGED_UCO, ConvertContentsToManaged, SM_PtrICustomMarshaler_PtrObj_PtrIntPtr_PtrException_RetVoid)
DEFINE_METHOD(MNGD_REF_CUSTOM_MARSHALER, CLEAR_NATIVE_UCO, ClearNative, SM_PtrICustomMarshaler_PtrObj_PtrIntPtr_PtrException_RetVoid)
DEFINE_METHOD(MNGD_REF_CUSTOM_MARSHALER, CLEAR_MANAGED_UCO, ClearManaged, SM_PtrICustomMarshaler_PtrObj_PtrIntPtr_PtrException_RetVoid)

DEFINE_CLASS(ASANY_MARSHALER, StubHelpers, AsAnyMarshaler)
Expand Down
Loading
Loading