Merge branch 'main' into CliTestsReorganize

MiYanni · MiYanni · commit d61efa6607a2 · 2025-04-10T06:13:59.000-07:00
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "microsoft.dotnet.darc": {
-      "version": "1.1.0-beta.25201.1",
+      "version": "1.1.0-beta.25209.3",
       "commands": [
         "darc"
       ]
diff --git a/documentation/project-docs/breaking-change-guidelines.md b/documentation/project-docs/breaking-change-guidelines.md
@@ -2,24 +2,25 @@
 
 This document provides guidelines for introducing new diagnostics or breaking changes to the .NET SDK, which configuration knobs are available, what criteria should guide the decision around severity, timeline for introduction, and deprecation of diagnostics, and what steps are required by the .NET release process.
 
+## What is a breaking change in the .NET SDK?
+
+A .NET SDK breaking change is when a customer upgrades to a newer .NET SDK, while changing nothing else in their environment, and experiences a disruption to their product build or execution.
+
 ## General guidance
 
-In general, we want to make updating the .NET SDK as smooth as possible for developers. This extends to .NET tooling such as IDEs and code editors which may have a different release schedule and cadence. For example, the .NET 9 SDK (which was a new major version) was released with Visual Studio 17.12 (which was a new minor version). In this example, breaking changes in the .NET 9 SDK could disproportionally impact Visual Studio users who are expecting incremental, non-breaking, changes in the new minor version. Same applies to other IDEs and code editors from the wider .NET community.
+In general, we want to make updating the .NET SDK as smooth as possible for developers. This extends to updating .NET tooling such as IDEs and code editors which may have a different release schedule and cadence. For example, the .NET 9 SDK (which was a new major version) was released with Visual Studio 17.12 (which was a new minor version). In this example, breaking changes in the .NET 9 SDK could disproportionally impact Visual Studio users who are expecting incremental, non-breaking, changes in the new minor version. Same applies to other IDEs and code editors from the wider .NET community.
 
 This means:
 * Introducing new changes in a staged/gradual way.
 * Tying new analyzers/diagnostics to a mechanism that requires explicit opt-in.
 * Providing a way to opt out of a change entirely.
 
-## Kinds of .NET SDK breaking changes
-
-There are many kinds of breaking changes that can ship in the .NET SDK, such as:
+## Examples of .NET SDK breaking changes
 
 * New MSBuild warnings and errors (props/targets).
 * New NuGet warnings and errors. 
   * For example, NuGet Audit.
-* Roslyn Analyzers and CodeFixes.
-  * This includes trimming/ILLink analyzers and codefixes.
+* Changes to Roslyn Analyzers and CodeFixes that apply to existing TFMs.
 * Behavioral/implementation changes.
   * MSBuild engine changes like MSBuild Server.
   * Implementation changes for MSBuild Tasks.
@@ -77,9 +78,11 @@ This knob exists so that users can safely and consistently say "for whatever rea
 
 ### Tie potentially impactful changes to the target TFM
 
-Changes that are expected to cause significant disruption should only be introduced behind the Target Framework knob. This ensures business continuity and allows developers to address changes needed as part of scheduled work to migrate a codebase to a new TFM.
+Changes that are expected to cause significant disruption should only be introduced behind the Target Framework knob. This ensures business continuity and allows developers to address changes needed as part of scheduled work to migrate a codebase to a new TFM. In general, new warnings/errors that only apply to a new TFM are not considered breaking changes. 
 
-Specific example: NuGet warnings for vulnerable transitive dependencies were introduced in the .NET 10 SDK only for applications targeting .NET 10 and higher.
+Examples:
+* NuGet warnings for vulnerable transitive dependencies were introduced in the .NET 10 SDK only for projects targeting .NET 10 and higher.
+* New Roslyn analyzers tied to a new target TFM.
 
 ## Required process for all .NET SDK breaking changes 
 
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
diff --git a/eng/Versions.props b/eng/Versions.props
diff --git a/eng/common/core-templates/job/publish-build-assets.yml b/eng/common/core-templates/job/publish-build-assets.yml
@@ -29,6 +29,9 @@ parameters:
 
   is1ESPipeline: ''
 
+  # Optional: 🌤️ or not the build has assets it wants to publish to BAR
+  isAssetlessBuild: false
+
 jobs:
 - job: Asset_Registry_Publish
 
@@ -72,14 +75,15 @@ jobs:
     - checkout: self
       fetchDepth: 3
       clean: true
-      
-    - task: DownloadPipelineArtifact@2
-      displayName: Download Asset Manifests
-      inputs:
-        artifactName: AssetManifests
-        targetPath: '$(Build.StagingDirectory)/AssetManifests'
-      condition: ${{ parameters.condition }}
-      continueOnError: ${{ parameters.continueOnError }}
+
+    - ${{ if eq(parameters.isAssetlessBuild, 'false') }}: 
+      - task: DownloadPipelineArtifact@2
+        displayName: Download Asset Manifests
+        inputs:
+          artifactName: AssetManifests
+          targetPath: '$(Build.StagingDirectory)/AssetManifests'
+        condition: ${{ parameters.condition }}
+        continueOnError: ${{ parameters.continueOnError }}
     
     - task: NuGetAuthenticate@1
 
@@ -92,6 +96,7 @@ jobs:
         scriptPath: $(Build.SourcesDirectory)/eng/common/sdk-task.ps1
         arguments: -task PublishBuildAssets -restore -msbuildEngine dotnet
           /p:ManifestsPath='$(Build.StagingDirectory)/AssetManifests'
+          /p:IsAssetlessBuild=${{ parameters.isAssetlessBuild }}
           /p:MaestroApiEndpoint=https://maestro.dot.net
           /p:OfficialBuildId=$(Build.BuildNumber)
       condition: ${{ parameters.condition }}
@@ -124,7 +129,7 @@ jobs:
           publishLocation: Container
           artifactName: ReleaseConfigs
 
-    - ${{ if eq(parameters.publishAssetsImmediately, 'true') }}:
+    - ${{ if or(eq(parameters.publishAssetsImmediately, 'true'), eq(parameters.isAssetlessBuild, 'true')) }}:
       - template: /eng/common/core-templates/post-build/setup-maestro-vars.yml
         parameters:
           BARBuildId: ${{ parameters.BARBuildId }}
@@ -145,6 +150,7 @@ jobs:
             -WaitPublishingFinish true
             -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}'
             -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}'
+            -SkipAssetsPublishing '${{ parameters.isAssetlessBuild }}'
 
     - ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}:
       - template: /eng/common/core-templates/steps/publish-logs.yml
diff --git a/eng/common/core-templates/post-build/post-build.yml b/eng/common/core-templates/post-build/post-build.yml
@@ -60,6 +60,11 @@ parameters:
       artifactNames: ''
       downloadArtifacts: true
 
+  - name: isAssetlessBuild
+    type: boolean
+    displayName: Is Assetless Build
+    default: false
+
   # These parameters let the user customize the call to sdk-task.ps1 for publishing
   # symbols & general artifacts as well as for signing validation
   - name: symbolPublishingAdditionalParameters
@@ -320,3 +325,4 @@ stages:
               -RequireDefaultChannels ${{ parameters.requireDefaultChannels }}
               -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}'
               -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}'
+              -SkipAssetsPublishing '${{ parameters.isAssetlessBuild }}'
diff --git a/eng/common/post-build/publish-using-darc.ps1 b/eng/common/post-build/publish-using-darc.ps1
@@ -6,7 +6,8 @@ param(
   [Parameter(Mandatory=$true)][string] $WaitPublishingFinish,
   [Parameter(Mandatory=$false)][string] $ArtifactsPublishingAdditionalParameters,
   [Parameter(Mandatory=$false)][string] $SymbolPublishingAdditionalParameters,
-  [Parameter(Mandatory=$false)][string] $RequireDefaultChannels
+  [Parameter(Mandatory=$false)][string] $RequireDefaultChannels,
+  [Parameter(Mandatory=$false)][string] $SkipAssetsPublishing
 )
 
 try {
@@ -39,6 +40,10 @@ try {
     $optionalParams.Add("--default-channels-required") | Out-Null
   }
 
+  if ("true" -eq $SkipAssetsPublishing) {
+    $optionalParams.Add("--skip-assets-publishing") | Out-Null
+  }
+
   & $darc add-build-to-channel `
     --id $buildId `
     --publishing-infra-version $PublishingInfraVersion `
diff --git a/eng/pipelines/templates/stages/vmr-validation.yml b/eng/pipelines/templates/stages/vmr-validation.yml
@@ -81,7 +81,7 @@ stages:
   - job: ValidateInstallers_Linux_arm64
     displayName: Validate Installers - Linux arm64
     pool: ${{ parameters.pool_LinuxArm64 }}
-    timeoutInMinutes: 30
+    timeoutInMinutes: 60
     steps:
     - template: ../steps/vmr-validate-installers.yml
       parameters:
diff --git a/eng/pipelines/templates/steps/vmr-validate-installers.yml b/eng/pipelines/templates/steps/vmr-validate-installers.yml
@@ -31,17 +31,12 @@ steps:
 
 - ${{ if eq(parameters.OS, 'Linux') }}:
   - script: |
-      extraBuildProperties="/p:TestRpmPackages=true"
-      if [[ '${{ parameters.targetArchitecture }}' == 'x64' ]]; then
-        # At the moment Deb packages are only available for x64
-        extraBuildProperties="$extraBuildProperties /p:TestDebPackages=true"
-      fi
-
       ./build.sh \
       --ci \
       -t \
       --projects test/Microsoft.DotNet.Installer.Tests/Microsoft.DotNet.Installer.Tests.csproj \
-      $extraBuildProperties
+      /p:TestRpmPackages=true \
+      /p:TestDebPackages=true
     displayName: Validate installer packages
     workingDirectory: $(Build.SourcesDirectory)
 
diff --git a/global.json b/global.json
@@ -14,8 +14,8 @@
     }
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25208.5",
-    "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25208.5",
+    "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25209.3",
+    "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25209.3",
     "Microsoft.Build.NoTargets": "3.7.0",
     "Microsoft.Build.Traversal": "3.4.0"
   }
diff --git a/src/Cli/dotnet/Commands/Test/CliConstants.cs b/src/Cli/dotnet/Commands/Test/CliConstants.cs
@@ -5,32 +5,16 @@ namespace Microsoft.DotNet.Cli.Commands.Test;
 
 internal static class CliConstants
 {
-    public const string DotnetRunCommand = "dotnet run";
-
     public const string ServerOptionKey = "--server";
     public const string DotNetTestPipeOptionKey = "--dotnet-test-pipe";
-    public const string FrameworkOptionKey = "--framework";
-    public const string NoProgressOptionKey = "--no-progress";
-    public static string NoAnsiOptionKey = "--no-ansi";
-    public static string OutputOptionKey = "--output";
 
     public const string ServerOptionValue = "dotnettestcli";
 
-    public const string ParametersSeparator = "--";
     public const string SemiColon = ";";
 
     public const string VSTest = "VSTest";
     public const string MicrosoftTestingPlatform = "Microsoft.Testing.Platform";
 
-    public const string TestSectionKey = "test";
-
-    public const string RestoreCommand = "Restore";
-    public const string BuildCommand = "Build";
-
-    public const string Configuration = "Configuration";
-    public const string RuntimeIdentifier = "RuntimeIdentifier";
-    public const string TargetFramework = "TargetFramework";
-
     public static readonly string[] ProjectExtensions = [".proj", ".csproj", ".vbproj", ".fsproj"];
     public static readonly string[] SolutionExtensions = [".sln", ".slnx", ".slnf"];
 
diff --git a/src/Cli/dotnet/Commands/Test/MSBuildUtility.cs b/src/Cli/dotnet/Commands/Test/MSBuildUtility.cs
@@ -90,6 +90,7 @@ public static BuildOptions GetBuildOptions(ParseResult parseResult, int degreeOf
             parseResult.GetValue(TestingPlatformOptions.NoBuildOption),
             parseResult.HasOption(CommonOptions.VerbosityOption) ? parseResult.GetValue(CommonOptions.VerbosityOption) : null,
             parseResult.GetValue(TestingPlatformOptions.NoLaunchProfileOption),
+            parseResult.GetValue(TestingPlatformOptions.NoLaunchProfileArgumentsOption),
             degreeOfParallelism,
             otherArgs,
             msbuildArgs);
diff --git a/src/Cli/dotnet/Commands/Test/Options.cs b/src/Cli/dotnet/Commands/Test/Options.cs
@@ -7,4 +7,12 @@ internal record TestOptions(string Architecture, bool HasFilterMode, bool IsHelp
 
 internal record PathOptions(string ProjectPath, string SolutionPath, string DirectoryPath);
 
-internal record BuildOptions(PathOptions PathOptions, bool HasNoRestore, bool HasNoBuild, VerbosityOptions? Verbosity, bool NoLaunchProfile, int DegreeOfParallelism, List<string> UnmatchedTokens, IEnumerable<string> MSBuildArgs);
+internal record BuildOptions(
+    PathOptions PathOptions,
+    bool HasNoRestore,
+    bool HasNoBuild,
+    VerbosityOptions? Verbosity,
+    bool NoLaunchProfile,
+    bool NoLaunchProfileArguments,
+    int DegreeOfParallelism, List<string> UnmatchedTokens,
+    IEnumerable<string> MSBuildArgs);
diff --git a/src/Cli/dotnet/Commands/Test/SolutionAndProjectUtility.cs b/src/Cli/dotnet/Commands/Test/SolutionAndProjectUtility.cs
@@ -1,4 +1,4 @@
-﻿// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.Diagnostics;
@@ -144,7 +144,12 @@ public static IEnumerable<ParallelizableTestModuleGroupWithSequentialInnerModule
                 testTfmsInParallel = true;
             }
 
-            var frameworks = targetFrameworks.Split(CliConstants.SemiColon, StringSplitOptions.RemoveEmptyEntries);
+            var frameworks = targetFrameworks
+                .Split(CliConstants.SemiColon, StringSplitOptions.RemoveEmptyEntries)
+                .Select(f => f.Trim())
+                .Where(f => !string.IsNullOrEmpty(f))
+                .Distinct();
+
             if (testTfmsInParallel)
             {
                 foreach (var framework in frameworks)
@@ -168,7 +173,7 @@ public static IEnumerable<ParallelizableTestModuleGroupWithSequentialInnerModule
 
                     if (GetModuleFromProject(projectInstance, projectCollection.Loggers, noLaunchProfile) is { } module)
                     {
-                        innerModules ??= new List<TestModule>(frameworks.Length);
+                        innerModules ??= new List<TestModule>();
                         innerModules.Add(module);
                     }
                 }
diff --git a/src/Cli/dotnet/Commands/Test/TestApplication.cs b/src/Cli/dotnet/Commands/Test/TestApplication.cs
@@ -75,8 +75,8 @@ private ProcessStartInfo CreateProcessStartInfo(TestOptions testOptions)
                 processStartInfo.EnvironmentVariables[entry.Key] = value;
             }
 
-            // TODO: Support --no-launch-profile-arguments
-            if (!string.IsNullOrEmpty(Module.LaunchSettings.CommandLineArgs))
+            if (!_buildOptions.NoLaunchProfileArguments &&
+                !string.IsNullOrEmpty(Module.LaunchSettings.CommandLineArgs))
             {
                 processStartInfo.Arguments = $"{processStartInfo.Arguments} {Module.LaunchSettings.CommandLineArgs}";
             }
@@ -95,9 +95,8 @@ private string GetArguments(TestOptions testOptions, bool isDll)
             return BuildArgs(testOptions, isDll);
         }
 
-        // We fallback to dotnet run only when we have a dll and an architecture is specified.
-        // TODO: Is this a valid case?
-        return BuildArgsWithDotnetRun(testOptions);
+        // If we reach here, that means we have a test project that doesn't produce an executable.
+        throw new InvalidOperationException($"A Microsoft.Testing.Platform test project should produce an executable. The file '{Module.RunProperties.RunCommand}' is dll.");
     }
 
     private static bool IsArchitectureSpecified(TestOptions testOptions)
@@ -290,33 +289,6 @@ private string BuildArgs(TestOptions testOptions, bool isDll)
         return builder.ToString();
     }
 
-    private string BuildArgsWithDotnetRun(TestOptions testOptions)
-    {
-        StringBuilder builder = new();
-
-        builder.Append($"{CliConstants.DotnetRunCommand} {TestingPlatformOptions.ProjectOption.Name} \"{Module.ProjectFullPath}\"");
-
-        // Because we restored and built before in MSHandler, we will skip those with dotnet run
-        builder.Append($" {CommonOptions.NoRestoreOption.Name}");
-        builder.Append($" {TestingPlatformOptions.NoBuildOption.Name}");
-
-        foreach (var arg in _buildOptions.MSBuildArgs)
-        {
-            builder.Append($" {arg}");
-        }
-
-        if (!string.IsNullOrEmpty(Module.TargetFramework))
-        {
-            builder.Append($" {CliConstants.FrameworkOptionKey} {Module.TargetFramework}");
-        }
-
-        builder.Append($" {CliConstants.ParametersSeparator} ");
-
-        AppendCommonArgs(builder, testOptions);
-
-        return builder.ToString();
-    }
-
     private void AppendCommonArgs(StringBuilder builder, TestOptions testOptions)
     {
         if (testOptions.IsHelp)
diff --git a/src/Cli/dotnet/Commands/Test/TestCommandParser.cs b/src/Cli/dotnet/Commands/Test/TestCommandParser.cs
@@ -242,6 +242,7 @@ private static CliCommand GetTestingPlatformCliCommand()
         command.Options.Add(TestingPlatformOptions.NoBuildOption);
         command.Options.Add(TestingPlatformOptions.NoAnsiOption);
         command.Options.Add(TestingPlatformOptions.NoLaunchProfileOption);
+        command.Options.Add(TestingPlatformOptions.NoLaunchProfileArgumentsOption);
         command.Options.Add(TestingPlatformOptions.NoProgressOption);
         command.Options.Add(TestingPlatformOptions.OutputOption);
 
diff --git a/src/Cli/dotnet/Commands/Test/TestingPlatformOptions.cs b/src/Cli/dotnet/Commands/Test/TestingPlatformOptions.cs
@@ -68,6 +68,11 @@ internal static class TestingPlatformOptions
         Arity = ArgumentArity.Zero
     };
 
+    public static readonly CliOption<bool> NoLaunchProfileArgumentsOption = new("--no-launch-profile-arguments")
+    {
+        Description = CliCommandStrings.CommandOptionNoLaunchProfileArgumentsDescription
+    };
+
     public static readonly CliOption<bool> NoProgressOption = new("--no-progress")
     {
         Description = CliCommandStrings.CmdNoProgressDescription,
diff --git a/src/SourceBuild/patches/winforms/0001-Suppress-IDE0031-warnings-in-VMR.patch b/src/SourceBuild/patches/winforms/0001-Suppress-IDE0031-warnings-in-VMR.patch
diff --git a/src/SourceBuild/patches/winforms/0002-Suppress-IDE0031-warnings-more.patch b/src/SourceBuild/patches/winforms/0002-Suppress-IDE0031-warnings-more.patch
diff --git a/test/dotnet.Tests/CommandTests/Project/Convert/DotnetProjectConvertTests.cs b/test/dotnet.Tests/CommandTests/Project/Convert/DotnetProjectConvertTests.cs
diff --git a/test/dotnet.Tests/CommandTests/Run/RunFileTests.cs b/test/dotnet.Tests/CommandTests/Run/RunFileTests.cs
diff --git a/test/dotnet.Tests/CommandTests/Test/GivenDotnetTestBuildsAndRunsTests.cs b/test/dotnet.Tests/CommandTests/Test/GivenDotnetTestBuildsAndRunsTests.cs

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`"isRoot": true,`
`4`	`4`	`"tools": {`
`5`	`5`	`"microsoft.dotnet.darc": {`
`6`		`- "version": "1.1.0-beta.25201.1",`
	`6`	`+ "version": "1.1.0-beta.25209.3",`
`7`	`7`	`"commands": [`
`8`	`8`	`"darc"`
`9`	`9`	`]`
Original file line number	Diff line number	Diff line change
`@@ -14,8 +14,8 @@`
`14`	`14`	`}`
`15`	`15`	`},`
`16`	`16`	`"msbuild-sdks": {`
`17`		`- "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25208.5",`
`18`		`- "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25208.5",`
	`17`	`+ "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25209.3",`
	`18`	`+ "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25209.3",`
`19`	`19`	`"Microsoft.Build.NoTargets": "3.7.0",`
`20`	`20`	`"Microsoft.Build.Traversal": "3.4.0"`
`21`	`21`	`}`