Merge branch 'main' of https://github.com/dotnet/sdk into merge/release/9.0.3xx-to-main

Author: Jason Zhai

.config/dotnet-tools.json

@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "microsoft.dotnet.darc": {
-      "version": "1.1.0-beta.24367.3",
+      "version": "1.1.0-beta.25161.2",
       "commands": [
         "darc"
       ]

.config/tsaoptions.json

@@ -0,0 +1,10 @@
+{
+    "instanceUrl": "https://devdiv.visualstudio.com/",
+    "template": "TFSDEVDIV",
+    "projectName": "DEVDIV",
+    "areaPath": "DevDiv\\NET Tools\\SDK",
+    "iterationPath": "DevDiv",
+    "notificationAliases": [ "[email protected]" ],
+    "repositoryName": "dotnet-sdk",
+    "codebaseName": "dotnet-sdk"
+}

.devcontainer/vmr/devcontainer.json

@@ -3,7 +3,7 @@
 // The container supports source-building the SDK
 {
     "name": "VMR with PR changes",
-    "image": "mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-39",
+    "image": "mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9",
     "hostRequirements": {
         // A completely source built .NET is >64 GB with all the repos/artifacts
         "storage": "128gb"

.devcontainer/vmr/init.sh

@@ -25,6 +25,6 @@ vmr_branch=$(git -C "$sdk_dir" log --pretty=format:'%D' HEAD^ \
   | sed 's@origin/@@' \
   | sed 's@,.*@@')
 
-"$workspace_dir/synchronize-vmr.sh" --branch "$vmr_branch" --debug
+"$workspace_dir/synchronize-vmr.sh" --branch "$vmr_branch" --ci --debug
 
-(cd "$vmr_dir" && ./prep-source-build.sh)
+cd "$vmr_dir"

.gitattributes

@@ -10,6 +10,12 @@
 ###############################################################################
 *.xlf linguist-generated=true
 
+###############################################################################
+# Set default behavior to:
+#   don't collapse these files in PRs
+###############################################################################
+**/build/** linguist-generated=false
+
 ###############################################################################
 # Set file behavior to:
 #   treat as text
@@ -61,3 +67,5 @@
 *.verified.txt text eol=lf working-tree-encoding=UTF-8
 *.verified.xml text eol=lf working-tree-encoding=UTF-8
 *.verified.json text eol=lf working-tree-encoding=UTF-8
+
+src/SourceBuild/patches/**/*.patch    text    eol=lf

.github/copilot-instructions.md

@@ -0,0 +1,15 @@
+Coding Style and Changes:
+- Code should match the style of the file it's in.
+- Changes should be minimal to resolve a problem in a clean way.
+- User-visible changes to behavior should be considered carefully before committing. They should always be flagged.
+
+Testing:
+- Large changes should always include test changes.
+- The Skip parameter of the Fact attribute to point to the specific issue link.
+
+Output Considerations:
+- When considering how output should look, solicit advice from baronfel.
+
+Localization:
+- Avoid modifying .xlf files and instead prompt the user to update them using the `/t:UpdateXlf` target on MSBuild.
+- Consider localizing strings in .resx files when possible.

.github/policies/resourceManagement.yml

@@ -1,115 +1,115 @@
-id: 
-name: GitOps.PullRequestIssueManagement
-description: GitOps.PullRequestIssueManagement primitive
-owner: 
-resource: repository
-disabled: false
-where: 
-configuration:
-  resourceManagementConfiguration:
-    scheduledSearches:
-    - description: Auto close "Area-NuGet" issues and add a comment pointing to NuGet repo
-      frequencies:
-      - daily:
-          time: 16:0
-      filters:
-      - isIssue
-      - isOpen
-      - hasLabel:
-          label: Area-NuGet
-      actions:
-      - addReply:
-          reply: >-
-            Thanks for creating this issue! We believe this issue is related to NuGet tooling, which is maintained by the NuGet team. Thus, we closed this one and encourage you to raise this issue in the [NuGet repository](https://github.com/NuGet/Home) instead. Don’t forget to check out [NuGet’s contributing guide](https://github.com/NuGet/Home/blob/dev/CONTRIBUTING.md#before-submitting-an-issue) before submitting an issue!
-
-
-            If you believe this issue was closed out of error, please comment to let us know.
-
-
-            Happy Coding!
-      - closeIssue
-    eventResponderTasks:
-    - if:
-      - payloadType: Pull_Request
-      - hasLabel:
-          label: Auto-Merge If Tests Pass
-      then:
-      - enableAutoMerge:
-          mergeMethod: Squash
-      description: Automatically merge pull requests
-    - if:
-      - payloadType: Pull_Request
-      - labelRemoved:
-          label: Auto-Merge If Tests Pass
-      then:
-      - disableAutoMerge
-      description: Automatically merge pull requests
-    - if:
-      - payloadType: Issues
-      - labelAdded:
-          label: Area-ApiCompat
-      then:
-      - addReply:
-          reply: '@dotnet/area-infrastructure-libraries a new issue has been filed in the ApiCompat area, please triage'
-      description: Notify apicompat of new untriaged bugs
-    - if:
-      - payloadType: Issues
-      - labelAdded:
-          label: Area-ILLink
-      then:
-      - addReply:
-          reply: '@dotnet/illink a new issue has been filed in the ILLink area, please triage'
-      description: Notify linker of new untriaged bugs
-    - if:
-      - payloadType: Pull_Request
-      - labelAdded:
-          label: Area-AspNetCore
-      - isOpen
-      then:
-      - addReply:
-          reply: >-
-            Thanks for your PR, @${issueAuthor}.
-
-            To learn about the PR process and branching schedule of this repo, please take a look at the [SDK PR Guide](https://github.com/dotnet/sdk/blob/main/documentation/project-docs/SDK-PR-guide.md).
-      description: Remind ASP.NET Core PR authors the process to follow
-    - if:
-      - payloadType: Issues
-      - labelAdded:
-          label: breaking-change
-      then:
-      - addLabel:
-          label: needs-breaking-change-doc-created
-      - addReply:
-          reply: >-
-            Added `needs-breaking-change-doc-created` label because this issue has the `breaking-change` label. 
-
-
-            1. [ ] Create and link to this issue a matching issue in the dotnet/docs repo using the [breaking change documentation template](https://aka.ms/dotnet/docs/new-breaking-change-issue), then remove this `needs-breaking-change-doc-created` label.
-
-
-            Tagging @dotnet/compat for awareness of the breaking change.
-      description: Add breaking change doc label to issue
-    - if:
-      - payloadType: Pull_Request
-      - labelAdded:
-          label: breaking-change
-      then:
-      - addLabel:
-          label: needs-breaking-change-doc-created
-      - addReply:
-          reply: >-
-            Added `needs-breaking-change-doc-created` label because this PR has the `breaking-change` label. 
-
-
-            When you commit this breaking change:
-
-
-            1. [ ] Create and link to this PR and the issue a matching issue in the dotnet/docs repo using the [breaking change documentation template](https://aka.ms/dotnet/docs/new-breaking-change-issue), then remove this `needs-breaking-change-doc-created` label.
-
-            2. [ ] Ask a committer to mail the `.NET Breaking Change Notification` DL.
-
-
-            Tagging @dotnet/compat for awareness of the breaking change.
-      description: Add breaking change doc label to PR
-onFailure: 
-onSuccess: 
+id: 
+name: GitOps.PullRequestIssueManagement
+description: GitOps.PullRequestIssueManagement primitive
+owner: 
+resource: repository
+disabled: false
+where: 
+configuration:
+  resourceManagementConfiguration:
+    scheduledSearches:
+    - description: Auto close "Area-NuGet" issues and add a comment pointing to NuGet repo
+      frequencies:
+      - daily:
+          time: 16:0
+      filters:
+      - isIssue
+      - isOpen
+      - hasLabel:
+          label: Area-NuGet
+      actions:
+      - addReply:
+          reply: >-
+            Thanks for creating this issue! We believe this issue is related to NuGet tooling, which is maintained by the NuGet team. Thus, we closed this one and encourage you to raise this issue in the [NuGet repository](https://github.com/NuGet/Home) instead. Don’t forget to check out [NuGet’s contributing guide](https://github.com/NuGet/Home/blob/dev/CONTRIBUTING.md#before-submitting-an-issue) before submitting an issue!
+
+
+            If you believe this issue was closed out of error, please comment to let us know.
+
+
+            Happy Coding!
+      - closeIssue
+    eventResponderTasks:
+    - if:
+      - payloadType: Pull_Request
+      - hasLabel:
+          label: Auto-Merge If Tests Pass
+      then:
+      - enableAutoMerge:
+          mergeMethod: Squash
+      description: Automatically merge pull requests
+    - if:
+      - payloadType: Pull_Request
+      - labelRemoved:
+          label: Auto-Merge If Tests Pass
+      then:
+      - disableAutoMerge
+      description: Automatically merge pull requests
+    - if:
+      - payloadType: Issues
+      - labelAdded:
+          label: Area-ApiCompat
+      then:
+      - addReply:
+          reply: '@dotnet/area-infrastructure-libraries a new issue has been filed in the ApiCompat area, please triage'
+      description: Notify apicompat of new untriaged bugs
+    - if:
+      - payloadType: Issues
+      - labelAdded:
+          label: Area-ILLink
+      then:
+      - addReply:
+          reply: '@dotnet/illink a new issue has been filed in the ILLink area, please triage'
+      description: Notify linker of new untriaged bugs
+    - if:
+      - payloadType: Pull_Request
+      - labelAdded:
+          label: Area-AspNetCore
+      - isOpen
+      then:
+      - addReply:
+          reply: >-
+            Thanks for your PR, @${issueAuthor}.
+
+            To learn about the PR process and branching schedule of this repo, please take a look at the [SDK PR Guide](https://github.com/dotnet/sdk/blob/main/documentation/project-docs/SDK-PR-guide.md).
+      description: Remind ASP.NET Core PR authors the process to follow
+    - if:
+      - payloadType: Issues
+      - labelAdded:
+          label: breaking-change
+      then:
+      - addLabel:
+          label: needs-breaking-change-doc-created
+      - addReply:
+          reply: >-
+            Added `needs-breaking-change-doc-created` label because this issue has the `breaking-change` label. 
+
+
+            1. [ ] Create and link to this issue a matching issue in the dotnet/docs repo using the [breaking change documentation template](https://aka.ms/dotnet/docs/new-breaking-change-issue), then remove this `needs-breaking-change-doc-created` label.
+
+
+            Tagging @dotnet/compat for awareness of the breaking change.
+      description: Add breaking change doc label to issue
+    - if:
+      - payloadType: Pull_Request
+      - labelAdded:
+          label: breaking-change
+      then:
+      - addLabel:
+          label: needs-breaking-change-doc-created
+      - addReply:
+          reply: >-
+            Added `needs-breaking-change-doc-created` label because this PR has the `breaking-change` label. 
+
+
+            When you commit this breaking change:
+
+
+            1. [ ] Create and link to this PR and the issue a matching issue in the dotnet/docs repo using the [breaking change documentation template](https://aka.ms/dotnet/docs/new-breaking-change-issue), then remove this `needs-breaking-change-doc-created` label.
+
+            2. [ ] Ask a committer to mail the `.NET Breaking Change Notification` DL.
+
+
+            Tagging @dotnet/compat for awareness of the breaking change.
+      description: Add breaking change doc label to PR
+onFailure: 
+onSuccess: 

.github/workflows/add-lockdown-label.yml

@@ -0,0 +1,75 @@
+name: Add Branch Lockdown Label to PRs
+
+on:
+  pull_request_target:
+  workflow_dispatch: # Allows manual triggering of the workflow
+
+permissions:
+  actions: write # For managing the operation state cache
+  issues: write
+
+jobs:
+  add-label:
+    runs-on: ubuntu-latest
+
+    permissions:
+      contents: read
+      pull-requests: write
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      - name: Install jq
+        run: sudo apt-get install -y jq
+
+      - name: Add label to PRs
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          # Determine the third Tuesday of the current month
+          third_tuesday=$(date -d "$(date +%Y-%m-01) +14 days" +%Y-%m-%d)
+          while [ $(date -d "$third_tuesday" +%u) -ne 2 ]; do
+            third_tuesday=$(date -d "$third_tuesday + 1 day" +%Y-%m-%d)
+          done
+          
+          # Determine the first Tuesday of the current month
+          first_tuesday=$(date -d "$(date +%Y-%m-01)" +%Y-%m-%d)
+          while [ $(date -d "$first_tuesday" +%u) -ne 2 ]; do
+            first_tuesday=$(date -d "$first_tuesday + 1 day" +%Y-%m-%d)
+          done
+
+          # Get current date
+          current_date=$(date +%Y-%m-%d)
+
+          echo "Current Date: $current_date"
+          echo "Third Tuesday of the month: $third_tuesday"
+          echo "First Tuesday of the month: $first_tuesday"
+
+          # Check if the current date is after the third Tuesday of this month or before the first Tuesday of this month
+          if [[ "$current_date" > "$third_tuesday" || "$current_date" < "$first_tuesday" ]]; then
+            echo "Within the label period. Checking if the branch matches..."
+
+            # Get all open PRs targeting branches release/8* and release/9* excluding release/9.0.3xx
+            echo "Running gh pr list query..."
+            prs=$(gh pr list --state open --limit 200 --json number,baseRefName,author,labels)
+            echo "Total PRs Count: $(echo "$prs" | jq length)"
+            echo "PRs JSON: $prs"
+
+            echo "Filtering PRs targeting release/8* and release/9* excluding release/9.0.3xx..."
+            prs_targeting_branches=$(echo "$prs" | jq '[.[] | select(.baseRefName | test("^release/[89].*")) | select(.baseRefName | test("^release/9.0.3xx") | not)]')
+            echo "Count of PRs targeting specific branches: $(echo "$prs_targeting_branches" | jq length)"
+
+            echo "Filtering PRs without Branch Lockdown label..."
+            filtered_prs=$(echo "$prs_targeting_branches" | jq '[.[] | select(.labels | map(.name) | index("Branch Lockdown") | not) | .number]')
+            echo "Filtered PRs without Branch Lockdown label JSON: $filtered_prs"
+            echo "Count of Filtered PRs without Branch Lockdown label: $(echo "$filtered_prs" | jq length)"
+
+            # Loop through filtered PRs and add label
+            for pr in $(echo "$filtered_prs" | jq -r '.[]'); do
+              echo "Adding label to PR #$pr"
+              gh pr edit $pr --add-label "Branch Lockdown"
+            done
+          else
+            echo "Outside the label period. No labels added."
+          fi