Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
c8a3181
Update CredScanSuppressions.json
amritanand-py Oct 8, 2025
1bf942d
Reformat markdownlint problem matcher JSON
amritanand-py Oct 8, 2025
c9411a7
Reformat auth.json for improved readability
amritanand-py Oct 8, 2025
f49f06b
Reformat config.json for consistent JSON style
amritanand-py Oct 8, 2025
adb5e74
Reformat input.template.json for consistent style
amritanand-py Oct 8, 2025
012b99f
Fix JSON formatting in signing policy file
amritanand-py Oct 8, 2025
2de5d8c
Reformat xunit.runner.json with consistent indentation
amritanand-py Oct 8, 2025
59bf496
Reformat runtimeconfig.template.json for consistency
amritanand-py Oct 8, 2025
a2301b3
Reformat runtimeconfig.template.json for consistency
amritanand-py Oct 8, 2025
127d9be
Reformat JSON in runtimeconfig.template.json
amritanand-py Oct 8, 2025
71f85e0
Reformat JSON in runtimeconfig.template.json
amritanand-py Oct 8, 2025
7d145de
Reformat JSON in runtimeconfig.template.json
amritanand-py Oct 8, 2025
8d5624a
Reformat deltascript.json for consistency
amritanand-py Oct 8, 2025
4f872c4
Reformat deltascript.json for readability
amritanand-py Oct 8, 2025
c6f9fea
Reformat deltascript.json for consistency
amritanand-py Oct 8, 2025
e8dc0e9
Reformat deltascript.json for consistency
amritanand-py Oct 8, 2025
96249f3
Reformat deltascript.json for consistency
amritanand-py Oct 8, 2025
492e82c
Reformat deltascript.json for readability
amritanand-py Oct 8, 2025
f07dc69
Reformat deltascript.json for async method change test
amritanand-py Oct 8, 2025
219299a
Reformat deltascript.json for consistency
amritanand-py Oct 8, 2025
4b991cf
Reformat deltascript.json for consistency
amritanand-py Oct 8, 2025
2c03781
Reformat deltascript.json for consistency
amritanand-py Oct 8, 2025
479c077
Reformat deltascript.json for readability
amritanand-py Oct 8, 2025
5cf7879
Reformat deltascript.json for consistency
amritanand-py Oct 8, 2025
18aa414
Reformat deltascript.json for consistency
amritanand-py Oct 8, 2025
53a734b
Reformat deltascript.json for consistency
amritanand-py Oct 8, 2025
3f3f8df
Reformat deltascript.json for LambdaBodyChange test
amritanand-py Oct 8, 2025
c4bf93a
Reformat deltascript.json for LambdaCapturesThis test
amritanand-py Oct 8, 2025
aa023ff
Reformat deltascript.json for consistent JSON style
amritanand-py Oct 8, 2025
2e9c4a9
Reformat deltascript.json for consistency
amritanand-py Oct 8, 2025
4e6b1a8
Reformat deltascript.json for consistency
amritanand-py Oct 8, 2025
d403a4d
Reformat deltascript.json for consistency
amritanand-py Oct 8, 2025
57751b1
Reformat deltascript.json for improved readability
amritanand-py Oct 8, 2025
608cd21
Fix trailing comma in tsconfig.json
amritanand-py Oct 8, 2025
dee00c2
Reformat tsconfig.shared.json for consistent style
amritanand-py Oct 8, 2025
5d0d9a2
Update tsconfig.worker.json
amritanand-py Oct 8, 2025
f050505
Reformat .markdownlint.json for consistent indentation
amritanand-py Oct 8, 2025
bd85d11
Reformat tsaoptions.json for improved readability
amritanand-py Oct 8, 2025
8e0dc1c
Reformat PInvokesExpectations.json for consistency
amritanand-py Oct 8, 2025
05ab42d
Update perf-slices.json
amritanand-py Oct 8, 2025
8058aa8
Update runtimeconfig.template.json
amritanand-py Oct 8, 2025
c14cb7d
Update runtimeconfig.template.json
amritanand-py Oct 8, 2025
6f0702b
Update runtimeconfig.template.json
amritanand-py Oct 8, 2025
b9ddc88
Update deltascript.json
amritanand-py Oct 8, 2025
9197363
Update runtimeconfig.template.json
amritanand-py Oct 8, 2025
e10c8ff
Update runtimeconfig.template.json
amritanand-py Oct 8, 2025
27d808a
Update tsconfig.json
amritanand-py Oct 8, 2025
37c14bf
Update CMakePresets.json
amritanand-py Oct 8, 2025
ad9f7e9
Update deltascript.json
amritanand-py Oct 8, 2025
03c1fa1
Update deltascript.json
amritanand-py Oct 8, 2025
26206b8
Update deltascript.json
amritanand-py Oct 8, 2025
1738ebb
Update package.json
amritanand-py Oct 8, 2025
f725263
Merge branch 'main' into fix/json-indentation
amritanand-py Oct 15, 2025
dea4200
Merge branch 'main' of https://github.com/amritanand-py/runtime into …
amritanand-py Oct 23, 2025
26fe90f
Merge branch 'main' into fix/json-indentation
amritanand-py Oct 24, 2025
1a85e8e
Merge branch 'main' into fix/json-indentation
amritanand-py Oct 30, 2025
b2b4f27
Merge branch 'main' into fix/json-indentation
amritanand-py Nov 13, 2025
92f803a
Merge upstream/main into fix/json-indentation
ViveliDuCh Feb 3, 2026
d2ba8a8
Merge branch 'main' into fix/json-indentation
ViveliDuCh Feb 3, 2026
7bb19e1
Fix empty lines and a value change
ViveliDuCh Feb 4, 2026
3ffcffb
Merge branch 'main' into fix/json-indentation
ViveliDuCh Feb 4, 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
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
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
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
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
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
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
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
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
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"configProperties": {
"System.Resources.Extensions.UseBinaryFormatter": true
}
"configProperties": {
"System.Resources.Extensions.UseBinaryFormatter": true
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
{
"changes": [
{"document": "AddFieldRVA.cs", "update": "AddFieldRVA_v1.cs"},
]
"changes": [
{
"document": "AddFieldRVA.cs",
"update": "AddFieldRVA_v1.cs"
}
]
}

Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
{
"changes": [
{"document": "AddInstanceField.cs", "update": "AddInstanceField_v1.cs"},
{"document": "AddInstanceField.cs", "update": "AddInstanceField_v2.cs"},
]
"changes": [
{
"document": "AddInstanceField.cs",
"update": "AddInstanceField_v1.cs"
},
{
"document": "AddInstanceField.cs",
"update": "AddInstanceField_v2.cs"
}
]
}

Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
{
"changes": [
{"document": "AddLambdaCapturingThis.cs", "update": "AddLambdaCapturingThis_v1.cs"},
]
"changes": [
{
"document": "AddLambdaCapturingThis.cs",
"update": "AddLambdaCapturingThis_v1.cs"
}
]
}

Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
{
"changes": [
{"document": "AddNestedClass.cs", "update": "AddNestedClass_v1.cs"},
]
"changes": [
{
"document": "AddNestedClass.cs",
"update": "AddNestedClass_v1.cs"
}
]
}

Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
{
"changes": [
{"document": "AddStaticField.cs", "update": "AddStaticField_v1.cs"},
]
"changes": [
{
"document": "AddStaticField.cs",
"update": "AddStaticField_v1.cs"
}
]
}

Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
{
"changes": [
{"document": "AddStaticLambda.cs", "update": "AddStaticLambda_v1.cs"},
]
"changes": [
{
"document": "AddStaticLambda.cs",
"update": "AddStaticLambda_v1.cs"
}
]
}

Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
{
"changes": [
{"document": "AsyncMethodChange.cs", "update": "AsyncMethodChange_v1.cs"}
]
"changes": [
{
"document": "AsyncMethodChange.cs",
"update": "AsyncMethodChange_v1.cs"
}
]
}

Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
{
"changes": [
{"document": "ClassWithCustomAttributes.cs", "update": "ClassWithCustomAttributes_v1.cs"},
]
"changes": [
{
"document": "ClassWithCustomAttributes.cs",
"update": "ClassWithCustomAttributes_v1.cs"
}
]
}

Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
{
"changes": [
{"document": "CustomAttributeDelete.cs", "update": "CustomAttributeDelete_v1.cs"},
]
"changes": [
{
"document": "CustomAttributeDelete.cs",
"update": "CustomAttributeDelete_v1.cs"
}
]
}

Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
{
"changes": [
{"document": "CustomAttributeUpdate.cs", "update": "CustomAttributeUpdate_v1.cs"},
]
"changes": [
{
"document": "CustomAttributeUpdate.cs",
"update": "CustomAttributeUpdate_v1.cs"
}
]
}

Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
{
"changes": [
{"document": "FirstCallAfterUpdate.cs", "update": "FirstCallAfterUpdate_v1.cs"},
{"document": "FirstCallAfterUpdate.cs", "update": "FirstCallAfterUpdate_v2.cs"},
]
"changes": [
{
"document": "FirstCallAfterUpdate.cs",
"update": "FirstCallAfterUpdate_v1.cs"
},
{
"document": "FirstCallAfterUpdate.cs",
"update": "FirstCallAfterUpdate_v2.cs"
}
]
}

Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
{
"changes": [
{"document": "GenericAddInstanceField.cs", "update": "GenericAddInstanceField_v1.cs"},
{"document": "GenericAddInstanceField.cs", "update": "GenericAddInstanceField_v2.cs"},
]
"changes": [
{
"document": "GenericAddInstanceField.cs",
"update": "GenericAddInstanceField_v1.cs"
},
{
"document": "GenericAddInstanceField.cs",
"update": "GenericAddInstanceField_v2.cs"
}
]
}

Loading
Loading