From b6763820bd99b48c765dc5df6fdf8ef769871ef3 Mon Sep 17 00:00:00 2001
From: Sam Byass <sam@samboycoding.me>
Date: Sat, 4 Feb 2023 19:00:40 +0000
Subject: [PATCH] Update all deps

---
 Cpp2IL.Core/Cpp2IL.Core.csproj                       |  4 ++--
 Cpp2IL.Gui/App.axaml                                 |  2 +-
 Cpp2IL.Gui/Cpp2IL.Gui.csproj                         | 12 ++++++------
 Cpp2IL.Gui/ViewLocator.cs                            |  2 +-
 Cpp2IL.Gui/Views/MainWindow.axaml.cs                 |  9 +++++----
 .../Cpp2IL.Plugin.BuildReport.csproj                 |  2 +-
 LibCpp2IL/LibCpp2IL.csproj                           |  2 +-
 7 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/Cpp2IL.Core/Cpp2IL.Core.csproj b/Cpp2IL.Core/Cpp2IL.Core.csproj
index dd7328eb..8c67f80d 100644
--- a/Cpp2IL.Core/Cpp2IL.Core.csproj
+++ b/Cpp2IL.Core/Cpp2IL.Core.csproj
@@ -26,7 +26,7 @@
 
     <ItemGroup>
         <!--Needed for DLL output-->
-        <PackageReference Include="AsmResolver.DotNet" Version="5.0.0" />
+        <PackageReference Include="AsmResolver.DotNet" Version="5.1.0" />
         
         <!--For ARM64 dissassembly-->
         <PackageReference Include="Disarm" Version="2022.1.0-master.26" />
@@ -40,7 +40,7 @@
         <!--Not used at runtime, but needed for the build-->
         <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
 
-        <PackageReference Include="PolySharp" Version="1.8.1" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
+        <PackageReference Include="PolySharp" Version="1.12.1" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
     </ItemGroup>
 
     <ItemGroup Condition="'$(TargetFramework)' != 'net6.0'">
diff --git a/Cpp2IL.Gui/App.axaml b/Cpp2IL.Gui/App.axaml
index 671317f6..9132490c 100644
--- a/Cpp2IL.Gui/App.axaml
+++ b/Cpp2IL.Gui/App.axaml
@@ -9,6 +9,6 @@
     <Application.Styles>
         <StyleInclude Source="avares://AvaloniaEdit/AvaloniaEdit.xaml" />
         <StyleInclude Source="avares://SharpTreeView/Themes/TreeView.xaml" />
-        <SimpleTheme Mode="Dark"/>
+        <SimpleTheme />
     </Application.Styles>
 </Application>
diff --git a/Cpp2IL.Gui/Cpp2IL.Gui.csproj b/Cpp2IL.Gui/Cpp2IL.Gui.csproj
index edf3e904..32d21c6d 100644
--- a/Cpp2IL.Gui/Cpp2IL.Gui.csproj
+++ b/Cpp2IL.Gui/Cpp2IL.Gui.csproj
@@ -19,13 +19,13 @@
         <None Remove=".gitignore" />
     </ItemGroup>
     <ItemGroup>
-        <PackageReference Include="Avalonia" Version="11.0.0-preview4" />
+        <PackageReference Include="Avalonia" Version="11.0.0-preview5" />
         <PackageReference Include="Avalonia.AvaloniaEdit" Version="11.0.0-preview2" />
-        <PackageReference Include="Avalonia.Desktop" Version="11.0.0-preview1" />
-        <PackageReference Include="Avalonia.Diagnostics" Version="11.0.0-preview4" />
-        <PackageReference Include="Avalonia.ReactiveUI" Version="11.0.0-preview4" />
-        <PackageReference Include="Avalonia.Themes.Simple" Version="11.0.0-preview4" />
-        <PackageReference Include="AvaloniaEdit.TextMate" Version="11.0.0-preview1" />
+        <PackageReference Include="Avalonia.Desktop" Version="11.0.0-preview5" />
+        <PackageReference Include="Avalonia.Diagnostics" Version="11.0.0-preview5" />
+        <PackageReference Include="Avalonia.ReactiveUI" Version="11.0.0-preview5" />
+        <PackageReference Include="Avalonia.Themes.Simple" Version="11.0.0-preview5" />
+        <PackageReference Include="AvaloniaEdit.TextMate" Version="11.0.0-preview2" />
     </ItemGroup>
     <ItemGroup>
       <ProjectReference Include="..\Cpp2IL.Core\Cpp2IL.Core.csproj" />
diff --git a/Cpp2IL.Gui/ViewLocator.cs b/Cpp2IL.Gui/ViewLocator.cs
index 168b45b4..94ccc415 100644
--- a/Cpp2IL.Gui/ViewLocator.cs
+++ b/Cpp2IL.Gui/ViewLocator.cs
@@ -10,7 +10,7 @@ public class ViewLocator : IDataTemplate
     {
         [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "All the viewmodel types are hard referenced")]
         [UnconditionalSuppressMessage("Trimming", "IL2057", Justification = "All the viewmodel types are hard referenced")]
-        public IControl Build(object? data)
+        public Control Build(object? data)
         {
             var name = data!.GetType().FullName!.Replace("ViewModel", "View");
             var type = Type.GetType(name);
diff --git a/Cpp2IL.Gui/Views/MainWindow.axaml.cs b/Cpp2IL.Gui/Views/MainWindow.axaml.cs
index 0ba8b95a..1a8419ab 100644
--- a/Cpp2IL.Gui/Views/MainWindow.axaml.cs
+++ b/Cpp2IL.Gui/Views/MainWindow.axaml.cs
@@ -10,6 +10,10 @@
 using Cpp2IL.Gui.ViewModels;
 using TextMateSharp.Grammars;
 
+#if DEBUG
+using Avalonia;
+#endif
+
 namespace Cpp2IL.Gui.Views
 {
     public partial class MainWindow : Window
@@ -51,10 +55,7 @@ private async void OnClickDropPrompt(object? sender, PointerPressedEventArgs e)
             var paths = new List<string>();
             foreach (var file in ret)
             {
-                if(!file.TryGetUri(out var uri))
-                    continue;
-                
-                paths.Add(uri.LocalPath);
+                paths.Add(file.Path.LocalPath);
             }
 
             vm.OnDropped(paths.ToArray());
diff --git a/Cpp2IL.Plugin.BuildReport/Cpp2IL.Plugin.BuildReport.csproj b/Cpp2IL.Plugin.BuildReport/Cpp2IL.Plugin.BuildReport.csproj
index 554a6991..6a85f9db 100644
--- a/Cpp2IL.Plugin.BuildReport/Cpp2IL.Plugin.BuildReport.csproj
+++ b/Cpp2IL.Plugin.BuildReport/Cpp2IL.Plugin.BuildReport.csproj
@@ -16,7 +16,7 @@
     </ItemGroup>
 
     <ItemGroup>
-      <PackageReference Include="System.Text.Json" Version="6.0.7" />
+      <PackageReference Include="System.Text.Json" Version="7.0.1" />
     </ItemGroup>
 
 </Project>
diff --git a/LibCpp2IL/LibCpp2IL.csproj b/LibCpp2IL/LibCpp2IL.csproj
index 389b4130..c814f56c 100644
--- a/LibCpp2IL/LibCpp2IL.csproj
+++ b/LibCpp2IL/LibCpp2IL.csproj
@@ -22,7 +22,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="AssetRipper.VersionUtilities" Version="1.2.1" />
+        <PackageReference Include="AssetRipper.VersionUtilities" Version="1.3.1" />
     </ItemGroup>
 
     <ItemGroup Condition="'$(TargetFramework)' != 'net6.0'">