From ad8c7a725ffeab08cd26099ba9f92dbccbbc0afd Mon Sep 17 00:00:00 2001 From: "D. Sidiropoulos" Date: Thu, 4 Apr 2024 11:40:39 +0200 Subject: [PATCH 1/4] feat (Laerdal.Scripts): move all scripts under the Laerdal.Scripts folder --- .github/workflows/github-compile.yml | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 1 + .../gradle/wrapper/gradle-wrapper.properties | 1 + ...Mgr.Bindings.Android.NativeBuilder.targets | 8 ++-- .../Laerdal.McuMgr.Bindings.Android.csproj | 8 ++-- ...Laerdal.McuMgr.Bindings.MacCatalyst.csproj | 8 ++-- ...Laerdal.McuMgr.Bindings.NetStandard.csproj | 8 ++-- .../Laerdal.McuMgr.Bindings.iOS.csproj | 8 ++-- Laerdal.McuMgr.sln | 8 ++-- Laerdal.McuMgr/Laerdal.McuMgr.csproj | 16 ++++---- .../Laerdal.CreateNewReleaseInGithub.sh | 0 .../Laerdal.McuMgr.Builder.targets | 41 ++++++++++--------- .../Laerdal.SetupBuildEnvironment.sh | 0 .../Laerdal.Version.sh | 0 azure-pipelines.yml | 4 +- 15 files changed, 58 insertions(+), 55 deletions(-) rename Laerdal.CreateNewReleaseInGithub.sh => Laerdal.Scripts/Laerdal.CreateNewReleaseInGithub.sh (100%) rename Laerdal.McuMgr.Builder.targets => Laerdal.Scripts/Laerdal.McuMgr.Builder.targets (90%) rename Laerdal.SetupBuildEnvironment.sh => Laerdal.Scripts/Laerdal.SetupBuildEnvironment.sh (100%) mode change 100755 => 100644 rename Laerdal.Version.sh => Laerdal.Scripts/Laerdal.Version.sh (100%) diff --git a/.github/workflows/github-compile.yml b/.github/workflows/github-compile.yml index 920447a2..54c5b974 100644 --- a/.github/workflows/github-compile.yml +++ b/.github/workflows/github-compile.yml @@ -50,7 +50,7 @@ jobs: - name: '🏗 📦 Build, Pack & Announce New Release (if appropriate)' shell: bash run: | - cd "$build_repository_folderpath" \ + cd "$build_repository_folderpath/Laerdal.Scripts" \ && \ dotnet \ msbuild \ diff --git a/Laerdal.McuMgr.Bindings.Android.Native/gradle/wrapper/gradle-wrapper.properties b/Laerdal.McuMgr.Bindings.Android.Native/gradle/wrapper/gradle-wrapper.properties index f398c33c..164080a8 100644 --- a/Laerdal.McuMgr.Bindings.Android.Native/gradle/wrapper/gradle-wrapper.properties +++ b/Laerdal.McuMgr.Bindings.Android.Native/gradle/wrapper/gradle-wrapper.properties @@ -2,5 +2,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/Laerdal.McuMgr.Bindings.Android.Native/mcumgr-laerdal-wrapper/gradle/wrapper/gradle-wrapper.properties b/Laerdal.McuMgr.Bindings.Android.Native/mcumgr-laerdal-wrapper/gradle/wrapper/gradle-wrapper.properties index 070cb702..3eda44db 100644 --- a/Laerdal.McuMgr.Bindings.Android.Native/mcumgr-laerdal-wrapper/gradle/wrapper/gradle-wrapper.properties +++ b/Laerdal.McuMgr.Bindings.Android.Native/mcumgr-laerdal-wrapper/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/Laerdal.McuMgr.Bindings.Android/Laerdal.McuMgr.Bindings.Android.NativeBuilder.targets b/Laerdal.McuMgr.Bindings.Android/Laerdal.McuMgr.Bindings.Android.NativeBuilder.targets index a332d096..b2f1a6f1 100644 --- a/Laerdal.McuMgr.Bindings.Android/Laerdal.McuMgr.Bindings.Android.NativeBuilder.targets +++ b/Laerdal.McuMgr.Bindings.Android/Laerdal.McuMgr.Bindings.Android.NativeBuilder.targets @@ -74,10 +74,10 @@ - - - - + + + + diff --git a/Laerdal.McuMgr.Bindings.Android/Laerdal.McuMgr.Bindings.Android.csproj b/Laerdal.McuMgr.Bindings.Android/Laerdal.McuMgr.Bindings.Android.csproj index 493884d7..90330324 100644 --- a/Laerdal.McuMgr.Bindings.Android/Laerdal.McuMgr.Bindings.Android.csproj +++ b/Laerdal.McuMgr.Bindings.Android/Laerdal.McuMgr.Bindings.Android.csproj @@ -55,10 +55,10 @@ true - 1.0.1037.0 - 1.0.1037.0 - 1.0.1037.0 - 1.0.1037.0 + 1.0.1039.0 + 1.0.1039.0 + 1.0.1039.0 + 1.0.1039.0 $(PackageId) $(Authors) diff --git a/Laerdal.McuMgr.Bindings.MacCatalyst/Laerdal.McuMgr.Bindings.MacCatalyst.csproj b/Laerdal.McuMgr.Bindings.MacCatalyst/Laerdal.McuMgr.Bindings.MacCatalyst.csproj index d27175cc..e99a1112 100644 --- a/Laerdal.McuMgr.Bindings.MacCatalyst/Laerdal.McuMgr.Bindings.MacCatalyst.csproj +++ b/Laerdal.McuMgr.Bindings.MacCatalyst/Laerdal.McuMgr.Bindings.MacCatalyst.csproj @@ -60,10 +60,10 @@ $(AllowedReferenceRelatedFileExtensions);.pdb - 1.0.1037.0 - 1.0.1037.0 - 1.0.1037.0 - 1.0.1037.0 + 1.0.1039.0 + 1.0.1039.0 + 1.0.1039.0 + 1.0.1039.0 $(PackageId) McuMgr Bindings for MacCatalyst - MAUI ready diff --git a/Laerdal.McuMgr.Bindings.NetStandard/Laerdal.McuMgr.Bindings.NetStandard.csproj b/Laerdal.McuMgr.Bindings.NetStandard/Laerdal.McuMgr.Bindings.NetStandard.csproj index f7ed3a16..d84b1442 100644 --- a/Laerdal.McuMgr.Bindings.NetStandard/Laerdal.McuMgr.Bindings.NetStandard.csproj +++ b/Laerdal.McuMgr.Bindings.NetStandard/Laerdal.McuMgr.Bindings.NetStandard.csproj @@ -37,10 +37,10 @@ $(AllowedReferenceRelatedFileExtensions);.pdb - 1.0.1037.0 - 1.0.1037.0 - 1.0.1037.0 - 1.0.1037.0 + 1.0.1039.0 + 1.0.1039.0 + 1.0.1039.0 + 1.0.1039.0 $(PackageId) McuMgr C# Implementation (WIP) diff --git a/Laerdal.McuMgr.Bindings.iOS/Laerdal.McuMgr.Bindings.iOS.csproj b/Laerdal.McuMgr.Bindings.iOS/Laerdal.McuMgr.Bindings.iOS.csproj index 3709b892..2002baec 100644 --- a/Laerdal.McuMgr.Bindings.iOS/Laerdal.McuMgr.Bindings.iOS.csproj +++ b/Laerdal.McuMgr.Bindings.iOS/Laerdal.McuMgr.Bindings.iOS.csproj @@ -58,10 +58,10 @@ $(AllowedReferenceRelatedFileExtensions);.pdb - 1.0.1037.0 - 1.0.1037.0 - 1.0.1037.0 - 1.0.1037.0 + 1.0.1039.0 + 1.0.1039.0 + 1.0.1039.0 + 1.0.1039.0 $(PackageId) McuMgr Bindings for iOS - MAUI ready diff --git a/Laerdal.McuMgr.sln b/Laerdal.McuMgr.sln index 0825d0c8..66832693 100644 --- a/Laerdal.McuMgr.sln +++ b/Laerdal.McuMgr.sln @@ -5,11 +5,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_Misc", "_Misc", "{2459FC0F LICENSE = LICENSE .gitignore = .gitignore azure-pipelines.yml = azure-pipelines.yml - Laerdal.CreateNewReleaseInGithub.sh = Laerdal.CreateNewReleaseInGithub.sh - Laerdal.McuMgr.Builder.targets = Laerdal.McuMgr.Builder.targets - Laerdal.Version.sh = Laerdal.Version.sh + Laerdal.CreateNewReleaseInGithub.sh = Laerdal.Scripts\Laerdal.CreateNewReleaseInGithub.sh + Laerdal.McuMgr.Builder.targets = Laerdal.Scripts\Laerdal.McuMgr.Builder.targets + Laerdal.Version.sh = Laerdal.Scripts\Laerdal.Version.sh global.json = global.json - Laerdal.SetupBuildEnvironment.sh = Laerdal.SetupBuildEnvironment.sh + Laerdal.SetupBuildEnvironment.sh = Laerdal.Scripts\Laerdal.SetupBuildEnvironment.sh .github\workflows\github-compile.yml = .github\workflows\github-compile.yml .github\workflows\github-deploy.yml = .github\workflows\github-deploy.yml EndProjectSection diff --git a/Laerdal.McuMgr/Laerdal.McuMgr.csproj b/Laerdal.McuMgr/Laerdal.McuMgr.csproj index e622eccf..75cb7a14 100644 --- a/Laerdal.McuMgr/Laerdal.McuMgr.csproj +++ b/Laerdal.McuMgr/Laerdal.McuMgr.csproj @@ -55,10 +55,10 @@ $(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb - 1.0.1037.0 - 1.0.1037.0 - 1.0.1037.0 - 1.0.1037.0 + 1.0.1039.0 + 1.0.1039.0 + 1.0.1039.0 + 1.0.1039.0 $(PackageId) $(Authors) @@ -149,21 +149,21 @@ - + - + - + - + diff --git a/Laerdal.CreateNewReleaseInGithub.sh b/Laerdal.Scripts/Laerdal.CreateNewReleaseInGithub.sh similarity index 100% rename from Laerdal.CreateNewReleaseInGithub.sh rename to Laerdal.Scripts/Laerdal.CreateNewReleaseInGithub.sh diff --git a/Laerdal.McuMgr.Builder.targets b/Laerdal.Scripts/Laerdal.McuMgr.Builder.targets similarity index 90% rename from Laerdal.McuMgr.Builder.targets rename to Laerdal.Scripts/Laerdal.McuMgr.Builder.targets index b343825d..e84bdcf9 100644 --- a/Laerdal.McuMgr.Builder.targets +++ b/Laerdal.Scripts/Laerdal.McuMgr.Builder.targets @@ -6,19 +6,19 @@ - + - - + + - + @@ -34,10 +34,9 @@ true $(BUILD_ARTIFACTSTAGINGDIRECTORY) - $([System.IO.Path]::Combine($(MSBuildThisFileDirectory), `Artifacts/`)) - - TestResults - $([System.IO.Path]::Combine($(MSBuildThisFileDirectory), $(Laerdal_Test_Results_Folderpath))) + $([System.IO.Path]::Combine($(MSBuildThisFileDirectory), `..`, `Artifacts/`)) + + $([System.IO.Path]::Combine($(MSBuildThisFileDirectory), `..`, `TestResults`)) false @@ -46,11 +45,13 @@ $(BUILD_REPOSITORY_NAME) True - Laerdal.McuMgr/Laerdal.McuMgr.csproj - Laerdal.McuMgr.Bindings.iOS/Laerdal.McuMgr.Bindings.iOS.csproj - Laerdal.McuMgr.Bindings.Android/Laerdal.McuMgr.Bindings.Android.csproj - Laerdal.McuMgr.Bindings.MacCatalyst/Laerdal.McuMgr.Bindings.MacCatalyst.csproj - Laerdal.McuMgr.Bindings.NetStandard/Laerdal.McuMgr.Bindings.NetStandard.csproj + $([System.IO.Path]::Combine($(MSBuildThisFileDirectory), `..`, `Laerdal.McuMgr`, `Laerdal.McuMgr.csproj`)) + $([System.IO.Path]::Combine($(MSBuildThisFileDirectory), `..`, `Laerdal.McuMgr.Bindings.iOS`, `Laerdal.McuMgr.Bindings.iOS.csproj`)) + $([System.IO.Path]::Combine($(MSBuildThisFileDirectory), `..`, `Laerdal.McuMgr.Bindings.Android`, `Laerdal.McuMgr.Bindings.Android.csproj`)) + $([System.IO.Path]::Combine($(MSBuildThisFileDirectory), `..`, `Laerdal.McuMgr.Bindings.MacCatalyst`, `Laerdal.McuMgr.Bindings.MacCatalyst.csproj`)) + $([System.IO.Path]::Combine($(MSBuildThisFileDirectory), `..`, `Laerdal.McuMgr.Bindings.NetStandard`, `Laerdal.McuMgr.Bindings.NetStandard.csproj`)) + + $([System.IO.Path]::Combine($(MSBuildThisFileDirectory), `..`, `Laerdal.McuMgr.Tests`, `Laerdal.McuMgr.Tests.csproj`)) @@ -87,7 +88,7 @@ EchoOff="true" Command=" bash '$(Laerdal_Version_Script_Filepath)' $(_Laerdal_Version_Script_Parameters) " ConsoleToMSBuild="true" - WorkingDirectory="$(MSBuildThisFileDirectory)"> + WorkingDirectory="$(MSBuildThisFileDirectory)/.."> @@ -187,7 +188,7 @@ <_Laerdal_Build_Parameters>$(_Laerdal_Build_Parameters)GradlePath=$(Laerdal_Gradle_Path); - <_Laerdal_Build_Parameters>$(_Laerdal_Build_Parameters)SourceRoot=$(MSBuildThisFileDirectory)/Laerdal.McuMgr.Bindings/; + <_Laerdal_Build_Parameters>$(_Laerdal_Build_Parameters)SourceRoot=$(MSBuildThisFileDirectory)/../Laerdal.McuMgr.Bindings/; <_Laerdal_Build_Parameters>$(_Laerdal_Build_Parameters)Configuration=$(Configuration); <_Laerdal_Build_Parameters>$(_Laerdal_Build_Parameters)PackageOutputPath=$(PackageOutputPath); <_Laerdal_Build_Parameters>$(_Laerdal_Build_Parameters)ShouldSkipMacCatalyst=$(ShouldSkipMacCatalyst); @@ -214,7 +215,7 @@ - <_Laerdal_Build_Parameters>$(_Laerdal_Build_Parameters)SourceRoot=$(MSBuildThisFileDirectory)/Laerdal.McuMgr/; + <_Laerdal_Build_Parameters>$(_Laerdal_Build_Parameters)SourceRoot=$(MSBuildThisFileDirectory)/../Laerdal.McuMgr/; <_Laerdal_Build_Parameters>$(_Laerdal_Build_Parameters)Laerdal_McuMgr_Bindings_Package_Version=$(Laerdal_Version_Assembly); @@ -228,7 +229,7 @@ AfterTargets="BuildProjects"> @@ -241,7 +242,7 @@ + WorkingDirectory="$(MSBuildThisFileDirectory)/.."/> @@ -275,7 +276,7 @@ - $([System.IO.Path]::Combine($(MSBuildThisFileDirectory), `Laerdal.CreateNewReleaseInGithub.sh`)) + $([System.IO.Path]::Combine($(MSBuildThisFileDirectory), `..`, `Laerdal.CreateNewReleaseInGithub.sh`)) <_Laerdal_Create_Github_Release_Script_Parameters>$(_Laerdal_Create_Github_Release_Script_Parameters) --git-branch '$(Laerdal_Source_Branch)' <_Laerdal_Create_Github_Release_Script_Parameters>$(_Laerdal_Create_Github_Release_Script_Parameters) --tag-version '$(Laerdal_Version_Base)' @@ -288,7 +289,7 @@ + WorkingDirectory="$(MSBuildThisFileDirectory)/.."/> diff --git a/Laerdal.SetupBuildEnvironment.sh b/Laerdal.Scripts/Laerdal.SetupBuildEnvironment.sh old mode 100755 new mode 100644 similarity index 100% rename from Laerdal.SetupBuildEnvironment.sh rename to Laerdal.Scripts/Laerdal.SetupBuildEnvironment.sh diff --git a/Laerdal.Version.sh b/Laerdal.Scripts/Laerdal.Version.sh similarity index 100% rename from Laerdal.Version.sh rename to Laerdal.Scripts/Laerdal.Version.sh diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 71422e8d..6a79969c 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -74,7 +74,7 @@ jobs: persistCredentials: True - task: Bash@3 - displayName: 'Setup Build Environment for "Laerdal.Helpers"' + displayName: '🛠 Setup Build Environment' inputs: targetType: filePath filePath: 'Laerdal.Scripts/Laerdal.SetupBuildEnvironment.sh' @@ -90,7 +90,7 @@ jobs: inputs: command: 'custom' custom: 'msbuild' - arguments: 'Laerdal.McuMgr.Builder.targets -m:1 -p:ShouldSkipMacCatalyst="true" -p:Laerdal_Gradle_Path="/usr/local/opt/gradle@7/bin/gradle" -p:Laerdal_Test_Results_Folderpath="$(Laerdal_Test_Results_Folderpath)" -p:Laerdal_Github_Access_Token="$(Github.ComponentsTeam.AccessToken)" -p:Laerdal_Repository_Path="$(Repository.Path)" -p:Laerdal_Source_Branch="$(Build.SourceBranch)" -p:PackageOutputPath="$(Build.ArtifactStagingDirectory)/Artifacts/" ' + arguments: 'Laerdal.Scripts/Laerdal.McuMgr.Builder.targets -m:1 -p:ShouldSkipMacCatalyst="true" -p:Laerdal_Gradle_Path="/usr/local/opt/gradle@7/bin/gradle" -p:Laerdal_Test_Results_Folderpath="$(Laerdal_Test_Results_Folderpath)" -p:Laerdal_Github_Access_Token="$(Github.ComponentsTeam.AccessToken)" -p:Laerdal_Repository_Path="$(Repository.Path)" -p:Laerdal_Source_Branch="$(Build.SourceBranch)" -p:PackageOutputPath="$(Build.ArtifactStagingDirectory)/Artifacts/" ' - task: PublishTestResults@2 displayName: '📡 Publish Test Results' From cdeee6fa2b23517600c9d07c697769839ad048a0 Mon Sep 17 00:00:00 2001 From: "D. Sidiropoulos" Date: Thu, 4 Apr 2024 13:00:49 +0200 Subject: [PATCH 2/4] fix (Laerdal.SetupBuildEnvironment.sh): we now store the password of the nuget feed in cleartext to cater to the needs of the vm image used in azure --- Laerdal.Scripts/Laerdal.SetupBuildEnvironment.sh | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/Laerdal.Scripts/Laerdal.SetupBuildEnvironment.sh b/Laerdal.Scripts/Laerdal.SetupBuildEnvironment.sh index 29ee6e22..46ee1133 100644 --- a/Laerdal.Scripts/Laerdal.SetupBuildEnvironment.sh +++ b/Laerdal.Scripts/Laerdal.SetupBuildEnvironment.sh @@ -219,12 +219,15 @@ if [ $exitCode != 0 ]; then fi echo -echo "** Adding 'Laerdal Nuget Feed' as a Nuget Source:" # keep this after workload-restoration otherwise we will run into problems -dotnet nuget add \ - source "${NUGET_FEED_URL}" \ - --name "LaerdalMedical" \ - --username "${NUGET_FEED_USERNAME}" \ - --password "${NUGET_FEED_ACCESSTOKEN}" +echo "** Adding 'Laerdal Nuget Feed' as a Nuget Source:" +# keep this after workload-restoration otherwise we will run into problems note that the 'store-password-in-clear-text' +# is necessary for azure pipelines once we move fully over to github actions we can remove this parameter completely +dotnet nuget add \ + source "${NUGET_FEED_URL}" \ + --name "LaerdalMedical" \ + --username "${NUGET_FEED_USERNAME}" \ + --password "${NUGET_FEED_ACCESSTOKEN}" \ + --store-password-in-clear-text declare exitCode=$? if [ $exitCode != 0 ]; then echo "##vso[task.logissue type=error]Failed to add 'Laerdal Nuget Feed' as a nuget source." From 328fab12f2b7f9573f8872e881a1280726e9e643 Mon Sep 17 00:00:00 2001 From: "D. Sidiropoulos" Date: Thu, 4 Apr 2024 13:30:04 +0200 Subject: [PATCH 3/4] fix (Laerdal.McuMgr.Bindings.Android.NativeBuilder.targets): we now pass the --validate-url parameter only on windows --- Laerdal.McuMgr.Bindings.Android.Native/gradlew | 0 .../mcumgr-laerdal-wrapper/gradlew | 0 ...erdal.McuMgr.Bindings.Android.NativeBuilder.targets | 10 ++++++---- 3 files changed, 6 insertions(+), 4 deletions(-) mode change 100755 => 100644 Laerdal.McuMgr.Bindings.Android.Native/gradlew mode change 100755 => 100644 Laerdal.McuMgr.Bindings.Android.Native/mcumgr-laerdal-wrapper/gradlew diff --git a/Laerdal.McuMgr.Bindings.Android.Native/gradlew b/Laerdal.McuMgr.Bindings.Android.Native/gradlew old mode 100755 new mode 100644 diff --git a/Laerdal.McuMgr.Bindings.Android.Native/mcumgr-laerdal-wrapper/gradlew b/Laerdal.McuMgr.Bindings.Android.Native/mcumgr-laerdal-wrapper/gradlew old mode 100755 new mode 100644 diff --git a/Laerdal.McuMgr.Bindings.Android/Laerdal.McuMgr.Bindings.Android.NativeBuilder.targets b/Laerdal.McuMgr.Bindings.Android/Laerdal.McuMgr.Bindings.Android.NativeBuilder.targets index b2f1a6f1..8b4f1bbe 100644 --- a/Laerdal.McuMgr.Bindings.Android/Laerdal.McuMgr.Bindings.Android.NativeBuilder.targets +++ b/Laerdal.McuMgr.Bindings.Android/Laerdal.McuMgr.Bindings.Android.NativeBuilder.targets @@ -65,6 +65,8 @@ C:\\Users\\$(USERNAME)\\AppData\\Local\\Android\\sdk $(McuMgrLaerdalWrapperLibSourceDirectory)/mcumgr-laerdal-wrapper/build/outputs/aar/mcumgr-laerdal-wrapper-release.aar + + --validate-url @@ -74,10 +76,10 @@ - - - - + + + + From b860160f6e5e19cdecb712ce412a23fe8eb3cdb7 Mon Sep 17 00:00:00 2001 From: "D. Sidiropoulos" Date: Thu, 4 Apr 2024 13:52:57 +0200 Subject: [PATCH 4/4] fix (Laerdal.SetupBuildEnvironment.sh): fix the path to the artifacts folder so that it will be properly added to the nuget sources --- .github/workflows/github-compile.yml | 3 ++- Laerdal.Scripts/Laerdal.SetupBuildEnvironment.sh | 13 +++++++++---- azure-pipelines.yml | 4 ++-- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/.github/workflows/github-compile.yml b/.github/workflows/github-compile.yml index 54c5b974..200e6ea6 100644 --- a/.github/workflows/github-compile.yml +++ b/.github/workflows/github-compile.yml @@ -45,7 +45,8 @@ jobs: "$build_repository_folderpath/Laerdal.Scripts/Laerdal.SetupBuildEnvironment.sh" \ "https://nuget.pkg.github.com/Laerdal/index.json" \ "${{ secrets.scl_github_nuget_feed_username }}" \ - "${{ secrets.scl_github_access_token }}" + "${{ secrets.scl_github_access_token }}" \ + "$build_repository_folderpath/Artifacts" - name: '🏗 📦 Build, Pack & Announce New Release (if appropriate)' shell: bash diff --git a/Laerdal.Scripts/Laerdal.SetupBuildEnvironment.sh b/Laerdal.Scripts/Laerdal.SetupBuildEnvironment.sh index 46ee1133..b458c651 100644 --- a/Laerdal.Scripts/Laerdal.SetupBuildEnvironment.sh +++ b/Laerdal.Scripts/Laerdal.SetupBuildEnvironment.sh @@ -4,6 +4,8 @@ declare -r NUGET_FEED_URL="$1" declare -r NUGET_FEED_USERNAME="$2" declare -r NUGET_FEED_ACCESSTOKEN="$3" +declare -r ARTIFACTS_FOLDER_PATH="$4" + if [ -z "${NUGET_FEED_URL}" ]; then echo "##vso[task.logissue type=error]Missing 'NUGET_FEED_URL' which was expected to be parameter #1." exit 3 @@ -19,6 +21,11 @@ if [ -z "${NUGET_FEED_ACCESSTOKEN}" ]; then exit 6 fi +if [ -z "${ARTIFACTS_FOLDER_PATH}" ]; then + echo "##vso[task.logissue type=error]Missing 'ARTIFACTS_FOLDER_PATH' which was expected to be parameter #4." + exit 7 +fi + brew install --cask objectivesharpie declare exitCode=$? if [ $exitCode != 0 ]; then @@ -207,11 +214,9 @@ if [ $exitCode != 0 ]; then exit 170 fi -declare -r CurrentDirectory="$( dirname "$( readlink -f "${BASH_SOURCE[0]:-"$(command -v -- "$0")"}" )" )" - echo -echo "** Adding 'Artifacts' Folder as a Nuget Source:" -mkdir -p "${CurrentDirectory}/Artifacts" && dotnet nuget add source "${CurrentDirectory}/Artifacts" --name "LocalArtifacts" +echo "** Adding 'Artifacts' Folder as a Nuget Source (dotnet):" +mkdir -p "${ARTIFACTS_FOLDER_PATH}" && dotnet nuget add source "${ARTIFACTS_FOLDER_PATH}" --name "LocalArtifacts" declare exitCode=$? if [ $exitCode != 0 ]; then echo "##vso[task.logissue type=error]Failed to add 'Artifacts' folder as a nuget source." diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 6a79969c..36db7887 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -78,13 +78,13 @@ jobs: inputs: targetType: filePath filePath: 'Laerdal.Scripts/Laerdal.SetupBuildEnvironment.sh' - arguments: ' "https://pkgs.dev.azure.com/LaerdalMedical/_packaging/LaerdalNuGet/nuget/v3/index.json" "$(Laerdal.NugetFeed.Username)" "$(Laerdal.NugetFeed.AccessToken)" ' + arguments: ' "https://pkgs.dev.azure.com/LaerdalMedical/_packaging/LaerdalNuGet/nuget/v3/index.json" "$(Laerdal.NugetFeed.Username)" "$(Laerdal.NugetFeed.AccessToken)" "$(Build.ArtifactStagingDirectory)/Artifacts/" ' # notice that explicitly disabling parallelization via m:1 below is vital because if parallelization is enabled the ios and android # builds will fail with cryptic errors due to multiple target-frameworks are involved coupled with the custom build logic for native libs # # also noticed that we intentionally skip the maccatalyst build on azure because under net8 we need macos14 to be available on azure but - # its not available just yet in 2024 Q1 :( + # it is not available just yet in 2024 Q1 :( - task: DotNetCoreCLI@2 displayName: '🏗 📦 Build, Pack & Announce New Release (if appropriate)' inputs: