Merge pull request #45499 from dotnet/main

Merge main into live

Author: dotnet-policy-service[bot]

.github/workflows/scorecards.yml

@@ -71,6 +71,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@6bb031afdd8eb862ea3fc1848194185e076637e5 # v3.28.11
+        uses: github/codeql-action/upload-sarif@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # v3.28.13
         with:
           sarif_file: results.sarif

docs/ai/semantic-kernel-dotnet-overview.md

@@ -202,9 +202,9 @@ string memoryCollectionName = "SummarizedAzureDocs";
 foreach (var fact in facts) {
     await memoryBuilder.SaveReferenceAsync(
         collection: memoryCollectionName,
-        description: fact.Key.Split(";")[1].Trim(),
+        description: fact.Key.Split(";")[0].Trim(),
         text: fact.Value,
-        externalId: fact.Key.Split(";")[2].Trim(),
+        externalId: fact.Key.Split(";")[1].Trim(),
         externalSourceName: "Azure Documentation"
     );
 }

docs/azure/sdk/snippets/aspnetcore-guidance/BlazorSample/BlazorSample.csproj

@@ -10,7 +10,7 @@
     <PackageReference Include="Azure.Messaging.ServiceBus" Version="7.18.4" />
 	  <PackageReference Include="Azure.Security.KeyVault.Secrets" Version="4.7.0" />
 	  <PackageReference Include="Azure.Storage.Blobs" Version="12.24.0" />
-	  <PackageReference Include="Microsoft.Extensions.Azure" Version="1.10.0" />
+	  <PackageReference Include="Microsoft.Extensions.Azure" Version="1.11.0" />
   </ItemGroup>
 
 </Project>

docs/azure/sdk/snippets/pagination/pagination.csproj

@@ -10,7 +10,7 @@
 
   <ItemGroup>
     <PackageReference Include="Azure.Security.KeyVault.Secrets" Version="4.7.0" />
-    <PackageReference Include="Microsoft.Extensions.Azure" Version="1.10.0" />
+    <PackageReference Include="Microsoft.Extensions.Azure" Version="1.11.0" />
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.3" />
     <PackageReference Include="System.Linq.Async" Version="6.0.1" />
   </ItemGroup>

docs/core/diagnostics/lldb-linux.md

@@ -49,7 +49,7 @@ To install the LLDB packages:
 
 ```console
     apk update
-    apk add lldb
+    apk add lldb py3-lldb
 ```
 
 To launch LLDB:

docs/core/tools/dotnet-test.md

@@ -25,7 +25,7 @@ Some examples of the `dotnet.config` file:
   name = "VSTest"
   ```
 
-## VSTest and Microsoft Testing Platform (MTP)
+## VSTest and Microsoft.Testing.Platform (MTP)
 
 ### [dotnet test with VSTest](#tab/dotnet-test-with-vstest)
 
@@ -441,14 +441,18 @@ dotnet test -h|--help
 With Microsoft Testing Platform, `dotnet test` operates faster than with VSTest. The test-related arguments are no longer fixed, as they are tied to the registered extensions in the test project(s). Moreover, MTP supports a globbing filter when running tests. For more information, see [Microsoft.Testing.Platform](../testing/microsoft-testing-platform-intro.md).
 
 > [!WARNING]
-> `dotnet test` doesn't run in environments that have test projects using both VSTest and Microsoft Testing Platform in the same solution, as the two platforms are mutually incompatible.
+> When Microsoft.Testing.Platform is opted in via `dotnet.config`, `dotnet test` expects all test projects to use Microsoft.Testing.Platform. It is an error if any of the test projects use VSTest.
 
 #### Implicit restore
 
 [!INCLUDE[dotnet restore note](~/includes/dotnet-restore-note.md)]
 
 #### Options
 
+> [!NOTE]
+> You can use only one of the following options at a time: `--project`, `--solution`, `--directory`, or `--test-modules`. These options can't be combined.
+> In addition, when using `--test-modules`, you can't specify `--arch`, `--configuration`, `--framework`, `--os`, or `--runtime`. These options are not relevant for an already-built module.
+
 - **`--project <PROJECT_PATH>`**
 
   Specifies the path to the test project.
@@ -461,9 +465,6 @@ With Microsoft Testing Platform, `dotnet test` operates faster than with VSTest.
 
   Specifies the path to a directory that contains a project or a solution.
 
-> [!NOTE]
-> You can use only one of the following options at a time: `--project`, `--solution`, or `--directory`. These options can't be combined.
-
 - **`--test-modules <EXPRESSION>`**
 
   Filters test modules using file globbing in .NET. Only tests belonging to those test modules will run. For more information and examples on how to use file globbing in .NET, see [File globbing](../../../docs/core/extensions/file-globbing.md).
@@ -533,14 +534,17 @@ With Microsoft Testing Platform, `dotnet test` operates faster than with VSTest.
 
 - **`args`**
 
-  Specifies extra arguments to pass to the test application(s). Use a space to separate multiple arguments. For more information and examples on what to pass, see [Microsoft Testing Platform](../../../docs/core/testing/microsoft-testing-platform-intro.md) and [Microsoft.Testing.Platform extensions](../../../docs/core/testing/microsoft-testing-platform-extensions.md).
+  Specifies extra arguments to pass to the test application(s). Use a space to separate multiple arguments. For more information and examples on what to pass, see [Microsoft.Testing.Platform overview](../../../docs/core/testing/microsoft-testing-platform-intro.md) and [Microsoft.Testing.Platform extensions](../../../docs/core/testing/microsoft-testing-platform-extensions.md).
+
+  > [!TIP]
+  > To specify extra arguments for specific projects, use the `TestingPlatformCommandLineArguments` MSBuild property.
 
 > [!NOTE]
 > To enable trace logging to a file, use the environment variable `DOTNET_CLI_TEST_TRACEFILE` to provide the path to the trace file.
 
 #### Examples
 
-- Run the tests in the project in the current directory:
+- Run the tests in the project or solution in the current directory:
 
   ```dotnetcli
   dotnet test
@@ -558,7 +562,7 @@ With Microsoft Testing Platform, `dotnet test` operates faster than with VSTest.
   dotnet test --solution ./TestProjects/TestProjects.sln
   ```
 
-- Run the tests in the `TestProjects` directory:
+- Run the tests in a solution or project that can be found in the `TestProjects` directory:
 
   ```dotnetcli
   dotnet test --directory ./TestProjects

docs/csharp/advanced-topics/expression-trees/snippets/InterpretExpressions.cs

@@ -1,4 +1,4 @@
-using System.Linq.Expressions;
+using System.Linq.Expressions;
 public static class InterpretExpressions
 {
     public static void ParseExpression()
@@ -16,8 +16,7 @@ public static void ParseExpression()
         ParameterExpression left = (ParameterExpression)operation.Left;
         ConstantExpression right = (ConstantExpression)operation.Right;
 
-        Console.WriteLine("Decomposed expression: {0} => {1} {2} {3}",
-                          param.Name, left.Name, operation.NodeType, right.Value);
+        Console.WriteLine($"Decomposed expression: {param.Name} => {left.Name} {operation.NodeType} {right.Value}");
 
         // This code produces the following output:
 

docs/csharp/advanced-topics/reflection-and-attributes/snippets/conceptual/Program.cs

@@ -1,4 +1,4 @@
-// See https://aka.ms/new-console-template for more information
+// See https://aka.ms/new-console-template for more information
 
 
 using System.Reflection;
@@ -35,10 +35,10 @@ from method in type.GetMethods()
 
     foreach (var groupOfMethods in pubTypesQuery)
     {
-        Console.WriteLine("Type: {0}", groupOfMethods.Key);
+        Console.WriteLine($"Type: {groupOfMethods.Key}");
         foreach (var method in groupOfMethods)
         {
-            Console.WriteLine("  {0}", method);
+            Console.WriteLine($"  {method}");
         }
     }
     // </QueryReflection>

docs/csharp/asynchronous-programming/snippets/async-scenarios/Program.cs

@@ -1,4 +1,4 @@
-using System.Text.RegularExpressions;
+using System.Text.RegularExpressions;
 using System.Windows;
 using Microsoft.AspNetCore.Mvc;
 
@@ -111,7 +111,7 @@ private static void Download(string URL)
 
     private static void DoSomethingWithData(object stringData)
     {
-        Console.WriteLine("Displaying data: ", stringData);
+        Console.WriteLine($"Displaying data: {stringData}");
     }
 
     // <GetUsersForDataset>

docs/csharp/fundamentals/coding-style/snippets/coding-conventions/program.cs

@@ -1,4 +1,4 @@
-using System.Text;
+using System.Text;
 
 namespace Coding_Conventions_Examples
 {
@@ -32,7 +32,7 @@ public static void DelegateExamples()
 
         public static void DelMethod(string str)
         {
-            Console.WriteLine("DelMethod argument: {0}", str);
+            Console.WriteLine($"DelMethod argument: {str}");
         }
         //</snippet14b>
 
@@ -174,7 +174,7 @@ static void Main(string[] args)
 
             if ((divisor != 0) && (dividend / divisor) is var result)
             {
-                Console.WriteLine("Quotient: {0}", result);
+                Console.WriteLine($"Quotient: {result}");
             }
             else
             {