Merge branch 'main' into wix5

Author: joeloff

.config/dotnet-tools.json

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

.github/workflows/pr-analysis.yml

@@ -1,7 +1,7 @@
 name: PR Analysis
 on:
   pull_request_target:
-    types: [opened, synchronize, labeled, unlabeled]
+    types: [opened, synchronize, labeled, unlabeled, ready_for_review]
 permissions:
   contents: read
   pull-requests: read

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

@@ -68,4 +68,4 @@ jobs:
                             name: 'Branch Lockdown'
                         });
                         console.log(`Removed Branch Lockdown label from PR #${pr.number}`);
-                    }
+                    }

.vsts-pr.yml

@@ -18,7 +18,7 @@ parameters:
 - name: enableArm64Job
   displayName: Enables the ARM64 job
   type: boolean
-  default: false
+  default: true
 
 variables:
 - template: /eng/pipelines/templates/variables/sdk-defaults.yml

Directory.Build.props

@@ -96,7 +96,13 @@
     <MicrosoftNETCoreAppHostPackageVersion>$(MicrosoftNETCoreAppRefPackageVersion)</MicrosoftNETCoreAppHostPackageVersion>
     <MicrosoftNETCoreAppRuntimePackageVersion>$(MicrosoftNETCoreAppRefPackageVersion)</MicrosoftNETCoreAppRuntimePackageVersion>
     <MicrosoftAspNetCoreAppRuntimePackageVersion>$(MicrosoftAspNetCoreAppRefPackageVersion)</MicrosoftAspNetCoreAppRuntimePackageVersion>
-    <MicrosoftWindowsDesktopAppRuntimePackageVersion>$(MicrosoftWindowsDesktopAppRefPackageVersion)</MicrosoftWindowsDesktopAppRuntimePackageVersion>
+    <!-- These are set based on the runtime shared framework and internal versions. This is because windowsdesktop is not built in
+         all VMR builds, but its version numbers are used to generate various bits of information. The VMR always aligns the version
+         numbers of the shared frameworks. -->
+    <MicrosoftWindowsDesktopAppRuntimePackageVersion>$(MicrosoftNETCoreAppRefPackageVersion)</MicrosoftWindowsDesktopAppRuntimePackageVersion>
+    <MicrosoftWindowsDesktopAppRefPackageVersion>$(MicrosoftNETCoreAppRefPackageVersion)</MicrosoftWindowsDesktopAppRefPackageVersion>
+    <MicrosoftNETSdkWindowsDesktopPackageVersion>$(MicrosoftNETCorePlatformsPackageVersion)</MicrosoftNETSdkWindowsDesktopPackageVersion>
+    <MicrosoftWindowsDesktopAppInternalPackageVersion>$(MicrosoftNETCorePlatformsPackageVersion)</MicrosoftWindowsDesktopAppInternalPackageVersion>
 
     <HostFxrVersion>$(MicrosoftNETCoreAppRuntimePackageVersion)</HostFxrVersion>
     <SharedHostVersion>$(MicrosoftNETCoreAppRuntimePackageVersion)</SharedHostVersion>

NuGet.config

@@ -6,6 +6,7 @@
     <!--  Begin: Package sources from dotnet-aspire -->
     <!--  End: Package sources from dotnet-aspire -->
     <!--  Begin: Package sources from dotnet-runtime -->
+    <add key="darc-int-dotnet-runtime-3875b54" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-3875b54e/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
     <add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
@@ -37,6 +38,7 @@
     <clear />
     <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
     <!--  Begin: Package sources from dotnet-runtime -->
+    <add key="darc-int-dotnet-runtime-3875b54" value="true" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
   </disabledPackageSources>

documentation/general/dotnet-run-file.md

@@ -98,6 +98,8 @@ Command `dotnet publish file.cs` is also supported for file-based programs.
 Note that file-based apps have implicitly set `PublishAot=true`, so publishing uses Native AOT (and building reports AOT warnings).
 To opt out, use `#:property PublishAot=false` directive in your `.cs` file.
 
+Command `dotnet clean file.cs` can be used to clean build artifacts of the file-based program.
+
 ## Entry points
 
 If a file is given to `dotnet run`, it has to be an *entry-point file*, otherwise an error is reported.
@@ -123,6 +125,10 @@ Similarly, implicit build files like `Directory.Build.props` or `Directory.Packa
 > [!CAUTION]
 > Multi-file support is postponed for .NET 11.
 > In .NET 10, only the single file passed as the command-line argument to `dotnet run` is part of the compilation.
+> Specifically, the virtual project has properties `EnableDefaultCompileItems=false` and `EnableDefaultEmbeddedResourceItems=false`
+> (which can be customized via `#:property` directives), and a `Compile` item for the entry point file.
+> During [conversion](#grow-up), any `Content`, `None`, `Compile`, and `EmbeddedResource` items that do not have metadata `ExcludeFromFileBasedAppConversion=true`
+> and that are files inside the entry point file's directory tree are copied to the converted directory.
 
 ### Nested files
 
@@ -364,9 +370,8 @@ or as the first argument if it makes sense for them.
 We could also add `dotnet compile` command that would be the equivalent of `dotnet build` but for file-based programs
 (because "compiling" might make more sense for file-based programs than "building").
 
-`dotnet clean` could be extended to support cleaning [the output directory](#build-outputs),
-e.g., via `dotnet clean --file-based-program <path-to-entry-point>`
-or `dotnet clean --all-file-based-programs`.
+`dotnet clean` could be extended to support cleaning all file-based app outputs,
+e.g., `dotnet clean --all-file-based-apps`.
 
 Adding references via `dotnet package add`/`dotnet reference add` could be supported for file-based programs as well,
 i.e., the command would add a `#:package`/`#:project` directive to the top of a `.cs` file.

documentation/manpages/sdk/dotnet-restore.1

@@ -14,7 +14,7 @@
 . ftr VB CB
 . ftr VBI CBI
 .\}
-.TH "dotnet-restore" "1" "2025-06-13" "" ".NET Documentation"
+.TH "dotnet-restore" "1" "2025-06-30" "" ".NET Documentation"
 .hy
 .SH dotnet restore
 .PP
@@ -387,8 +387,8 @@ You can configure the level at which auditing will fail by setting the \f[V]<NuG
 Possible values are \f[V]low\f[R], \f[V]moderate\f[R], \f[V]high\f[R], and \f[V]critical\f[R].
 For example if you only want to see moderate, high, and critical advisories, you can set the property to \f[V]moderate\f[R].
 .PP
-Starting in .NET 9, NuGet audits both \f[I]direct\f[R] and \f[I]transitive\f[R] package references, by default.
-In .NET 8, only \f[I]direct\f[R] package references are audited.
+In .NET 8 and .NET 9, only \f[I]direct\f[R] package references are audited by default.
+Starting in .NET 10, NuGet audits both \f[I]direct\f[R] and \f[I]transitive\f[R] package references by default.
 You can change the mode by setting the \f[V]<NuGetAuditMode>\f[R] MSBuild property to \f[V]direct\f[R] or \f[V]all\f[R].
 .PP
 For more information, see Auditing package dependencies for security vulnerabilities.

documentation/manpages/sdk/dotnet-tool-update.1

@@ -14,7 +14,7 @@
 . ftr VB CB
 . ftr VBI CBI
 .\}
-.TH "dotnet-tool-update" "1" "2025-06-13" "" ".NET Documentation"
+.TH "dotnet-tool-update" "1" "2025-06-30" "" ".NET Documentation"
 .hy
 .SH dotnet tool update
 .PP
@@ -27,23 +27,23 @@ dotnet-tool-update - Updates the specified .NET tool on your machine.
 .nf
 \f[C]
 dotnet tool update <PACKAGE_ID> -g|--global
-    [--add-source <SOURCE>] [--allow-downgrade]
+    [--add-source <SOURCE>] [--all] [--allow-downgrade]
     [--configfile <FILE>]
     [--disable-parallel] [--framework <FRAMEWORK>]
     [--ignore-failed-sources] [--interactive]
     [--no-cache] [--prerelease]
     [-v|--verbosity <LEVEL>] [--version <VERSION>]
 
 dotnet tool update <PACKAGE_ID> --tool-path <PATH>
-    [--add-source <SOURCE>] [--allow-downgrade]
+    [--add-source <SOURCE>] [--all] [--allow-downgrade]
     [--configfile <FILE>]
     [--disable-parallel] [--framework <FRAMEWORK>]
     [--ignore-failed-sources] [--interactive] 
     [--no-cache] [--prerelease]
     [-v|--verbosity <LEVEL>] [--version <VERSION>]
 
 dotnet tool update <PACKAGE_ID> --local
-    [--add-source <SOURCE>] [--allow-downgrade]
+    [--add-source <SOURCE>] [--all] [--allow-downgrade]
     [--configfile <FILE>]
     [--disable-parallel] [--framework <FRAMEWORK>]
     [--ignore-failed-sources] [--interactive]
@@ -84,6 +84,12 @@ If the same package and version is in multiple feeds, the fastest feed wins.
 For more information, see What happens when a NuGet package is installed?.
 .RE
 .IP \[bu] 2
+\f[B]\f[VB]--all\f[B]\f[R]
+.RS 2
+.PP
+Update all tools.
+.RE
+.IP \[bu] 2
 \f[B]\f[VB]--allow-downgrade\f[B]\f[R]
 .RS 2
 .PP

documentation/project-docs/developer-guide.md

@@ -8,7 +8,7 @@ In order to build and test the .NET Core Command-line Interface (CLI), you need
 ### For Windows
 
 1. git (available from the [Git Website](http://www.git-scm.com/)) on the PATH.
-2. MSVC, C++ CMake Tools, and C++ ATL through the Visual Studio Installer.
+2. MSVC, C++ CMake Tools, and C++ ATL through the Visual Studio Installer via the "Desktop development with C++" workload.
 
 ### For Linux