Browse Source

Switched back to #if since ReferenceOutputAssembly doesn't work properly for classic project format

pull/2104/head
Nikita Tsukanov 8 years ago
parent
commit
6347a610c7
  1. 4
      src/Avalonia.Base/Avalonia.Base.csproj
  2. 15
      src/Avalonia.Base/Utilities/AvaloniaResourcesIndex.cs

4
src/Avalonia.Base/Avalonia.Base.csproj

@ -7,9 +7,7 @@
<IsPackable>false</IsPackable> <IsPackable>false</IsPackable>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\Avalonia.Build.Tasks\Avalonia.Build.Tasks.csproj"> <ProjectReference Include="..\Avalonia.Build.Tasks\Avalonia.Build.Tasks.csproj"/>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup> </ItemGroup>
<Import Project="..\..\build\Base.props" /> <Import Project="..\..\build\Base.props" />
<Import Project="..\..\build\Binding.props" /> <Import Project="..\..\build\Binding.props" />

15
src/Avalonia.Base/Utilities/AvaloniaResourcesIndex.cs

@ -9,7 +9,10 @@ using System.Runtime.Serialization.Json;
namespace Avalonia.Utilities namespace Avalonia.Utilities
{ {
public static class AvaloniaResourcesIndexReaderWriter #if !BUILDTASK
public
#endif
static class AvaloniaResourcesIndexReaderWriter
{ {
private const int LastKnownVersion = 1; private const int LastKnownVersion = 1;
public static List<AvaloniaResourcesIndexEntry> Read(Stream stream) public static List<AvaloniaResourcesIndexEntry> Read(Stream stream)
@ -34,14 +37,20 @@ namespace Avalonia.Utilities
} }
[DataContract] [DataContract]
public class AvaloniaResourcesIndex #if !BUILDTASK
public
#endif
class AvaloniaResourcesIndex
{ {
[DataMember] [DataMember]
public List<AvaloniaResourcesIndexEntry> Entries { get; set; } = new List<AvaloniaResourcesIndexEntry>(); public List<AvaloniaResourcesIndexEntry> Entries { get; set; } = new List<AvaloniaResourcesIndexEntry>();
} }
[DataContract] [DataContract]
public class AvaloniaResourcesIndexEntry #if !BUILDTASK
public
#endif
class AvaloniaResourcesIndexEntry
{ {
[DataMember] [DataMember]
public string Path { get; set; } public string Path { get; set; }

Loading…
Cancel
Save