Skip to content

Commit d854ad3

Browse files
gewarrengewarren
authored
Merge pull request #9898 from dotnet/main
Merge main into live
2 parents 73a284e + bc5c3d5 commit d854ad3

File tree

567 files changed

+1803
-1216
lines changed

Some content is hidden

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

567 files changed

+1803
-1216
lines changed

‎.github/policies/label-prs.yml

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,21 @@
1-
id:
21
name: GitOps.PullRequestIssueManagement
32
description: GitOps.PullRequestIssueManagement primitive
4-
owner:
53
resource: repository
6-
disabled: false
7-
where:
4+
85
configuration:
96
resourceManagementConfiguration:
107
eventResponderTasks:
11-
- if:
8+
- description: Label main to live PRs
9+
triggerOnOwnActions: true
10+
if:
1211
- payloadType: Pull_Request
13-
- isActivitySender:
14-
user: dotnet-policy-service
15-
issueAuthor: False
12+
- isAction:
13+
action: Opened
14+
- titleContains:
15+
pattern: Merge main into live
16+
isRegex: False
1617
then:
1718
- addLabel:
1819
label: ':octocat: auto-merge'
19-
triggerOnOwnActions: true
20-
description: Label PRs from Dotnet Policy Service
20+
21+

‎.github/workflows/quest-bulk.yml

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,17 @@ on:
88
description: "The reason for running the bulk import workflow"
99
required: true
1010
default: "Initial import into Quest (Azure DevOps)"
11+
duration:
12+
description: "The number of days to import issues for. Defaults to 5 days."
13+
required: false
14+
default: "5"
1115

1216
jobs:
1317
bulk-import:
1418
runs-on: ubuntu-latest
1519
permissions:
1620
issues: write
21+
id-token: write
1722
pull-requests: write
1823
if: ${{ github.repository_owner == 'dotnet' }}
1924

@@ -23,16 +28,25 @@ jobs:
2328
run: |
2429
echo "Reason: ${{ github.event.inputs.reason }}"
2530
31+
- name: Azure OpenID Connect
32+
id: azure-oidc-auth
33+
uses: dotnet/docs-tools/.github/actions/oidc-auth-flow@main
34+
with:
35+
client-id: ${{ secrets.CLIENT_ID }}
36+
tenant-id: ${{ secrets.TENANT_ID }}
37+
audience: ${{ secrets.OSMP_API_AUDIENCE }}
38+
2639
- name: bulk-sequester
2740
id: bulk-sequester
2841
uses: dotnet/docs-tools/actions/sequester@main
2942
env:
3043
ImportOptions__ApiKeys__GitHubToken: ${{ secrets.GITHUB_TOKEN }}
31-
ImportOptions__ApiKeys__OSPOKey: ${{ secrets.OSPO_KEY }}
3244
ImportOptions__ApiKeys__QuestKey: ${{ secrets.QUEST_KEY }}
45+
ImportOptions__ApiKeys__AzureAccessToken: ${{ steps.azure-oidc-auth.outputs.access-token }}
3346
ImportOptions__ApiKeys__SequesterPrivateKey: ${{ secrets.SEQUESTER_PRIVATEKEY }}
3447
ImportOptions__ApiKeys__SequesterAppID: ${{ secrets.SEQUESTER_APPID }}
3548
with:
3649
org: ${{ github.repository_owner }}
3750
repo: ${{ github.repository }}
3851
issue: '-1'
52+
duration: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.duration || 5 }}

‎.github/workflows/quest.yml

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ jobs:
2121
runs-on: ubuntu-latest
2222
permissions:
2323
issues: write
24+
id-token: write
2425
pull-requests: write
2526

2627
steps:
@@ -30,14 +31,22 @@ jobs:
3031
echo "Reason: ${{ github.event.inputs.reason }}"
3132
echo "Issue number: ${{ github.event.inputs.issue }}"
3233
34+
- name: Azure OpenID Connect
35+
id: azure-oidc-auth
36+
uses: dotnet/docs-tools/.github/actions/oidc-auth-flow@main
37+
with:
38+
client-id: ${{ secrets.CLIENT_ID }}
39+
tenant-id: ${{ secrets.TENANT_ID }}
40+
audience: ${{ secrets.OSMP_API_AUDIENCE }}
41+
3342
# This step occurs when ran manually, passing the manual issue number input
3443
- name: manual-sequester
3544
if: ${{ github.event_name == 'workflow_dispatch' }}
3645
id: manual-sequester
3746
uses: dotnet/docs-tools/actions/sequester@main
3847
env:
3948
ImportOptions__ApiKeys__GitHubToken: ${{ secrets.GITHUB_TOKEN }}
40-
ImportOptions__ApiKeys__OSPOKey: ${{ secrets.OSPO_KEY }}
49+
ImportOptions__ApiKeys__AzureAccessToken: ${{ steps.azure-oidc-auth.outputs.access-token }}
4150
ImportOptions__ApiKeys__QuestKey: ${{ secrets.QUEST_KEY }}
4251
ImportOptions__ApiKeys__SequesterPrivateKey: ${{ secrets.SEQUESTER_PRIVATEKEY }}
4352
ImportOptions__ApiKeys__SequesterAppID: ${{ secrets.SEQUESTER_APPID }}
@@ -53,12 +62,11 @@ jobs:
5362
uses: dotnet/docs-tools/actions/sequester@main
5463
env:
5564
ImportOptions__ApiKeys__GitHubToken: ${{ secrets.GITHUB_TOKEN }}
56-
ImportOptions__ApiKeys__OSPOKey: ${{ secrets.OSPO_KEY }}
65+
ImportOptions__ApiKeys__AzureAccessToken: ${{ steps.azure-oidc-auth.outputs.access-token }}
5766
ImportOptions__ApiKeys__QuestKey: ${{ secrets.QUEST_KEY }}
5867
ImportOptions__ApiKeys__SequesterPrivateKey: ${{ secrets.SEQUESTER_PRIVATEKEY }}
5968
ImportOptions__ApiKeys__SequesterAppID: ${{ secrets.SEQUESTER_APPID }}
6069
with:
6170
org: ${{ github.repository_owner }}
6271
repo: ${{ github.repository }}
6372
issue: ${{ github.event.issue.number }}
64-

‎xml/SourceLinkInformation/net-7.0/Microsoft.CSharp.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"Assembly": "Microsoft.CSharp",
33
"GUID": "D7465CDC42BB0708DE4CF8C0C295FDF0FFFFFFFF",
4+
"Tag": "sb3+XhJN2vxJryIyYNi38yjWJthxmljoLkgJgDFV8CM=",
45
"Types": [
56
{
67
"Members": [

‎xml/SourceLinkInformation/net-7.0/Microsoft.Extensions.Caching.Abstractions.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"Assembly": "Microsoft.Extensions.Caching.Abstractions",
33
"GUID": "16C75B0A91C34ECBAD7DA30D51CC9276FFFFFFFF",
4+
"Tag": "sb3+XhJN2vxJryIyYNi38yjWJthxmljoLkgJgDFV8CM=",
45
"Types": [
56
{
67
"Members": [

‎xml/SourceLinkInformation/net-7.0/Microsoft.Extensions.Caching.Memory.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"Assembly": "Microsoft.Extensions.Caching.Memory",
33
"GUID": "9EB69CD8808D46289517AB217B71AEE4FFFFFFFF",
4+
"Tag": "sb3+XhJN2vxJryIyYNi38yjWJthxmljoLkgJgDFV8CM=",
45
"Types": [
56
{
67
"Members": [
@@ -82,7 +83,7 @@
8283
},
8384
{
8485
"DocsId": "M:Microsoft.Extensions.Caching.Memory.MemoryCache.Finalize",
85-
"SourceLink": "https://github.com/dotnet/runtime/blob/5535e31a712343a63f5d7d796cd874e563e5ac14/src/libraries/Microsoft.Extensions.Caching.Memory/src/MemoryCache.cs#L72C27-L16707566C0"
86+
"SourceLink": "https://github.com/dotnet/runtime/blob/5535e31a712343a63f5d7d796cd874e563e5ac14/src/libraries/Microsoft.Extensions.Caching.Memory/src/MemoryCache.cs#L72C27-L72C41"
8687
},
8788
{
8889
"DocsId": "M:Microsoft.Extensions.Caching.Memory.MemoryCache.CreateEntry(System.Object)",

‎xml/SourceLinkInformation/net-7.0/Microsoft.Extensions.Configuration.Abstractions.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"Assembly": "Microsoft.Extensions.Configuration.Abstractions",
33
"GUID": "DA2D202FCC914C3782FD4E88A52351A9FFFFFFFF",
4+
"Tag": "sb3+XhJN2vxJryIyYNi38yjWJthxmljoLkgJgDFV8CM=",
45
"Types": [
56
{
67
"Members": [
@@ -106,7 +107,7 @@
106107
},
107108
{
108109
"DocsId": "M:Microsoft.Extensions.Configuration.ConfigurationRootExtensions.GetDebugView(Microsoft.Extensions.Configuration.IConfigurationRoot,System.Func{Microsoft.Extensions.Configuration.ConfigurationDebugViewContext,System.String})",
109-
"SourceLink": "https://github.com/dotnet/runtime/blob/5535e31a712343a63f5d7d796cd874e563e5ac14/src/libraries/Microsoft.Extensions.Configuration.Abstractions/src/ConfigurationRootExtensions.cs#L16707566C0-L78C39"
110+
"SourceLink": "https://github.com/dotnet/runtime/blob/5535e31a712343a63f5d7d796cd874e563e5ac14/src/libraries/Microsoft.Extensions.Configuration.Abstractions/src/ConfigurationRootExtensions.cs#L74C13-L78C39"
110111
}
111112
],
112113
"DocsId": "T:Microsoft.Extensions.Configuration.ConfigurationRootExtensions",

‎xml/SourceLinkInformation/net-7.0/Microsoft.Extensions.Configuration.Binder.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"Assembly": "Microsoft.Extensions.Configuration.Binder",
33
"GUID": "F4F5CFD5FF1843B5A23DC553EBDDA836FFFFFFFF",
4+
"Tag": "sb3+XhJN2vxJryIyYNi38yjWJthxmljoLkgJgDFV8CM=",
45
"Types": [
56
{
67
"Members": [

‎xml/SourceLinkInformation/net-7.0/Microsoft.Extensions.Configuration.CommandLine.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"Assembly": "Microsoft.Extensions.Configuration.CommandLine",
33
"GUID": "B88A22D79D744155A939DA5D5BDC49BCFFFFFFFF",
4+
"Tag": "sb3+XhJN2vxJryIyYNi38yjWJthxmljoLkgJgDFV8CM=",
45
"Types": [
56
{
67
"Members": [

‎xml/SourceLinkInformation/net-7.0/Microsoft.Extensions.Configuration.EnvironmentVariables.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"Assembly": "Microsoft.Extensions.Configuration.EnvironmentVariables",
33
"GUID": "2B89E2A7CFFD4A54B8344FB6BD1C55DBFFFFFFFF",
4+
"Tag": "sb3+XhJN2vxJryIyYNi38yjWJthxmljoLkgJgDFV8CM=",
45
"Types": [
56
{
67
"Members": [

‎xml/SourceLinkInformation/net-7.0/Microsoft.Extensions.Configuration.FileExtensions.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"Assembly": "Microsoft.Extensions.Configuration.FileExtensions",
33
"GUID": "DBA2C6F2C2354F6D82037D013500C64CFFFFFFFF",
4+
"Tag": "sb3+XhJN2vxJryIyYNi38yjWJthxmljoLkgJgDFV8CM=",
45
"Types": [
56
{
67
"Members": [

‎xml/SourceLinkInformation/net-7.0/Microsoft.Extensions.Configuration.Ini.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"Assembly": "Microsoft.Extensions.Configuration.Ini",
33
"GUID": "A07767ECDF78465C8CA2DDA92CB45DFDFFFFFFFF",
4+
"Tag": "sb3+XhJN2vxJryIyYNi38yjWJthxmljoLkgJgDFV8CM=",
45
"Types": [
56
{
67
"Members": [
@@ -18,15 +19,15 @@
1819
},
1920
{
2021
"DocsId": "M:Microsoft.Extensions.Configuration.IniConfigurationExtensions.AddIniFile(Microsoft.Extensions.Configuration.IConfigurationBuilder,Microsoft.Extensions.FileProviders.IFileProvider,System.String,System.Boolean,System.Boolean)",
21-
"SourceLink": "https://github.com/dotnet/runtime/blob/5535e31a712343a63f5d7d796cd874e563e5ac14/src/libraries/Microsoft.Extensions.Configuration.Ini/src/IniConfigurationExtensions.cs#L16707566C0-L81C16"
22+
"SourceLink": "https://github.com/dotnet/runtime/blob/5535e31a712343a63f5d7d796cd874e563e5ac14/src/libraries/Microsoft.Extensions.Configuration.Ini/src/IniConfigurationExtensions.cs#L67C13-L81C16"
2223
},
2324
{
2425
"DocsId": "M:Microsoft.Extensions.Configuration.IniConfigurationExtensions.AddIniFile(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.Action{Microsoft.Extensions.Configuration.Ini.IniConfigurationSource})",
2526
"SourceLink": "https://github.com/dotnet/runtime/blob/5535e31a712343a63f5d7d796cd874e563e5ac14/src/libraries/Microsoft.Extensions.Configuration.Ini/src/IniConfigurationExtensions.cs#L91C16-L91C44"
2627
},
2728
{
2829
"DocsId": "M:Microsoft.Extensions.Configuration.IniConfigurationExtensions.AddIniStream(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.IO.Stream)",
29-
"SourceLink": "https://github.com/dotnet/runtime/blob/5535e31a712343a63f5d7d796cd874e563e5ac14/src/libraries/Microsoft.Extensions.Configuration.Ini/src/IniConfigurationExtensions.cs#L16707566C0-L103C86"
30+
"SourceLink": "https://github.com/dotnet/runtime/blob/5535e31a712343a63f5d7d796cd874e563e5ac14/src/libraries/Microsoft.Extensions.Configuration.Ini/src/IniConfigurationExtensions.cs#L101C13-L103C86"
3031
}
3132
],
3233
"DocsId": "T:Microsoft.Extensions.Configuration.IniConfigurationExtensions",

‎xml/SourceLinkInformation/net-7.0/Microsoft.Extensions.Configuration.Json.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"Assembly": "Microsoft.Extensions.Configuration.Json",
33
"GUID": "61A09F5FBB8C4E8884DFC6043B4FE99DFFFFFFFF",
4+
"Tag": "sb3+XhJN2vxJryIyYNi38yjWJthxmljoLkgJgDFV8CM=",
45
"Types": [
56
{
67
"Members": [
@@ -18,15 +19,15 @@
1819
},
1920
{
2021
"DocsId": "M:Microsoft.Extensions.Configuration.JsonConfigurationExtensions.AddJsonFile(Microsoft.Extensions.Configuration.IConfigurationBuilder,Microsoft.Extensions.FileProviders.IFileProvider,System.String,System.Boolean,System.Boolean)",
21-
"SourceLink": "https://github.com/dotnet/runtime/blob/5535e31a712343a63f5d7d796cd874e563e5ac14/src/libraries/Microsoft.Extensions.Configuration.Json/src/JsonConfigurationExtensions.cs#L16707566C0-L81C16"
22+
"SourceLink": "https://github.com/dotnet/runtime/blob/5535e31a712343a63f5d7d796cd874e563e5ac14/src/libraries/Microsoft.Extensions.Configuration.Json/src/JsonConfigurationExtensions.cs#L67C13-L81C16"
2223
},
2324
{
2425
"DocsId": "M:Microsoft.Extensions.Configuration.JsonConfigurationExtensions.AddJsonFile(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.Action{Microsoft.Extensions.Configuration.Json.JsonConfigurationSource})",
2526
"SourceLink": "https://github.com/dotnet/runtime/blob/5535e31a712343a63f5d7d796cd874e563e5ac14/src/libraries/Microsoft.Extensions.Configuration.Json/src/JsonConfigurationExtensions.cs#L91C16-L91C44"
2627
},
2728
{
2829
"DocsId": "M:Microsoft.Extensions.Configuration.JsonConfigurationExtensions.AddJsonStream(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.IO.Stream)",
29-
"SourceLink": "https://github.com/dotnet/runtime/blob/5535e31a712343a63f5d7d796cd874e563e5ac14/src/libraries/Microsoft.Extensions.Configuration.Json/src/JsonConfigurationExtensions.cs#L16707566C0-L103C87"
30+
"SourceLink": "https://github.com/dotnet/runtime/blob/5535e31a712343a63f5d7d796cd874e563e5ac14/src/libraries/Microsoft.Extensions.Configuration.Json/src/JsonConfigurationExtensions.cs#L101C13-L103C87"
3031
}
3132
],
3233
"DocsId": "T:Microsoft.Extensions.Configuration.JsonConfigurationExtensions",

‎xml/SourceLinkInformation/net-7.0/Microsoft.Extensions.Configuration.UserSecrets.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"Assembly": "Microsoft.Extensions.Configuration.UserSecrets",
33
"GUID": "7985AB78594446AABD081E7B023AE76CFFFFFFFF",
4+
"Tag": "sb3+XhJN2vxJryIyYNi38yjWJthxmljoLkgJgDFV8CM=",
45
"Types": [
56
{
67
"Members": [

‎xml/SourceLinkInformation/net-7.0/Microsoft.Extensions.Configuration.Xml.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"Assembly": "Microsoft.Extensions.Configuration.Xml",
33
"GUID": "62B84D1503184876AC1D7CBB210684D7FFFFFFFF",
4+
"Tag": "sb3+XhJN2vxJryIyYNi38yjWJthxmljoLkgJgDFV8CM=",
45
"Types": [
56
{
67
"Members": [
@@ -18,15 +19,15 @@
1819
},
1920
{
2021
"DocsId": "M:Microsoft.Extensions.Configuration.XmlConfigurationExtensions.AddXmlFile(Microsoft.Extensions.Configuration.IConfigurationBuilder,Microsoft.Extensions.FileProviders.IFileProvider,System.String,System.Boolean,System.Boolean)",
21-
"SourceLink": "https://github.com/dotnet/runtime/blob/5535e31a712343a63f5d7d796cd874e563e5ac14/src/libraries/Microsoft.Extensions.Configuration.Xml/src/XmlConfigurationExtensions.cs#L16707566C0-L90C16"
22+
"SourceLink": "https://github.com/dotnet/runtime/blob/5535e31a712343a63f5d7d796cd874e563e5ac14/src/libraries/Microsoft.Extensions.Configuration.Xml/src/XmlConfigurationExtensions.cs#L76C13-L90C16"
2223
},
2324
{
2425
"DocsId": "M:Microsoft.Extensions.Configuration.XmlConfigurationExtensions.AddXmlFile(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.Action{Microsoft.Extensions.Configuration.Xml.XmlConfigurationSource})",
2526
"SourceLink": "https://github.com/dotnet/runtime/blob/5535e31a712343a63f5d7d796cd874e563e5ac14/src/libraries/Microsoft.Extensions.Configuration.Xml/src/XmlConfigurationExtensions.cs#L102C16-L102C44"
2627
},
2728
{
2829
"DocsId": "M:Microsoft.Extensions.Configuration.XmlConfigurationExtensions.AddXmlStream(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.IO.Stream)",
29-
"SourceLink": "https://github.com/dotnet/runtime/blob/5535e31a712343a63f5d7d796cd874e563e5ac14/src/libraries/Microsoft.Extensions.Configuration.Xml/src/XmlConfigurationExtensions.cs#L16707566C0-L116C86"
30+
"SourceLink": "https://github.com/dotnet/runtime/blob/5535e31a712343a63f5d7d796cd874e563e5ac14/src/libraries/Microsoft.Extensions.Configuration.Xml/src/XmlConfigurationExtensions.cs#L114C13-L116C86"
3031
}
3132
],
3233
"DocsId": "T:Microsoft.Extensions.Configuration.XmlConfigurationExtensions",

‎xml/SourceLinkInformation/net-7.0/Microsoft.Extensions.Configuration.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"Assembly": "Microsoft.Extensions.Configuration",
33
"GUID": "8354F3DFEA3B4A48A7AF3BBB2D10CF2EFFFFFFFF",
4+
"Tag": "sb3+XhJN2vxJryIyYNi38yjWJthxmljoLkgJgDFV8CM=",
45
"Types": [
56
{
67
"Members": [

‎xml/SourceLinkInformation/net-7.0/Microsoft.Extensions.DependencyInjection.Abstractions.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"Assembly": "Microsoft.Extensions.DependencyInjection.Abstractions",
33
"GUID": "E0BF07351B974D929224C67EA13E9206FFFFFFFF",
4+
"Tag": "sb3+XhJN2vxJryIyYNi38yjWJthxmljoLkgJgDFV8CM=",
45
"Types": [
56
{
67
"Members": [
@@ -495,7 +496,7 @@
495496
},
496497
{
497498
"DocsId": "M:Microsoft.Extensions.DependencyInjection.ServiceDescriptor.#ctor(System.Type,System.Object,System.Func{System.IServiceProvider,System.Object,System.Object},Microsoft.Extensions.DependencyInjection.ServiceLifetime)",
498-
"SourceLink": "https://github.com/dotnet/runtime/blob/9f4b1f5d664afdfc80e1508ab7ed099dff210fbd/src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/src/ServiceDescriptor.cs#L16707566C0-L127C10"
499+
"SourceLink": "https://github.com/dotnet/runtime/blob/9f4b1f5d664afdfc80e1508ab7ed099dff210fbd/src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/src/ServiceDescriptor.cs#L112C15-L127C10"
499500
},
500501
{
501502
"DocsId": "M:Microsoft.Extensions.DependencyInjection.ServiceDescriptor.ToString",

0 commit comments

Comments
 (0)