From 8a5bad02c12bf700d265de33ce4b9d1a83d92542 Mon Sep 17 00:00:00 2001 From: Jonathan ANTOINE Date: Fri, 18 Apr 2025 20:40:42 +0200 Subject: [PATCH 1/6] use framework --- .github/workflows/create-nuget.yml | 33 ++++++++++++------------------ 1 file changed, 13 insertions(+), 20 deletions(-) diff --git a/.github/workflows/create-nuget.yml b/.github/workflows/create-nuget.yml index 67b82dbf6..c1a0a1b01 100644 --- a/.github/workflows/create-nuget.yml +++ b/.github/workflows/create-nuget.yml @@ -23,28 +23,21 @@ jobs: with: dotnet-version: '9.x' - - name: Build MBProgressHUD for simulator + + + + - name: Build MBProgressHUD Framework run: | xcodebuild -project ${{ env.SRC_FOLDER }}/${{ env.PROJ_NAME }} \ - -target "MBProgressHUD Static Library" \ - -sdk iphonesimulator${{ env.SDK }} \ - IPHONEOS_DEPLOYMENT_TARGET=12.0 \ - EXCLUDED_ARCHS="arm64" + -target "MBProgressHUD Framework" \ - - name: Build MBProgressHUD for device - run: | - xcodebuild -project ${{ env.SRC_FOLDER }}/${{ env.PROJ_NAME }} \ - -target "MBProgressHUD Static Library" \ - -sdk iphoneos${{ env.SDK }} \ - IPHONEOS_DEPLOYMENT_TARGET=12.0 - - - name: Create universal lib with lipo in dotnet-binding - run: | - lipo -create \ - ${{ env.SRC_FOLDER }}/build/Release-iphoneos/libMBProgressHUD.a \ - ${{ env.SRC_FOLDER }}/build/Release-iphonesimulator/libMBProgressHUD.a \ - -output ./dotnet-binding/libMBProgressHUD.a - lipo -info ./dotnet-binding/libMBProgressHUD.a + + - name: Upload .xcframework as artifact + uses: actions/upload-artifact@v4.6.2 + with: + name: xcframework + compression-level: '1' + path: ${{ env.SRC_FOLDER }}/*.xcframework - name: restore workload working-directory: ./dotnet-binding @@ -63,4 +56,4 @@ jobs: with: name: nuget-package compression-level: '0' - path: /Users/runner/work/MBProgressHUD-dotnet/MBProgressHUD-dotnet/dotnet-binding/bin/Release/*.nupkg + path: ${{ env.SRC_FOLDER }}/dotnet-binding/bin/Release/*.nupkg From 6e2f27b0c1339d25f5031c161e13ea327278fab1 Mon Sep 17 00:00:00 2001 From: Jonathan ANTOINE Date: Fri, 18 Apr 2025 20:43:35 +0200 Subject: [PATCH 2/6] force simulator ? --- .github/workflows/create-nuget.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/create-nuget.yml b/.github/workflows/create-nuget.yml index c1a0a1b01..f26f80c43 100644 --- a/.github/workflows/create-nuget.yml +++ b/.github/workflows/create-nuget.yml @@ -24,12 +24,11 @@ jobs: dotnet-version: '9.x' - - - name: Build MBProgressHUD Framework run: | xcodebuild -project ${{ env.SRC_FOLDER }}/${{ env.PROJ_NAME }} \ -target "MBProgressHUD Framework" \ + -sdk iphonesimulator${{ env.SDK }} \ - name: Upload .xcframework as artifact From 298f85d293da24a2683091f0b0b3998816b4ba78 Mon Sep 17 00:00:00 2001 From: Jonathan ANTOINE Date: Fri, 18 Apr 2025 20:48:19 +0200 Subject: [PATCH 3/6] build 2 framework and bound them --- .github/workflows/create-nuget.yml | 16 ++++++++++++++-- dotnet-binding/MBProgressHUD-dotnet.csproj | 4 ++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/.github/workflows/create-nuget.yml b/.github/workflows/create-nuget.yml index f26f80c43..f80aeef13 100644 --- a/.github/workflows/create-nuget.yml +++ b/.github/workflows/create-nuget.yml @@ -24,19 +24,31 @@ jobs: dotnet-version: '9.x' - - name: Build MBProgressHUD Framework + - name: Build MBProgressHUD iphonesimulator Framework run: | xcodebuild -project ${{ env.SRC_FOLDER }}/${{ env.PROJ_NAME }} \ -target "MBProgressHUD Framework" \ -sdk iphonesimulator${{ env.SDK }} \ + - name: Build MBProgressHUD iphonesimulator Framework + run: | + xcodebuild -project ${{ env.SRC_FOLDER }}/${{ env.PROJ_NAME }} \ + -target "MBProgressHUD Framework" \ + -sdk iphoneos{{ env.SDK }} \ + + - name: Build xcframework + run: | + xcodebuild -create-xcframework \ + -framework "${{ env.SRC_FOLDER }}/build/Release-iphonesimulator/MBProgressHUD.framework" \ + -framework "${{ env.SRC_FOLDER }}/build/Release-iphoneos/MBProgressHUD.framework" \ + -output ./dotnet-binding/MBProgressHUD.xcframework - name: Upload .xcframework as artifact uses: actions/upload-artifact@v4.6.2 with: name: xcframework compression-level: '1' - path: ${{ env.SRC_FOLDER }}/*.xcframework + path: ./dotnet-binding/MBProgressHUD.xcframework - name: restore workload working-directory: ./dotnet-binding diff --git a/dotnet-binding/MBProgressHUD-dotnet.csproj b/dotnet-binding/MBProgressHUD-dotnet.csproj index edd6cb378..06abbe546 100644 --- a/dotnet-binding/MBProgressHUD-dotnet.csproj +++ b/dotnet-binding/MBProgressHUD-dotnet.csproj @@ -25,8 +25,8 @@ - - Static + + Framework Foundation ImageIO CoreGraphics From da6a9688c0feeab8715bb1f9e9a23112732a3301 Mon Sep 17 00:00:00 2001 From: Jonathan ANTOINE Date: Fri, 18 Apr 2025 20:49:15 +0200 Subject: [PATCH 4/6] Update version to 1.0.0.1 --- dotnet-binding/MBProgressHUD-dotnet.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotnet-binding/MBProgressHUD-dotnet.csproj b/dotnet-binding/MBProgressHUD-dotnet.csproj index 06abbe546..bbd9d5ba6 100644 --- a/dotnet-binding/MBProgressHUD-dotnet.csproj +++ b/dotnet-binding/MBProgressHUD-dotnet.csproj @@ -8,7 +8,7 @@ com.jonathanantoine.MBProgressHUD - 1.0.0.0 + 1.0.0.1 Jonathan Antoine MBProgressHUD for dotnet https://github.com/jonathanantoine/MBProgressHUD-dotnet From cee916ea482b20abc52cfade941ac57bce2bd7c7 Mon Sep 17 00:00:00 2001 From: Jonathan ANTOINE Date: Fri, 18 Apr 2025 20:50:10 +0200 Subject: [PATCH 5/6] Missing $ in build --- .github/workflows/create-nuget.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/create-nuget.yml b/.github/workflows/create-nuget.yml index f80aeef13..5d5f281cb 100644 --- a/.github/workflows/create-nuget.yml +++ b/.github/workflows/create-nuget.yml @@ -34,7 +34,7 @@ jobs: run: | xcodebuild -project ${{ env.SRC_FOLDER }}/${{ env.PROJ_NAME }} \ -target "MBProgressHUD Framework" \ - -sdk iphoneos{{ env.SDK }} \ + -sdk iphoneos${{ env.SDK }} \ - name: Build xcframework run: | From 5aecaf018be7f41492e050f49daea158dac2668a Mon Sep 17 00:00:00 2001 From: Jonathan ANTOINE Date: Fri, 18 Apr 2025 20:54:45 +0200 Subject: [PATCH 6/6] rename artifact --- .github/workflows/create-nuget.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/create-nuget.yml b/.github/workflows/create-nuget.yml index 5d5f281cb..77eda2e64 100644 --- a/.github/workflows/create-nuget.yml +++ b/.github/workflows/create-nuget.yml @@ -65,6 +65,6 @@ jobs: - name: Upload .nupkg as artifact uses: actions/upload-artifact@v4.6.2 with: - name: nuget-package + name: MBProgressHUD-nuget-package compression-level: '0' path: ${{ env.SRC_FOLDER }}/dotnet-binding/bin/Release/*.nupkg