From 006bedf8cd7eb66008c691310fd6d51ad13100a3 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, 26 Dec 2018 21:15:39 +0100
Subject: [PATCH] Updated Avalonia

---
 build/Avalonia.Desktop.props                      |  8 ++++----
 build/Avalonia.props                              |  4 ++--
 build/EmbedXaml.props                             |  4 ++--
 src/SimpleWavSplitter.Avalonia/App.xaml           | 12 +++++++-----
 src/SimpleWavSplitter.Avalonia/MainWindow.xaml.cs |  6 +++---
 5 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/build/Avalonia.Desktop.props b/build/Avalonia.Desktop.props
index 9f8c1b3..cbd4396 100644
--- a/build/Avalonia.Desktop.props
+++ b/build/Avalonia.Desktop.props
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <PackageReference Include="Avalonia.Desktop" Version="0.7.0" />
+    <PackageReference Include="Avalonia.Desktop" Version="0.7.1-build989-beta" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="SharpDX" Version="4.0.1" />
@@ -10,10 +10,10 @@
     <PackageReference Include="SharpDX.DXGI" Version="4.0.1" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="SkiaSharp" Version="1.60.0" />
-    <PackageReference Include="Avalonia.Skia.Linux.Natives" Version="1.60.0.1" />
+    <PackageReference Include="SkiaSharp" Version="1.68.0" />
+    <PackageReference Include="SkiaSharp.NativeAssets.Linux" Version="1.68.0" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Serilog.Sinks.Trace" Version="2.1.0" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/build/Avalonia.props b/build/Avalonia.props
index 4de92b9..f2d5a2e 100644
--- a/build/Avalonia.props
+++ b/build/Avalonia.props
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="0.7.0" />
+    <PackageReference Include="Avalonia" Version="0.7.1-build989-beta" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Serilog" Version="2.5.0" />
@@ -11,4 +11,4 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.CSharp" Version="4.5.0" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/build/EmbedXaml.props b/build/EmbedXaml.props
index e411c3f..a8fa87a 100644
--- a/build/EmbedXaml.props
+++ b/build/EmbedXaml.props
@@ -4,8 +4,8 @@
       <DependentUpon>%(Filename)</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
-    <EmbeddedResource Include="**\*.xaml">
+    <AvaloniaResource Include="**\*.xaml">
       <SubType>Designer</SubType>
-    </EmbeddedResource>
+    </AvaloniaResource>
   </ItemGroup>
 </Project>
diff --git a/src/SimpleWavSplitter.Avalonia/App.xaml b/src/SimpleWavSplitter.Avalonia/App.xaml
index 24ec910..a00d982 100644
--- a/src/SimpleWavSplitter.Avalonia/App.xaml
+++ b/src/SimpleWavSplitter.Avalonia/App.xaml
@@ -1,8 +1,10 @@
 <!-- Copyright (c) Wiesław Šoltés. All rights reserved. -->
 <!-- Licensed under the MIT license. See LICENSE file in the project root for full license information. -->
-<Application xmlns="https://github.com/avaloniaui">
-  <Application.Styles>
-    <StyleInclude Source="resm:Avalonia.Themes.Default.DefaultTheme.xaml?assembly=Avalonia.Themes.Default"/>
-    <StyleInclude Source="resm:Avalonia.Themes.Default.Accents.BaseLight.xaml?assembly=Avalonia.Themes.Default"/>
-  </Application.Styles>
+<Application x:Class="SimpleWavSplitter.Avalonia.App"
+             xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <Application.Styles>
+        <StyleInclude Source="avares://Avalonia.Themes.Default/DefaultTheme.xaml"/>
+        <StyleInclude Source="avares://Avalonia.Themes.Default/Accents/BaseLight.xaml"/>
+    </Application.Styles>
 </Application>
diff --git a/src/SimpleWavSplitter.Avalonia/MainWindow.xaml.cs b/src/SimpleWavSplitter.Avalonia/MainWindow.xaml.cs
index 345a69d..5e73bbc 100644
--- a/src/SimpleWavSplitter.Avalonia/MainWindow.xaml.cs
+++ b/src/SimpleWavSplitter.Avalonia/MainWindow.xaml.cs
@@ -66,7 +66,7 @@ namespace SimpleWavSplitter.Avalonia
                 dlg.InitialDirectory = textOutputPath.Text;
             }
 
-            var result = await dlg.ShowAsync();
+            var result = await dlg.ShowAsync(this);
             if (!string.IsNullOrWhiteSpace(result))
             {
                 textOutputPath.Text = result;
@@ -80,7 +80,7 @@ namespace SimpleWavSplitter.Avalonia
             dlg.Filters.Add(new FileDialogFilter() { Name = "All Files", Extensions = { "*" } });
             dlg.AllowMultiple = true;
 
-            var result = await dlg.ShowAsync();
+            var result = await dlg.ShowAsync(this);
             if (result != null)
             {
                 _wavFileSplitter.GetWavHeader(result, text => textOutput.Text = text);
@@ -94,7 +94,7 @@ namespace SimpleWavSplitter.Avalonia
             dlg.Filters.Add(new FileDialogFilter() { Name = "All Files", Extensions = { "*" } });
             dlg.AllowMultiple = true;
 
-            var result = await dlg.ShowAsync();
+            var result = await dlg.ShowAsync(this);
             if (result != null)
             {
                 await _wavFileSplitter.SplitWavFiles(