diff --git a/Laerdal.Dfu/Laerdal.Dfu.csproj b/Laerdal.Dfu/Laerdal.Dfu.csproj index f92c72d..065c9b5 100644 --- a/Laerdal.Dfu/Laerdal.Dfu.csproj +++ b/Laerdal.Dfu/Laerdal.Dfu.csproj @@ -2,7 +2,7 @@ - net7.0-ios;net7.0-android;netstandard2.1; + net8.0-ios;net8.0-android;netstandard2.1; true true @@ -50,11 +50,11 @@ - + - + diff --git a/Laerdal.Scripts/Laerdal.SetupBuildEnvironment.sh b/Laerdal.Scripts/Laerdal.SetupBuildEnvironment.sh index 3c7de69..1182a5e 100755 --- a/Laerdal.Scripts/Laerdal.SetupBuildEnvironment.sh +++ b/Laerdal.Scripts/Laerdal.SetupBuildEnvironment.sh @@ -70,7 +70,9 @@ dotnet \ install \ maui \ ios \ - android + android \ + maui-ios \ + maui-android # --from-rollback-file=https://maui.blob.core.windows.net/metadata/rollbacks/${dotnet_8_workload_version}.json # we need to install additional packages manually declare exitCode=$? if [ $exitCode != 0 ]; then diff --git a/README.md b/README.md index 96fbffc..f7aaa42 100644 --- a/README.md +++ b/README.md @@ -10,70 +10,15 @@ The native iOS Pod library is located here: https://github.com/NordicSemiconduct [![NuGet Badge](https://buildstats.info/nuget/Laerdal.Dfu?includePreReleases=true)](https://www.nuget.org/packages/Laerdal.Dfu/) -## Requirements - -You'll need : - -- **MacOS** - - with **XCode** - - with **Xamarin.iOS** - - with **gradle** - - with **Xamarin.Android** - - [with **ObjectiveSharpie**] (optional) - -```bash -brew cask install objectivesharpie -``` - -[More about Objective Sharpie](https://docs.microsoft.com/en-us/xamarin/cross-platform/macios/binding/objective-sharpie/get-started) - -## Steps to build on Local-Dev +## Building Locally ### 1) Checkout ```bash git clone https://github.com/Laerdal/Laerdal.Dfu.git ``` - -### 2) Comment out in the .csproj files any mention of Git-related properties - -### 3) Set the MSBuild version to 15.0 in Rider's settings (MSBuild 17.0+ won't build) - -### 4) Run build script - -There are 2 sources for the iOS package : via building the release code or using the CocoaPods. - -To build the nuget via building the source code, run : +### 2) Build ```bash -./build.sh -v +dotnet msbuild Laerdal.Scripts/Laerdal.Builder.targets /m:1 /p:Laerdal_Version=9.0.x.0 /p:Laerdal_Github_Access_Token= ``` - -You'll find the nuget in `Laerdal.Dfu.Output/` - -### Known issues - -- [**Invalid Swift support when submitted to the Apple AppStore**](https://github.com/Laerdal/Laerdal.Dfu.iOS/issues/3) | - -Fix : https://github.com/Laerdal/Laerdal.Dfu.iOS/issues/3#issuecomment-783298581 | - -```shell -#!/usr/bin/env sh -xcode_lib_path="/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift-5.0/iphoneos" -app_path=$1 -app_name= -libs=("$app_path/Products/Applications/$app_name/Frameworks/"*.dylib) - -for i in "${libs[@]}" -do - cp "$xcode_lib_path/$(basename "$i")" "$app_path/SwiftSupport/iphoneos/" - cp "$xcode_lib_path/$(basename "$i")" "$app_path/Products/Applications/$app_name/Frameworks/" -done -``` - -> -- Thanks [@OliverFlecke](https://github.com/OliverFlecke) - -- [**ObjCRuntime.RuntimeException: Can't register the class XXX when the dynamic registrar has been linked away"**](https://github.com/Laerdal/Laerdal.Dfu.iOS/issues/1) - -Fix : You might need to add "--optimize=-remove-dynamic-registrar" to your apps mtouch args. - diff --git a/global.json b/global.json index 237f5ce..3639463 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "7.0.0", + "version": "8.0.0", "rollForward": "latestFeature", "allowPrerelease": false }