Merging main into darc-main-03521c65-ef47-4da5-a989-1a9ff03d8aa7

Author: dotnet-maestro[bot]

eng/Version.Details.xml

@@ -579,13 +579,13 @@
       <Uri>https://github.com/dotnet/arcade-services</Uri>
       <Sha>bd2309670213218bc0e2073379e4985b346600c7</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Testing.Platform" Version="1.8.0-preview.25257.2">
+    <Dependency Name="Microsoft.Testing.Platform" Version="1.8.0-preview.25262.2">
       <Uri>https://github.com/microsoft/testfx</Uri>
-      <Sha>2b3a9fd44e2cbb1c52362a211b025b9eddbd8ec1</Sha>
+      <Sha>9a016c071b017918233cbf99e1d21144fb9ce5f3</Sha>
     </Dependency>
-    <Dependency Name="MSTest" Version="3.10.0-preview.25257.2">
+    <Dependency Name="MSTest" Version="3.10.0-preview.25262.2">
       <Uri>https://github.com/microsoft/testfx</Uri>
-      <Sha>2b3a9fd44e2cbb1c52362a211b025b9eddbd8ec1</Sha>
+      <Sha>9a016c071b017918233cbf99e1d21144fb9ce5f3</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Extensions.Configuration.Ini" Version="10.0.0-preview.5.25260.104">
       <Uri>https://github.com/dotnet/dotnet</Uri>

eng/Versions.props

@@ -30,7 +30,7 @@
     <UsingToolVSSDK>true</UsingToolVSSDK>
     <FlagNetStandard1XDependencies Condition="'$(DotNetBuildSourceOnly)' == 'true'">true</FlagNetStandard1XDependencies>
     <!-- This property is only used in the dotnet test integration tests. -->
-    <MicrosoftTestingPlatformVersion>1.8.0-preview.25257.2</MicrosoftTestingPlatformVersion>
+    <MicrosoftTestingPlatformVersion>1.8.0-preview.25262.2</MicrosoftTestingPlatformVersion>
   </PropertyGroup>
   <PropertyGroup Label="Servicing version information">
     <VersionFeature21>30</VersionFeature21>
@@ -328,7 +328,7 @@
     <AwesomeAssertionsVersion>8.0.2</AwesomeAssertionsVersion>
     <AwesomeAssertionsJsonVersion>8.0.0</AwesomeAssertionsJsonVersion>
     <MoqPackageVersion>4.18.4</MoqPackageVersion>
-    <MSTestVersion>3.10.0-preview.25257.2</MSTestVersion>
+    <MSTestVersion>3.10.0-preview.25262.2</MSTestVersion>
     <XunitCombinatorialVersion>1.3.2</XunitCombinatorialVersion>
     <MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>8.0.0-beta.23607.1</MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>
   </PropertyGroup>

src/Cli/dotnet/Commands/Hidden/Add/Package/AddPackageCommandParser.cs

@@ -43,7 +43,7 @@ private static Command ConstructCommand()
             }
             else
             {
-                return new PackageAddCommand(parseResult, parseResult.GetValue(AddCommandParser.ProjectArgument)).Execute();
+                return new PackageAddCommand(parseResult, parseResult.GetValue(AddCommandParser.ProjectArgument) ?? Directory.GetCurrentDirectory()).Execute();
             }
         });
 

src/Cli/dotnet/Commands/Reference/List/ReferenceListCommand.cs

@@ -22,7 +22,8 @@ public ReferenceListCommand(
 
         _fileOrDirectory = parseResult.HasOption(ReferenceCommandParser.ProjectOption) ?
             parseResult.GetValue(ReferenceCommandParser.ProjectOption) :
-            parseResult.GetValue(ListCommandParser.SlnOrProjectArgument);
+            parseResult.GetValue(ListCommandParser.SlnOrProjectArgument) ??
+            Directory.GetCurrentDirectory();
     }
 
     public override int Execute()

src/Cli/dotnet/Commands/Test/TestCommandParser.cs

@@ -164,8 +164,6 @@ public static string GetTestRunnerName()
         var builder = new ConfigurationBuilder();
 
         string? dotnetConfigPath = GetDotnetConfigPath(Environment.CurrentDirectory);
-        Debug.Assert(dotnetConfigPath is not null);
-
         if (!File.Exists(dotnetConfigPath))
         {
             return CliConstants.VSTest;

src/Layout/redist/targets/Crossgen.targets

@@ -7,9 +7,7 @@
                                     '$(TargetArchitecture)' != 'ppc64le' and
                                     '$(DotNetBuildUseMonoRuntime)' != 'true'">true</IsCrossgenSupported>
 
-    <Crossgen2Rid>$(HostOSName)-$(BuildArchitecture)</Crossgen2Rid>
-
-    <RuntimeNETCrossgenPackageName>microsoft.netcore.app.crossgen2.$(Crossgen2Rid)</RuntimeNETCrossgenPackageName>
+    <RuntimeNETCrossgenPackageName>microsoft.netcore.app.crossgen2.$(NETCoreSdkRuntimeIdentifier)</RuntimeNETCrossgenPackageName>
   </PropertyGroup>
 
   <!-- Download the runtime package with the crossgen executable in it -->