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 @@
-
+
@@ -40,7 +40,7 @@
-
+
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 @@
-
+
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 @@
-
+
-
-
-
-
-
+
+
+
+
+
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();
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 @@
-
+
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 @@
-
+