Skip to content

Commit 5b89a58

Browse files
mgravellmgravell
committed
Merge branch 'main' into marc/ocbin
# Conflicts: # AspNetCore.sln
2 parents 2a2647c + bad8559 commit 5b89a58

File tree

674 files changed

+19182
-53429
lines changed

Some content is hidden

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

674 files changed

+19182
-53429
lines changed

‎.azure/pipelines/ci.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ trigger:
1212
- internal/release/*
1313

1414
# Run PR validation on all branches
15+
# This doesn't have any path exclusions, even for things like docs, because
16+
# we have it configured in GitHub as a required check, and for it to pass
17+
# it must actually run, even if it's not relevant to a particular change.
1518
pr:
1619
autoCancel: true
1720
branches:

‎.azure/pipelines/quarantined-pr.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,12 @@ pr:
2020
- release/*
2121
paths:
2222
exclude:
23+
- .devcontainer/*
2324
- .github/*
2425
- .vscode/*
26+
- docs/*
2527
- '**/*.md'
26-
- CODE-OF-CONDUCT.md
27-
- CONTRIBUTING.md
2828
- LICENSE.TXT
29-
- README.md
30-
- SECURITY.md
3129
- THIRD-PARTY-NOTICES.TXT
3230

3331
schedules:

‎.config/CredScanSuppressions.json

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -69,22 +69,6 @@
6969
"file": "\\src\\DefaultBuilder\\test\\Microsoft.AspNetCore.FunctionalTests\\testCert.pfx",
7070
"_justification": "Legitimate UT certificate file with private key"
7171
},
72-
{
73-
"file": "\\src\\Identity\\ApiAuthorization.IdentityServer\\test\\current.pfx",
74-
"_justification": "Legitimate UT certificate file with private key"
75-
},
76-
{
77-
"file": "\\src\\Identity\\ApiAuthorization.IdentityServer\\test\\expired.pfx",
78-
"_justification": "Legitimate UT certificate file with private key"
79-
},
80-
{
81-
"file": "\\src\\Identity\\ApiAuthorization.IdentityServer\\test\\future.pfx",
82-
"_justification": "Legitimate UT certificate file with private key"
83-
},
84-
{
85-
"file": "\\src\\Identity\\ApiAuthorization.IdentityServer\\test\\test.pfx",
86-
"_justification": "Legitimate UT certificate file with private key"
87-
},
8872
{
8973
"file": "\\src\\Middleware\\WebSockets\\test\\ConformanceTests\\AutobahnTestApp\\TestResources\\testCert.pfx",
9074
"_justification": "Legitimate UT certificate file with private key"

‎.editorconfig

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,8 @@ dotnet_diagnostic.CA1018.severity = warning
8787
dotnet_diagnostic.CA1047.severity = warning
8888

8989
# CA1305: Specify IFormatProvider
90-
dotnet_diagnostic.CA1305.severity = warning
90+
# TODO: Renable as warning after https://github.com/dotnet/roslyn-analyzers/issues/6746 is resolved
91+
dotnet_diagnostic.CA1305.severity = suggestion
9192

9293
# CA1507: Use nameof to express symbol names
9394
dotnet_diagnostic.CA1507.severity = warning

‎.github/fabricbot.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3236,7 +3236,7 @@
32363236
{
32373237
"name": "addMilestone",
32383238
"parameters": {
3239-
"milestoneName": "6.0.19"
3239+
"milestoneName": "6.0.21"
32403240
}
32413241
}
32423242
]
@@ -3280,7 +3280,7 @@
32803280
{
32813281
"name": "addMilestone",
32823282
"parameters": {
3283-
"milestoneName": "7.0.8"
3283+
"milestoneName": "7.0.10"
32843284
}
32853285
}
32863286
]
@@ -3461,7 +3461,7 @@
34613461
{
34623462
"name": "addReply",
34633463
"parameters": {
3464-
"comment": "Looks like this PR hasn't been active for some time and the codebase could have been changed in the meantime.\nTo make sure no breaking changes are introduced, please leave an `/azp run` comment here to rerun the CI pipeline and confirm success before merging the change."
3464+
"comment": "Looks like this PR hasn't been active for some time and the codebase could have been changed in the meantime.\nTo make sure no conflicting changes have occurred, please rerun validation before merging. You can do this by leaving an `/azp run` comment here (requires commit rights), or by simply closing and reopening."
34653465
}
34663466
},
34673467
{

‎.github/workflows/markdownlint-problem-matcher.json

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
{
2+
"problemMatcher": [
3+
{
4+
"owner": "markdownlint",
5+
"pattern": [
6+
{
7+
"regexp": "^([^:]*):(\\d+):?(\\d+)?\\s([\\w-\\/]*)\\s(.*)$",
8+
"file": 1,
9+
"line": 2,
10+
"column": 3,
11+
"code": 4,
12+
"message": 5
13+
}
14+
]
15+
}
16+
]
17+
}

‎.github/workflows/markdownlint.yml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
name: Markdownlint
2+
3+
permissions:
4+
contents: read
5+
6+
# run even on changes without markdown changes, so that we can
7+
# make it in GitHub a required check for PR's
8+
on:
9+
pull_request:
10+
11+
jobs:
12+
lint:
13+
14+
runs-on: ubuntu-latest
15+
16+
steps:
17+
- uses: actions/checkout@v2
18+
- name: Use Node.js
19+
uses: actions/setup-node@v1
20+
with:
21+
node-version: 16.x
22+
- name: Run Markdownlint
23+
run: |
24+
echo "::add-matcher::.github/workflows/markdownlint-problem-matcher.json"
25+
npm i -g markdownlint-cli
26+
markdownlint "docs/**/*.md"

‎.markdownlint.json

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"default": true,
3+
"ul-indent": false,
4+
"no-trailing-spaces": false,
5+
"line-length": false,
6+
"blanks-around-headings": false,
7+
"no-duplicate-heading": { "siblings_only": true },
8+
"no-trailing-punctuation": false,
9+
"ol-prefix": { "one_or_ordered": true },
10+
"blanks-around-fences": false,
11+
"blanks-around-lists": false,
12+
"no-inline-html": { "allowed_elements": [ "summary", "details" ]},
13+
"no-bare-urls": false,
14+
"single-trailing-newline": false,
15+
"emphasis-style": false,
16+
17+
// rule settings and options are documented in https://github.com/DavidAnson/markdownlint
18+
// feel free to disable more low value rules in here; get rule name from the error message.
19+
// the purpose of the linter is to catch significant issues like broken links.
20+
}

‎AspNetCore.sln

Lines changed: 1 addition & 121 deletions
Original file line numberDiff line numberDiff line change
@@ -611,16 +611,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Metada
611611
EndProject
612612
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Identity", "Identity", "{9F21A235-436E-4020-A076-1DF4F89D0CA0}"
613613
EndProject
614-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ApiAuthorization.IdentityServer", "ApiAuthorization.IdentityServer", "{DEE6A986-419B-4102-ACBE-1BE8D34ACBA9}"
615-
EndProject
616-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{10F429CC-6470-40AF-81FA-6F17895E4058}"
617-
EndProject
618-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApiAuthSample", "src\Identity\ApiAuthorization.IdentityServer\samples\ApiAuthSample\ApiAuthSample.csproj", "{1A99E178-8480-47C0-B7F0-A1240297F2FB}"
619-
EndProject
620-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.ApiAuthorization.IdentityServer", "src\Identity\ApiAuthorization.IdentityServer\src\Microsoft.AspNetCore.ApiAuthorization.IdentityServer.csproj", "{7AC2504B-A351-40D1-92BC-CABEFFBB14DC}"
621-
EndProject
622-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.ApiAuthorization.IdentityServer.Tests", "src\Identity\ApiAuthorization.IdentityServer\test\Microsoft.AspNetCore.ApiAuthorization.IdentityServer.Tests.csproj", "{BDB91F2F-2CD5-4675-BC7F-C94F117784DF}"
623-
EndProject
624614
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core", "Core", "{9E0B9A09-167E-4DF7-8AA4-F9323A306F90}"
625615
EndProject
626616
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Identity", "src\Identity\Core\src\Microsoft.AspNetCore.Identity.csproj", "{F1B75625-567A-4AF3-BB68-75A4CF93F2B8}"
@@ -1336,12 +1326,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HostedInAspNet.Server", "sr
13361326
EndProject
13371327
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StandaloneApp", "src\Components\WebAssembly\testassets\StandaloneApp\StandaloneApp.csproj", "{A40350FE-4334-4007-B1C3-6BEB1B070309}"
13381328
EndProject
1339-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wasm.Authentication.Client", "src\Components\WebAssembly\testassets\Wasm.Authentication.Client\Wasm.Authentication.Client.csproj", "{C26965A9-EAC6-4E5A-B8C1-D161260EFE4F}"
1340-
EndProject
1341-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wasm.Authentication.Server", "src\Components\WebAssembly\testassets\Wasm.Authentication.Server\Wasm.Authentication.Server.csproj", "{FE5290C7-45DA-46F8-BD74-698E7A161DD6}"
1342-
EndProject
1343-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wasm.Authentication.Shared", "src\Components\WebAssembly\testassets\Wasm.Authentication.Shared\Wasm.Authentication.Shared.csproj", "{ED66DC0E-FD6A-477A-BA8A-5273AA64F580}"
1344-
EndProject
13451329
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "HealthChecks", "HealthChecks", "{C1E7F837-6988-43E2-9E1C-7302DB484F99}"
13461330
EndProject
13471331
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{2A91479A-4ABE-4BB7-9A5E-CA3B9CCFC69E}"
@@ -1786,7 +1770,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IdentitySample.ApiEndpoints
17861770
EndProject
17871771
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.OutputCaching.Microbenchmarks", "src\Middleware\OutputCaching\perf\Microbenchmarks\Microsoft.AspNetCore.OutputCaching.Microbenchmarks.csproj", "{6ACC2B1B-6175-4CAB-8DED-4BA1469C136C}"
17881772
EndProject
1789-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Components.WasmMinimal", "src\Components\test\testassets\Components.WasmMinimal\Components.WasmMinimal.csproj", "{87D58D50-20D1-4091-88C5-8D88DCCC2DE3}"
1773+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Components.WasmMinimal", "src\Components\test\testassets\Components.WasmMinimal\Components.WasmMinimal.csproj", "{87D58D50-20D1-4091-88C5-8D88DCCC2DE3}"
17901774
EndProject
17911775
Global
17921776
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -4280,54 +4264,6 @@ Global
42804264
{3A554C0B-2956-4152-BF31-2C8CAE5D2717}.Release|x64.Build.0 = Release|Any CPU
42814265
{3A554C0B-2956-4152-BF31-2C8CAE5D2717}.Release|x86.ActiveCfg = Release|Any CPU
42824266
{3A554C0B-2956-4152-BF31-2C8CAE5D2717}.Release|x86.Build.0 = Release|Any CPU
4283-
{1A99E178-8480-47C0-B7F0-A1240297F2FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
4284-
{1A99E178-8480-47C0-B7F0-A1240297F2FB}.Debug|Any CPU.Build.0 = Debug|Any CPU
4285-
{1A99E178-8480-47C0-B7F0-A1240297F2FB}.Debug|arm64.ActiveCfg = Debug|Any CPU
4286-
{1A99E178-8480-47C0-B7F0-A1240297F2FB}.Debug|arm64.Build.0 = Debug|Any CPU
4287-
{1A99E178-8480-47C0-B7F0-A1240297F2FB}.Debug|x64.ActiveCfg = Debug|Any CPU
4288-
{1A99E178-8480-47C0-B7F0-A1240297F2FB}.Debug|x64.Build.0 = Debug|Any CPU
4289-
{1A99E178-8480-47C0-B7F0-A1240297F2FB}.Debug|x86.ActiveCfg = Debug|Any CPU
4290-
{1A99E178-8480-47C0-B7F0-A1240297F2FB}.Debug|x86.Build.0 = Debug|Any CPU
4291-
{1A99E178-8480-47C0-B7F0-A1240297F2FB}.Release|Any CPU.ActiveCfg = Release|Any CPU
4292-
{1A99E178-8480-47C0-B7F0-A1240297F2FB}.Release|Any CPU.Build.0 = Release|Any CPU
4293-
{1A99E178-8480-47C0-B7F0-A1240297F2FB}.Release|arm64.ActiveCfg = Release|Any CPU
4294-
{1A99E178-8480-47C0-B7F0-A1240297F2FB}.Release|arm64.Build.0 = Release|Any CPU
4295-
{1A99E178-8480-47C0-B7F0-A1240297F2FB}.Release|x64.ActiveCfg = Release|Any CPU
4296-
{1A99E178-8480-47C0-B7F0-A1240297F2FB}.Release|x64.Build.0 = Release|Any CPU
4297-
{1A99E178-8480-47C0-B7F0-A1240297F2FB}.Release|x86.ActiveCfg = Release|Any CPU
4298-
{1A99E178-8480-47C0-B7F0-A1240297F2FB}.Release|x86.Build.0 = Release|Any CPU
4299-
{7AC2504B-A351-40D1-92BC-CABEFFBB14DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
4300-
{7AC2504B-A351-40D1-92BC-CABEFFBB14DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
4301-
{7AC2504B-A351-40D1-92BC-CABEFFBB14DC}.Debug|arm64.ActiveCfg = Debug|Any CPU
4302-
{7AC2504B-A351-40D1-92BC-CABEFFBB14DC}.Debug|arm64.Build.0 = Debug|Any CPU
4303-
{7AC2504B-A351-40D1-92BC-CABEFFBB14DC}.Debug|x64.ActiveCfg = Debug|Any CPU
4304-
{7AC2504B-A351-40D1-92BC-CABEFFBB14DC}.Debug|x64.Build.0 = Debug|Any CPU
4305-
{7AC2504B-A351-40D1-92BC-CABEFFBB14DC}.Debug|x86.ActiveCfg = Debug|Any CPU
4306-
{7AC2504B-A351-40D1-92BC-CABEFFBB14DC}.Debug|x86.Build.0 = Debug|Any CPU
4307-
{7AC2504B-A351-40D1-92BC-CABEFFBB14DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
4308-
{7AC2504B-A351-40D1-92BC-CABEFFBB14DC}.Release|Any CPU.Build.0 = Release|Any CPU
4309-
{7AC2504B-A351-40D1-92BC-CABEFFBB14DC}.Release|arm64.ActiveCfg = Release|Any CPU
4310-
{7AC2504B-A351-40D1-92BC-CABEFFBB14DC}.Release|arm64.Build.0 = Release|Any CPU
4311-
{7AC2504B-A351-40D1-92BC-CABEFFBB14DC}.Release|x64.ActiveCfg = Release|Any CPU
4312-
{7AC2504B-A351-40D1-92BC-CABEFFBB14DC}.Release|x64.Build.0 = Release|Any CPU
4313-
{7AC2504B-A351-40D1-92BC-CABEFFBB14DC}.Release|x86.ActiveCfg = Release|Any CPU
4314-
{7AC2504B-A351-40D1-92BC-CABEFFBB14DC}.Release|x86.Build.0 = Release|Any CPU
4315-
{BDB91F2F-2CD5-4675-BC7F-C94F117784DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
4316-
{BDB91F2F-2CD5-4675-BC7F-C94F117784DF}.Debug|Any CPU.Build.0 = Debug|Any CPU
4317-
{BDB91F2F-2CD5-4675-BC7F-C94F117784DF}.Debug|arm64.ActiveCfg = Debug|Any CPU
4318-
{BDB91F2F-2CD5-4675-BC7F-C94F117784DF}.Debug|arm64.Build.0 = Debug|Any CPU
4319-
{BDB91F2F-2CD5-4675-BC7F-C94F117784DF}.Debug|x64.ActiveCfg = Debug|Any CPU
4320-
{BDB91F2F-2CD5-4675-BC7F-C94F117784DF}.Debug|x64.Build.0 = Debug|Any CPU
4321-
{BDB91F2F-2CD5-4675-BC7F-C94F117784DF}.Debug|x86.ActiveCfg = Debug|Any CPU
4322-
{BDB91F2F-2CD5-4675-BC7F-C94F117784DF}.Debug|x86.Build.0 = Debug|Any CPU
4323-
{BDB91F2F-2CD5-4675-BC7F-C94F117784DF}.Release|Any CPU.ActiveCfg = Release|Any CPU
4324-
{BDB91F2F-2CD5-4675-BC7F-C94F117784DF}.Release|Any CPU.Build.0 = Release|Any CPU
4325-
{BDB91F2F-2CD5-4675-BC7F-C94F117784DF}.Release|arm64.ActiveCfg = Release|Any CPU
4326-
{BDB91F2F-2CD5-4675-BC7F-C94F117784DF}.Release|arm64.Build.0 = Release|Any CPU
4327-
{BDB91F2F-2CD5-4675-BC7F-C94F117784DF}.Release|x64.ActiveCfg = Release|Any CPU
4328-
{BDB91F2F-2CD5-4675-BC7F-C94F117784DF}.Release|x64.Build.0 = Release|Any CPU
4329-
{BDB91F2F-2CD5-4675-BC7F-C94F117784DF}.Release|x86.ActiveCfg = Release|Any CPU
4330-
{BDB91F2F-2CD5-4675-BC7F-C94F117784DF}.Release|x86.Build.0 = Release|Any CPU
43314267
{F1B75625-567A-4AF3-BB68-75A4CF93F2B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
43324268
{F1B75625-567A-4AF3-BB68-75A4CF93F2B8}.Debug|Any CPU.Build.0 = Debug|Any CPU
43334269
{F1B75625-567A-4AF3-BB68-75A4CF93F2B8}.Debug|arm64.ActiveCfg = Debug|Any CPU
@@ -8334,54 +8270,6 @@ Global
83348270
{A40350FE-4334-4007-B1C3-6BEB1B070309}.Release|x64.Build.0 = Release|Any CPU
83358271
{A40350FE-4334-4007-B1C3-6BEB1B070309}.Release|x86.ActiveCfg = Release|Any CPU
83368272
{A40350FE-4334-4007-B1C3-6BEB1B070309}.Release|x86.Build.0 = Release|Any CPU
8337-
{C26965A9-EAC6-4E5A-B8C1-D161260EFE4F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
8338-
{C26965A9-EAC6-4E5A-B8C1-D161260EFE4F}.Debug|Any CPU.Build.0 = Debug|Any CPU
8339-
{C26965A9-EAC6-4E5A-B8C1-D161260EFE4F}.Debug|arm64.ActiveCfg = Debug|Any CPU
8340-
{C26965A9-EAC6-4E5A-B8C1-D161260EFE4F}.Debug|arm64.Build.0 = Debug|Any CPU
8341-
{C26965A9-EAC6-4E5A-B8C1-D161260EFE4F}.Debug|x64.ActiveCfg = Debug|Any CPU
8342-
{C26965A9-EAC6-4E5A-B8C1-D161260EFE4F}.Debug|x64.Build.0 = Debug|Any CPU
8343-
{C26965A9-EAC6-4E5A-B8C1-D161260EFE4F}.Debug|x86.ActiveCfg = Debug|Any CPU
8344-
{C26965A9-EAC6-4E5A-B8C1-D161260EFE4F}.Debug|x86.Build.0 = Debug|Any CPU
8345-
{C26965A9-EAC6-4E5A-B8C1-D161260EFE4F}.Release|Any CPU.ActiveCfg = Release|Any CPU
8346-
{C26965A9-EAC6-4E5A-B8C1-D161260EFE4F}.Release|Any CPU.Build.0 = Release|Any CPU
8347-
{C26965A9-EAC6-4E5A-B8C1-D161260EFE4F}.Release|arm64.ActiveCfg = Release|Any CPU
8348-
{C26965A9-EAC6-4E5A-B8C1-D161260EFE4F}.Release|arm64.Build.0 = Release|Any CPU
8349-
{C26965A9-EAC6-4E5A-B8C1-D161260EFE4F}.Release|x64.ActiveCfg = Release|Any CPU
8350-
{C26965A9-EAC6-4E5A-B8C1-D161260EFE4F}.Release|x64.Build.0 = Release|Any CPU
8351-
{C26965A9-EAC6-4E5A-B8C1-D161260EFE4F}.Release|x86.ActiveCfg = Release|Any CPU
8352-
{C26965A9-EAC6-4E5A-B8C1-D161260EFE4F}.Release|x86.Build.0 = Release|Any CPU
8353-
{FE5290C7-45DA-46F8-BD74-698E7A161DD6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
8354-
{FE5290C7-45DA-46F8-BD74-698E7A161DD6}.Debug|Any CPU.Build.0 = Debug|Any CPU
8355-
{FE5290C7-45DA-46F8-BD74-698E7A161DD6}.Debug|arm64.ActiveCfg = Debug|Any CPU
8356-
{FE5290C7-45DA-46F8-BD74-698E7A161DD6}.Debug|arm64.Build.0 = Debug|Any CPU
8357-
{FE5290C7-45DA-46F8-BD74-698E7A161DD6}.Debug|x64.ActiveCfg = Debug|Any CPU
8358-
{FE5290C7-45DA-46F8-BD74-698E7A161DD6}.Debug|x64.Build.0 = Debug|Any CPU
8359-
{FE5290C7-45DA-46F8-BD74-698E7A161DD6}.Debug|x86.ActiveCfg = Debug|Any CPU
8360-
{FE5290C7-45DA-46F8-BD74-698E7A161DD6}.Debug|x86.Build.0 = Debug|Any CPU
8361-
{FE5290C7-45DA-46F8-BD74-698E7A161DD6}.Release|Any CPU.ActiveCfg = Release|Any CPU
8362-
{FE5290C7-45DA-46F8-BD74-698E7A161DD6}.Release|Any CPU.Build.0 = Release|Any CPU
8363-
{FE5290C7-45DA-46F8-BD74-698E7A161DD6}.Release|arm64.ActiveCfg = Release|Any CPU
8364-
{FE5290C7-45DA-46F8-BD74-698E7A161DD6}.Release|arm64.Build.0 = Release|Any CPU
8365-
{FE5290C7-45DA-46F8-BD74-698E7A161DD6}.Release|x64.ActiveCfg = Release|Any CPU
8366-
{FE5290C7-45DA-46F8-BD74-698E7A161DD6}.Release|x64.Build.0 = Release|Any CPU
8367-
{FE5290C7-45DA-46F8-BD74-698E7A161DD6}.Release|x86.ActiveCfg = Release|Any CPU
8368-
{FE5290C7-45DA-46F8-BD74-698E7A161DD6}.Release|x86.Build.0 = Release|Any CPU
8369-
{ED66DC0E-FD6A-477A-BA8A-5273AA64F580}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
8370-
{ED66DC0E-FD6A-477A-BA8A-5273AA64F580}.Debug|Any CPU.Build.0 = Debug|Any CPU
8371-
{ED66DC0E-FD6A-477A-BA8A-5273AA64F580}.Debug|arm64.ActiveCfg = Debug|Any CPU
8372-
{ED66DC0E-FD6A-477A-BA8A-5273AA64F580}.Debug|arm64.Build.0 = Debug|Any CPU
8373-
{ED66DC0E-FD6A-477A-BA8A-5273AA64F580}.Debug|x64.ActiveCfg = Debug|Any CPU
8374-
{ED66DC0E-FD6A-477A-BA8A-5273AA64F580}.Debug|x64.Build.0 = Debug|Any CPU
8375-
{ED66DC0E-FD6A-477A-BA8A-5273AA64F580}.Debug|x86.ActiveCfg = Debug|Any CPU
8376-
{ED66DC0E-FD6A-477A-BA8A-5273AA64F580}.Debug|x86.Build.0 = Debug|Any CPU
8377-
{ED66DC0E-FD6A-477A-BA8A-5273AA64F580}.Release|Any CPU.ActiveCfg = Release|Any CPU
8378-
{ED66DC0E-FD6A-477A-BA8A-5273AA64F580}.Release|Any CPU.Build.0 = Release|Any CPU
8379-
{ED66DC0E-FD6A-477A-BA8A-5273AA64F580}.Release|arm64.ActiveCfg = Release|Any CPU
8380-
{ED66DC0E-FD6A-477A-BA8A-5273AA64F580}.Release|arm64.Build.0 = Release|Any CPU
8381-
{ED66DC0E-FD6A-477A-BA8A-5273AA64F580}.Release|x64.ActiveCfg = Release|Any CPU
8382-
{ED66DC0E-FD6A-477A-BA8A-5273AA64F580}.Release|x64.Build.0 = Release|Any CPU
8383-
{ED66DC0E-FD6A-477A-BA8A-5273AA64F580}.Release|x86.ActiveCfg = Release|Any CPU
8384-
{ED66DC0E-FD6A-477A-BA8A-5273AA64F580}.Release|x86.Build.0 = Release|Any CPU
83858273
{B06040BC-DA28-4923-8CAC-20EB517D471B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
83868274
{B06040BC-DA28-4923-8CAC-20EB517D471B}.Debug|Any CPU.Build.0 = Debug|Any CPU
83878275
{B06040BC-DA28-4923-8CAC-20EB517D471B}.Debug|arm64.ActiveCfg = Debug|Any CPU
@@ -11056,11 +10944,6 @@ Global
1105610944
{71DE18B5-87F9-4D03-89BB-C3E243576F92} = {627BE8B3-59E6-4F1D-8C9C-76B804D41724}
1105710945
{3A554C0B-2956-4152-BF31-2C8CAE5D2717} = {71DE18B5-87F9-4D03-89BB-C3E243576F92}
1105810946
{9F21A235-436E-4020-A076-1DF4F89D0CA0} = {017429CC-C5FB-48B4-9C46-034E29EE2F06}
11059-
{DEE6A986-419B-4102-ACBE-1BE8D34ACBA9} = {9F21A235-436E-4020-A076-1DF4F89D0CA0}
11060-
{10F429CC-6470-40AF-81FA-6F17895E4058} = {DEE6A986-419B-4102-ACBE-1BE8D34ACBA9}
11061-
{1A99E178-8480-47C0-B7F0-A1240297F2FB} = {10F429CC-6470-40AF-81FA-6F17895E4058}
11062-
{7AC2504B-A351-40D1-92BC-CABEFFBB14DC} = {DEE6A986-419B-4102-ACBE-1BE8D34ACBA9}
11063-
{BDB91F2F-2CD5-4675-BC7F-C94F117784DF} = {DEE6A986-419B-4102-ACBE-1BE8D34ACBA9}
1106410947
{9E0B9A09-167E-4DF7-8AA4-F9323A306F90} = {9F21A235-436E-4020-A076-1DF4F89D0CA0}
1106510948
{F1B75625-567A-4AF3-BB68-75A4CF93F2B8} = {9E0B9A09-167E-4DF7-8AA4-F9323A306F90}
1106610949
{0F5F1299-7303-49B8-BEBF-9FF3B522CE0F} = {9F21A235-436E-4020-A076-1DF4F89D0CA0}
@@ -11417,9 +11300,6 @@ Global
1141711300
{9788C76F-658B-4441-88F8-22C6B86FAD27} = {7D2B0799-A634-42AC-AE77-5D167BA51389}
1141811301
{1970D5CD-D9A4-4673-A297-179BB04199F4} = {7D2B0799-A634-42AC-AE77-5D167BA51389}
1141911302
{A40350FE-4334-4007-B1C3-6BEB1B070309} = {7D2B0799-A634-42AC-AE77-5D167BA51389}
11420-
{C26965A9-EAC6-4E5A-B8C1-D161260EFE4F} = {7D2B0799-A634-42AC-AE77-5D167BA51389}
11421-
{FE5290C7-45DA-46F8-BD74-698E7A161DD6} = {7D2B0799-A634-42AC-AE77-5D167BA51389}
11422-
{ED66DC0E-FD6A-477A-BA8A-5273AA64F580} = {7D2B0799-A634-42AC-AE77-5D167BA51389}
1142311303
{C1E7F837-6988-43E2-9E1C-7302DB484F99} = {017429CC-C5FB-48B4-9C46-034E29EE2F06}
1142411304
{2A91479A-4ABE-4BB7-9A5E-CA3B9CCFC69E} = {C1E7F837-6988-43E2-9E1C-7302DB484F99}
1142511305
{7CB09412-C9B0-47E8-A8C3-311AA4CFDE04} = {C1E7F837-6988-43E2-9E1C-7302DB484F99}

‎Directory.Build.props

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,9 @@
126126

127127
<!-- don't warn about unnecessary trim warning suppressions. can be removed with preview 6. -->
128128
<NoWarn>$(NoWarn);IL2121</NoWarn>
129+
130+
<!-- // Temporary diagnostic code from https://github.com/dotnet/extensions/pull/4130 for metrics APIs used in test. -->
131+
<NoWarn>$(NoWarn);TBD</NoWarn>
129132
</PropertyGroup>
130133

131134
<!-- Source code settings -->

0 commit comments

Comments
 (0)