diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6157da3..3f91ec0 100644 --- 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 new file mode 100644 index 0000000..69334f9 Binary files /dev/null and b/tests/FmgLib.MauiMarkup.Generator.Test/DLLs/Syncfusion.Licensing.dll differ diff --git a/tests/FmgLib.MauiMarkup.Generator.Test/DLLs/Syncfusion.Maui.Core.dll b/tests/FmgLib.MauiMarkup.Generator.Test/DLLs/Syncfusion.Maui.Core.dll new file mode 100644 index 0000000..34f3f9d Binary files /dev/null and b/tests/FmgLib.MauiMarkup.Generator.Test/DLLs/Syncfusion.Maui.Core.dll differ diff --git a/tests/FmgLib.MauiMarkup.Generator.Test/DLLs/Syncfusion.Maui.Data.dll b/tests/FmgLib.MauiMarkup.Generator.Test/DLLs/Syncfusion.Maui.Data.dll new file mode 100644 index 0000000..28d5deb Binary files /dev/null and b/tests/FmgLib.MauiMarkup.Generator.Test/DLLs/Syncfusion.Maui.Data.dll differ diff --git a/tests/FmgLib.MauiMarkup.Generator.Test/DLLs/Syncfusion.Maui.DataGrid.dll b/tests/FmgLib.MauiMarkup.Generator.Test/DLLs/Syncfusion.Maui.DataGrid.dll new file mode 100644 index 0000000..064a307 Binary files /dev/null and b/tests/FmgLib.MauiMarkup.Generator.Test/DLLs/Syncfusion.Maui.DataGrid.dll differ diff --git a/tests/FmgLib.MauiMarkup.Generator.Test/DLLs/Syncfusion.Maui.DataSource.dll b/tests/FmgLib.MauiMarkup.Generator.Test/DLLs/Syncfusion.Maui.DataSource.dll new file mode 100644 index 0000000..9c069c5 Binary files /dev/null and b/tests/FmgLib.MauiMarkup.Generator.Test/DLLs/Syncfusion.Maui.DataSource.dll differ diff --git a/tests/FmgLib.MauiMarkup.Generator.Test/DLLs/Syncfusion.Maui.GridCommon.dll b/tests/FmgLib.MauiMarkup.Generator.Test/DLLs/Syncfusion.Maui.GridCommon.dll new file mode 100644 index 0000000..3420fbc Binary files /dev/null and b/tests/FmgLib.MauiMarkup.Generator.Test/DLLs/Syncfusion.Maui.GridCommon.dll differ diff --git a/tests/FmgLib.MauiMarkup.Generator.Test/DLLs/Syncfusion.Maui.Inputs.dll b/tests/FmgLib.MauiMarkup.Generator.Test/DLLs/Syncfusion.Maui.Inputs.dll new file mode 100644 index 0000000..0d228f2 Binary files /dev/null and b/tests/FmgLib.MauiMarkup.Generator.Test/DLLs/Syncfusion.Maui.Inputs.dll differ diff --git a/tests/FmgLib.MauiMarkup.Generator.Test/DLLs/Syncfusion.Maui.ListView.dll b/tests/FmgLib.MauiMarkup.Generator.Test/DLLs/Syncfusion.Maui.ListView.dll new file mode 100644 index 0000000..62bd6a1 Binary files /dev/null and b/tests/FmgLib.MauiMarkup.Generator.Test/DLLs/Syncfusion.Maui.ListView.dll differ diff --git a/tests/FmgLib.MauiMarkup.Generator.Test/DLLs/Syncfusion.Maui.PullToRefresh.dll b/tests/FmgLib.MauiMarkup.Generator.Test/DLLs/Syncfusion.Maui.PullToRefresh.dll new file mode 100644 index 0000000..9266902 Binary files /dev/null and b/tests/FmgLib.MauiMarkup.Generator.Test/DLLs/Syncfusion.Maui.PullToRefresh.dll differ diff --git a/tests/FmgLib.MauiMarkup.Generator.Test/FmgLib.MauiMarkup.Generator.Test.csproj b/tests/FmgLib.MauiMarkup.Generator.Test/FmgLib.MauiMarkup.Generator.Test.csproj index 5d38b08..1ace3f8 100644 --- 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 @@ Always + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + Always diff --git a/tests/FmgLib.MauiMarkup.Generator.Test/IntegrationTesting.cs b/tests/FmgLib.MauiMarkup.Generator.Test/IntegrationTesting.cs index a2ee8ab..6664bb9 100644 --- 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);