From 4d2d68057b5f8782aef7df33b690b0d8265cee8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wies=C5=82aw=20=C5=A0olt=C3=A9s?= <wieslaw.soltes@gmail.com>
Date: Wed, 17 May 2017 19:49:21 +0200
Subject: [PATCH] Restore UseRoslynPathHack

---
 build.cake                                                  | 1 +
 src/Skia/Avalonia.Skia.Android/Avalonia.Skia.Android.csproj | 3 +++
 src/Skia/Avalonia.Skia.iOS/Avalonia.Skia.iOS.csproj         | 3 +++
 src/iOS/Avalonia.iOS/Avalonia.iOS.csproj                    | 3 +++
 4 files changed, 10 insertions(+)

diff --git a/build.cake b/build.cake
index 2d62ae2d54..2bd88e3c50 100644
--- a/build.cake
+++ b/build.cake
@@ -143,6 +143,7 @@ Task("Build")
         MSBuild(parameters.MSBuildSolution, settings => {
             settings.SetConfiguration(parameters.Configuration);
             settings.WithProperty("Platform", "\"" + parameters.Platform + "\"");
+            settings.WithProperty("UseRoslynPathHack", "true");
             settings.SetVerbosity(Verbosity.Minimal);
             settings.WithProperty("Windows", "True");
             settings.UseToolVersion(MSBuildToolVersion.VS2017);
diff --git a/src/Skia/Avalonia.Skia.Android/Avalonia.Skia.Android.csproj b/src/Skia/Avalonia.Skia.Android/Avalonia.Skia.Android.csproj
index 4cd1f21022..55cefda6e4 100644
--- a/src/Skia/Avalonia.Skia.Android/Avalonia.Skia.Android.csproj
+++ b/src/Skia/Avalonia.Skia.Android/Avalonia.Skia.Android.csproj
@@ -86,4 +86,7 @@
   <Import Project="..\..\Shared\RenderHelpers\RenderHelpers.projitems" Label="Shared" />
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
   <Import Project="..\..\..\build\SkiaSharp.props" />
+  <PropertyGroup Condition="'$(UseRoslynPathHack)' == ''">
+    <CscToolPath>$(MSBuildToolsPath)\Roslyn</CscToolPath>
+  </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Skia/Avalonia.Skia.iOS/Avalonia.Skia.iOS.csproj b/src/Skia/Avalonia.Skia.iOS/Avalonia.Skia.iOS.csproj
index b2d92b0304..a3a08ec060 100644
--- a/src/Skia/Avalonia.Skia.iOS/Avalonia.Skia.iOS.csproj
+++ b/src/Skia/Avalonia.Skia.iOS/Avalonia.Skia.iOS.csproj
@@ -88,4 +88,7 @@
   <Import Project="..\..\Shared\RenderHelpers\RenderHelpers.projitems" Label="Shared" />
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
   <Import Project="..\..\..\build\SkiaSharp.props" />
+  <PropertyGroup Condition="'$(UseRoslynPathHack)' == ''">
+    <CscToolPath>$(MSBuildToolsPath)\Roslyn</CscToolPath>
+  </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/src/iOS/Avalonia.iOS/Avalonia.iOS.csproj b/src/iOS/Avalonia.iOS/Avalonia.iOS.csproj
index fd150052da..333be18735 100644
--- a/src/iOS/Avalonia.iOS/Avalonia.iOS.csproj
+++ b/src/iOS/Avalonia.iOS/Avalonia.iOS.csproj
@@ -105,4 +105,7 @@
   <Import Project="..\..\Shared\PlatformSupport\PlatformSupport.projitems" Label="Shared" />
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
   <Import Project="..\..\..\build\Rx.props" />
+  <PropertyGroup Condition="'$(UseRoslynPathHack)' == ''">
+    <CscToolPath>$(MSBuildToolsPath)\Roslyn</CscToolPath>
+  </PropertyGroup>
 </Project>
\ No newline at end of file