From 11faa85633a1dbd4a5218795e8e406a944eca4b3 Mon Sep 17 00:00:00 2001 From: Rolf Bjarne Kvinge Date: Tue, 28 Jun 2016 22:21:38 +0200 Subject: [PATCH] [msbuild] Don't Assert.Ignore in ctors, it ends up as failures. --- .../ProjectsTests/Extensions/ExtensionTestBase.cs | 3 +-- .../tests/Xamarin.iOS.Tasks.Tests/ProjectsTests/ProjectTest.cs | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/msbuild/tests/Xamarin.iOS.Tasks.Tests/ProjectsTests/Extensions/ExtensionTestBase.cs b/msbuild/tests/Xamarin.iOS.Tasks.Tests/ProjectsTests/Extensions/ExtensionTestBase.cs index 29ec98f8a6..4e0ac93af9 100644 --- a/msbuild/tests/Xamarin.iOS.Tasks.Tests/ProjectsTests/Extensions/ExtensionTestBase.cs +++ b/msbuild/tests/Xamarin.iOS.Tasks.Tests/ProjectsTests/Extensions/ExtensionTestBase.cs @@ -12,14 +12,12 @@ namespace Xamarin.iOS.Tasks public ExtensionTestBase (string platform) { Platform = platform; - AssertValidDeviceBuild (platform); } public ExtensionTestBase (string bundlePath, string platform) { BundlePath = bundlePath; Platform = platform; - AssertValidDeviceBuild (platform); } public void BuildExtension (string hostAppName, string extensionName, string platform, int expectedErrorCount = 0) @@ -77,6 +75,7 @@ namespace Xamarin.iOS.Tasks [SetUp] public override void Setup () { + AssertValidDeviceBuild (Platform); SetupEngine (); } } diff --git a/msbuild/tests/Xamarin.iOS.Tasks.Tests/ProjectsTests/ProjectTest.cs b/msbuild/tests/Xamarin.iOS.Tasks.Tests/ProjectsTests/ProjectTest.cs index 702a96e2f4..b2640e9d64 100644 --- a/msbuild/tests/Xamarin.iOS.Tasks.Tests/ProjectsTests/ProjectTest.cs +++ b/msbuild/tests/Xamarin.iOS.Tasks.Tests/ProjectsTests/ProjectTest.cs @@ -10,13 +10,11 @@ namespace Xamarin.iOS.Tasks public ProjectTest (string platform) { Platform = platform; - AssertValidDeviceBuild (platform); } public ProjectTest (string bundlePath, string platform) { BundlePath = bundlePath; Platform = platform; - AssertValidDeviceBuild (platform); } public void SetupPaths (string appName, string platform) @@ -29,6 +27,7 @@ namespace Xamarin.iOS.Tasks [SetUp] public override void Setup () { + AssertValidDeviceBuild (Platform); SetupEngine (); }