Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jul 2, 2024
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions eng/dotnet-format/dotnet-format-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions test/Microsoft.DotNet.GenAPI.Tests/CSharpFileBuilderTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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: """
Expand All @@ -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: """
Expand Down
2 changes: 1 addition & 1 deletion test/Microsoft.NET.Build.Tests/GenerateResourceTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions test/Microsoft.NET.Build.Tests/WorkloadTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -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()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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()
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion test/dotnet-sln.Tests/GivenDotnetSlnAdd.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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");

Comment on lines -593 to -616
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This test was removed from main here. The same test was also removed from 6.0.2xx here. Then, the branch merge from 6.0.2xx into main added it back. This was likely a merge issue and the test was intended to be removed, since the first PR was indicated as the reason #22865 could be resolved. So, we're rightfully removing the test from main.

// Call test
CommandResult result = new DotnetTestCommand(Log, disableNewOutput: true)
.WithWorkingDirectory(testProjectDirectory)
Expand Down
Loading