Merge main branch to release/dnup

.azuredevops/dependabot.yml

@@ -0,0 +1,5 @@
+version: 2
+
+# Disabling dependabot on Azure DevOps as this is a mirrored repo. Updates should go through github.
+enable-campaigned-updates: false
+enable-security-updates: false

.editorconfig

@@ -515,11 +515,11 @@ dotnet_diagnostic.IDE0040.severity = warning
 insert_final_newline = false
 
 # Verify settings
-[*.{received,verified}.{txt,xml,json}]
+[*.{received,verified}.{txt,xml,json,sh,zsh,nu,fish,ps1}]
 charset = "utf-8-bom"
 end_of_line = lf
 indent_size = unset
 indent_style = unset
 insert_final_newline = false
 tab_width = unset
-trim_trailing_whitespace = false
+trim_trailing_whitespace = false

.gitattributes

@@ -67,3 +67,7 @@
 *.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
+*.verified.sh text eol=lf working-tree-encoding=UTF-8
+*.verified.zsh text eol=lf working-tree-encoding=UTF-8
+*.verified.nu text eol=lf working-tree-encoding=UTF-8
+*.verified.fish text eol=lf working-tree-encoding=UTF-8

.github/copilot-instructions.md

@@ -1,3 +1,7 @@
+Use the instructions from the main branch if available: @dotnet/sdk/files/.github/copilot-instructions.md
+
+If the instructions from main are not available, use the following as a fallback:
+
 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.
@@ -34,3 +38,8 @@ Localization:
 
 Documentation:
 - Do not manually edit files under documentation/manpages/sdk as these are generated based on documentation and should not be manually modified.
+
+External Dependencies:
+- Changes that require modifications to the dotnet/templating repository (Microsoft.TemplateEngine packages) should be made directly in that repository, not worked around in this repo.
+- The dotnet/templating repository owns the TemplateEngine.Edge, TemplateEngine.Abstractions, and related packages.
+- If a change requires updates to template engine behavior or formatting (e.g., DisplayName properties), file an issue in dotnet/templating and make the changes there rather than adding workarounds in this SDK repository.

.github/policies/resourceManagement.yml

@@ -1,10 +1,10 @@
-id: 
+id:
 name: GitOps.PullRequestIssueManagement
 description: GitOps.PullRequestIssueManagement primitive
-owner: 
+owner:
 resource: repository
 disabled: false
-where: 
+where:
 configuration:
   resourceManagementConfiguration:
     scheduledSearches:
@@ -90,7 +90,7 @@ configuration:
           label: needs-breaking-change-doc-created
       - addReply:
           reply: >-
-            Added `needs-breaking-change-doc-created` label because this PR has the `breaking-change` label. 
+            Added `needs-breaking-change-doc-created` label because this PR has the `breaking-change` label.
 
 
             When you commit this breaking change:
@@ -103,5 +103,23 @@ configuration:
 
             You can refer to the [.NET SDK breaking change guidelines](https://github.com/dotnet/sdk/blob/main/documentation/project-docs/breaking-change-guidelines.md)
       description: Add breaking change instructions to PR.
-onFailure: 
-onSuccess: 
+    - description: Remind Telemetry PR authors of the telemetry guidelines
+      if:
+      - payloadType: Pull_Request
+      - labelAdded:
+          label: Area-Telemetry
+      then:
+      - addReply:
+          reply: >-
+            This PR has been labeled with `Area-Telemetry`. Please ensure that any telemetry changes in this PR
+
+            * comply with the [published guidance](https://learn.microsoft.com/dotnet/core/tools/telemetry#data-points)
+            * are added to the [repo-local telemetry documentation](./documentation/project-docs/telemetry.md)
+            * get a matching .NET Docs issue raised to document the telemetry changes
+              * Go to https://learn.microsoft.com/dotnet/core/tools/telemetry
+              * Scroll down to the bottom and click the 'Open a documentation issue' link to create an issue with pre-filled details
+      - requestReview:
+          reviewer: dsplaisted
+
+onFailure:
+onSuccess:

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

@@ -3,6 +3,11 @@ name: Add Branch Lockdown Label to PRs
 on:
   pull_request_target:
   workflow_dispatch: # Allows manual triggering of the workflow
+    branches:
+      - 'release/8.*'
+      - 'release/9.*'
+      - 'release/10.*'
+      - 'main'
 
 permissions:
   actions: write # For managing the operation state cache
@@ -11,6 +16,8 @@ permissions:
 jobs:
   add-label:
     runs-on: ubuntu-latest
+    # Only run on the main repository, not forks
+    if: github.repository == 'dotnet/sdk'
 
     permissions:
       contents: read
@@ -19,6 +26,8 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v2
+        with:
+          persist-credentials: false
 
       - name: Install jq
         run: sudo apt-get install -y jq

.github/workflows/copilot-setup-steps.yml

@@ -20,6 +20,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        with:
+          persist-credentials: false
       - name: Do an initial build to ensure all dependencies are restored
         continue-on-error: true
         run: |

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

@@ -2,15 +2,20 @@ name: Remove Lockdown Label from PRs
 
 on:
   pull_request_target:
-    types: [closed]
+    branches:
+      - 'release/8.*'
+      - 'release/9.*'
+      - 'release/10.*'
+      - 'main'
 
 permissions:
     actions: write
     pull-requests: write
 
 jobs:
     remove-labels:
-        if: github.event.pull_request.merged == true && contains(github.event.pull_request.labels.*.name, 'Branding')
+        # Only run on the main repository, not forks
+        if: github.event.pull_request.merged == true && contains(github.event.pull_request.labels.*.name, 'Branding') && github.repository == 'dotnet/sdk'
         runs-on: ubuntu-latest
         steps:
         -   name: PR's only change is <VersionFeature> in eng/Versions.props

.github/workflows/update-man-pages.yml

@@ -17,6 +17,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           ref: release/10.0.1xx
+          persist-credentials: false
 
       - name: Update man-pages
         run: |

.github/workflows/update-static-web-assets-baselines.yml

@@ -24,9 +24,10 @@ jobs:
 
       - name: Checkout PR branch
         run: |
-          gh pr checkout ${{ github.event.inputs.pr_number }}
+          gh pr checkout ${GITHUB_EVENT_INPUTS_PR_NUMBER}
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_EVENT_INPUTS_PR_NUMBER: ${{ github.event.inputs.pr_number }}
 
       - name: Run build script
         id: build
@@ -79,33 +80,39 @@ jobs:
       - name: Comment on PR - No changes
         if: steps.update.outcome == 'success' && steps.check-changes.outputs.changes == 'false'
         run: |
-          gh pr comment ${{ github.event.inputs.pr_number }} \
+          gh pr comment ${GITHUB_EVENT_INPUTS_PR_NUMBER} \
             --body "No baselines were updated."
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_EVENT_INPUTS_PR_NUMBER: ${{ github.event.inputs.pr_number }}
 
       - name: Comment on PR - Changes pushed
         if: steps.commit.outcome == 'success'
         run: |
-          gh pr comment ${{ github.event.inputs.pr_number }} \
+          gh pr comment ${GITHUB_EVENT_INPUTS_PR_NUMBER} \
             --body "Baselines updated."
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_EVENT_INPUTS_PR_NUMBER: ${{ github.event.inputs.pr_number }}
 
       - name: Comment on PR - Failure
         if: steps.build.outcome == 'failure' || steps.update.outcome == 'failure' || (steps.check-changes.outputs.changes == 'true' && steps.commit.outcome == 'failure')
         run: |
           ERROR_MSG="Update baselines failed"
 
-          if [[ "${{ steps.build.outcome }}" == "failure" ]]; then
+          if [[ "${STEPS_BUILD_OUTCOME}" == "failure" ]]; then
             ERROR_MSG="$ERROR_MSG: Build script failed"
-          elif [[ "${{ steps.update.outcome }}" == "failure" ]]; then
+          elif [[ "${STEPS_UPDATE_OUTCOME}" == "failure" ]]; then
             ERROR_MSG="$ERROR_MSG: Update baselines script failed"
-          elif [[ "${{ steps.commit.outcome }}" == "failure" ]]; then
+          elif [[ "${STEPS_COMMIT_OUTCOME}" == "failure" ]]; then
             ERROR_MSG="$ERROR_MSG: Failed to commit or push changes"
           fi
 
-          gh pr comment ${{ github.event.inputs.pr_number }} \
+          gh pr comment ${GITHUB_EVENT_INPUTS_PR_NUMBER} \
             --body "$ERROR_MSG"
         env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          STEPS_BUILD_OUTCOME: ${{ steps.build.outcome }}
+          STEPS_UPDATE_OUTCOME: ${{ steps.update.outcome }}
+          STEPS_COMMIT_OUTCOME: ${{ steps.commit.outcome }}
+          GITHUB_EVENT_INPUTS_PR_NUMBER: ${{ github.event.inputs.pr_number }}

.vscode/settings.json

@@ -1,4 +1,11 @@
 {
     "dotnet.testWindow.disableAutoDiscovery": true,
-    "dotnet.defaultSolution": "sdk.slnx"
+    "dotnet.testWindow.disableBuildOnRun": true,
+    "dotnet.defaultSolution": "cli.slnf",
+    "files.associations": {
+      "*.slnf": "json",
+      "*.props": "xml",
+      "*.targets": "xml",
+      "*.*proj": "xml"
+    }
 }

.vsts-ci.yml

@@ -5,7 +5,7 @@ trigger:
   branches:
     include:
     - main
-    - release/10.0.1*
+    - release/10.0.2*
     - internal/release/*
     - exp/*
 
@@ -98,10 +98,11 @@ extends:
             name: $(DncEngInternalBuildPool)
             image: windows.vs2022.amd64
             os: windows
-          helixTargetQueue: windows.amd64.vs2022.pre
+          helixTargetQueue: windows.amd64.vs2026.pre.scout
           oneESCompat:
             templateFolderName: templates-official
             publishTaskPrefix: 1ES.
+          populateInternalRuntimeVariables: true
           runtimeSourceProperties: /p:DotNetRuntimeSourceFeed=https://ci.dot.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64)
           locBranch: release/10.0.1xx
           # WORKAROUND: BinSkim requires the folder exist prior to scanning.
@@ -141,6 +142,14 @@ extends:
                 _SignType: real
               dependsOn: Official_windows_x64
               downloadManifestMsiPackages: true
+            ### TestTemplatesCG ###
+            # Note: This job is only used to allow the test templates to be built locally on the agent as opposed to Helix.
+            # The tests acquire the templates' PackageReferences from NuGet, which allows them to be scanned by CG (component governance).
+            # CG is only ran internally, so this job makes sense to only run alongside of the official jobs.
+            - categoryName: TestTemplatesCG
+              testProjects: $(Build.SourcesDirectory)/test/dotnet-new.IntegrationTests/dotnet-new.IntegrationTests.csproj
+              testRunnerAdditionalArguments: -class Microsoft.DotNet.Cli.New.IntegrationTests.DotnetNewTestTemplatesTests
+              publishXunitResults: true
 
       ############### LINUX ###############
       - template: /eng/pipelines/templates/jobs/sdk-job-matrix.yml@self
@@ -153,6 +162,7 @@ extends:
           oneESCompat:
             templateFolderName: templates-official
             publishTaskPrefix: 1ES.
+          populateInternalRuntimeVariables: true
           runtimeSourceProperties: /p:DotNetRuntimeSourceFeed=https://ci.dot.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64)
           ${{ if and(eq(parameters.runTestBuild, false), ne(variables['Build.Reason'], 'PullRequest')) }}:
             timeoutInMinutes: 90
@@ -235,6 +245,7 @@ extends:
           oneESCompat:
             templateFolderName: templates-official
             publishTaskPrefix: 1ES.
+          populateInternalRuntimeVariables: true
           runtimeSourceProperties: /p:DotNetRuntimeSourceFeed=https://ci.dot.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64)
           ${{ if and(eq(parameters.runTestBuild, false), ne(variables['Build.Reason'], 'PullRequest')) }}:
             timeoutInMinutes: 90
@@ -260,6 +271,8 @@ extends:
               vmImage: macOS-latest
               os: macOS
             helixTargetQueue: osx.13.arm64
+            populateInternalRuntimeVariables: true
+            runtimeSourceProperties: /p:DotNetRuntimeSourceFeed=https://ci.dot.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64)
             macOSJobParameterSets:
             - categoryName: TestBuild
               targetArchitecture: arm64
@@ -270,7 +283,9 @@ extends:
         - template: /eng/dotnet-format/dotnet-format-integration.yml@self
           parameters:
             oneESCompat:
+              templateFolderName: templates-official
               publishTaskPrefix: 1ES.
+            populateInternalRuntimeVariables: true
             runtimeSourceProperties: /p:DotNetRuntimeSourceFeed=https://ci.dot.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64)
 
     ############### PUBLISH STAGE ###############

.vsts-pr.yml

@@ -47,7 +47,7 @@ stages:
         name: $(DncEngPublicBuildPool)
         demands: ImageOverride -equals windows.vs2022.amd64.open
         os: windows
-      helixTargetQueue: windows.amd64.vs2022.pre.open
+      helixTargetQueue: windows.amd64.vs2026.pre.scout.open
 
   ############### LINUX ###############
   - template: /eng/pipelines/templates/jobs/sdk-job-matrix.yml

CODEOWNERS

@@ -31,8 +31,8 @@
 /src/WasmSdk @lewing @akoeplinger @pavelsavara @maraf
 
 # Area-Format
-/src/Cli/dotnet/commands/dotnet-format @arunchndr
-/test/dotnet-format.UnitTests @arunchndr
+/src/Cli/dotnet/Commands/Format @phil-allen-msft
+/test/dotnet-format.UnitTests @phil-allen-msft
 
 # Area-NuGet
 /src/Cli/dotnet/Commands/NuGet @dotnet/nuget-team
@@ -47,21 +47,21 @@
 /test/dotnet.Tests/CommandTests/Restore @dotnet/nuget-team
 
 # Area-FSharp
-/src/Cli/dotnet/commands/dotnet-fsi @dotnet/fsharp
+/src/Cli/dotnet/Commands/Fsi @dotnet/fsharp
 /test/dotnet-fsi.Tests @dotnet/fsharp
 
 # Area-DotNet Test
-/src/Cli/dotnet/commands/dotnet-test @dotnet/dotnet-testing-admin
-/src/Cli/dotnet/commands/dotnet-vstest @dotnet/dotnet-testing-admin
-/test/dotnet-test.Tests @dotnet/dotnet-testing-admin
-/test/dotnet-vstest.Tests @dotnet/dotnet-testing-admin
+/src/Cli/dotnet/Commands/Test @dotnet/dotnet-testing-admin
+/src/Cli/dotnet/Commands/VSTest @dotnet/dotnet-testing-admin
+/test/dotnet.Tests/CommandTests/Test @dotnet/dotnet-testing-admin
+/test/dotnet.Tests/CommandTests/VSTest @dotnet/dotnet-testing-admin
 /test/dotnet-new.IntegrationTests @dotnet/dotnet-testing-admin
 /template_feed/Microsoft.DotNet.Common.*/content/MSTest* @dotnet/dotnet-testing-admin
 /template_feed/Microsoft.DotNet.Common.*/content/NUnit* @dotnet/dotnet-testing-admin
 /template_feed/Microsoft.DotNet.Common.*/content/XUnit* @dotnet/dotnet-testing-admin
 
 # Area-Templates
-/src/Cli/dotnet/commands/dotnet-new @dotnet/templating-engine-maintainers
+/src/Cli/dotnet/Commands/New @dotnet/templating-engine-maintainers
 /src/Cli/Microsoft.TemplateEngine.Cli @dotnet/templating-engine-maintainers
 /test/dotnet-new.IntegrationTests @dotnet/templating-engine-maintainers
 /test/Microsoft.TemplateEngine.* @dotnet/templating-engine-maintainers
@@ -77,10 +77,10 @@
 /src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.ClickOnce.targets @sujitnayak
 
 # Area-Watch
-/test/TestAssets/TestProjects/Watch*/ @tmat @arunchndr @dotnet/roslyn-ide
-/test/dotnet-watch.Tests/ @tmat @arunchndr @dotnet/roslyn-ide
+/test/TestAssets/TestProjects/Watch*/ @tmat @dotnet/roslyn-ide
+/test/dotnet-watch.Tests/ @tmat @dotnet/roslyn-ide
 /test/Microsoft.AspNetCore.Watch.BrowserRefresh.Tests/ @dotnet/aspnet-blazor-eng
-/src/BuiltInTools/* @tmat @arunchndr @dotnet/roslyn-ide
+/src/BuiltInTools/* @tmat @dotnet/roslyn-ide
 /src/BuiltInTools/BrowserRefresh @dotnet/aspnet-blazor-eng
 /src/BuiltInTools/AspireService @dotnet/aspnet-blazor-eng
 
@@ -117,4 +117,4 @@
 # Area-Infrastructure
 .vsts-ci.yml @MiYanni
 .vsts-pr.yml @MiYanni
-/eng/pipelines @MiYanni
+/eng/pipelines @MiYanni