Don't rely on indirect project reference, but copy the files

Mattias1 · Aug 17, 2023 · 414c88e · 414c88e
1 parent e6cc7bd
commit 414c88e
Show file tree

Hide file tree

Showing 10 changed files with 24 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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
@@ -5,7 +5,7 @@
     <Description>Some extensions to quickly build Avalonia UI desktop applications without needing XAML.</Description>
     <AssemblyTitle>Avalonia Extensions</AssemblyTitle>
     <TargetFramework>net7.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
+    <ImplicitUsings>disable</ImplicitUsings>
     <Nullable>enable</Nullable>
 
     <!--Avalonia doesen't support TrimMode=link currently,but we are working on that https://github.com/AvaloniaUI/Avalonia/issues/6892 -->
@@ -32,11 +32,6 @@
     <PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.3" />
   </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\lib\Avalonia.Markup.Declarative\src\Avalonia.Markup.Declarative\Avalonia.Markup.Declarative.csproj" />
-    <ProjectReference Include="..\..\Avalonia.Markup.Declarative.SourceGenerator\Avalonia.Markup.Declarative.SourceGenerator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false"/>
-  </ItemGroup>
-
   <ItemGroup>
     <None Include="..\README.md" Pack="true" PackagePath="\"/>
   </ItemGroup>

diff --git 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
@@ -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
@@ -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
@@ -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
diff --git 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