浏览代码

Fixed build? Maybe? Appveyor, pretty please?

Nikita Tsukanov 8 年之前
父节点
当前提交
e388a485ce

+ 1 - 1
Avalonia.sln

@@ -117,7 +117,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ControlCatalog.Desktop", "s
 EndProject
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ControlCatalog.iOS", "samples\ControlCatalog.iOS\ControlCatalog.iOS.csproj", "{57E0455D-D565-44BB-B069-EE1AA20F8337}"
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ControlCatalog.iOS", "samples\ControlCatalog.iOS\ControlCatalog.iOS.csproj", "{57E0455D-D565-44BB-B069-EE1AA20F8337}"
 EndProject
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Skia.RenderTests", "tests\Avalonia.RenderTests\Avalonia.Skia.RenderTests.csproj", "{D35A9F3D-8BB0-496E-BF72-444038A7DEBB}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Skia.RenderTests", "tests\Avalonia.RenderTests\Avalonia.Skia.RenderTests.csproj", "{D35A9F3D-8BB0-496E-BF72-444038A7DEBB}"
 EndProject
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.DesignerSupport.Tests", "tests\Avalonia.DesignerSupport.Tests\Avalonia.DesignerSupport.Tests.csproj", "{52F55355-D120-42AC-8116-8410A7D602FA}"
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.DesignerSupport.Tests", "tests\Avalonia.DesignerSupport.Tests\Avalonia.DesignerSupport.Tests.csproj", "{52F55355-D120-42AC-8116-8410A7D602FA}"
 EndProject
 EndProject

+ 1 - 1
tests/Avalonia.RenderTests/Avalonia.Skia.RenderTests.csproj

@@ -2,7 +2,7 @@
   <PropertyGroup>
   <PropertyGroup>
     <TargetFrameworks>netcoreapp1.1;net461</TargetFrameworks>
     <TargetFrameworks>netcoreapp1.1;net461</TargetFrameworks>
     <Platform Condition="'$(TargetFramework)' == 'net461'">x86</Platform>
     <Platform Condition="'$(TargetFramework)' == 'net461'">x86</Platform>
-    <OutputPath>bin\$(Configuration)</OutputPath>
+    <OutputPath>bin\Skia\$(Configuration)</OutputPath>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <EnableDefaultCompileItems>False</EnableDefaultCompileItems>
     <EnableDefaultCompileItems>False</EnableDefaultCompileItems>
     <DefineConstants>$(DefineConstants);AVALONIA_SKIA;AVALONIA_SKIA_SKIP_FAIL</DefineConstants>
     <DefineConstants>$(DefineConstants);AVALONIA_SKIA;AVALONIA_SKIA_SKIP_FAIL</DefineConstants>

+ 1 - 1
tests/Avalonia.RenderTests/TestBase.cs

@@ -55,7 +55,7 @@ namespace Avalonia.Direct2D1.RenderTests
 #if AVALONIA_CAIRO
 #if AVALONIA_CAIRO
             string testFiles = Path.GetFullPath(@"..\..\tests\TestFiles\Cairo");
             string testFiles = Path.GetFullPath(@"..\..\tests\TestFiles\Cairo");
 #elif AVALONIA_SKIA
 #elif AVALONIA_SKIA
-            string testFiles = Path.GetFullPath(@"..\..\..\..\TestFiles\Skia");
+            string testFiles = Path.GetFullPath(@"..\..\..\..\..\TestFiles\Skia");
 #else
 #else
             string testFiles = Path.GetFullPath(@"..\..\tests\TestFiles\Direct2D1");
             string testFiles = Path.GetFullPath(@"..\..\tests\TestFiles\Direct2D1");
 #endif
 #endif