Merge branch 'main' into copilot/fix-50641

Author: baronfel

.editorconfig

@@ -280,6 +280,10 @@ dotnet_diagnostic.IDE0200.severity = none
 dotnet_diagnostic.IDE0240.severity = warning
 
 # Additional rules for template engine source code
+
+# Default severity for analyzer diagnostics with category 'StyleCop.CSharp.SpacingRules'
+dotnet_analyzer_diagnostic.category-StyleCop.CSharp.SpacingRules.severity = none
+
 [{src,test}/**{Microsoft.TemplateEngine.*,dotnet-new?*}/**.cs]
 # Default analyzed API surface = 'public' (public APIs)
 dotnet_code_quality.api_surface = public

Directory.Build.props

@@ -48,7 +48,8 @@
     <NetCurrent>net10.0</NetCurrent>
     <NetToolMinimum Condition="'$(DotNetBuildSourceOnly)' == 'true'">$(NetCurrent)</NetToolMinimum>
     <ToolsetTargetFramework>$(SdkTargetFramework)</ToolsetTargetFramework>
-    <VisualStudioServiceTargetFramework>net8.0</VisualStudioServiceTargetFramework>
+    <VisualStudioServiceTargetFramework>net9.0</VisualStudioServiceTargetFramework>
+    <VisualStudioTargetFramework>net472</VisualStudioTargetFramework>
 
     <!-- We used to have scenarios where the MSBuild host (VSMac) had an older .NET, but don't any more. -->
     <ResolverTargetFramework>$(SdkTargetFramework)</ResolverTargetFramework>

Directory.Build.targets

@@ -96,8 +96,9 @@
   <!-- Include SourcePackage.editorconfig in all source packages. -->
   <Target Name="_AddEditorConfigToSourcePackage">
     <ItemGroup>
-      <TfmSpecificPackageFile Include="$(MSBuildThisFileDirectory)eng\SourcePackage.editorconfig" PackagePath="contentFiles/cs/$(TargetFramework)/.editorconfig" Condition="'$(TargetFrameworkIdentifier)' != '.NETStandard'"  />
+      <TfmSpecificPackageFile Include="$(MSBuildThisFileDirectory)eng\SourcePackage.editorconfig" PackagePath="contentFiles/cs/$(TargetFramework)/.editorconfig" Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'"  />
       <TfmSpecificPackageFile Include="$(MSBuildThisFileDirectory)eng\SourcePackage.netstandard.editorconfig" PackagePath="contentFiles/cs/$(TargetFramework)/.editorconfig" Condition="'$(TargetFrameworkIdentifier)' == '.NETStandard'" />
+      <TfmSpecificPackageFile Include="$(MSBuildThisFileDirectory)eng\SourcePackage.netframework.editorconfig" PackagePath="contentFiles/cs/$(TargetFramework)/.editorconfig" Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'" />
     </ItemGroup>
   </Target>
 

Directory.Packages.props

@@ -59,7 +59,6 @@
     <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="$(MicrosoftExtensionsLoggingAbstractionsVersion)" />
     <PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingConsoleVersion)" />
     <PackageVersion Include="Microsoft.Extensions.ObjectPool" Version="$(MicrosoftExtensionsObjectPoolPackageVersion)" />
-    <PackageVersion Include="Microsoft.Extensions.Configuration.Ini" Version="$(MicrosoftExtensionsConfigurationIniVersion)" />
     <PackageVersion Include="Microsoft.FSharp.Compiler" Version="$(MicrosoftFSharpCompilerPackageVersion)" />
     <PackageVersion Include="Microsoft.Net.Compilers.Toolset.Framework" Version="$(MicrosoftNetCompilersToolsetFrameworkPackageVersion)" />
     <PackageVersion Include="Microsoft.Management.Infrastructure" Version="3.0.0" />

documentation/general/dotnet-run-file.md

@@ -295,7 +295,8 @@ We always need to re-run MSBuild if implicit build files like `Directory.Build.p
 from `.cs` files, the only relevant MSBuild inputs are the `#:` directives,
 hence we can first check the `.cs` file timestamps and for those that have changed, compare the sets of `#:` directives.
 If only `.cs` files change, it is enough to invoke `csc.exe` (directly or via a build server)
-re-using command-line arguments that the last MSBuild invocation passed to the compiler.
+re-using command-line arguments that the last MSBuild invocation passed to the compiler
+(you can opt out of this via an MSBuild property `FileBasedProgramCanSkipMSBuild=false`).
 If no inputs change, it is enough to start the target executable without invoking the build at all.
 
 ## Alternatives and future work

documentation/manpages/sdk/dotnet-nuget-locals.1

@@ -14,7 +14,7 @@
 . ftr VB CB
 . ftr VBI CBI
 .\}
-.TH "dotnet-nuget-locals" "1" "2025-08-15" "" ".NET Documentation"
+.TH "dotnet-nuget-locals" "1" "2025-08-29" "" ".NET Documentation"
 .hy
 .SH dotnet nuget locals
 .PP

documentation/manpages/sdk/dotnet-nuget-push.1

@@ -14,7 +14,7 @@
 . ftr VB CB
 . ftr VBI CBI
 .\}
-.TH "dotnet-nuget-push" "1" "2025-08-15" "" ".NET Documentation"
+.TH "dotnet-nuget-push" "1" "2025-08-29" "" ".NET Documentation"
 .hy
 .SH dotnet nuget push
 .PP

documentation/manpages/sdk/dotnet-nuget-sign.1

@@ -14,7 +14,7 @@
 . ftr VB CB
 . ftr VBI CBI
 .\}
-.TH "dotnet-nuget-sign" "1" "2025-08-15" "" ".NET Documentation"
+.TH "dotnet-nuget-sign" "1" "2025-08-29" "" ".NET Documentation"
 .hy
 .SH dotnet nuget sign
 .PP

documentation/manpages/sdk/dotnet-publish.1

@@ -14,7 +14,7 @@
 . ftr VB CB
 . ftr VBI CBI
 .\}
-.TH "dotnet-publish" "1" "2025-06-13" "" ".NET Documentation"
+.TH "dotnet-publish" "1" "2025-08-29" "" ".NET Documentation"
 .hy
 .SH dotnet publish
 .PP
@@ -57,7 +57,7 @@ The application\[cq]s dependencies, which are copied from the NuGet cache into t
 The \f[V]dotnet publish\f[R] command\[cq]s output is ready for deployment to a hosting system (for example, a server, PC, Mac, laptop) for execution.
 It\[cq]s the only officially supported way to prepare the application for deployment.
 Depending on the type of deployment that the project specifies, the hosting system may or may not have the .NET shared runtime installed on it.
-For more information, see Publish .NET apps with the .NET CLI.
+For more information, see .NET application publishing overview.
 .SS Implicit restore
 .PP
 You don\[cq]t have to run \f[V]dotnet restore\f[R] because it\[cq]s run implicitly by all commands that require a restore to occur, such as \f[V]dotnet new\f[R], \f[V]dotnet build\f[R], \f[V]dotnet run\f[R], \f[V]dotnet test\f[R], \f[V]dotnet publish\f[R], and \f[V]dotnet pack\f[R].
@@ -346,7 +346,7 @@ Available since .NET 6.
 .PP
 Publishes the .NET runtime with your application so the runtime doesn\[cq]t need to be installed on the target machine.
 Default is \f[V]true\f[R] if a runtime identifier is specified and the project is an executable project (not a library project).
-For more information, see .NET application publishing and Publish .NET apps with the .NET CLI.
+For more information, see Self-contained deployment.
 .PP
 If this option is used without specifying \f[V]true\f[R] or \f[V]false\f[R], the default is \f[V]true\f[R].
 In that case, don\[cq]t put the solution or project argument immediately after \f[V]--self-contained\f[R], because \f[V]true\f[R] or \f[V]false\f[R] is expected in that position.
@@ -369,7 +369,7 @@ The URI of the NuGet package source to use during the restore operation.
 .PP
 Publishes the application for a given runtime.
 For a list of Runtime Identifiers (RIDs), see the RID catalog.
-For more information, see .NET application publishing and Publish .NET apps with the .NET CLI.
+For more information, see .NET application publishing overview.
 If you use this option, use \f[V]--self-contained\f[R] or \f[V]--no-self-contained\f[R] also.
 .RE
 .IP \[bu] 2
@@ -495,8 +495,6 @@ dotnet publish --no-dependencies
 .IP \[bu] 2
 \&.NET application publishing overview
 .IP \[bu] 2
-Publish .NET apps with the .NET CLI
-.IP \[bu] 2
 Target frameworks
 .IP \[bu] 2
 Runtime Identifier (RID) catalog

documentation/manpages/sdk/dotnet-reference-remove.1

@@ -14,7 +14,7 @@
 . ftr VB CB
 . ftr VBI CBI
 .\}
-.TH "dotnet-reference-remove" "1" "2025-08-15" "" ".NET Documentation"
+.TH "dotnet-reference-remove" "1" "2025-08-29" "" ".NET Documentation"
 .hy
 .SH dotnet reference remove
 .PP