Merge main to resolve conflicts

Resolved conflict in CommonOptions.cs by adapting to the new Option structure:
- Uses Option<string> instead of DynamicForwardedOption<string>
- Sets IsDynamic = true
- Uses ForwardAsMany to forward both TargetFramework and _CommandLineDefinedTargetFramework properties
- Maintains AddCompletions at the end

Author: Copilot

.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

@@ -34,3 +34,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.

.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/*
 

Directory.Packages.props

@@ -52,7 +52,7 @@
     <PackageVersion Include="Microsoft.DotNet.Build.Tasks.Workloads" Version="$(MicrosoftDotNetBuildTasksWorkloadsPackageVersion)" />
     <PackageVersion Include="Microsoft.DotNet.Installer.Windows.Security.TestData" Version="$(MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion)" />
     <PackageVersion Include="Microsoft.DotNet.SignCheck" Version="$(ArcadeSdkVersion)" />
-    <PackageVersion Include="Microsoft.DotNet.XUnitExtensions" Version="$(MicrosoftDotNetXUnitExtensionsVersion)" />
+    <PackageVersion Include="Microsoft.DotNet.XUnitExtensions" Version="$(MicrosoftDotNetXUnitExtensionsPackageVersion)" />
     <PackageVersion Include="Microsoft.Extensions.DependencyModel" Version="$(MicrosoftExtensionsDependencyModelPackageVersion)" />
     <PackageVersion Include="Microsoft.Extensions.FileProviders.Abstractions" Version="$(MicrosoftExtensionsFileProvidersAbstractionsPackageVersion)" />
     <PackageVersion Include="Microsoft.Extensions.FileSystemGlobbing" Version="$(MicrosoftExtensionsFileSystemGlobbingPackageVersion)" />

NuGet.config

@@ -3,6 +3,8 @@
   <packageSources>
     <clear />
     <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
+    <!--  Begin: Package sources from dotnet-dotnet -->
+    <!--  End: Package sources from dotnet-dotnet -->
     <!--  Begin: Package sources from microsoft-testfx -->
     <!--  End: Package sources from microsoft-testfx -->
     <!--  Begin: Package sources from dotnet-aspire -->

cli.slnf

@@ -0,0 +1,15 @@
+{
+  "solution": {
+    "path": "sdk.slnx",
+    "projects": [
+      "src\\BuiltInTools\\dotnet-watch\\dotnet-watch.csproj",
+      "src\\Cli\\dotnet\\dotnet.csproj",
+      "src\\Cli\\Microsoft.DotNet.Cli.Utils\\Microsoft.DotNet.Cli.Utils.csproj",
+      "test\\dotnet-new.IntegrationTests\\dotnet-new.IntegrationTests.csproj",
+      "test\\dotnet-watch.Tests\\dotnet-watch.Tests.csproj",
+      "test\\dotnet.Tests\\dotnet.Tests.csproj",
+      "test\\Microsoft.DotNet.Cli.Utils.Tests\\Microsoft.DotNet.Cli.Utils.Tests.csproj",
+      "test\\Microsoft.NET.TestFramework\\Microsoft.NET.TestFramework.csproj"
+    ]
+  }
+}

documentation/general/analyzer-redirecting.md

@@ -19,11 +19,12 @@ Targeting an SDK (and hence also loading analyzers) with newer major version in
 
 ## Overview
 
-- The SDK will contain a VSIX with the analyzer DLLs and an MEF-exported implementation of `IAnalyzerAssemblyRedirector`.
+- The SDK will deploy analyzer DLLs and Roslyn will deploy an implementation of `IAnalyzerAssemblyRedirector`
+  (could be deployed by SDK but we are saving on analyzer loads and Roslyn already has a VSIX with a DLL).
   Implementations of this interface are imported by Roslyn and can redirect analyzer DLL loading.
 
-- The SDK's implementation of `IAnalyzerAssemblyRedirector` will redirect any analyzer DLL matching some pattern
-  to the corresponding DLL deployed via the VSIX.
+- That implementation of `IAnalyzerAssemblyRedirector` will redirect any analyzer DLL matching some pattern
+  to the corresponding DLL deployed with VS.
   Details of this process are described below.
 
 - Note that when `IAnalyzerAssemblyRedirector` is involved, Roslyn is free to not use shadow copy loading and instead load the DLLs directly.
@@ -33,7 +34,7 @@ Targeting an SDK (and hence also loading analyzers) with newer major version in
 
 ## Details
 
-The VSIX contains some analyzers, for example:
+The VS deployment contains some analyzers, for example:
 
 ```
 AspNetCoreAnalyzers\analyzers\dotnet\cs\Microsoft.AspNetCore.App.Analyzers.dll
@@ -69,7 +70,7 @@ C:\Program Files\dotnet\sdk\9.0.100-preview.5.24307.3\Sdks\Microsoft.NET.Sdk\ana
 will be redirected to
 
 ```
-{VSIX}\SDKAnalyzers\Sdks\Microsoft.NET.Sdk\analyzers\Microsoft.CodeAnalysis.NetAnalyzers.dll
+{InstallDir}\SDKAnalyzers\Sdks\Microsoft.NET.Sdk\analyzers\Microsoft.CodeAnalysis.NetAnalyzers.dll
 ```
 
 where `metadata.json` has `"SDKAnalyzers": "9.0.100-dev"`, because
@@ -83,6 +84,5 @@ Analyzers that cannot be matched will continue to be loaded from the SDK
 ### Implementation
 
 Analyzer DLLs are contained in transport package `VS.Redist.Common.Net.Core.SDK.RuntimeAnalyzers`.
-The redirecting logic lives in "system" VS extension `Microsoft.Net.Sdk.AnalyzerRedirecting`.
 
 [torn-sdk]: https://github.com/dotnet/sdk/issues/42087

documentation/general/dotnet-run-file.md

@@ -56,6 +56,9 @@ Additionally, the implicit project file has the following customizations:
     in case there is a project or solution in the same directory as the file-based app.
     This ensures that items from nested projects and artifacts are not included by the app.
 
+  - `EnableDefaultEmbeddedResourceItems` and `EnableDefaultNoneItems` properties are set to `false` if the default SDK (`Microsoft.NET.Sdk`) is being used.
+    This avoids including files like `./**/*.resx` in simple file-based apps where users usually don't expect that.
+
 ## Grow up
 
 When file-based programs reach an inflection point where build customizations in a project file are needed,