Merge branch 'main' into jjonescz-patch-1

Author: jjonescz

.config/dotnet-tools.json

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

.devcontainer/devcontainer.json

@@ -27,5 +27,10 @@
     "DOTNET_ROOT": "${containerWorkspaceFolder}/.dotnet",
     "DOTNET_MSBUILD_SDK_RESOLVER_CLI_DIR": "${containerWorkspaceFolder}/.dotnet",
     "NUGET_PACKAGES": "/home/vscode/.nuget/packages"
+  },
+  "remoteUser": "vscode",
+  "hostRequirements": {
+    "cpus": 16,
+    "memory": "32gb"
   }
 }

.devcontainer/scripts/post-creation.sh

@@ -1,4 +1,12 @@
+#! /usr/bin/env sh
+
 # Install SDK and tool dependencies before container starts
 # Also run the full restore on the repo so that go-to definition
 # and other language features will be available in C# files
 ./restore.sh
+# run the build so that everything is 'hot'
+./build.sh -tl:off
+# setup the IDE env to point to the local .dotnet folder so that assemblies/tools are loaded as expected
+# this script is run from repo root so shellcheck warning about relative-path lookups can be ignored
+# shellcheck disable=SC1091
+. ./artifacts/sdk-build-env.sh

.editorconfig

@@ -475,6 +475,10 @@ indent_brace_style = Allman
 [*.{csproj,vbproj,vcxproj,vcxproj.filters,proj,nativeproj,locproj}]
 indent_size = 2
 
+# WiX files
+[*.{wixproj,wxs,wxi,wxl,thm}]
+indent_size = 2
+
 [*.{csproj,vbproj,proj,nativeproj,locproj}]
 charset = utf-8-bom
 

.github/ISSUE_TEMPLATE/10_bug_report.md

@@ -29,5 +29,11 @@ Include the exception you get when facing this issue
 -->
 
 ### Further technical details
-- Include the output of `dotnet --info`
-- The IDE (VS / VS Code/ VS4Mac) you're running on, and its version
+<details><summary>details of dotnet --info</summary>
+<p>
+<!-- 
+Include the `dotnet --info` output here
+-->
+</p>
+</details>
+- The IDE (VS / VS Code/ VS4Mac) you're running on, and its version

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

@@ -25,6 +25,7 @@ jobs:
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: Do an initial build to ensure all dependencies are restored
+        continue-on-error: true
         run: |
           ./build.sh
       - name: Put repo-local dotnet install on PATH

.vscode/launch.json

@@ -0,0 +1,27 @@
+{
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": ".NET Core Launch (console)",
+      "type": "coreclr",
+      "request": "launch",
+      "program": "${workspaceFolder}${/}artifacts${/}bin${/}redist${/}Debug${/}dotnet${/}sdk${/}10.0.100--dev${/}dotnet.dll",
+      "args": [
+      ],
+      "env": {
+        "MSBuildExtensionsPath": "${workspaceFolder}${/}artifacts${/}bin${/}redist${/}Debug${/}dotnet${/}sdk${/}10.0.100-dev",
+        "MSBuildSDKsPath": "${workspaceFolder}${/}artifacts${/}bin${/}redist${/}Debug${/}dotnet${/}sdk${/}10.0.100-dev${/}Sdks",
+        "DOTNET_ROOT": "${workspaceFolder}${/}artifacts${/}bin${/}redist${/}Debug${/}dotnet",
+      },
+      "stopAtEntry": false,
+      "console": "integratedTerminal",
+      "justMyCode": true
+    },
+    {
+      "name": ".NET Core Attach",
+      "type": "coreclr",
+      "request": "attach",
+      "requireExactSource": false
+    }
+  ]
+}

.vscode/mcp.json

@@ -0,0 +1,9 @@
+{
+	"servers": {
+		"ms.docs": {
+			"url": "https://learn.microsoft.com/api/mcp",
+			"type": "http"
+		}
+	},
+	"inputs": []
+}

.vscode/settings.json

@@ -0,0 +1,4 @@
+{
+    "dotnet.testWindow.disableAutoDiscovery": true,
+    "dotnet.defaultSolution": "sdk.slnx"
+}

CODEOWNERS

@@ -34,12 +34,16 @@
 /test/dotnet-format.UnitTests @arunchndr
 
 # Area-NuGet
-/src/Cli/dotnet/commands/dotnet-add/dotnet-add-package @dotnet/nuget-team
-/test/dotnet-add-package.Tests @dotnet/nuget-team
-/src/Cli/dotnet/commands/dotnet-nuget @dotnet/nuget-team
-/test/dotnet-nuget.UnitTests @dotnet/nuget-team
-/src/Cli/dotnet/commands/dotnet-list/dotnet-list-package @dotnet/nuget-team
-/test/dotnet-list-package.Tests @dotnet/nuget-team
+/src/Cli/dotnet/Commands/NuGet @dotnet/nuget-team
+/src/Cli/dotnet/Commands/Pack @dotnet/nuget-team
+/src/Cli/dotnet/Commands/Package @dotnet/nuget-team
+/src/Cli/dotnet/Commands/Restore @dotnet/nuget-team
+/test/Microsoft.NET.Restore.Tests @dotnet/nuget-team
+/test/Microsoft.NET.Pack.Tests @dotnet/nuget-team
+/test/dotnet.Tests/CommandTests/NuGet @dotnet/nuget-team
+/test/dotnet.Tests/CommandTests/Pack @dotnet/nuget-team
+/test/dotnet.Tests/CommandTests/Package @dotnet/nuget-team
+/test/dotnet.Tests/CommandTests/Restore @dotnet/nuget-team
 
 # Area-FSharp
 /src/Cli/dotnet/commands/dotnet-fsi @dotnet/fsharp