Fixed merge conflicts manually.

trippsc2 · Nov 24, 2020 · 51162c1 · 51162c1
1 parent 9658b32
commit 51162c1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/OpenTracker.Models/RequirementNodes/RequirementNodeID.cs b/OpenTracker.Models/RequirementNodes/RequirementNodeID.cs
@@ -10,6 +10,8 @@ public enum RequirementNodeID
         EntranceDungeonAllInsanity,
         EntranceNone,
         EntranceNoneInverted,
+        Flute,
+        FluteActivated,
         LightWorld,
         LightWorldInverted,
         LightWorldInvertedNotBunny,

diff --git a/OpenTracker/OpenTracker.csproj b/OpenTracker/OpenTracker.csproj
@@ -23,17 +23,19 @@
     <None Remove="bin\**" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="0.10.0-preview5" />
-    <PackageReference Include="Avalonia.Desktop" Version="0.10.0-preview5" />
-    <PackageReference Include="Avalonia.Diagnostics" Version="0.10.0-preview5" />
-    <PackageReference Include="Avalonia.ReactiveUI" Version="0.10.0-preview5" />
-    <PackageReference Include="Avalonia.Xaml.Behaviors" Version="0.10.0-preview5" />
+    <PackageReference Include="Avalonia" Version="0.10.0-preview6" />
+    <PackageReference Include="Avalonia.Desktop" Version="0.10.0-preview6" />
+    <PackageReference Include="Avalonia.Diagnostics" Version="0.10.0-preview6" />
+    <PackageReference Include="Avalonia.ReactiveUI" Version="0.10.0-preview6" />
+    <PackageReference Include="Avalonia.Xaml.Behaviors" Version="0.10.0-preview6" />
     <PackageReference Include="Dotnet.Bundle" Version="0.9.13" />
-    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.0">
+    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
+    <PackageReference Include="Serilog" Version="2.10.0" />
+    <PackageReference Include="Serilog.Sinks.File" Version="4.1.0" />
     <PackageReference Include="ThemeEditor.Controls.ColorPicker" Version="0.10.0-preview6" />
   </ItemGroup>
   <ItemGroup>