Merging main into darc-main-6a483e62-9a15-475d-a31b-7c7d1c96cb9f

dotnet-maestro[bot] · dotnet-maestro[bot] · commit 15e09e2028fb · 2025-05-27T02:04:52.000Z
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.25271.3",
+      "version": "1.1.0-beta.25272.3",
       "commands": [
         "darc"
       ]
diff --git a/README.md b/README.md
@@ -20,7 +20,7 @@ Visibility|All jobs|
 You can download the .NET SDK as either an installer (MSI, PKG) or a zip (zip, tar.gz). The .NET SDK contains both the .NET runtime and CLI tools.
 
 - [Official builds](https://dotnet.microsoft.com/download/dotnet)
-- [**.NET SDK latest builds table**](documentation/package-table.md)
+- [**.NET SDK latest builds table**](https://github.com/dotnet/dotnet/blob/main/docs/builds-table.md)
 
 > [!NOTE]
 > When acquiring installers from the .NET SDK latest builds table, be aware that the installers are the **latest bits**. With development builds, internal NuGet feeds are necessary for some scenarios (for example, to acquire the runtime pack for self-contained apps). You can use the following NuGet.config to configure these feeds. See the following document [Configuring NuGet behavior](https://docs.microsoft.com/nuget/consume-packages/configuring-nuget-behavior) for more information on where to modify your NuGet.config to apply the changes.
diff --git a/documentation/package-table.md b/documentation/package-table.md
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -538,13 +538,13 @@
       <Uri>https://github.com/dotnet/dotnet</Uri>
       <Sha>9d86ce59f05e31b1bccb0cd5604f803416796fe4</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.25271.3">
+    <Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.25272.3">
       <Uri>https://github.com/dotnet/arcade-services</Uri>
-      <Sha>5d2b9c17bf40f12fb843f329cd60d68105e73389</Sha>
+      <Sha>b6c1947b3493a1ad3a1a87fa689128e1d73309ba</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.DarcLib" Version="1.1.0-beta.25271.3">
+    <Dependency Name="Microsoft.DotNet.DarcLib" Version="1.1.0-beta.25272.3">
       <Uri>https://github.com/dotnet/arcade-services</Uri>
-      <Sha>5d2b9c17bf40f12fb843f329cd60d68105e73389</Sha>
+      <Sha>b6c1947b3493a1ad3a1a87fa689128e1d73309ba</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Testing.Platform" Version="1.8.0-preview.25270.10">
       <Uri>https://github.com/microsoft/testfx</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
@@ -89,7 +89,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/arcade-services -->
-    <MicrosoftDotNetDarcLibVersion>1.1.0-beta.25271.3</MicrosoftDotNetDarcLibVersion>
+    <MicrosoftDotNetDarcLibVersion>1.1.0-beta.25272.3</MicrosoftDotNetDarcLibVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/aspire -->
diff --git a/eng/cgmanifest.json b/eng/cgmanifest.json
@@ -25,7 +25,7 @@
                 "type": "nuget",
                 "nuget": {
                     "name": "MSTest",
-                    "version": "3.8.3"
+                    "version": "3.9.0"
                 }
             }
         },
@@ -52,7 +52,7 @@
                 "type": "nuget",
                 "nuget": {
                     "name": "NUnit.Analyzers",
-                    "version": "4.6.0"
+                    "version": "4.7.0"
                 }
             }
         },
@@ -70,7 +70,7 @@
                 "type": "nuget",
                 "nuget": {
                     "name": "Microsoft.Playwright.NUnit",
-                    "version": "1.51.0"
+                    "version": "1.52.0"
                 }
             }
         },
diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/Company.TestProject1.csproj b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-CSharp/Company.TestProject1.csproj
@@ -1,5 +1,5 @@
 ﻿<!--#if (UseMSTestSdk)-->
-<Project Sdk="MSTest.Sdk/3.8.3">
+<Project Sdk="MSTest.Sdk/3.9.0">
 
   <PropertyGroup>
     <TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">net10.0</TargetFramework>
@@ -54,7 +54,7 @@
 <!--#if (CoverageTool == "coverlet")-->
     <PackageReference Include="coverlet.collector" Version="6.0.4" />
 <!--#endif-->
-    <PackageReference Include="MSTest" Version="3.8.3" />
+    <PackageReference Include="MSTest" Version="3.9.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/Company.TestProject1.fsproj b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-FSharp/Company.TestProject1.fsproj
@@ -1,5 +1,5 @@
 <!--#if (UseMSTestSdk)-->
-<Project Sdk="MSTest.Sdk/3.8.3">
+<Project Sdk="MSTest.Sdk/3.9.0">
 
   <PropertyGroup>
     <TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">net10.0</TargetFramework>
@@ -59,7 +59,7 @@
 <!--#if (CoverageTool == "coverlet")-->
     <PackageReference Include="coverlet.collector" Version="6.0.4" />
 <!--#endif-->
-    <PackageReference Include="MSTest" Version="3.8.3" />
+    <PackageReference Include="MSTest" Version="3.9.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/Company.TestProject1.vbproj b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/MSTest-VisualBasic/Company.TestProject1.vbproj
@@ -1,5 +1,5 @@
 ﻿<!--#if (UseMSTestSdk)-->
-<Project Sdk="MSTest.Sdk/3.8.3">
+<Project Sdk="MSTest.Sdk/3.9.0">
 
   <PropertyGroup>
     <TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">net10.0</TargetFramework>
@@ -54,7 +54,7 @@
 <!--#if (CoverageTool == "coverlet")-->
     <PackageReference Include="coverlet.collector" Version="6.0.4" />
 <!--#endif-->
-    <PackageReference Include="MSTest" Version="3.8.3" />
+    <PackageReference Include="MSTest" Version="3.9.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-CSharp/Company.TestProject1.csproj b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-CSharp/Company.TestProject1.csproj
@@ -13,9 +13,9 @@
 
   <ItemGroup>
     <PackageReference Include="coverlet.collector" Version="6.0.4" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.0" />
     <PackageReference Include="NUnit" Version="4.3.2" />
-    <PackageReference Include="NUnit.Analyzers" Version="4.6.0" />
+    <PackageReference Include="NUnit.Analyzers" Version="4.7.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="5.0.0" />
   </ItemGroup>
 
diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-FSharp/Company.TestProject1.fsproj b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-FSharp/Company.TestProject1.fsproj
@@ -17,9 +17,9 @@
 
   <ItemGroup>
     <PackageReference Include="coverlet.collector" Version="6.0.4" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.0" />
     <PackageReference Include="NUnit" Version="4.3.2" />
-    <PackageReference Include="NUnit.Analyzers" Version="4.6.0" />
+    <PackageReference Include="NUnit.Analyzers" Version="4.7.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="5.0.0" />
   </ItemGroup>
 
diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-VisualBasic/Company.TestProject1.vbproj b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/NUnit-VisualBasic/Company.TestProject1.vbproj
@@ -11,9 +11,9 @@
 
   <ItemGroup>
     <PackageReference Include="coverlet.collector" Version="6.0.4" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.0" />
     <PackageReference Include="NUnit" Version="4.3.2" />
-    <PackageReference Include="NUnit.Analyzers" Version="4.6.0" />
+    <PackageReference Include="NUnit.Analyzers" Version="4.7.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="5.0.0" />
   </ItemGroup>
 
diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/Company.TestProject1.csproj b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-MSTest-CSharp/Company.TestProject1.csproj
@@ -1,5 +1,5 @@
 ﻿<!--#if (UseMSTestSdk)-->
-<Project Sdk="MSTest.Sdk/3.8.3">
+<Project Sdk="MSTest.Sdk/3.9.0">
 
   <PropertyGroup>
     <TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">net10.0</TargetFramework>
@@ -56,7 +56,7 @@
     <PackageReference Include="coverlet.collector" Version="6.0.4" />
 <!--#endif-->
     <PackageReference Include="Microsoft.Playwright.MSTest" Version="1.51.0" />
-    <PackageReference Include="MSTest" Version="3.8.3" />
+    <PackageReference Include="MSTest" Version="3.9.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-NUnit-CSharp/Company.TestProject1.csproj b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/Playwright-NUnit-CSharp/Company.TestProject1.csproj
@@ -13,10 +13,10 @@
 
   <ItemGroup>
     <PackageReference Include="coverlet.collector" Version="6.0.4" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
-    <PackageReference Include="Microsoft.Playwright.NUnit" Version="1.51.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.0" />
+    <PackageReference Include="Microsoft.Playwright.NUnit" Version="1.52.0" />
     <PackageReference Include="NUnit" Version="4.3.2" />
-    <PackageReference Include="NUnit.Analyzers" Version="4.6.0" />
+    <PackageReference Include="NUnit.Analyzers" Version="4.7.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="5.0.0" />
   </ItemGroup>
 
diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-CSharp/Company.TestProject1.csproj b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-CSharp/Company.TestProject1.csproj
@@ -12,7 +12,7 @@
 
   <ItemGroup>
     <PackageReference Include="coverlet.collector" Version="6.0.4" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.0" />
     <PackageReference Include="xunit" Version="2.9.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2" />
   </ItemGroup>
diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/Company.TestProject1.fsproj b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-FSharp/Company.TestProject1.fsproj
@@ -16,7 +16,7 @@
 
   <ItemGroup>
     <PackageReference Include="coverlet.collector" Version="6.0.4" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.0" />
     <PackageReference Include="xunit" Version="2.9.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2" />
   </ItemGroup>
diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-VisualBasic/Company.TestProject1.vbproj b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/XUnit-VisualBasic/Company.TestProject1.vbproj
@@ -10,7 +10,7 @@
 
   <ItemGroup>
     <PackageReference Include="coverlet.collector" Version="6.0.4" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.0" />
     <PackageReference Include="xunit" Version="2.9.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2" />
   </ItemGroup>
diff --git a/test/dotnet-new.IntegrationTests/DotnetNewTestTemplatesTests.cs b/test/dotnet-new.IntegrationTests/DotnetNewTestTemplatesTests.cs
@@ -11,7 +11,7 @@ public class DotnetNewTestTemplatesTests : BaseIntegrationTest
 
         private static readonly ImmutableArray<string> SupportedTargetFrameworks =
         [
-            "net10.0",
+            ToolsetInfo.CurrentTargetFramework
         ];
 
         private static readonly (string ProjectTemplateName, string ItemTemplateName, string[] Languages, bool SupportsTestingPlatform)[] AvailableItemTemplates =
@@ -50,13 +50,16 @@ public void WriteLine(string format, params object[] args) { }
 
         static DotnetNewTestTemplatesTests()
         {
+            // This is the live location of the build
             string templatePackagePath = Path.Combine(
                 RepoTemplatePackages,
-                "Microsoft.DotNet.Common.ProjectTemplates.10.0",
+                $"Microsoft.DotNet.Common.ProjectTemplates.{ToolsetInfo.CurrentTargetFrameworkVersion}",
                 "content");
 
             var dummyLog = new NullTestOutputHelper();
 
+            // Here we uninstall first, because we want to make sure we clean up before the installation
+            // i.e we want to make sure our installation is done
             new DotnetNewCommand(dummyLog, "uninstall", templatePackagePath)
                    .WithCustomHive(CreateTemporaryFolder(folderName: "Home"))
                    .WithWorkingDirectory(CreateTemporaryFolder())
@@ -66,7 +69,8 @@ static DotnetNewTestTemplatesTests()
                 .WithCustomHive(CreateTemporaryFolder(folderName: "Home"))
                 .WithWorkingDirectory(CreateTemporaryFolder())
                 .Execute()
-                .Should().ExitWith(0);
+                .Should()
+                .Pass();
         }
 
         [Theory]
@@ -80,19 +84,21 @@ public void ItemTemplate_CanBeInstalledAndTestArePassing(string targetFramework,
             // Create new test project: dotnet new <projectTemplate> -n <testProjectName> -f <targetFramework> -lang <language>
             string args = $"{projectTemplate} -n {testProjectName} -f {targetFramework} -lang {language} -o {outputDirectory}";
             new DotnetNewCommand(_log, args)
-             .WithCustomHive(outputDirectory).WithRawArguments()
-             .WithWorkingDirectory(workingDirectory)
-             .Execute()
-             .Should().ExitWith(0);
+                .WithCustomHive(outputDirectory).WithRawArguments()
+                .WithWorkingDirectory(workingDirectory)
+                .Execute()
+                .Should()
+                .Pass();
 
             var itemName = "test";
 
-            // Add test item to test project: dotnet new <itemTemplate> -n <test> -lang <language> -o <testProjectName>
+            // Add test item to test project: dotnet new <itemTemplate> -n <test> -lang <language> -o <outputDirectory>
             new DotnetNewCommand(_log, $"{itemTemplate} -n {itemName} -lang {language} -o {outputDirectory}")
                 .WithCustomHive(outputDirectory).WithRawArguments()
                 .WithWorkingDirectory(workingDirectory)
                 .Execute()
-                .Should().ExitWith(0);
+                .Should()
+                .Pass();
 
             if (language == Languages.FSharp)
             {
@@ -106,9 +112,11 @@ public void ItemTemplate_CanBeInstalledAndTestArePassing(string targetFramework,
                 .WithWorkingDirectory(outputDirectory)
                 .Execute(outputDirectory);
 
-            result.Should().ExitWith(0);
+            result.Should().Pass();
 
             result.StdOut.Should().Contain("Passed!");
+            // We created another test class (which will contain 1 test), and we already have 1 test when we created the test project.
+            // Therefore, in total we would have 2.
             result.StdOut.Should().MatchRegex(@"Passed:\s*2");
 
             Directory.Delete(outputDirectory, true);
@@ -126,18 +134,19 @@ public void ProjectTemplate_CanBeInstalledAndTestsArePassing(string targetFramew
             // Create new test project: dotnet new <projectTemplate> -n <testProjectName> -f <targetFramework> -lang <language>
             string args = $"{projectTemplate} -n {testProjectName} -f {targetFramework} -lang {language} -o {outputDirectory}";
             new DotnetNewCommand(_log, args)
-             .WithCustomHive(outputDirectory).WithRawArguments()
-             .WithWorkingDirectory(workingDirectory)
-             .Execute()
-             .Should().ExitWith(0);
+                .WithCustomHive(outputDirectory).WithRawArguments()
+                .WithWorkingDirectory(workingDirectory)
+                .Execute()
+                .Should()
+                .Pass();
 
             if (runDotnetTest)
             {
                 var result = new DotnetTestCommand(_log, false)
                 .WithWorkingDirectory(outputDirectory)
                 .Execute(outputDirectory);
 
-                result.Should().ExitWith(0);
+                result.Should().Pass();
 
                 result.StdOut.Should().Contain("Passed!");
                 result.StdOut.Should().MatchRegex(@"Passed:\s*1");
@@ -164,18 +173,19 @@ public void MSTestAndPlaywrightProjectTemplate_WithCoverageToolAndTestRunner_Can
             // Create new test project: dotnet new <projectTemplate> -n <testProjectName> -f <targetFramework> -lang <language> --coverage-tool <coverageTool> --test-runner <testRunner>
             string args = $"{projectTemplate} -n {testProjectName} -f {targetFramework} -lang {language} -o {outputDirectory} --coverage-tool {coverageTool} --test-runner {testRunner}";
             new DotnetNewCommand(_log, args)
-             .WithCustomHive(outputDirectory).WithRawArguments()
-             .WithWorkingDirectory(workingDirectory)
-             .Execute()
-             .Should().ExitWith(0);
+                .WithCustomHive(outputDirectory).WithRawArguments()
+                .WithWorkingDirectory(workingDirectory)
+                .Execute()
+                .Should()
+                .Pass();
 
             if (runDotnetTest)
             {
                 var result = new DotnetTestCommand(_log, false)
                 .WithWorkingDirectory(outputDirectory)
                 .Execute(outputDirectory);
 
-                result.Should().ExitWith(0);
+                result.Should().Pass();
 
                 result.StdOut.Should().Contain("Passed!");
                 result.StdOut.Should().MatchRegex(@"Passed:\s*1");

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.25271.3",`
	`6`	`+ "version": "1.1.0-beta.25272.3",`
`7`	`7`	`"commands": [`
`8`	`8`	`"darc"`
`9`	`9`	`]`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@`
`25`	`25`	`"type": "nuget",`
`26`	`26`	`"nuget": {`
`27`	`27`	`"name": "MSTest",`
`28`		`- "version": "3.8.3"`
	`28`	`+ "version": "3.9.0"`
`29`	`29`	`}`
`30`	`30`	`}`
`31`	`31`	`},`
`@@ -52,7 +52,7 @@`
`52`	`52`	`"type": "nuget",`
`53`	`53`	`"nuget": {`
`54`	`54`	`"name": "NUnit.Analyzers",`
`55`		`- "version": "4.6.0"`
	`55`	`+ "version": "4.7.0"`
`56`	`56`	`}`
`57`	`57`	`}`
`58`	`58`	`},`
`@@ -70,7 +70,7 @@`
`70`	`70`	`"type": "nuget",`
`71`	`71`	`"nuget": {`
`72`	`72`	`"name": "Microsoft.Playwright.NUnit",`
`73`		`- "version": "1.51.0"`
	`73`	`+ "version": "1.52.0"`
`74`	`74`	`}`
`75`	`75`	`}`
`76`	`76`	`},`