diff --git a/.github/workflows/build-gtk.yml b/.github/workflows/build-gtk.yml index 243e8cd231e7..d8e8a07e6ca5 100644 --- a/.github/workflows/build-gtk.yml +++ b/.github/workflows/build-gtk.yml @@ -38,6 +38,13 @@ jobs: dotnet build -c Release Mali.slnf - name: Pack MAUI run: dotnet pack Mali.slnf + - name: Build Mali.ZXing + run: dotnet build -c Release --framework=net8.0-gtk src/ZXing.Net.Maui/ZXing.Net.MAUI.sln + - name: Pack Mali.ZXing + run: | + dotnet pack src/ZXing.Net.Maui/ZXing.Net.MAUI/ZXing.Net.MAUI.csproj --no-build --no-restore + dotnet pack src/ZXing.Net.Maui/ZXing.Net.MAUI.Controls/ZXing.Net.MAUI.Controls.csproj --no-build --no-restore + - name: Upload binaries to nuget (if tag or main branch, and nugetKey is present) env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/src/ZXing.Net.Maui/ZXing.Net.MAUI.Controls/ZXing.Net.MAUI.Controls.csproj b/src/ZXing.Net.Maui/ZXing.Net.MAUI.Controls/ZXing.Net.MAUI.Controls.csproj index 46731042ddde..bbb1ff9167a9 100644 --- a/src/ZXing.Net.Maui/ZXing.Net.MAUI.Controls/ZXing.Net.MAUI.Controls.csproj +++ b/src/ZXing.Net.Maui/ZXing.Net.MAUI.Controls/ZXing.Net.MAUI.Controls.csproj @@ -1,22 +1,26 @@  net8.0-gtk - ZXing.Net.Maui.Controls - ZXing.Net.MAUI Barcode Scanner for .NET MAUI - Redth + Mali.ZXing.Controls + Mali.ZXing (fork of ZXing.Net.MAUI) Barcode Scanner for .NET MAUI + webwarrior-ws,Redth True true false Copyright © Redth - https://github.com/redth/BigIslandBarcoding + https://github.com/nblockchain/Mali/tree/main/src/ZXing.Net.Maui + README.md MIT - https://github.com/redth/BigIslandBarcoding + https://github.com/nblockchain/Mali/tree/main/src/ZXing.Net.Maui $(PackageVersion) true portable Library + + + diff --git a/src/ZXing.Net.Maui/ZXing.Net.MAUI/ZXing.Net.MAUI.csproj b/src/ZXing.Net.Maui/ZXing.Net.MAUI/ZXing.Net.MAUI.csproj index 474a232aa2cf..cca6732ba1ca 100644 --- a/src/ZXing.Net.Maui/ZXing.Net.MAUI/ZXing.Net.MAUI.csproj +++ b/src/ZXing.Net.Maui/ZXing.Net.MAUI/ZXing.Net.MAUI.csproj @@ -1,15 +1,16 @@  net8.0-gtk - ZXing.Net.Maui - ZXing.Net.MAUI Barcode Scanner for .NET MAUI - Redth + Mali.ZXing + Mali.ZXing (fork of ZXing.Net.MAUI) Barcode Scanner for .NET MAUI + webwarrior-ws,Redth True True true false Copyright © Redth - https://github.com/redth/ZXing.Net.Maui + https://github.com/nblockchain/Mali/tree/main/src/ZXing.Net.Maui + README.md MIT True $(GitRepositoryUrl) @@ -27,6 +28,10 @@ $(MSBuildProjectDirectory)\..\..\ <_MauiBuildTasksLocation>$(MauiPath).nuspec\ + + + +