Fix build wrt lib package folder structure updates

Mattias1 · Oct 25, 2023 · a34f16c · a34f16c
1 parent f7111fa
commit a34f16c
Show file tree

Hide file tree

Showing 6 changed files with 55 additions and 10 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -0,0 +1,37 @@
+name: AvaloniaExtensions CI build pipeline
+
+on:
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+
+    name: Build
+    runs-on: ubuntu-latest
+
+    steps:
+      # Build
+      - name: Clone avalonia-extensions
+        uses: actions/checkout@v3
+      - name: Clone Avalonia.Markup.Declarative
+        uses: actions/checkout@v3
+        with:
+          repository: AvaloniaUI/Avalonia.Markup.Declarative
+          path: lib/Avalonia.Markup.Declarative
+      - name: Copy Avalonia.Markup.Declarative lib files
+        run: |
+          mkdir -p AvaloniaExtensions/lib/Avalonia.Markup.Declarative/
+          cd lib/Avalonia.Markup.Declarative/src/Avalonia.Markup.Declarative/
+          cp -r --parents *.cs ../../../../AvaloniaExtensions/lib/Avalonia.Markup.Declarative/
+          cp -r --parents **/*.cs ../../../../AvaloniaExtensions/lib/Avalonia.Markup.Declarative/
+          cd ../../../../
+
+      - name: Setup dotnet sdk
+        uses: actions/setup-dotnet@v3
+        with:
+          dotnet-version: 7.0.x
+      - name: Restore backend dependencies
+        run: dotnet restore
+      - name: Build backend
+        run: dotnet build --configuration Release --no-restore
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -20,10 +20,12 @@ jobs:
           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/
+        run: |
+          mkdir -p AvaloniaExtensions/lib/Avalonia.Markup.Declarative/
+          cd lib/Avalonia.Markup.Declarative/src/Avalonia.Markup.Declarative/
+          cp -r --parents *.cs ../../../../AvaloniaExtensions/lib/Avalonia.Markup.Declarative/
+          cp -r --parents **/*.cs ../../../../AvaloniaExtensions/lib/Avalonia.Markup.Declarative/
+          cd ../../../../
 
       - name: Setup dotnet sdk
         uses: actions/setup-dotnet@v3

diff --git a/AvaloniaExtensions/AppBuilderExtensions.cs b/AvaloniaExtensions/AppBuilderExtensions.cs
@@ -1,19 +1,20 @@
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
-using Avalonia.LogicalTree;
 using Avalonia.Markup.Declarative;
 using Avalonia.Themes.Fluent;
 using System;
 using System.Linq;
 
 namespace AvaloniaExtensions;
 
-public static class AppBuilderExtensions {
+public static class AvaloniaExtensionsApp {
   public static string StartupPath => AssetExtensions.StartupPath;
 
   public static AppBuilder Init() => AppBuilder.Configure<Application>().UsePlatformDetect();
+}
 
+public static class AppBuilderExtensions {
   /// <summary>
   /// Add a settings file. It'll save the settings file when closing the app.
   /// </summary>

diff --git a/AvaloniaExtensions/lib/Avalonia.Markup.Declarative/.gitkeep b/AvaloniaExtensions/lib/Avalonia.Markup.Declarative/.gitkeep
diff --git a/ExampleApp/Program.cs b/ExampleApp/Program.cs
@@ -3,7 +3,7 @@
 using Avalonia.Markup.Declarative;
 using ExampleApp;
 
-AppBuilderExtensions.Init()
+AvaloniaExtensionsApp.Init()
     .WithSettingsFile<SettingsComponent.ExampleSettings>("./example-settings.json")
     .StartDesktopApp(() => ExtendedWindow.Init<MainComponent>("Example app")
         .AddLazyComponent<SettingsComponent>()

diff --git a/README.md b/README.md
@@ -19,7 +19,7 @@ This is a simple example application:
 ``` csharp
 using AvaloniaExtensions;
 
-AppBuilderExtensions.Init().StartDesktopApp("Example app", () => new ReadmeComponent());
+AppBuilderExtensionsApp.Init().StartDesktopApp("Example app", () => new ReadmeComponent());
 
 public class ReadmeComponent : CanvasComponentBase {
   protected override void InitializeControls() {
@@ -39,8 +39,13 @@ Setup development environment
 - 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/`
+  ```
+  mkdir -p AvaloniaExtensions/lib/Avalonia.Markup.Declarative/
+  cd lib/Avalonia.Markup.Declarative/src/Avalonia.Markup.Declarative/
+  cp -r --parents *.cs ../../../../AvaloniaExtensions/lib/Avalonia.Markup.Declarative/
+  cp -r --parents **/*.cs ../../../../AvaloniaExtensions/lib/Avalonia.Markup.Declarative/
+  cd ../../../../
+  ```
 - Start the example app with `cd ExampleApp/ && dotnet run`