Skip to content

Commit

Permalink
[mmptests] Update according to MSBuild changes.
Browse files Browse the repository at this point in the history
  • Loading branch information
rolfbjarne committed Oct 11, 2018
1 parent 745c18c commit 4362842
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions tests/mmptest/src/MMPTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -685,15 +685,15 @@ public void BuildingSameSolutionTwice_ShouldNotRunACToolTwice ()

string project = TI.GenerateUnifiedExecutableProject (test);

string buildOutput = TI.BuildProject (project, true, diagnosticMSBuild: true, useMSBuild: true);
string buildOutput = TI.BuildProject (project, true);
Assert.True (buildOutput.Contains ("actool execution started with arguments"), $"Initial build should run actool");

buildOutput = TI.BuildProject (project, true, diagnosticMSBuild: true, useMSBuild: true);
buildOutput = TI.BuildProject (project, true);
Assert.False (buildOutput.Contains ("actool execution started with arguments"), $"Second build should not run actool");

TI.RunAndAssert ("touch", Path.Combine (tmpDir, "Assets.xcassets/AppIcon.appiconset/[email protected]"), "touch icon");

buildOutput = TI.BuildProject (project, true, diagnosticMSBuild: true, useMSBuild: true);
buildOutput = TI.BuildProject (project, true);
Assert.True (buildOutput.Contains ("actool execution started with arguments"), $"Build after touching icon must run actool");
});
}
Expand Down
4 changes: 2 additions & 2 deletions tests/mmptest/src/PackageReferenceTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public void AppsWithPackageReferencs_BuildAndRun (bool full)

string project = TI.GenerateUnifiedExecutableProject (config);
TI.NugetRestore (project);
TI.BuildProject (project, true, useMSBuild: true);
TI.BuildProject (project, true);
TI.RunGeneratedUnifiedExecutable (config);
});
}
Expand All @@ -44,7 +44,7 @@ public void ExtensionProjectPackageReferencs_Build ()
TI.CopyFileWithSubstitutions (main, main, s => s.Replace ("%TESTCODE%", TestCode));

TI.NugetRestore (project);
string output = TI.BuildProject (Path.Combine (tmpDir, "Today/TodayExtensionTest.csproj"), isUnified: true, useMSBuild: true);
string output = TI.BuildProject (Path.Combine (tmpDir, "Today/TodayExtensionTest.csproj"), isUnified: true);
Assert.IsTrue (!output.Contains ("MM2013"));
});
}
Expand Down

0 comments on commit 4362842

Please sign in to comment.