Merge pull request #41926 from dotnet/main

Merge main into live
dotnet · Jul 29, 2024 · 1b4be88 · 1b4be88
2 parents b5c406f + c626a3c
commit 1b4be88
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 68 deletions.
diff --git a/.github/workflows/check-for-build-warnings.yml b/.github/workflows/check-for-build-warnings.yml
@@ -1,7 +1,7 @@
 name: 'OPS status checker'
 
 on: 
-  pull_request_target:
+  pull_request:
     types: [opened, synchronize, reopened]
 
 permissions:
@@ -12,19 +12,14 @@ jobs:
     name: Look for build warnings
     runs-on: ubuntu-latest
     permissions:
-        statuses: write
-        issues: write
-        pull-requests: write
+        statuses: read
+        pull-requests: read
     steps:
     - name: Harden Runner
       uses: step-security/harden-runner@0d381219ddf674d61a7572ddd19d7941e271515c # v2.9.0
       with:
         egress-policy: audit
 
-    - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
-      with:
-        ref: ${{ github.event.pull_request.head.sha }}
-
     - uses: dotnet/docs-tools/actions/status-checker@5e8bcc78465d45a7544bba56509a1a69922b6a5a # main
       with:
         repo_token: ${{ secrets.GITHUB_TOKEN }}

diff --git a/.github/workflows/clean-repo.yml b/.github/workflows/clean-repo.yml
@@ -13,7 +13,6 @@ jobs:
     runs-on: ubuntu-latest
     permissions:
       contents: write
-      issues: write
       pull-requests: write
 
     steps:

diff --git a/.github/workflows/docs-verifier-tryfix.yml b/.github/workflows/docs-verifier-tryfix.yml
diff --git a/.github/workflows/docs-verifier.yml b/.github/workflows/docs-verifier.yml
@@ -1,5 +1,9 @@
 name: MSDocs build verifier
 on: pull_request
+
+permissions:
+  contents: read
+
 env:
   GITHUB_PR_NUMBER: ${{ github.event.pull_request.number }}
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

diff --git a/.github/workflows/live-protection.yml b/.github/workflows/live-protection.yml
@@ -1,4 +1,7 @@
-on: [pull_request_target]
+on: [pull_request]
+
+permissions:
+  contents: read
 
 jobs:
   comment:

diff --git a/.github/workflows/rebase-needed.yml b/.github/workflows/rebase-needed.yml
@@ -2,7 +2,7 @@ name: "rebase required"
 
 on:
   push:
-  pull_request_target:
+  pull_request:
     types: [synchronize]
 
 permissions:

diff --git a/docs/azure/sdk/dependency-injection.md b/docs/azure/sdk/dependency-injection.md
@@ -50,7 +50,7 @@ In the *Program.cs* file, invoke the <xref:Microsoft.Extensions.Azure.AzureClien
 
 ### [HostBuilder](#tab/host-builder)
 
-:::code language="csharp" source="snippets/dependency-injection/HostBuilder/Program.cs" id="snippet_HostBuilder" highlight="11-27":::
+:::code language="csharp" source="snippets/dependency-injection/HostBuilder/Program.cs" id="snippet_HostBuilder" highlight="11-26":::
 
 ---