Merge main into live

.github/policies/label-prs.yml

@@ -1,20 +1,21 @@
-id:
 name: GitOps.PullRequestIssueManagement
 description: GitOps.PullRequestIssueManagement primitive
-owner:
 resource: repository
-disabled: false
-where:
+
 configuration:
   resourceManagementConfiguration:
     eventResponderTasks:
-    - if:
+    - description: Label main to live PRs
+      triggerOnOwnActions: true
+      if:
       - payloadType: Pull_Request
-      - isActivitySender:
-          user: dotnet-policy-service
-          issueAuthor: False
+      - isAction:
+          action: Opened
+      - titleContains:
+          pattern: Merge main into live
+          isRegex: False
       then:
       - addLabel:
           label: ':octocat: auto-merge'
-      triggerOnOwnActions: true
-      description: Label PRs from Dotnet Policy Service
+
+

.github/workflows/quest-bulk.yml

@@ -8,12 +8,17 @@ on:
         description: "The reason for running the bulk import workflow"
         required: true
         default: "Initial import into Quest (Azure DevOps)"
+      duration:
+        description: "The number of days to import issues for. Defaults to 5 days."
+        required: false
+        default: "5"
 
 jobs:
   bulk-import:
     runs-on: ubuntu-latest
     permissions:
       issues: write
+      id-token: write
       pull-requests: write
     if: ${{ github.repository_owner == 'dotnet' }}
 
@@ -23,16 +28,25 @@ jobs:
         run: |
           echo "Reason: ${{ github.event.inputs.reason }}"
 
+      - name: Azure OpenID Connect
+        id: azure-oidc-auth
+        uses: dotnet/docs-tools/.github/actions/oidc-auth-flow@main
+        with:
+          client-id: ${{ secrets.CLIENT_ID }}
+          tenant-id: ${{ secrets.TENANT_ID }}
+          audience: ${{ secrets.OSMP_API_AUDIENCE }}
+
       - name: bulk-sequester
         id: bulk-sequester
         uses: dotnet/docs-tools/actions/sequester@main
         env:
           ImportOptions__ApiKeys__GitHubToken: ${{ secrets.GITHUB_TOKEN }}
-          ImportOptions__ApiKeys__OSPOKey: ${{ secrets.OSPO_KEY }}
           ImportOptions__ApiKeys__QuestKey: ${{ secrets.QUEST_KEY }}
+          ImportOptions__ApiKeys__AzureAccessToken: ${{ steps.azure-oidc-auth.outputs.access-token }}
           ImportOptions__ApiKeys__SequesterPrivateKey: ${{ secrets.SEQUESTER_PRIVATEKEY }}
           ImportOptions__ApiKeys__SequesterAppID: ${{ secrets.SEQUESTER_APPID }}
         with:
           org: ${{ github.repository_owner }}
           repo: ${{ github.repository }}
           issue: '-1'
+          duration: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.duration || 5 }}

.github/workflows/quest.yml

@@ -21,6 +21,7 @@ jobs:
     runs-on: ubuntu-latest
     permissions:
       issues: write
+      id-token: write
       pull-requests: write
 
     steps:
@@ -30,14 +31,22 @@ jobs:
           echo "Reason: ${{ github.event.inputs.reason }}"
           echo "Issue number: ${{ github.event.inputs.issue }}"
 
+      - name: Azure OpenID Connect
+        id: azure-oidc-auth
+        uses: dotnet/docs-tools/.github/actions/oidc-auth-flow@main
+        with:
+          client-id: ${{ secrets.CLIENT_ID }}
+          tenant-id: ${{ secrets.TENANT_ID }}
+          audience: ${{ secrets.OSMP_API_AUDIENCE }}
+
       # This step occurs when ran manually, passing the manual issue number input
       - name: manual-sequester
         if: ${{ github.event_name == 'workflow_dispatch' }}
         id: manual-sequester
         uses: dotnet/docs-tools/actions/sequester@main
         env:
           ImportOptions__ApiKeys__GitHubToken: ${{ secrets.GITHUB_TOKEN }}
-          ImportOptions__ApiKeys__OSPOKey: ${{ secrets.OSPO_KEY }}
+          ImportOptions__ApiKeys__AzureAccessToken:  ${{ steps.azure-oidc-auth.outputs.access-token }}
           ImportOptions__ApiKeys__QuestKey: ${{ secrets.QUEST_KEY }}
           ImportOptions__ApiKeys__SequesterPrivateKey: ${{ secrets.SEQUESTER_PRIVATEKEY }}
           ImportOptions__ApiKeys__SequesterAppID: ${{ secrets.SEQUESTER_APPID }}
@@ -53,12 +62,11 @@ jobs:
         uses: dotnet/docs-tools/actions/sequester@main
         env:
           ImportOptions__ApiKeys__GitHubToken: ${{ secrets.GITHUB_TOKEN }}
-          ImportOptions__ApiKeys__OSPOKey: ${{ secrets.OSPO_KEY }}
+          ImportOptions__ApiKeys__AzureAccessToken: ${{ steps.azure-oidc-auth.outputs.access-token }}
           ImportOptions__ApiKeys__QuestKey: ${{ secrets.QUEST_KEY }}
           ImportOptions__ApiKeys__SequesterPrivateKey: ${{ secrets.SEQUESTER_PRIVATEKEY }}
           ImportOptions__ApiKeys__SequesterAppID: ${{ secrets.SEQUESTER_APPID }}
         with:
           org: ${{ github.repository_owner }}
           repo: ${{ github.repository }}
           issue: ${{ github.event.issue.number }}
-

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

@@ -1,6 +1,7 @@
 {
   "Assembly": "Microsoft.CSharp",
   "GUID": "D7465CDC42BB0708DE4CF8C0C295FDF0FFFFFFFF",
+  "Tag": "sb3+XhJN2vxJryIyYNi38yjWJthxmljoLkgJgDFV8CM=",
   "Types": [
     {
       "Members": [

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

@@ -1,6 +1,7 @@
 {
   "Assembly": "Microsoft.Extensions.Caching.Abstractions",
   "GUID": "16C75B0A91C34ECBAD7DA30D51CC9276FFFFFFFF",
+  "Tag": "sb3+XhJN2vxJryIyYNi38yjWJthxmljoLkgJgDFV8CM=",
   "Types": [
     {
       "Members": [

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

@@ -1,6 +1,7 @@
 {
   "Assembly": "Microsoft.Extensions.Caching.Memory",
   "GUID": "9EB69CD8808D46289517AB217B71AEE4FFFFFFFF",
+  "Tag": "sb3+XhJN2vxJryIyYNi38yjWJthxmljoLkgJgDFV8CM=",
   "Types": [
     {
       "Members": [
@@ -82,7 +83,7 @@
         },
         {
           "DocsId": "M:Microsoft.Extensions.Caching.Memory.MemoryCache.Finalize",
-          "SourceLink": "https://github.com/dotnet/runtime/blob/5535e31a712343a63f5d7d796cd874e563e5ac14/src/libraries/Microsoft.Extensions.Caching.Memory/src/MemoryCache.cs#L72C27-L16707566C0"
+          "SourceLink": "https://github.com/dotnet/runtime/blob/5535e31a712343a63f5d7d796cd874e563e5ac14/src/libraries/Microsoft.Extensions.Caching.Memory/src/MemoryCache.cs#L72C27-L72C41"
         },
         {
           "DocsId": "M:Microsoft.Extensions.Caching.Memory.MemoryCache.CreateEntry(System.Object)",

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

@@ -1,6 +1,7 @@
 {
   "Assembly": "Microsoft.Extensions.Configuration.Abstractions",
   "GUID": "DA2D202FCC914C3782FD4E88A52351A9FFFFFFFF",
+  "Tag": "sb3+XhJN2vxJryIyYNi38yjWJthxmljoLkgJgDFV8CM=",
   "Types": [
     {
       "Members": [
@@ -106,7 +107,7 @@
         },
         {
           "DocsId": "M:Microsoft.Extensions.Configuration.ConfigurationRootExtensions.GetDebugView(Microsoft.Extensions.Configuration.IConfigurationRoot,System.Func{Microsoft.Extensions.Configuration.ConfigurationDebugViewContext,System.String})",
-          "SourceLink": "https://github.com/dotnet/runtime/blob/5535e31a712343a63f5d7d796cd874e563e5ac14/src/libraries/Microsoft.Extensions.Configuration.Abstractions/src/ConfigurationRootExtensions.cs#L16707566C0-L78C39"
+          "SourceLink": "https://github.com/dotnet/runtime/blob/5535e31a712343a63f5d7d796cd874e563e5ac14/src/libraries/Microsoft.Extensions.Configuration.Abstractions/src/ConfigurationRootExtensions.cs#L74C13-L78C39"
         }
       ],
       "DocsId": "T:Microsoft.Extensions.Configuration.ConfigurationRootExtensions",

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

@@ -1,6 +1,7 @@
 {
   "Assembly": "Microsoft.Extensions.Configuration.Binder",
   "GUID": "F4F5CFD5FF1843B5A23DC553EBDDA836FFFFFFFF",
+  "Tag": "sb3+XhJN2vxJryIyYNi38yjWJthxmljoLkgJgDFV8CM=",
   "Types": [
     {
       "Members": [

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

@@ -1,6 +1,7 @@
 {
   "Assembly": "Microsoft.Extensions.Configuration.CommandLine",
   "GUID": "B88A22D79D744155A939DA5D5BDC49BCFFFFFFFF",
+  "Tag": "sb3+XhJN2vxJryIyYNi38yjWJthxmljoLkgJgDFV8CM=",
   "Types": [
     {
       "Members": [

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

@@ -1,6 +1,7 @@
 {
   "Assembly": "Microsoft.Extensions.Configuration.EnvironmentVariables",
   "GUID": "2B89E2A7CFFD4A54B8344FB6BD1C55DBFFFFFFFF",
+  "Tag": "sb3+XhJN2vxJryIyYNi38yjWJthxmljoLkgJgDFV8CM=",
   "Types": [
     {
       "Members": [

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

@@ -1,6 +1,7 @@
 {
   "Assembly": "Microsoft.Extensions.Configuration.FileExtensions",
   "GUID": "DBA2C6F2C2354F6D82037D013500C64CFFFFFFFF",
+  "Tag": "sb3+XhJN2vxJryIyYNi38yjWJthxmljoLkgJgDFV8CM=",
   "Types": [
     {
       "Members": [

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

@@ -1,6 +1,7 @@
 {
   "Assembly": "Microsoft.Extensions.Configuration.Ini",
   "GUID": "A07767ECDF78465C8CA2DDA92CB45DFDFFFFFFFF",
+  "Tag": "sb3+XhJN2vxJryIyYNi38yjWJthxmljoLkgJgDFV8CM=",
   "Types": [
     {
       "Members": [
@@ -18,15 +19,15 @@
         },
         {
           "DocsId": "M:Microsoft.Extensions.Configuration.IniConfigurationExtensions.AddIniFile(Microsoft.Extensions.Configuration.IConfigurationBuilder,Microsoft.Extensions.FileProviders.IFileProvider,System.String,System.Boolean,System.Boolean)",
-          "SourceLink": "https://github.com/dotnet/runtime/blob/5535e31a712343a63f5d7d796cd874e563e5ac14/src/libraries/Microsoft.Extensions.Configuration.Ini/src/IniConfigurationExtensions.cs#L16707566C0-L81C16"
+          "SourceLink": "https://github.com/dotnet/runtime/blob/5535e31a712343a63f5d7d796cd874e563e5ac14/src/libraries/Microsoft.Extensions.Configuration.Ini/src/IniConfigurationExtensions.cs#L67C13-L81C16"
         },
         {
           "DocsId": "M:Microsoft.Extensions.Configuration.IniConfigurationExtensions.AddIniFile(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.Action{Microsoft.Extensions.Configuration.Ini.IniConfigurationSource})",
           "SourceLink": "https://github.com/dotnet/runtime/blob/5535e31a712343a63f5d7d796cd874e563e5ac14/src/libraries/Microsoft.Extensions.Configuration.Ini/src/IniConfigurationExtensions.cs#L91C16-L91C44"
         },
         {
           "DocsId": "M:Microsoft.Extensions.Configuration.IniConfigurationExtensions.AddIniStream(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.IO.Stream)",
-          "SourceLink": "https://github.com/dotnet/runtime/blob/5535e31a712343a63f5d7d796cd874e563e5ac14/src/libraries/Microsoft.Extensions.Configuration.Ini/src/IniConfigurationExtensions.cs#L16707566C0-L103C86"
+          "SourceLink": "https://github.com/dotnet/runtime/blob/5535e31a712343a63f5d7d796cd874e563e5ac14/src/libraries/Microsoft.Extensions.Configuration.Ini/src/IniConfigurationExtensions.cs#L101C13-L103C86"
         }
       ],
       "DocsId": "T:Microsoft.Extensions.Configuration.IniConfigurationExtensions",

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

@@ -1,6 +1,7 @@
 {
   "Assembly": "Microsoft.Extensions.Configuration.Json",
   "GUID": "61A09F5FBB8C4E8884DFC6043B4FE99DFFFFFFFF",
+  "Tag": "sb3+XhJN2vxJryIyYNi38yjWJthxmljoLkgJgDFV8CM=",
   "Types": [
     {
       "Members": [
@@ -18,15 +19,15 @@
         },
         {
           "DocsId": "M:Microsoft.Extensions.Configuration.JsonConfigurationExtensions.AddJsonFile(Microsoft.Extensions.Configuration.IConfigurationBuilder,Microsoft.Extensions.FileProviders.IFileProvider,System.String,System.Boolean,System.Boolean)",
-          "SourceLink": "https://github.com/dotnet/runtime/blob/5535e31a712343a63f5d7d796cd874e563e5ac14/src/libraries/Microsoft.Extensions.Configuration.Json/src/JsonConfigurationExtensions.cs#L16707566C0-L81C16"
+          "SourceLink": "https://github.com/dotnet/runtime/blob/5535e31a712343a63f5d7d796cd874e563e5ac14/src/libraries/Microsoft.Extensions.Configuration.Json/src/JsonConfigurationExtensions.cs#L67C13-L81C16"
         },
         {
           "DocsId": "M:Microsoft.Extensions.Configuration.JsonConfigurationExtensions.AddJsonFile(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.Action{Microsoft.Extensions.Configuration.Json.JsonConfigurationSource})",
           "SourceLink": "https://github.com/dotnet/runtime/blob/5535e31a712343a63f5d7d796cd874e563e5ac14/src/libraries/Microsoft.Extensions.Configuration.Json/src/JsonConfigurationExtensions.cs#L91C16-L91C44"
         },
         {
           "DocsId": "M:Microsoft.Extensions.Configuration.JsonConfigurationExtensions.AddJsonStream(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.IO.Stream)",
-          "SourceLink": "https://github.com/dotnet/runtime/blob/5535e31a712343a63f5d7d796cd874e563e5ac14/src/libraries/Microsoft.Extensions.Configuration.Json/src/JsonConfigurationExtensions.cs#L16707566C0-L103C87"
+          "SourceLink": "https://github.com/dotnet/runtime/blob/5535e31a712343a63f5d7d796cd874e563e5ac14/src/libraries/Microsoft.Extensions.Configuration.Json/src/JsonConfigurationExtensions.cs#L101C13-L103C87"
         }
       ],
       "DocsId": "T:Microsoft.Extensions.Configuration.JsonConfigurationExtensions",

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

@@ -1,6 +1,7 @@
 {
   "Assembly": "Microsoft.Extensions.Configuration.UserSecrets",
   "GUID": "7985AB78594446AABD081E7B023AE76CFFFFFFFF",
+  "Tag": "sb3+XhJN2vxJryIyYNi38yjWJthxmljoLkgJgDFV8CM=",
   "Types": [
     {
       "Members": [

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

@@ -1,6 +1,7 @@
 {
   "Assembly": "Microsoft.Extensions.Configuration.Xml",
   "GUID": "62B84D1503184876AC1D7CBB210684D7FFFFFFFF",
+  "Tag": "sb3+XhJN2vxJryIyYNi38yjWJthxmljoLkgJgDFV8CM=",
   "Types": [
     {
       "Members": [
@@ -18,15 +19,15 @@
         },
         {
           "DocsId": "M:Microsoft.Extensions.Configuration.XmlConfigurationExtensions.AddXmlFile(Microsoft.Extensions.Configuration.IConfigurationBuilder,Microsoft.Extensions.FileProviders.IFileProvider,System.String,System.Boolean,System.Boolean)",
-          "SourceLink": "https://github.com/dotnet/runtime/blob/5535e31a712343a63f5d7d796cd874e563e5ac14/src/libraries/Microsoft.Extensions.Configuration.Xml/src/XmlConfigurationExtensions.cs#L16707566C0-L90C16"
+          "SourceLink": "https://github.com/dotnet/runtime/blob/5535e31a712343a63f5d7d796cd874e563e5ac14/src/libraries/Microsoft.Extensions.Configuration.Xml/src/XmlConfigurationExtensions.cs#L76C13-L90C16"
         },
         {
           "DocsId": "M:Microsoft.Extensions.Configuration.XmlConfigurationExtensions.AddXmlFile(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.Action{Microsoft.Extensions.Configuration.Xml.XmlConfigurationSource})",
           "SourceLink": "https://github.com/dotnet/runtime/blob/5535e31a712343a63f5d7d796cd874e563e5ac14/src/libraries/Microsoft.Extensions.Configuration.Xml/src/XmlConfigurationExtensions.cs#L102C16-L102C44"
         },
         {
           "DocsId": "M:Microsoft.Extensions.Configuration.XmlConfigurationExtensions.AddXmlStream(Microsoft.Extensions.Configuration.IConfigurationBuilder,System.IO.Stream)",
-          "SourceLink": "https://github.com/dotnet/runtime/blob/5535e31a712343a63f5d7d796cd874e563e5ac14/src/libraries/Microsoft.Extensions.Configuration.Xml/src/XmlConfigurationExtensions.cs#L16707566C0-L116C86"
+          "SourceLink": "https://github.com/dotnet/runtime/blob/5535e31a712343a63f5d7d796cd874e563e5ac14/src/libraries/Microsoft.Extensions.Configuration.Xml/src/XmlConfigurationExtensions.cs#L114C13-L116C86"
         }
       ],
       "DocsId": "T:Microsoft.Extensions.Configuration.XmlConfigurationExtensions",

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

@@ -1,6 +1,7 @@
 {
   "Assembly": "Microsoft.Extensions.Configuration",
   "GUID": "8354F3DFEA3B4A48A7AF3BBB2D10CF2EFFFFFFFF",
+  "Tag": "sb3+XhJN2vxJryIyYNi38yjWJthxmljoLkgJgDFV8CM=",
   "Types": [
     {
       "Members": [

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

@@ -1,6 +1,7 @@
 {
   "Assembly": "Microsoft.Extensions.DependencyInjection.Abstractions",
   "GUID": "E0BF07351B974D929224C67EA13E9206FFFFFFFF",
+  "Tag": "sb3+XhJN2vxJryIyYNi38yjWJthxmljoLkgJgDFV8CM=",
   "Types": [
     {
       "Members": [
@@ -495,7 +496,7 @@
         },
         {
           "DocsId": "M:Microsoft.Extensions.DependencyInjection.ServiceDescriptor.#ctor(System.Type,System.Object,System.Func{System.IServiceProvider,System.Object,System.Object},Microsoft.Extensions.DependencyInjection.ServiceLifetime)",
-          "SourceLink": "https://github.com/dotnet/runtime/blob/9f4b1f5d664afdfc80e1508ab7ed099dff210fbd/src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/src/ServiceDescriptor.cs#L16707566C0-L127C10"
+          "SourceLink": "https://github.com/dotnet/runtime/blob/9f4b1f5d664afdfc80e1508ab7ed099dff210fbd/src/libraries/Microsoft.Extensions.DependencyInjection.Abstractions/src/ServiceDescriptor.cs#L112C15-L127C10"
         },
         {
           "DocsId": "M:Microsoft.Extensions.DependencyInjection.ServiceDescriptor.ToString",