diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 38e5e38..5d880d9 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -19,6 +19,11 @@ jobs:
with:
repository: AvaloniaUI/Avalonia.Markup.Declarative
path: lib/Avalonia.Markup.Declarative
+ - name: Copy Avalonia.Markup.Declarative lib files
+ run: >
+ cp
+ lib/Avalonia.Markup.Declarative/src/Avalonia.Markup.Declarative/*.cs
+ AvaloniaExtensions/lib/Avalonia.Markup.Declarative/
- name: Setup dotnet sdk
uses: actions/setup-dotnet@v3
diff --git a/.gitignore b/.gitignore
index e3b72e9..35d56f6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,3 +32,5 @@ UpgradeLog*.htm
*.swp
lib/**
!lib/.gitkeep
+AvaloniaExtensions/lib/Avalonia.Markup.Declarative/**
+!AvaloniaExtensions/lib/Avalonia.Markup.Declarative/.gitkeep
diff --git a/AvaloniaExtensions/AppBuilderExtensions.cs b/AvaloniaExtensions/AppBuilderExtensions.cs
index db7594d..1a18cb5 100644
--- a/AvaloniaExtensions/AppBuilderExtensions.cs
+++ b/AvaloniaExtensions/AppBuilderExtensions.cs
@@ -4,6 +4,9 @@
using Avalonia.LogicalTree;
using Avalonia.Markup.Declarative;
using Avalonia.Themes.Fluent;
+using System;
+using System.IO;
+using System.Linq;
using System.Reflection;
namespace AvaloniaExtensions;
diff --git a/AvaloniaExtensions/AvaloniaExtensions.csproj b/AvaloniaExtensions/AvaloniaExtensions.csproj
index dad2d5d..c3d6054 100644
--- a/AvaloniaExtensions/AvaloniaExtensions.csproj
+++ b/AvaloniaExtensions/AvaloniaExtensions.csproj
@@ -5,7 +5,7 @@
Some extensions to quickly build Avalonia UI desktop applications without needing XAML.
Avalonia Extensions
net7.0
- enable
+ disable
enable
@@ -32,11 +32,6 @@
-
-
-
-
-
diff --git a/AvaloniaExtensions/CanvasComponentBase.cs b/AvaloniaExtensions/CanvasComponentBase.cs
index 9c16aa8..e6ea629 100644
--- a/AvaloniaExtensions/CanvasComponentBase.cs
+++ b/AvaloniaExtensions/CanvasComponentBase.cs
@@ -5,6 +5,8 @@
using Avalonia.Layout;
using Avalonia.Markup.Declarative;
using Avalonia.Media.Imaging;
+using System;
+using System.Collections.Generic;
namespace AvaloniaExtensions;
diff --git a/AvaloniaExtensions/CanvasControlExtensions.cs b/AvaloniaExtensions/CanvasControlExtensions.cs
index 07905b6..ddaf035 100644
--- a/AvaloniaExtensions/CanvasControlExtensions.cs
+++ b/AvaloniaExtensions/CanvasControlExtensions.cs
@@ -1,5 +1,6 @@
using Avalonia.Controls;
using Avalonia.Markup.Declarative;
+using System;
namespace AvaloniaExtensions;
diff --git a/AvaloniaExtensions/ExtendedComboBox.cs b/AvaloniaExtensions/ExtendedComboBox.cs
index 897fb30..87881be 100644
--- a/AvaloniaExtensions/ExtendedComboBox.cs
+++ b/AvaloniaExtensions/ExtendedComboBox.cs
@@ -1,6 +1,8 @@
using Avalonia.Controls;
using Avalonia.Interactivity;
using Avalonia.Markup.Declarative;
+using System;
+using System.Collections.Generic;
namespace AvaloniaExtensions;
diff --git a/AvaloniaExtensions/ExtendedWindow.cs b/AvaloniaExtensions/ExtendedWindow.cs
index a2639a2..c51acf5 100644
--- a/AvaloniaExtensions/ExtendedWindow.cs
+++ b/AvaloniaExtensions/ExtendedWindow.cs
@@ -1,6 +1,8 @@
using Avalonia;
using Avalonia.Controls;
using Avalonia.Markup.Declarative;
+using System;
+using System.Collections.Generic;
namespace AvaloniaExtensions;
diff --git a/AvaloniaExtensions/lib/Avalonia.Markup.Declarative/.gitkeep b/AvaloniaExtensions/lib/Avalonia.Markup.Declarative/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/README.md b/README.md
index c932a63..8b4c745 100644
--- a/README.md
+++ b/README.md
@@ -36,8 +36,12 @@ For a more elaborate example, you can take a look at the
Setup development environment
------------------------------
-Clone the [Avalonia.Markup.Declarative](https://github.com/AvaloniaUI/Avalonia.Markup.Declarative)
-repo in the `lib/` folder, then run `cd ExampleApp/ && dotnet run`.
+- Clone the [Avalonia.Markup.Declarative](https://github.com/AvaloniaUI/Avalonia.Markup.Declarative)
+ repo in the 'lib' folder
+- Copy the needed files to the 'AvaloniaExtensions/lib/Avalonia.Markup.Declarative' folder with
+ `cp lib/Avalonia.Markup.Declarative/src/Avalonia.Markup.Declarative/*.cs
+ AvaloniaExtensions/lib/Avalonia.Markup.Declarative/`
+- Start the example app with `cd ExampleApp/ && dotnet run`
Publish release