Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: Laerdal/Laerdal.Dfu.Bindings.iOS
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v4.15.3.43980-beta
Choose a base ref
...
head repository: Laerdal/Laerdal.Dfu.Bindings.iOS
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: refs/heads/develop
Choose a head ref
  • 9 commits
  • 19 files changed
  • 3 contributors

Commits on Nov 15, 2024

  1. doc (README.md): update description to have it mention MacCatalyst 

    [skip ci]
    @ksidirop-laerdal
    ksidirop-laerdal committed Nov 15, 2024
    Copy the full SHA
    09fe9e0 View commit details

Commits on Jan 15, 2025

  1. refa: split up the single .csproj we had into 4 distinct projects so … 

    …that we will now generate separate nugets for iOS, iOSSimulator.Arm64, iOSSimulator.x64 and MacCatalyst (wip)
    @ksidirop-laerdal
    ksidirop-laerdal committed Jan 15, 2025
    Copy the full SHA
    5d75867 View commit details

  2. Merge pull request #33 from Laerdal/ksidirop/MAN-456-resupport-iossim… 

    …ulator-side-builds

[MAN-456] Re-add support for ios-simulators
    @ksidirop-laerdal
    ksidirop-laerdal authored Jan 15, 2025
    Copy the full SHA
    421a0c5 View commit details

  3. fix (Laerdal.targets): fix the title, the assembly-name and the root-… 

    …namespace aspects of the generated packages
    @ksidirop-laerdal
    ksidirop-laerdal committed Jan 15, 2025
    Copy the full SHA
    7736a65 View commit details

  4. Merge pull request #34 from Laerdal/ksidirop/MAN-456-resupport-iossim… 

    …ulator-side-builds

[MAN-456] Re-add support for ios-simulator
    @ksidirop-laerdal
    ksidirop-laerdal authored Jan 15, 2025
    Copy the full SHA
    7a34e8a View commit details

  5. refa (Laerdal.targets): the iphone-simulator nugets now have the same… 

    … base name as the iOS nuget (Laerdal.Dfu.Bindings.iOS) and differ only by a certain postfix to the package version

   with this new scheme on each build we generate 4 nugets like so:

     Laerdal.Dfu.Bindings.iOS           version: 1.2.3
     Laerdal.Dfu.Bindings.iOS           version: 1.2.3-ios-sim-x64    (for the legacy iphonesimulator-x86_64)
     Laerdal.Dfu.Bindings.iOS           version: 1.2.3-ios-sim-arm64  (for the new iphonesimulator-arm64)
     Laerdal.Dfu.Bindings.MacCatalyst   version: 1.2.3

[skip ci]
    @ksidirop-laerdal
    ksidirop-laerdal committed Jan 15, 2025
    Copy the full SHA
    9691ebc View commit details

  6. Merge pull request #35 from Laerdal/ksidirop/MAN-456-resupport-iossim… 

    …ulator-side-builds

[MAN-456] The iphone-simulator nugets now have the same base name as the iOS nuget (Laerdal.Dfu.Bindings.iOS) and differ only by a certain postfix to the package version
    @laerdal-mu-components-team
    laerdal-mu-components-team authored Jan 15, 2025
    Copy the full SHA
    f011f77 View commit details

Commits on Jan 16, 2025

  1. upgrade (github-actions.yml): upgrade to ios/mac-catalyst sdks versio… 

    …n 18.0 per MAN-470
    @ksidirop-laerdal
    ksidirop-laerdal committed Jan 16, 2025
    Copy the full SHA
    511f49e View commit details

  2. Merge pull request #36 from Laerdal/ksidirop/MAN-456-resupport-iossim… 

    …ulator-side-builds

[MAN-456] Re-support ios-simulator side-builds
    @ksidirop-laerdal
    ksidirop-laerdal authored Jan 16, 2025
    Copy the full SHA
    3fc7576 View commit details
6 changes: 3 additions & 3 deletions .github/workflows/github-actions.yml
View file
Original file line number Diff line number Diff line change
@@ -28,15 +28,15 @@ env:
SCL_DEPENDENCY_TRACKER_SERVER_URL: ${{ secrets.SCL_DEPENDENCY_TRACKER_SERVER_URL }}
SCL_DEPENDENCY_TRACKER_SIGNING_PRIVATE_KEY: ${{ secrets.SCL_DEPENDENCY_TRACKER_SIGNING_PRIVATE_KEY }}

DOTNET_TARGET_WORKLOAD_VERSION: "8.0.402" # dont upgrade this lightheartedly the workload snapshot implicitly defines which versions of Android/iOS/MacCatalyst SDKs are supported
DOTNET_TARGET_WORKLOAD_VERSION: "8.0.405" # dont upgrade this lightheartedly the workload snapshot implicitly defines which versions of Android/iOS/MacCatalyst SDKs are supported

BINDINGS_IOS___SDK_VERSION: "18.1" # for xcodebuild
BINDINGS_IOS___XCODE_IDE_DEV_PATH: "/Applications/Xcode_16.1.app/Contents/Developer" # for xcodebuild
BINDINGS_IOS___DOTNET_TARGET_PLATFORM_VERSION: "17.0" # for the csproj file
BINDINGS_IOS___DOTNET_TARGET_PLATFORM_VERSION: "18.0" # for the csproj file

BINDINGS_MACCATALYST___SDK_VERSION: "15.1" # for xcodebuild
BINDINGS_MACCATALYST___XCODE_IDE_DEV_PATH: "/Applications/Xcode_16.1.app/Contents/Developer" # for xcodebuild
BINDINGS_MACCATALYST___DOTNET_TARGET_PLATFORM_VERSION: "17.0" # for the csproj file
BINDINGS_MACCATALYST___DOTNET_TARGET_PLATFORM_VERSION: "18.0" # for the csproj file


on:
9 changes: 6 additions & 3 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -405,13 +405,16 @@ ASALocalRun/
.localhistory/

Output/
Laerdal.Dfu.Bindings.iOS/Carthage/
Laerdal.Dfu.Bindings.iOS/Sharpie/
Laerdal.Dfu.Bindings.iOS/Frameworks/
Laerdal.Dfu.Native/
Laerdal.Dfu.Bindings.*/Carthage/
Laerdal.Dfu.Bindings.*/Sharpie/
Laerdal.Dfu.Bindings.*/Frameworks/


*.binlog
*.csproj.xml

# we dont want to allow any local nuget.configs to be checked in as they can cause issues with the build and/or contain hardcoded API keys with write access to the
# nuget feed and this is something we definitely want to avoid at all costs for obvious reasons such nuget.config files should be remain local to each dev machine
[Nn][Uu][Gg][Ee][Tt].[Cc][Oo][Nn][Ff][Ii][Gg]

Loading