From c2f9f892224bbc1c8ebadbafef05ba670da14fa7 Mon Sep 17 00:00:00 2001 From: Kyriakos Sidiropoulos Date: Wed, 10 Apr 2024 17:22:21 +0200 Subject: [PATCH 1/2] fix (Laerdal.Builder.targets): Laerdal_ProjectFile -> Laerdal_Project --- Laerdal.Dfu/Laerdal.Dfu.csproj | 56 ++++++------- Laerdal.Dfu/Laerdal.targets | 4 +- Laerdal.Scripts/Laerdal.Builder.targets | 107 ++++++++++-------------- 3 files changed, 76 insertions(+), 91 deletions(-) diff --git a/Laerdal.Dfu/Laerdal.Dfu.csproj b/Laerdal.Dfu/Laerdal.Dfu.csproj index 5399c78..b8b2a9c 100644 --- a/Laerdal.Dfu/Laerdal.Dfu.csproj +++ b/Laerdal.Dfu/Laerdal.Dfu.csproj @@ -1,40 +1,40 @@ - - - net7.0-ios;net7.0-android - true - true - enable - 14.2 - 21.0 - + + net7.0-ios;net7.0-android + true + true + enable - - Laerdal.Dfu - Ble;Tools;Dfu;Bluetooth;Nordic;Semiconductor - Laerdal Medical, Francois Raminosona - Wrapper around Nordic.Dfu - + 14.2 + 21.0 + - - - 1 - 27 - $(BUILD_BUILDID) - $([MSBuild]::Add(8, $(GITHUB_RUN_NUMBER))) - $([MSBuild]::Add(8, $(CI_PIPELINE_IID))) - 0 + + Laerdal.Dfu + Ble;Tools;Dfu;Bluetooth;Nordic;Semiconductor + Laerdal Medical, Francois Raminosona + Wrapper around Nordic.Dfu + - $(Laerdal_Version_Major).$(Laerdal_Version_Minor).$(Laerdal_Version_Build) - + + + 1 + 27 + $(BUILD_BUILDID) + $([MSBuild]::Add(8, $(GITHUB_RUN_NUMBER))) + $([MSBuild]::Add(8, $(CI_PIPELINE_IID))) + 0 - + $(Laerdal_Version_Major).$(Laerdal_Version_Minor).$(Laerdal_Version_Build) + + + - + - + \ No newline at end of file diff --git a/Laerdal.Dfu/Laerdal.targets b/Laerdal.Dfu/Laerdal.targets index 6fb5866..bea5937 100644 --- a/Laerdal.Dfu/Laerdal.targets +++ b/Laerdal.Dfu/Laerdal.targets @@ -25,10 +25,10 @@ - $(Laerdal_Package_Name) + $(Laerdal_Package_Name) $(Laerdal_Package_Name) $(Laerdal_Package_Name) - $(Laerdal_Package_Name) + $(Laerdal_Package_Name) $(Laerdal_Package_Copyright) diff --git a/Laerdal.Scripts/Laerdal.Builder.targets b/Laerdal.Scripts/Laerdal.Builder.targets index 4e68d46..1200f48 100644 --- a/Laerdal.Scripts/Laerdal.Builder.targets +++ b/Laerdal.Scripts/Laerdal.Builder.targets @@ -1,81 +1,41 @@ - - - - - - + - - - + - High - - $([System.IO.Path]::Combine($(MSBuildThisFileDirectory), `..`, `Output`)) - $(BUILD_ARTIFACTSTAGINGDIRECTORY) + %0A + Release - $([System.IO.Path]::Combine($(MSBuildThisFileDirectory), `..`, `Laerdal.Dfu`, `Laerdal.Dfu.csproj`)) - - $(MSBuildThisFileDirectory) - + $(BUILD_ARTIFACTSTAGINGDIRECTORY) + $([System.IO.Path]::Combine($(MSBuildThisFileDirectory), `..`, `Artifacts/`)) - - - - - $([System.IO.Path]::Combine($(Laerdal_Script_FolderPath), `Laerdal.Version.sh`)) - $([System.IO.Path]::Combine($(PackageOutputPath), `version.txt`)) - - - 1 - main - develop - - <_Laerdal_Version_Script_Parameters>$(_Laerdal_Version_Script_Parameters) -o $(Laerdal_Version_Details_FilePath) - <_Laerdal_Version_Script_Parameters>$(_Laerdal_Version_Script_Parameters) --major $(Laerdal_Version_Major) - <_Laerdal_Version_Script_Parameters>$(_Laerdal_Version_Script_Parameters) --master-branch $(Laerdal_Master_Branch_Name) - <_Laerdal_Version_Script_Parameters>$(_Laerdal_Version_Script_Parameters) --develop-branch $(Laerdal_Develop_Branch_Name) - + $(BUILD_SOURCEBRANCH) + $(BUILD_REPOSITORY_NAME) + True - - - - - - - - - $([System.Text.RegularExpressions.Regex]::Replace("$(Laerdal_Version_Full)", "^(\d*)\.(\d*)\.(\d*)-?([^.]*).?(\d*)?$", "$1.$2.$3")) - $([System.Text.RegularExpressions.Regex]::Replace("$(Laerdal_Version_Full)", "^(\d*)\.(\d*)\.(\d*)-?([^.]*).?(\d*)?$", "$5")) - 0 - + $([System.IO.Path]::Combine($(MSBuildThisFileDirectory), `..`, `Laerdal.Dfu`, `Laerdal.Dfu.csproj`)) + - - - - - - + + + - + + + - - - + @@ -83,12 +43,37 @@ <_Laerdal_Build_Parameters>$(_Laerdal_Build_Parameters);Configuration=$(Configuration) <_Laerdal_Build_Parameters>$(_Laerdal_Build_Parameters);PackageOutputPath=$(PackageOutputPath) - <_Laerdal_Build_Parameters>$(_Laerdal_Build_Parameters);Laerdal_Version_Full=$(Laerdal_Version_Full) - <_Laerdal_Build_Parameters>$(_Laerdal_Build_Parameters);Laerdal_Version_Assembly=$(Laerdal_Version_Assembly) - \ No newline at end of file + + + + + + + + + + $([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)' + <_Laerdal_Create_Github_Release_Script_Parameters>$(_Laerdal_Create_Github_Release_Script_Parameters) --access-token '$(Laerdal_Github_Access_Token)' + <_Laerdal_Create_Github_Release_Script_Parameters>$(_Laerdal_Create_Github_Release_Script_Parameters) --repository-path '$(Laerdal_Repository_Path)' + + + + + + + + From 497dda2f851dba2337572efdefdb0c685b382b14 Mon Sep 17 00:00:00 2001 From: Kyriakos Sidiropoulos Date: Thu, 11 Apr 2024 16:01:04 +0200 Subject: [PATCH 2/2] clean (github-actions.yml) --- .github/workflows/github-actions.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml index af9867d..d55625b 100644 --- a/.github/workflows/github-actions.yml +++ b/.github/workflows/github-actions.yml @@ -18,7 +18,6 @@ env: # note that its vital that we use our own token here instead of GITHUB_TOKEN that is because access the # nuget repos of Laerdal.Dfu.Bindings.iOS and Laerdal.Dfu.Bindings.Android which are inaccessible to the GITHUB_TOKEN SCL_GITHUB_ACCESS_TOKEN: ${{ secrets.SCL_GITHUB_ACCESS_TOKEN }} - SCL_NUGET_ORG_FEED_API_KEY: ${{ secrets.NUGET_ORG_FEED_API_KEY }} SCL_AZURE_ARTIFACTS_API_KEY: ${{ secrets.SCL_AZURE_ARTIFACTS_API_KEY }} SCL_GITHUB_NUGET_FEED_USERNAME: ${{ secrets.SCL_GITHUB_NUGET_FEED_USERNAME }}