Merge pull request #122 from Laerdal/ksidirop/MAN-372-consolidate-xco…

…de-and-iphoneos-sdk-versions-as-giithub-ci-vars [MAN-372] Consolidate xcode and iphoneos sdk versions as giithub ci vars
Laerdal · Jul 11, 2024 · 265a13d · 265a13d
2 parents 8dd3c94 + 8410c11
commit 265a13d
Show file tree

Hide file tree

Showing 10 changed files with 273 additions and 199 deletions.
diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml
@@ -14,6 +14,11 @@ env:
   SCL_AZURE_ARTIFACTS_API_KEY: ${{    secrets.SCL_AZURE_ARTIFACTS_API_KEY    }}
   SCL_GITHUB_NUGET_FEED_USERNAME: ${{ secrets.SCL_GITHUB_NUGET_FEED_USERNAME }}
 
+  BINDINGS_IOS___SDK_VERSION: "17.5"
+  BINDINGS_IOS___XCODE_IDE_DEV_PATH: "/Applications/Xcode_15.4.app/Contents/Developer"
+
+  BINDINGS_MACCATALYST___SDK_VERSION: "14.5"
+  BINDINGS_MACCATALYST___XCODE_IDE_DEV_PATH: "/Applications/Xcode_15.4.app/Contents/Developer"
 
 on:
   workflow_call: #     so that other workflows can trigger this
@@ -57,20 +62,26 @@ jobs:
       - name: '🏗 📦 Build, Pack & Announce New Release (if appropriate)'
         shell: 'bash'
         run: |
-          cd                  "${{env.BUILD_REPOSITORY_FOLDERPATH}}/Laerdal.Scripts"                \
-                     &&                                                                             \
-          dotnet                                                                                    \
-             msbuild                                                                                \
-             "Laerdal.Builder.targets"                                                              \
-             -m:1                                                                                   \
-             -p:Should_Skip_MacCatalyst="false"                                                     \
-                                                                                                    \
-                           -p:PackageOutputPath="${{env.BUILD_REPOSITORY_FOLDERPATH}}/Artifacts"    \
-                         -p:Laerdal_Gradle_Path="/opt/homebrew/opt/gradle@7/bin/gradle"             \
-                       -p:Laerdal_Source_Branch="${{env.LAERDAL_SOURCE_BRANCH}}"                    \
-                     -p:Laerdal_Repository_Path="${{env.LAERDAL_REPOSITORY_PATH}}"                  \
-                 -p:Laerdal_Github_Access_Token="${{env.SCL_GITHUB_ACCESS_TOKEN}}"                  \
-             -p:Laerdal_Test_Results_Folderpath="${{env.BUILD_REPOSITORY_FOLDERPATH}}/TestResults"
+          cd                  "${{env.BUILD_REPOSITORY_FOLDERPATH}}/Laerdal.Scripts"                            \
+                     &&                                                                                         \
+          dotnet                                                                                                \
+             msbuild                                                                                            \
+             "Laerdal.Builder.targets"                                                                          \
+             -m:1                                                                                               \
+             -p:Should_Skip_MacCatalyst="false"                                                                 \
+                                                                                                                \
+                                       -p:PackageOutputPath="${{env.BUILD_REPOSITORY_FOLDERPATH}}/Artifacts"    \
+                                     -p:Laerdal_Gradle_Path="/opt/homebrew/opt/gradle@7/bin/gradle"             \
+                                   -p:Laerdal_Source_Branch="${{env.LAERDAL_SOURCE_BRANCH}}"                    \
+                                 -p:Laerdal_Repository_Path="${{env.LAERDAL_REPOSITORY_PATH}}"                  \
+                             -p:Laerdal_Github_Access_Token="${{env.SCL_GITHUB_ACCESS_TOKEN}}"                  \
+                         -p:Laerdal_Test_Results_Folderpath="${{env.BUILD_REPOSITORY_FOLDERPATH}}/TestResults"  \
+                                                                                                                \
+                      -p:Laerdal_Bindings_iOS___Sdk_Version="${{env.BINDINGS_IOS___SDK_VERSION}}"               \
+                    -p:Laerdal_Bindings_iOS___Xcode_Ide_Dev_Path="${{env.BINDINGS_IOS___XCODE_IDE_DEV_PATH}}"             \
+                                                                                                                \
+              -p:Laerdal_Bindings_MacCatalyst___Sdk_Version="${{env.BINDINGS_MACCATALYST___SDK_VERSION}}"       \
+            -p:Laerdal_Bindings_MacCatalyst___Xcode_Ide_Dev_Path="${{env.BINDINGS_MACCATALYST___XCODE_IDE_DEV_PATH}}"
 
       - name: '📡 Publish Test Results' # https://github.com/marketplace/actions/publish-test-results
         uses: 'EnricoMi/publish-unit-test-result-action/macos@v2'

diff --git a/Laerdal.McuMgr.Bindings.Android/Laerdal.McuMgr.Bindings.Android.csproj b/Laerdal.McuMgr.Bindings.Android/Laerdal.McuMgr.Bindings.Android.csproj
@@ -55,10 +55,10 @@
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 
         <!-- these versions are getting replaced by the build script in one swift pass -->
-        <Version>1.0.1071.0</Version>
-        <FileVersion>1.0.1071.0</FileVersion>
-        <PackageVersion>1.0.1071.0</PackageVersion>
-        <AssemblyVersion>1.0.1071.0</AssemblyVersion>
+        <Version>1.0.1150.0</Version>
+        <FileVersion>1.0.1150.0</FileVersion>
+        <PackageVersion>1.0.1150.0</PackageVersion>
+        <AssemblyVersion>1.0.1150.0</AssemblyVersion>
 
         <Title>$(PackageId)</Title>
         <Owners>$(Authors)</Owners>

diff --git a/Laerdal.McuMgr.Bindings.MacCatalyst/Laerdal.McuMgr.Bindings.MacCatalyst.csproj b/Laerdal.McuMgr.Bindings.MacCatalyst/Laerdal.McuMgr.Bindings.MacCatalyst.csproj
@@ -33,6 +33,10 @@
 
         <NativeFrameworkParentFolderpath>$([System.IO.Path]::Combine($(MSBuildThisFileDirectory), 'Frameworks'))</NativeFrameworkParentFolderpath>
         <NativeFrameworkActualTargetFolderpath>$(NativeFrameworkParentFolderpath)/McuMgrBindingsiOS.framework</NativeFrameworkActualTargetFolderpath>
+
+        <!-- set these explicitly here only for experimentation    as far as cicd is concerned these values should be set in the .yml file of the pipeline                                                                                 -->
+        <!-- <Laerdal_Bindings_MacCatalyst___Sdk_Version Condition="        '$(Laerdal_Bindings_MacCatalyst___Sdk_Version)'        == '' ">14.5</Laerdal_Bindings_MacCatalyst___Sdk_Version>                                               -->
+        <!-- <Laerdal_Bindings_MacCatalyst___Xcode_Ide_Dev_Path Condition=" '$(Laerdal_Bindings_MacCatalyst___Xcode_Ide_Dev_Path)' == '' ">/Applications/Xcode_15.4.app/Contents/Developer</Laerdal_Bindings_MacCatalyst___Xcode_Ide_Dev_Path>  -->
     </PropertyGroup>
 
     <PropertyGroup>
@@ -65,10 +69,10 @@
         <AllowedReferenceRelatedFileExtensions>$(AllowedReferenceRelatedFileExtensions);.pdb</AllowedReferenceRelatedFileExtensions>
 
         <!-- these versions are getting replaced by the build script in one swift pass -->
-        <Version>1.0.1039.0</Version>
-        <FileVersion>1.0.1039.0</FileVersion>
-        <PackageVersion>1.0.1039.0</PackageVersion>
-        <AssemblyVersion>1.0.1039.0</AssemblyVersion>
+        <Version>1.0.1150.0</Version>
+        <FileVersion>1.0.1150.0</FileVersion>
+        <PackageVersion>1.0.1150.0</PackageVersion>
+        <AssemblyVersion>1.0.1150.0</AssemblyVersion>
 
         <Title>$(PackageId)</Title>
         <Summary>McuMgr Bindings for MacCatalyst - MAUI ready</Summary>
@@ -158,7 +162,16 @@
 
         <!-- 1. build and generate the fat libs from the proxy swift project                                                -->
         <Exec WorkingDirectory="../Laerdal.McuMgr.Bindings.MacCatalystAndIos.Native" Command=" bash -c &quot; chmod +x ./Laerdal.Mac.CompileAndGenerateFatLibs.sh &quot; "/>
-        <Exec WorkingDirectory="../Laerdal.McuMgr.Bindings.MacCatalystAndIos.Native" Command=" bash -c &quot; SWIFT_OUTPUT_PATH='$(NativeFrameworkParentFolderpath)' XCODEBUILD_TARGET_SDK='macosx' SUPPORTS_MACCATALYST='YES' ./Laerdal.Mac.CompileAndGenerateFatLibs.sh &quot; "/>
+
+        <PropertyGroup>
+            <_CliCommand>$(_CliCommand)  SWIFT_OUTPUT_PATH='$(NativeFrameworkParentFolderpath)'                        </_CliCommand>
+            <_CliCommand>$(_CliCommand)  XCODE_IDE_DEV_PATH='$(Laerdal_Bindings_MacCatalyst___Xcode_Ide_Dev_Path)'     </_CliCommand>
+            <_CliCommand>$(_CliCommand)  XCODEBUILD_TARGET_SDK='macosx'                                                </_CliCommand>
+            <_CliCommand>$(_CliCommand)  XCODEBUILD_TARGET_SDK_VERSION='$(Laerdal_Bindings_MacCatalyst___Sdk_Version)' </_CliCommand>
+            <_CliCommand>$(_CliCommand)  ./Laerdal.Mac.CompileAndGenerateFatLibs.sh                                    </_CliCommand>
+        </PropertyGroup>
+
+        <Exec WorkingDirectory="../Laerdal.McuMgr.Bindings.MacCatalystAndIos.Native" Command=" $(_CliCommand) "/>
 
         <!-- warning   its absolutely vital to remove any softlink files as they are causing -->
         <!-- warning   codesign to fail when using the resulting nuget in maui apps   go figure ... -->