From 6347a610c7ec866f85d23c29ff09f0e9c2f408a6 Mon Sep 17 00:00:00 2001
From: Nikita Tsukanov <keks9n@gmail.com>
Date: Sun, 25 Nov 2018 13:55:44 +0300
Subject: [PATCH] Switched back to #if since ReferenceOutputAssembly doesn't
 work properly for classic project format

---
 src/Avalonia.Base/Avalonia.Base.csproj            |  4 +---
 .../Utilities/AvaloniaResourcesIndex.cs           | 15 ++++++++++++---
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/Avalonia.Base/Avalonia.Base.csproj b/src/Avalonia.Base/Avalonia.Base.csproj
index e10f13d628..abc4ed80d8 100644
--- a/src/Avalonia.Base/Avalonia.Base.csproj
+++ b/src/Avalonia.Base/Avalonia.Base.csproj
@@ -7,9 +7,7 @@
     <IsPackable>false</IsPackable>
   </PropertyGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Avalonia.Build.Tasks\Avalonia.Build.Tasks.csproj">
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
+    <ProjectReference Include="..\Avalonia.Build.Tasks\Avalonia.Build.Tasks.csproj"/>
   </ItemGroup>
   <Import Project="..\..\build\Base.props" />
   <Import Project="..\..\build\Binding.props" />
diff --git a/src/Avalonia.Base/Utilities/AvaloniaResourcesIndex.cs b/src/Avalonia.Base/Utilities/AvaloniaResourcesIndex.cs
index c7d1e47148..22e5c952bf 100644
--- a/src/Avalonia.Base/Utilities/AvaloniaResourcesIndex.cs
+++ b/src/Avalonia.Base/Utilities/AvaloniaResourcesIndex.cs
@@ -9,7 +9,10 @@ using System.Runtime.Serialization.Json;
 
 namespace Avalonia.Utilities
 {
-    public static class AvaloniaResourcesIndexReaderWriter
+    #if !BUILDTASK
+    public
+    #endif
+    static class AvaloniaResourcesIndexReaderWriter
     {
         private const int LastKnownVersion = 1;
         public static List<AvaloniaResourcesIndexEntry> Read(Stream stream)
@@ -34,14 +37,20 @@ namespace Avalonia.Utilities
     }
 
     [DataContract]
-    public class AvaloniaResourcesIndex
+#if !BUILDTASK
+    public
+#endif
+    class AvaloniaResourcesIndex
     {       
         [DataMember]
         public List<AvaloniaResourcesIndexEntry> Entries { get; set; } = new List<AvaloniaResourcesIndexEntry>();
     }
 
     [DataContract]
-    public class AvaloniaResourcesIndexEntry
+#if !BUILDTASK
+    public
+#endif
+    class AvaloniaResourcesIndexEntry
     {
         [DataMember]
         public string Path { get; set; }