Merge pull request #164 from FmgLib/v8.8.9

fix.
FmgLib · Dec 14, 2024 · 56b8c14 · 56b8c14
2 parents 805296a + 1d1a02a
commit 56b8c14
Show file tree

Hide file tree

Showing 12 changed files with 49 additions and 9 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -5,12 +5,14 @@ on:
   push:
     branches:
     - master
+    - develop
 
 env:
   SOLUTION_PATH: './FmgLib.MauiMarkup.sln'
-  PROJECT_PATH: 'src\FmgLib.MauiMarkup\FmgLib.MauiMarkup.csproj'
+  GENERATOR_PROJECT_PATH: 'src\FmgLib.MauiMarkup.Generator\FmgLib.MauiMarkup.Generator.csproj'
+  MAIN_PROJECT_PATH: 'src\FmgLib.MauiMarkup\FmgLib.MauiMarkup.csproj'
   PACKAGE_OUTPUT_DIRECTORY: ${{ github.workspace }}\output
-  NUGET_API_KEY: ${{ secrets.NUGET_AUTH_TOKEN }}
+  NUGET_API_KEY: ${{ secrets.NUGET_API_KEY }}
 
 jobs:
   deploy:
@@ -28,14 +30,16 @@ jobs:
     - name: Install MAUI workload
       run: dotnet workload install maui
 
-    - name: Clean output directory
+    - name: Clean solution
       run: dotnet clean ${{ env.SOLUTION_PATH }} -c Release
 
-    - name: Build the solution
-      run: dotnet build ${{ env.SOLUTION_PATH }} -c Release
+    - name: Build Generator Project
+      run: dotnet build ${{ env.GENERATOR_PROJECT_PATH }} -c Release
 
-    - name: Pack NuGet package
-      run: dotnet pack ${{ env.PROJECT_PATH }} -c Release --no-build -o ${{ env.PACKAGE_OUTPUT_DIRECTORY }}
+    - name: Build and Pack Main Project
+      run: |
+        dotnet build ${{ env.MAIN_PROJECT_PATH }} -c Release
+        dotnet pack ${{ env.MAIN_PROJECT_PATH }} -c Release --no-build -o ${{ env.PACKAGE_OUTPUT_DIRECTORY }}
 
     - name: Push to NuGet
       run: |

diff --git a/tests/FmgLib.MauiMarkup.Generator.Test/DLLs/Syncfusion.Licensing.dll b/tests/FmgLib.MauiMarkup.Generator.Test/DLLs/Syncfusion.Licensing.dll
diff --git a/tests/FmgLib.MauiMarkup.Generator.Test/DLLs/Syncfusion.Maui.Core.dll b/tests/FmgLib.MauiMarkup.Generator.Test/DLLs/Syncfusion.Maui.Core.dll
diff --git a/tests/FmgLib.MauiMarkup.Generator.Test/DLLs/Syncfusion.Maui.Data.dll b/tests/FmgLib.MauiMarkup.Generator.Test/DLLs/Syncfusion.Maui.Data.dll
diff --git a/tests/FmgLib.MauiMarkup.Generator.Test/DLLs/Syncfusion.Maui.DataGrid.dll b/tests/FmgLib.MauiMarkup.Generator.Test/DLLs/Syncfusion.Maui.DataGrid.dll
diff --git a/tests/FmgLib.MauiMarkup.Generator.Test/DLLs/Syncfusion.Maui.DataSource.dll b/tests/FmgLib.MauiMarkup.Generator.Test/DLLs/Syncfusion.Maui.DataSource.dll
diff --git a/tests/FmgLib.MauiMarkup.Generator.Test/DLLs/Syncfusion.Maui.GridCommon.dll b/tests/FmgLib.MauiMarkup.Generator.Test/DLLs/Syncfusion.Maui.GridCommon.dll
diff --git a/tests/FmgLib.MauiMarkup.Generator.Test/DLLs/Syncfusion.Maui.Inputs.dll b/tests/FmgLib.MauiMarkup.Generator.Test/DLLs/Syncfusion.Maui.Inputs.dll
diff --git a/tests/FmgLib.MauiMarkup.Generator.Test/DLLs/Syncfusion.Maui.ListView.dll b/tests/FmgLib.MauiMarkup.Generator.Test/DLLs/Syncfusion.Maui.ListView.dll
diff --git a/tests/FmgLib.MauiMarkup.Generator.Test/DLLs/Syncfusion.Maui.PullToRefresh.dll b/tests/FmgLib.MauiMarkup.Generator.Test/DLLs/Syncfusion.Maui.PullToRefresh.dll
diff --git a/tests/FmgLib.MauiMarkup.Generator.Test/FmgLib.MauiMarkup.Generator.Test.csproj b/tests/FmgLib.MauiMarkup.Generator.Test/FmgLib.MauiMarkup.Generator.Test.csproj
@@ -150,6 +150,33 @@
 	  <None Update="DLLs\SkiaSharp.Views.Maui.Core.dll">
 	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
 	  </None>
+	  <None Update="DLLs\Syncfusion.Licensing.dll">
+	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+	  </None>
+	  <None Update="DLLs\Syncfusion.Maui.Core.dll">
+	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+	  </None>
+	  <None Update="DLLs\Syncfusion.Maui.Data.dll">
+	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+	  </None>
+	  <None Update="DLLs\Syncfusion.Maui.DataGrid.dll">
+	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+	  </None>
+	  <None Update="DLLs\Syncfusion.Maui.DataSource.dll">
+	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+	  </None>
+	  <None Update="DLLs\Syncfusion.Maui.GridCommon.dll">
+	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+	  </None>
+	  <None Update="DLLs\Syncfusion.Maui.Inputs.dll">
+	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+	  </None>
+	  <None Update="DLLs\Syncfusion.Maui.ListView.dll">
+	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+	  </None>
+	  <None Update="DLLs\Syncfusion.Maui.PullToRefresh.dll">
+	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+	  </None>
 	  <None Update="DLLs\UraniumUI.dll">
 	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
 	  </None>

diff --git a/tests/FmgLib.MauiMarkup.Generator.Test/IntegrationTesting.cs b/tests/FmgLib.MauiMarkup.Generator.Test/IntegrationTesting.cs
@@ -72,7 +72,7 @@ namespace ConsoleApp1;
 //[MauiMarkup(typeof(DateEditActualAppearance), typeof(MultilineEdit), typeof(SimpleButton), typeof(DXStackLayout), typeof(DXLayoutBase))]
 //[MauiMarkup(typeof(CardsView), typeof(VisualStateGroup))]
 //[MauiMarkup(typeof(SKLottieView),typeof(SKFileLottieImageSource), typeof(SKAnimatedSurfaceView))]
-[MauiMarkup(typeof(KeyboardAccelerator))]
+[MauiMarkup(typeof(Syncfusion.Maui.Core.SfAvatarView))]
 public class FileName
 { }";
 
@@ -117,7 +117,16 @@ public class FileName
             @$"{rootPath}\DLLs\SkiaSharp.Extended.dll",
             @$"{rootPath}\DLLs\SkiaSharp.Extended.UI.dll",
             @$"{rootPath}\DLLs\SkiaSharp.SceneGraph.dll",
-            @$"{rootPath}\DLLs\SkiaSharp.Skottie.dll"
+            @$"{rootPath}\DLLs\SkiaSharp.Skottie.dll",
+            @$"{rootPath}\DLLs\Syncfusion.Licensing.dll",
+            @$"{rootPath}\DLLs\Syncfusion.Maui.Core.dll",
+            @$"{rootPath}\DLLs\Syncfusion.Maui.Data.dll",
+            @$"{rootPath}\DLLs\Syncfusion.Maui.DataGrid.dll",
+            @$"{rootPath}\DLLs\Syncfusion.Maui.DataSource.dll",
+            @$"{rootPath}\DLLs\Syncfusion.Maui.GridCommon.dll",
+            @$"{rootPath}\DLLs\Syncfusion.Maui.Inputs.dll",
+            @$"{rootPath}\DLLs\Syncfusion.Maui.ListView.dll",
+            @$"{rootPath}\DLLs\Syncfusion.Maui.PullToRefresh.dll"
         };
 
         var (compilation, diagnostics) = CreateCompilation(source, additionalReferences);