Unskip tests with Done issues + dotnet-format test fix (#41684)

MiYanni · web-flow · commit 962fbf2f4659 · 2024-07-02T09:41:14.000-07:00
diff --git a/eng/dotnet-format/dotnet-format-integration.yml b/eng/dotnet-format/dotnet-format-integration.yml
@@ -14,14 +14,13 @@ parameters:
     _branchName: "main"
     _sha: "a3bb37003aeccad012a6e7dd220977599e8b8e65"
     _useParentSdk: 0
-  # Formatting sdk fails: https://github.com/dotnet/sdk/issues/41060
-  # - Name: sdk
-  #   _repo: "https://github.com/dotnet/sdk"
-  #   _repoName: "dotnet/sdk"
-  #   _targetSolution: "sdk.sln"
-  #   _branchName: "main"
-  #   _sha: "be25db95c376bffd508a023399ddd34392fe6458"
-  #   _useParentSdk: 0
+  - Name: sdk
+    _repo: "https://github.com/dotnet/sdk"
+    _repoName: "dotnet/sdk"
+    _targetSolution: "sdk.sln"
+    _branchName: "main"
+    _sha: "be25db95c376bffd508a023399ddd34392fe6458"
+    _useParentSdk: 0
   - Name: project_system
     _repo: "https://github.com/dotnet/project-system"
     _repoName: "dotnet/project-system"
diff --git a/test/Microsoft.DotNet.GenAPI.Tests/CSharpFileBuilderTests.cs b/test/Microsoft.DotNet.GenAPI.Tests/CSharpFileBuilderTests.cs
@@ -2125,7 +2125,7 @@ public partial class foo
                 includeInternalSymbols: false);
         }
 
-        [Fact(Skip = "https://github.com/dotnet/roslyn/issues/67019")]
+        [Fact(Skip = "https://github.com/dotnet/roslyn/issues/74109")]
         public void TestInterfaceWithOperatorGeneration()
         {
             RunTest(original: """
@@ -2149,7 +2149,7 @@ public partial interface IntType
                  includeInternalSymbols: false);
         }
 
-        [Fact(Skip = "https://github.com/dotnet/roslyn/issues/67019")]
+        [Fact(Skip = "https://github.com/dotnet/roslyn/issues/74109")]
         public void TestInterfaceWithCheckedOperatorGeneration()
         {
             RunTest(original: """
diff --git a/test/Microsoft.NET.Build.Tests/GenerateResourceTests.cs b/test/Microsoft.NET.Build.Tests/GenerateResourceTests.cs
@@ -10,7 +10,7 @@ public GenerateResourceTests(ITestOutputHelper log) : base(log)
         {
         }
 
-        [Theory(Skip = "https://github.com/microsoft/msbuild/issues/4488")]
+        [WindowsOnlyTheory]
         [InlineData(ToolsetInfo.CurrentTargetFramework, true)]
         public void DependentUponTest(string targetFramework, bool isExe)
         {
diff --git a/test/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildACppCliProjectWithTransitiveDeps.cs b/test/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildACppCliProjectWithTransitiveDeps.cs
@@ -12,7 +12,7 @@ public GivenThatWeWantToBuildACppCliProjectWithTransitiveDeps(ITestOutputHelper
 
         private readonly Lazy<TestAsset> _buildAsset;
 
-        [FullMSBuildOnlyFact(Skip = "https://github.com/dotnet/sdk/issues/3785")]
+        [FullMSBuildOnlyFact(Skip = "https://github.com/dotnet/sdk/issues/11008")]
         public void It_can_generate_correct_depsJson_file()
         {
             TestAsset testAsset = _buildAsset.Value;
@@ -23,7 +23,7 @@ public void It_can_generate_correct_depsJson_file()
             depsJsonContent.Should().Contain("NETCoreCppCliTestC.dll", "should contain transitive reference");
         }
 
-        [FullMSBuildOnlyFact(Skip = "https://github.com/dotnet/sdk/issues/3785")]
+        [FullMSBuildOnlyFact(Skip = "https://github.com/dotnet/sdk/issues/11008")]
         public void It_can_generate_all_runtimeconfig_files_to_output_folder()
         {
             TestAsset testAsset = _buildAsset.Value;
@@ -35,7 +35,7 @@ public void It_can_generate_all_runtimeconfig_files_to_output_folder()
             });
         }
 
-        [FullMSBuildOnlyFact(Skip = "https://github.com/dotnet/sdk/issues/3785")]
+        [FullMSBuildOnlyFact(Skip = "https://github.com/dotnet/sdk/issues/11008")]
         public void It_can_generate_all_depsjson_files_to_output_folder()
         {
             TestAsset testAsset = _buildAsset.Value;
diff --git a/test/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildADesktopExe.cs b/test/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildADesktopExe.cs
@@ -657,7 +657,7 @@ static void Main(string[] args)
                 .And.NotHaveStdOutContaining("Could not determine");
         }
 
-        [FullMSBuildOnlyTheory(Skip = "https://github.com/NuGet/Home/issues/8238")]
+        [FullMSBuildOnlyTheory(Skip = "https://github.com/dotnet/NuGet.BuildTasks/issues/75")]
         [InlineData("4.3.3")]
         [InlineData("4.1.0")]
         public void Aliases_are_preserved_if_inbox_assembly_wins_conflict_resolution(string httpPackageVersion)
diff --git a/test/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildAWindowsDesktopProject.cs b/test/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildAWindowsDesktopProject.cs
@@ -186,7 +186,7 @@ public void It_fails_if_windows_target_platform_version_is_invalid()
                 .HaveStdOutContaining("NETSDK1140");
         }
 
-        [WindowsOnlyTheory(Skip = "https://github.com/dotnet/sdk/pull/29009")]
+        [WindowsOnlyTheory]
         [InlineData(true)]
         [InlineData(false)]
         public void It_succeeds_if_windows_target_platform_version_does_not_have_trailing_zeros(bool setInTargetframework)
diff --git a/test/Microsoft.NET.Build.Tests/WorkloadTests.cs b/test/Microsoft.NET.Build.Tests/WorkloadTests.cs
@@ -109,7 +109,7 @@ public void It_should_fail_to_restore_without_workload_when_multitargeted()
             //  .HaveStdOutContaining("android");
         }
 
-        [Fact(Skip = "https://github.com/dotnet/sdk/issues/19866")]
+        [Fact]
         public void It_should_fail_to_build_without_workload_when_multitargeted()
         {
             var testProject = new TestProject()
@@ -229,7 +229,7 @@ public void It_should_import_aliased_pack()
                 .BeEquivalentTo("true");
         }
 
-        [Fact(Skip = "https://github.com/dotnet/sdk/issues/19866")]
+        [Fact]
         public void It_should_get_suggested_workload_by_GetRequiredWorkloads_target()
         {
             var mainProject = new TestProject()
diff --git a/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishASingleFileApp.cs b/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishASingleFileApp.cs
@@ -307,7 +307,7 @@ public void No_runtime_files()
         }
 
 
-        [RequiresMSBuildVersionTheory("17.0.0.32901", Skip = "https://github.com/dotnet/runtime/issues/60308")]
+        [RequiresMSBuildVersionTheory("17.0.0.32901")]
         [InlineData(true)]
         [InlineData(false)]
         public void It_supports_composite_r2r(bool extractAll)
diff --git a/test/Microsoft.NET.Sdk.Razor.Tests/DesignTimeBuildIntegrationTest.cs b/test/Microsoft.NET.Sdk.Razor.Tests/DesignTimeBuildIntegrationTest.cs
@@ -31,7 +31,7 @@ public void DesignTimeBuild_DoesNotRunRazorTargets()
             new FileInfo(Path.Combine(outputPath, "SimpleMvc.Views.pdb")).Should().NotExist();
         }
 
-        [Fact(Skip = "Skipping until https://github.com/dotnet/aspnetcore/issues/28825 is resolved.")]
+        [Fact]
         public void RazorGenerateDesignTime_ReturnsRazorGenerateWithTargetPath()
         {
             var testAsset = "RazorSimpleMvc";
diff --git a/test/Microsoft.NET.ToolPack.Tests/GivenThatWeWantToPackAToolProjectWithGeneratePackageOnBuild.cs b/test/Microsoft.NET.ToolPack.Tests/GivenThatWeWantToPackAToolProjectWithGeneratePackageOnBuild.cs
@@ -71,7 +71,7 @@ public void It_builds_and_result_contains_dependencies_dll()
             }
         }
 
-        [Theory(Skip = "https://github.com/dotnet/sdk/issues/3471")]
+        [Theory(Skip = "https://github.com/dotnet/sdk/issues/10335")]
         [InlineData(false, false)]
         [InlineData(false, true)]
         [InlineData(true, false)]
diff --git a/test/Microsoft.TemplateEngine.Cli.UnitTests/ParserTests/TabCompletionTests.cs b/test/Microsoft.TemplateEngine.Cli.UnitTests/ParserTests/TabCompletionTests.cs
@@ -342,7 +342,7 @@ public void CanCompleteParameters_StartsWith_FromMultipleTemplates()
         }
 
 #pragma warning disable xUnit1004 // Test methods should not be skipped
-        [Fact(Skip = "https://github.com/dotnet/templating/issues/4192")]
+        [Fact(Skip = "https://github.com/dotnet/templating/issues/4387")]
 #pragma warning restore xUnit1004 // Test methods should not be skipped
         public void CanCompleteParameters_StartsWith_AfterOption()
         {
diff --git a/test/dotnet-format.Tests/tests/Utilities/TestProjectsPathHelper.cs b/test/dotnet-format.Tests/tests/Utilities/TestProjectsPathHelper.cs
@@ -10,14 +10,14 @@ public static string GetProjectsDirectory()
         {
             if (s_projectsDirectory == null)
             {
-                var assetsDirectory = Path.Combine(TestContext.Current.TestAssetsDirectory, "dotnet-format.TestsProjects");
+                var assetsDirectory = Path.Combine(TestContext.Current.TestAssetsDirectory, "dotnet-format");
                 if (Directory.Exists(assetsDirectory))
                 {
                     s_projectsDirectory = assetsDirectory;
                     return assetsDirectory;
                 }
 
-                throw new ArgumentException("Can't find the project asserts directory");
+                throw new ArgumentException("Can't find the project assets directory");
             }
 
             return s_projectsDirectory;
diff --git a/test/dotnet-sln.Tests/GivenDotnetSlnAdd.cs b/test/dotnet-sln.Tests/GivenDotnetSlnAdd.cs
@@ -990,7 +990,7 @@ public void WhenPassedAnUnknownProjectTypeItFails()
                 .WithWorkingDirectory(projectDirectory)
                 .Execute($"sln", "App.sln", "add", projectToAdd);
             cmd.Should().Fail();
-            cmd.StdErr.Should().BeVisuallyEquivalentTo("Unsupported project type. Check with your sdk provider.");
+            cmd.StdErr.Should().BeVisuallyEquivalentTo("has an unknown project type and cannot be added to the solution file. Contact your SDK provider for support.");
 
             File.ReadAllText(slnFullPath)
                 .Should().BeVisuallyEquivalentTo(contentBefore);
diff --git a/test/dotnet-test.Tests/GivenDotnetTestBuildsAndRunsTestfromCsproj.cs b/test/dotnet-test.Tests/GivenDotnetTestBuildsAndRunsTestfromCsproj.cs
@@ -590,30 +590,6 @@ public void ItShouldShowWarningMessageOnCollectCodeCoverage()
         {
             var testProjectDirectory = CopyAndRestoreVSTestDotNetCoreTestApp("13");
 
-            // Call test
-            CommandResult result = new DotnetTestCommand(Log, disableNewOutput: true)
-                                        .WithWorkingDirectory(testProjectDirectory)
-                                        .Execute(
-                                            "--collect", "Code Coverage",
-                                            "--filter", "VSTestPassTest");
-
-            // Verify test results
-            if (!TestContext.IsLocalized())
-            {
-                result.StdOut.Should().Contain("No code coverage data available. Code coverage is currently supported only on Windows and Linux x64.");
-                result.StdOut.Should().Contain("Total:     1");
-                result.StdOut.Should().Contain("Passed:     1");
-                result.StdOut.Should().NotContain("Failed!");
-            }
-
-            result.ExitCode.Should().Be(0);
-        }
-
-        [PlatformSpecificFact(TestPlatforms.Linux, Skip = "https://github.com/dotnet/sdk/issues/22865")]
-        public void ItShouldShowWarningMessageOnCollectCodeCoverageThatProfilerWasNotInitialized()
-        {
-            var testProjectDirectory = CopyAndRestoreVSTestDotNetCoreTestApp("13");
-
             // Call test
             CommandResult result = new DotnetTestCommand(Log, disableNewOutput: true)
                                         .WithWorkingDirectory(testProjectDirectory)

Original file line number	Diff line number	Diff line change
`@@ -2125,7 +2125,7 @@ public partial class foo`
`2125`	`2125`	`includeInternalSymbols: false);`
`2126`	`2126`	`}`
`2127`	`2127`
`2128`		`- [Fact(Skip = "https://github.com/dotnet/roslyn/issues/67019")]`
	`2128`	`+ [Fact(Skip = "https://github.com/dotnet/roslyn/issues/74109")]`
`2129`	`2129`	`public void TestInterfaceWithOperatorGeneration()`
`2130`	`2130`	`{`
`2131`	`2131`	`RunTest(original: """`
`@@ -2149,7 +2149,7 @@ public partial interface IntType`
`2149`	`2149`	`includeInternalSymbols: false);`
`2150`	`2150`	`}`
`2151`	`2151`
`2152`		`- [Fact(Skip = "https://github.com/dotnet/roslyn/issues/67019")]`
	`2152`	`+ [Fact(Skip = "https://github.com/dotnet/roslyn/issues/74109")]`
`2153`	`2153`	`public void TestInterfaceWithCheckedOperatorGeneration()`
`2154`	`2154`	`{`
`2155`	`2155`	`RunTest(original: """`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ public GenerateResourceTests(ITestOutputHelper log) : base(log)`
`10`	`10`	`{`
`11`	`11`	`}`
`12`	`12`
`13`		`- [Theory(Skip = "https://github.com/microsoft/msbuild/issues/4488")]`
	`13`	`+ [WindowsOnlyTheory]`
`14`	`14`	`[InlineData(ToolsetInfo.CurrentTargetFramework, true)]`
`15`	`15`	`public void DependentUponTest(string targetFramework, bool isExe)`
`16`	`16`	`{`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ public GivenThatWeWantToBuildACppCliProjectWithTransitiveDeps(ITestOutputHelper`
`12`	`12`
`13`	`13`	`private readonly Lazy<TestAsset> _buildAsset;`
`14`	`14`
`15`		`- [FullMSBuildOnlyFact(Skip = "https://github.com/dotnet/sdk/issues/3785")]`
	`15`	`+ [FullMSBuildOnlyFact(Skip = "https://github.com/dotnet/sdk/issues/11008")]`
`16`	`16`	`public void It_can_generate_correct_depsJson_file()`
`17`	`17`	`{`
`18`	`18`	`TestAsset testAsset = _buildAsset.Value;`
`@@ -23,7 +23,7 @@ public void It_can_generate_correct_depsJson_file()`
`23`	`23`	`depsJsonContent.Should().Contain("NETCoreCppCliTestC.dll", "should contain transitive reference");`
`24`	`24`	`}`
`25`	`25`
`26`		`- [FullMSBuildOnlyFact(Skip = "https://github.com/dotnet/sdk/issues/3785")]`
	`26`	`+ [FullMSBuildOnlyFact(Skip = "https://github.com/dotnet/sdk/issues/11008")]`
`27`	`27`	`public void It_can_generate_all_runtimeconfig_files_to_output_folder()`
`28`	`28`	`{`
`29`	`29`	`TestAsset testAsset = _buildAsset.Value;`
`@@ -35,7 +35,7 @@ public void It_can_generate_all_runtimeconfig_files_to_output_folder()`
`35`	`35`	`});`
`36`	`36`	`}`
`37`	`37`
`38`		`- [FullMSBuildOnlyFact(Skip = "https://github.com/dotnet/sdk/issues/3785")]`
	`38`	`+ [FullMSBuildOnlyFact(Skip = "https://github.com/dotnet/sdk/issues/11008")]`
`39`	`39`	`public void It_can_generate_all_depsjson_files_to_output_folder()`
`40`	`40`	`{`
`41`	`41`	`TestAsset testAsset = _buildAsset.Value;`
Original file line number	Diff line number	Diff line change
`@@ -657,7 +657,7 @@ static void Main(string[] args)`
`657`	`657`	`.And.NotHaveStdOutContaining("Could not determine");`
`658`	`658`	`}`
`659`	`659`
`660`		`- [FullMSBuildOnlyTheory(Skip = "https://github.com/NuGet/Home/issues/8238")]`
	`660`	`+ [FullMSBuildOnlyTheory(Skip = "https://github.com/dotnet/NuGet.BuildTasks/issues/75")]`
`661`	`661`	`[InlineData("4.3.3")]`
`662`	`662`	`[InlineData("4.1.0")]`
`663`	`663`	`public void Aliases_are_preserved_if_inbox_assembly_wins_conflict_resolution(string httpPackageVersion)`
Original file line number	Diff line number	Diff line change
`@@ -186,7 +186,7 @@ public void It_fails_if_windows_target_platform_version_is_invalid()`
`186`	`186`	`.HaveStdOutContaining("NETSDK1140");`
`187`	`187`	`}`
`188`	`188`
`189`		`- [WindowsOnlyTheory(Skip = "https://github.com/dotnet/sdk/pull/29009")]`
	`189`	`+ [WindowsOnlyTheory]`
`190`	`190`	`[InlineData(true)]`
`191`	`191`	`[InlineData(false)]`
`192`	`192`	`public void It_succeeds_if_windows_target_platform_version_does_not_have_trailing_zeros(bool setInTargetframework)`
Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ public void It_should_fail_to_restore_without_workload_when_multitargeted()`
`109`	`109`	`// .HaveStdOutContaining("android");`
`110`	`110`	`}`
`111`	`111`
`112`		`- [Fact(Skip = "https://github.com/dotnet/sdk/issues/19866")]`
	`112`	`+ [Fact]`
`113`	`113`	`public void It_should_fail_to_build_without_workload_when_multitargeted()`
`114`	`114`	`{`
`115`	`115`	`var testProject = new TestProject()`
`@@ -229,7 +229,7 @@ public void It_should_import_aliased_pack()`
`229`	`229`	`.BeEquivalentTo("true");`
`230`	`230`	`}`
`231`	`231`
`232`		`- [Fact(Skip = "https://github.com/dotnet/sdk/issues/19866")]`
	`232`	`+ [Fact]`
`233`	`233`	`public void It_should_get_suggested_workload_by_GetRequiredWorkloads_target()`
`234`	`234`	`{`
`235`	`235`	`var mainProject = new TestProject()`
Original file line number	Diff line number	Diff line change
`@@ -307,7 +307,7 @@ public void No_runtime_files()`
`307`	`307`	`}`
`308`	`308`
`309`	`309`
`310`		`- [RequiresMSBuildVersionTheory("17.0.0.32901", Skip = "https://github.com/dotnet/runtime/issues/60308")]`
	`310`	`+ [RequiresMSBuildVersionTheory("17.0.0.32901")]`
`311`	`311`	`[InlineData(true)]`
`312`	`312`	`[InlineData(false)]`
`313`	`313`	`public void It_supports_composite_r2r(bool extractAll)`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ public void DesignTimeBuild_DoesNotRunRazorTargets()`
`31`	`31`	`new FileInfo(Path.Combine(outputPath, "SimpleMvc.Views.pdb")).Should().NotExist();`
`32`	`32`	`}`
`33`	`33`
`34`		`- [Fact(Skip = "Skipping until https://github.com/dotnet/aspnetcore/issues/28825 is resolved.")]`
	`34`	`+ [Fact]`
`35`	`35`	`public void RazorGenerateDesignTime_ReturnsRazorGenerateWithTargetPath()`
`36`	`36`	`{`
`37`	`37`	`var testAsset = "RazorSimpleMvc";`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ public void It_builds_and_result_contains_dependencies_dll()`
`71`	`71`	`}`
`72`	`72`	`}`
`73`	`73`
`74`		`- [Theory(Skip = "https://github.com/dotnet/sdk/issues/3471")]`
	`74`	`+ [Theory(Skip = "https://github.com/dotnet/sdk/issues/10335")]`
`75`	`75`	`[InlineData(false, false)]`
`76`	`76`	`[InlineData(false, true)]`
`77`	`77`	`[InlineData(true, false)]`
Original file line number	Diff line number	Diff line change
`@@ -342,7 +342,7 @@ public void CanCompleteParameters_StartsWith_FromMultipleTemplates()`
`342`	`342`	`}`
`343`	`343`
`344`	`344`	`#pragma warning disable xUnit1004 // Test methods should not be skipped`
`345`		`- [Fact(Skip = "https://github.com/dotnet/templating/issues/4192")]`
	`345`	`+ [Fact(Skip = "https://github.com/dotnet/templating/issues/4387")]`
`346`	`346`	`#pragma warning restore xUnit1004 // Test methods should not be skipped`
`347`	`347`	`public void CanCompleteParameters_StartsWith_AfterOption()`
`348`	`348`	`{`