From ffeefabf1c210cbbae6e23b56ca7bb5074afd44e Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Wed, 16 May 2018 00:46:48 +0200 Subject: [PATCH] Update ControlCatalog.Desktop output dir. The output path has changed from `bin\Release` to `bin\Release\net461`. --- parameters.cake | 2 +- tests/Avalonia.DesignerSupport.Tests/DesignerSupportTests.cs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/parameters.cake b/parameters.cake index e224cce151..06cb9ba2b2 100644 --- a/parameters.cake +++ b/parameters.cake @@ -115,7 +115,7 @@ public class Parameters FileZipSuffix = Version + ".zip"; ZipCoreArtifacts = ZipRoot.CombineWithFilePath("Avalonia-" + FileZipSuffix); - ZipSourceControlCatalogDesktopDirs = (DirectoryPath)context.Directory("./samples/ControlCatalog.Desktop/bin/" + DirSuffix); + ZipSourceControlCatalogDesktopDirs = (DirectoryPath)context.Directory("./samples/ControlCatalog.Desktop/bin/" + DirSuffix + "/net461); ZipTargetControlCatalogDesktopDirs = ZipRoot.CombineWithFilePath("ControlCatalog.Desktop-" + FileZipSuffix); } } diff --git a/tests/Avalonia.DesignerSupport.Tests/DesignerSupportTests.cs b/tests/Avalonia.DesignerSupport.Tests/DesignerSupportTests.cs index 32da700acc..f320fa6fe8 100644 --- a/tests/Avalonia.DesignerSupport.Tests/DesignerSupportTests.cs +++ b/tests/Avalonia.DesignerSupport.Tests/DesignerSupportTests.cs @@ -11,9 +11,9 @@ namespace Avalonia.DesignerSupport.Tests { public class DesignerSupportTests { - [Theory(Skip = "Skipping for now as failing on AppVeyor"), + [Theory, InlineData(@"Avalonia.DesignerSupport.TestApp.exe", @"..\..\tests\Avalonia.DesignerSupport.TestApp\MainWindow.xaml"), - InlineData(@"..\..\samples\ControlCatalog.Desktop\bin\$BUILD\ControlCatalog.dll", @"..\..\samples\ControlCatalog\MainWindow.xaml")] + InlineData(@"..\..\samples\ControlCatalog.Desktop\bin\$BUILD\net461\ControlCatalog.dll", @"..\..\samples\ControlCatalog\MainWindow.xaml")] public void DesignerApiShoudBeOperational(string outputDir, string xamlFile) { var xaml = File.ReadAllText(xamlFile);