Merge branch 'release/9.0.2xx' into merge/release/9.0.1xx-to-release/…

…9.0.2xx
dotnet · Dec 12, 2024 · ed95480 · ed95480
2 parents eb17e6d + 6d67e2a
commit ed95480
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 6 deletions.
diff --git a/test/HelixTasks/SDKCustomCreateXUnitWorkItemsWithTestExclusion.cs b/test/HelixTasks/SDKCustomCreateXUnitWorkItemsWithTestExclusion.cs
@@ -152,7 +152,7 @@ private async Task<List<ITaskItem>> PrepareWorkItem(ITaskItem xunitProject)
 
                 var testFilter = string.IsNullOrEmpty(assemblyPartitionInfo.ClassListArgumentString) ? "" : $"--filter \"{assemblyPartitionInfo.ClassListArgumentString}\"";
                 command = $"{driver} test {assemblyName} -e HELIX_WORK_ITEM_TIMEOUT={timeout} {testExecutionDirectory} {msbuildAdditionalSdkResolverFolder} " +
-                            $"{(XUnitArguments != null ? " " + XUnitArguments : "")} --results-directory .{Path.DirectorySeparatorChar} --logger trx --blame-hang --blame-hang-timeout 30m {testFilter} -- {arguments}";
+                          $"{(XUnitArguments != null ? " " + XUnitArguments : "")} --results-directory .{Path.DirectorySeparatorChar} --logger trx --logger \"console;verbosity=detailed\" --blame-hang --blame-hang-timeout 30m {testFilter} -- {arguments}";
 
                 Log.LogMessage($"Creating work item with properties Identity: {assemblyName}, PayloadDirectory: {publishDirectory}, Command: {command}");
 

diff --git a/test/Microsoft.NET.Build.Containers.UnitTests/RegistryTests.cs b/test/Microsoft.NET.Build.Containers.UnitTests/RegistryTests.cs
@@ -395,12 +395,12 @@ public async Task UploadBlobChunkedAsync_Failure()
         api.Verify(api => api.Blob.Upload.UploadChunkAsync(It.IsIn(absoluteUploadUri, uploadPath), It.IsAny<HttpContent>(), It.IsAny<CancellationToken>()), Times.Exactly(1));
     }
 
+    [Theory(Skip = "https://github.com/dotnet/sdk/issues/42820")]
     [InlineData(true, true, true)]
     [InlineData(false, true, true)]
     [InlineData(true, false, true)]
     [InlineData(false, false, true)]
     [InlineData(false, false, false)]
-    [Theory]
     public async Task InsecureRegistry(bool isInsecureRegistry, bool serverIsHttps, bool httpServerCloseAbortive)
     {
         ILogger logger = _loggerFactory.CreateLogger(nameof(InsecureRegistry));

diff --git a/test/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildANetCoreApp.cs b/test/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildANetCoreApp.cs
@@ -48,7 +48,7 @@ public void It_targets_the_right_shared_framework(string targetFramework, string
         }
 
         //  Test behavior when implicit version differs for framework-dependent and self-contained apps
-        [Theory]
+        [Theory(Skip = "https://github.com/dotnet/sdk/issues/45417")]
         [InlineData("netcoreapp1.0", false, true, "1.0.5")]
         [InlineData("netcoreapp1.0", true, true, "1.0.16")]
         [InlineData("netcoreapp1.0", false, false, "1.0.5")]

diff --git a/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToStoreAProjectWithDependencies.cs b/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToStoreAProjectWithDependencies.cs
@@ -121,7 +121,7 @@ public void compose_dependencies_noopt()
             storeDirectory.Should().OnlyHaveFiles(files_on_disk);
         }
 
-        [Fact]
+        [Fact(Skip = "https://github.com/dotnet/sdk/issues/45417")]
         public void store_nativeonlyassets()
         {
             TestAsset simpleDependenciesAsset = _testAssetsManager

diff --git a/test/dotnet-new.Tests/DotnetNewListTests.Approval.cs b/test/dotnet-new.Tests/DotnetNewListTests.Approval.cs
@@ -7,7 +7,8 @@ namespace Microsoft.DotNet.Cli.New.IntegrationTests
 {
     public partial class DotnetNewListTests
     {
-        [Theory]
+#pragma warning disable xUnit1004 // Test methods should not be skipped
+        [Theory(Skip = "https://github.com/dotnet/sdk/issues/45406")]
         [InlineData("-l")]
         [InlineData("--list")]
         public Task BasicTest_WhenLegacyCommandIsUsed(string commandName)
@@ -27,7 +28,7 @@ public Task BasicTest_WhenLegacyCommandIsUsed(string commandName)
                 .DisableRequireUniquePrefix();
         }
 
-        [Fact]
+        [Fact(Skip = "https://github.com/dotnet/sdk/issues/45406")]
         public Task BasicTest_WhenListCommandIsUsed()
         {
             CommandResult commandResult = new DotnetNewCommand(_log, "list")
@@ -41,6 +42,7 @@ public Task BasicTest_WhenListCommandIsUsed()
 
             return Verify(commandResult.StdOut).UniqueForOSPlatform();
         }
+#pragma warning restore xUnit1004
 
         [Fact]
         public Task Constraints_CanShowMessageIfTemplateGroupIsRestricted()