Skip to content

Commit 62e1433

Browse files
author
Mirroring
committed
Merge commit '82553995bf4e84914fdbc9200697584c0e8b6390'
2 parents dd92d7d + 8255399 commit 62e1433

1 file changed

Lines changed: 12 additions & 11 deletions

File tree

‎src/Tests/Microsoft.NET.Build.Tests/WorkloadTests.cs‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ public WorkloadTests(ITestOutputHelper log) : base(log)
1111
{
1212
}
1313

14-
[Fact]
14+
// Changing these tests to core MSBuild only for 8.0 since there were weird test failures and the Full Framework resolver doesn't ship from 8.0 into Visual Studio anymore.
15+
[CoreMSBuildOnlyFact]
1516
public void It_should_build_with_workload()
1617
{
1718
var testProject = new TestProject()
@@ -29,7 +30,7 @@ public void It_should_build_with_workload()
2930
.Pass();
3031
}
3132

32-
[Fact]
33+
[CoreMSBuildOnlyFact]
3334
public void It_should_fail_without_workload()
3435
{
3536
var testProject = new TestProject()
@@ -49,7 +50,7 @@ public void It_should_fail_without_workload()
4950
.HaveStdOutContaining("NETSDK1147");
5051
}
5152

52-
[Fact]
53+
[CoreMSBuildOnlyFact]
5354
public void It_should_create_suggested_workload_items()
5455
{
5556
var testProject = new TestProject()
@@ -80,7 +81,7 @@ public void It_should_create_suggested_workload_items()
8081
.BeEquivalentTo(new[] { ("microsoft-net-sdk-missingtestworkload", "microsoft.net.sdk.missingtestworkload") });
8182
}
8283

83-
[Fact]
84+
[CoreMSBuildOnlyFact]
8485
public void It_should_fail_to_restore_without_workload_when_multitargeted()
8586
{
8687
var testProject = new TestProject()
@@ -107,7 +108,7 @@ public void It_should_fail_to_restore_without_workload_when_multitargeted()
107108
// .HaveStdOutContaining("android");
108109
}
109110

110-
[Fact(Skip = "https://github.com/dotnet/sdk/issues/19866")]
111+
[CoreMSBuildOnlyFact(Skip = "https://github.com/dotnet/sdk/issues/19866")]
111112
public void It_should_fail_to_build_without_workload_when_multitargeted()
112113
{
113114
var testProject = new TestProject()
@@ -129,7 +130,7 @@ public void It_should_fail_to_build_without_workload_when_multitargeted()
129130
.HaveStdOutContaining("android");
130131
}
131132

132-
[Fact]
133+
[CoreMSBuildOnlyFact]
133134
public void It_should_fail_to_build_when_multitargeted_to_unknown_platforms()
134135
{
135136
var testProject = new TestProject()
@@ -150,7 +151,7 @@ public void It_should_fail_to_build_when_multitargeted_to_unknown_platforms()
150151
}
151152

152153

153-
[Fact]
154+
[CoreMSBuildOnlyFact]
154155
public void It_should_fail_with_resolver_disabled()
155156
{
156157
var testProject = new TestProject()
@@ -172,7 +173,7 @@ public void It_should_fail_with_resolver_disabled()
172173
.HaveStdOutContaining("NETSDK1208");
173174
}
174175

175-
[Fact]
176+
[CoreMSBuildOnlyFact]
176177
public void It_should_import_AutoImports_for_installed_workloads()
177178
{
178179
var testProject = new TestProject()
@@ -198,7 +199,7 @@ public void It_should_import_AutoImports_for_installed_workloads()
198199
.BeEquivalentTo("true");
199200
}
200201

201-
[Fact]
202+
[CoreMSBuildOnlyFact]
202203
public void It_should_import_aliased_pack()
203204
{
204205
var testProject = new TestProject()
@@ -227,7 +228,7 @@ public void It_should_import_aliased_pack()
227228
.BeEquivalentTo("true");
228229
}
229230

230-
[Fact(Skip = "https://github.com/dotnet/sdk/issues/19866")]
231+
[CoreMSBuildOnlyFact(Skip = "https://github.com/dotnet/sdk/issues/19866")]
231232
public void It_should_get_suggested_workload_by_GetRequiredWorkloads_target()
232233
{
233234
var mainProject = new TestProject()
@@ -255,7 +256,7 @@ public void It_should_get_suggested_workload_by_GetRequiredWorkloads_target()
255256
.BeEquivalentTo("android");
256257
}
257258

258-
[Theory(Skip = "https://github.com/dotnet/installer/issues/13361")]
259+
[CoreMSBuildOnlyTheory(Skip = "https://github.com/dotnet/installer/issues/13361")]
259260
[InlineData($"{ToolsetInfo.CurrentTargetFramework}-android;{ToolsetInfo.CurrentTargetFramework}-ios", $"{ToolsetInfo.CurrentTargetFramework}-android;{ToolsetInfo.CurrentTargetFramework}-ios", "android;android-aot")]
260261
[InlineData(ToolsetInfo.CurrentTargetFramework, $"{ToolsetInfo.CurrentTargetFramework};{ToolsetInfo.CurrentTargetFramework}-android;{ToolsetInfo.CurrentTargetFramework}-ios", "macos;android-aot")]
261262
[InlineData($"{ToolsetInfo.CurrentTargetFramework};{ToolsetInfo.CurrentTargetFramework}-ios", $"{ToolsetInfo.CurrentTargetFramework};{ToolsetInfo.CurrentTargetFramework}-android", "macos;android-aot")]

0 commit comments

Comments
 (0)