Skip to content
Closed
Show file tree
Hide file tree
Changes from all 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
16 changes: 2 additions & 14 deletions src/Build.OM.UnitTests/Definition/ProjectCollection_Tests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -181,11 +181,7 @@ public void GlobalPropertyInheritLoadFromFile()
/// <summary>
/// Loading a project from a file inherits the project collection's global properties
/// </summary>
#if FEATURE_INSTALLED_MSBUILD
[Fact]
#else
[Fact(Skip = "https://github.com/dotnet/msbuild/issues/276")]
#endif
public void GlobalPropertyInheritLoadFromFile2()
{
string path = null;
Expand All @@ -196,7 +192,7 @@ public void GlobalPropertyInheritLoadFromFile2()

using ProjectCollection collection = new ProjectCollection();
collection.SetGlobalProperty("p", "v");
Project project = collection.LoadProject(path, "4.0");
Project project = collection.LoadProject(path, "Current");

Assert.Equal("v", project.GlobalProperties["p"]);
}
Expand All @@ -212,11 +208,7 @@ public void GlobalPropertyInheritLoadFromFile2()
/// <summary>
/// Loading a project from a file inherits the project collection's global properties
/// </summary>
#if FEATURE_INSTALLED_MSBUILD
[Fact]
#else
[Fact(Skip = "https://github.com/dotnet/msbuild/issues/276")]
#endif
public void GlobalPropertyInheritLoadFromFile3()
{
string path = null;
Expand All @@ -227,7 +219,7 @@ public void GlobalPropertyInheritLoadFromFile3()

using ProjectCollection collection = new ProjectCollection();
collection.SetGlobalProperty("p", "v");
Project project = collection.LoadProject(path, null, "4.0");
Project project = collection.LoadProject(path, null, "Current");

Assert.Equal("v", project.GlobalProperties["p"]);
}
Expand Down Expand Up @@ -1095,11 +1087,7 @@ public void DefaultToolsVersion()
/// <summary>
/// Current default from registry is 4.0 if 2.0 is not installed
/// </summary>
#if FEATURE_INSTALLED_MSBUILD
[Fact]
#else
[Fact(Skip = "https://github.com/dotnet/msbuild/issues/276")]
#endif
public void DefaultToolsVersion2()
{
if (ToolLocationHelper.GetPathToDotNetFramework(TargetDotNetFrameworkVersion.Version20) != null)
Expand Down
4 changes: 1 addition & 3 deletions src/Build.OM.UnitTests/Definition/Project_Tests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -980,9 +980,6 @@ public void ChangeGlobalPropertiesPreexisting()
/// </summary>
#if FEATURE_INSTALLED_MSBUILD
[Fact]
#else
[Fact(Skip = "https://github.com/dotnet/msbuild/issues/276")]
#endif
public void ChangeGlobalPropertiesInitiallyFromProjectCollection()
{
Dictionary<string, string> initial = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
Expand All @@ -1002,6 +999,7 @@ public void ChangeGlobalPropertiesInitiallyFromProjectCollection()
collection.GlobalProperties["p0"].ShouldBe("v0");
collection.GlobalProperties["p1"].ShouldBe("v1");
}
#endif

/// <summary>
/// Changing global property to the same value should not dirty the project.
Expand Down
2 changes: 1 addition & 1 deletion src/Build.UnitTests/BackEnd/TargetEntry_Tests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -826,7 +826,7 @@ public void TestTargetOutputsOnFinishedEventNoVariableSet()
/// <summary>
/// Make sure that if an after target fails that the build result is reported as failed.
/// </summary>
[Fact(Skip = "https://github.com/dotnet/msbuild/issues/515")]
[Fact]
public void AfterTargetsShouldReportFailedBuild()
{
// Since we're creating our own BuildManager, we need to make sure that the default
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2137,7 +2137,7 @@ public void TestSkipInvalidConfigurationsCase(bool useNewParser)
/// <summary>
/// When we have a bad framework moniker we expect the build to fail.
/// </summary>
[Fact(Skip = "https://github.com/dotnet/msbuild/issues/515")]
[Fact]
public void BadFrameworkMonkierExpectBuildToFail()
{
string tmpFileName = FileUtilities.GetTemporaryFileName();
Expand Down Expand Up @@ -2225,7 +2225,7 @@ public void BadFrameworkMonkierExpectBuildToFail()
/// When we have a bad framework moniker we expect the build to fail. In this case we are passing a poorly formatted framework moniker.
/// This will test the exception path where the framework name is invalid rather than just not .netFramework
/// </summary>
[Fact(Skip = "https://github.com/dotnet/msbuild/issues/515")]
[Fact]
public void BadFrameworkMonkierExpectBuildToFail2()
{
string tmpFileName = FileUtilities.GetTemporaryFileName();
Expand Down
4 changes: 0 additions & 4 deletions src/Tasks.UnitTests/MSBuild_Tests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -383,11 +383,7 @@ public void LogErrorWhenBuildingVCProj()
/// However, it's a situation where the project author doesn't have control over the
/// property value and so he can't escape it himself.
/// </summary>
#if RUNTIME_TYPE_NETCORE
[Fact(Skip = "https://github.com/dotnet/msbuild/issues/259")]
#else
[Fact]
#endif
public void PropertyOverridesContainSemicolon()
{
ObjectModelHelpers.DeleteTempProjectDirectory();
Expand Down
6 changes: 1 addition & 5 deletions src/Utilities.UnitTests/ToolLocationHelper_Tests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -149,11 +149,7 @@ public void GetSDKRootLocation()
unversionedSDKValue.ShouldBe(expectedValue);
}

#if RUNTIME_TYPE_NETCORE
[WindowsOnlyFact(Skip = "https://github.com/dotnet/msbuild/issues/1250")]
#else
[WindowsOnlyFact(Skip = "https://github.com/dotnet/msbuild/issues/2569")]
#endif
[WindowsOnlyFact]
public void GetUnversionedSDKUnionMetadataLocation()
{
string sdkRootPath = ToolLocationHelper.GetPlatformSDKLocation("Windows", "10.0");
Expand Down
Loading