From 6ed9d9edc21526ce7575ae3128cc881c85100f18 Mon Sep 17 00:00:00 2001 From: vnugent Date: Sun, 10 Mar 2024 21:58:28 -0400 Subject: source tree project location updated --- .../src/VNLib.Plugins.Essentials.Oauth.csproj | 6 ++--- Module.Taskfile.yaml | 26 +++++++++------------- .../src/OAuth2ClientApplications.csproj | 6 ++--- Taskfile.yaml | 9 +++----- 4 files changed, 20 insertions(+), 27 deletions(-) diff --git a/Libs/VNLib.Plugins.Essentials.Oauth/src/VNLib.Plugins.Essentials.Oauth.csproj b/Libs/VNLib.Plugins.Essentials.Oauth/src/VNLib.Plugins.Essentials.Oauth.csproj index 94a088e..b756f36 100644 --- a/Libs/VNLib.Plugins.Essentials.Oauth/src/VNLib.Plugins.Essentials.Oauth.csproj +++ b/Libs/VNLib.Plugins.Essentials.Oauth/src/VNLib.Plugins.Essentials.Oauth.csproj @@ -50,9 +50,9 @@ - - - + + + diff --git a/Module.Taskfile.yaml b/Module.Taskfile.yaml index 378faca..d248921 100644 --- a/Module.Taskfile.yaml +++ b/Module.Taskfile.yaml @@ -17,13 +17,13 @@ vars: tasks: -#called by build pipeline to sync repo + #called by build pipeline to sync repo update: cmds: - - git remote update - - git reset --hard + - git reset --hard #clean up any local changes + - git remote update - git pull origin {{.BRANCH_NAME}} --verify-signatures - #re-write semver after hard reset so build still works properly + #re-write semver after hard reset - dotnet-gitversion.exe /updateprojectfiles #called by build pipeline to build module @@ -35,25 +35,21 @@ tasks: - task: build_debug - task: build_release - postbuild_success: + publish: cmds: + #git archive in the module directory + - git archive --format {{.ARCHIVE_FILE_FORMAT}} --output {{.ARCHIVE_FILE_NAME}} HEAD #push packages to the sleet feed (feed path is vnbuild global) - sleet push "{{.PACK_OUT}}/debug/" --source debug --config "{{.SLEET_CONFIG_PATH}}" --force - sleet push "{{.PACK_OUT}}/release/" --source release --config "{{.SLEET_CONFIG_PATH}}" --force - #git archive in the module directory - - git archive --format {{.ARCHIVE_FILE_FORMAT}} --output {{.ARCHIVE_FILE_NAME}} HEAD - - postbuild_failed: - cmds: - - echo "postbuild failed {{.MODULE_NAME}}" - #called by build pipeline to clean module clean: cmds: - #clean solution - - dotnet clean /p:BuildInParallel=true /p:MultiProcessorCompilation=true - + #clean solution + - dotnet clean /p:BuildInParallel=true /p:MultiProcessorCompilation=true + - cmd: powershell -Command "rm {{ .ARCHIVE_FILE_NAME }} --Force" + ignore_error: true #Internal tasks build_debug: diff --git a/Plugins/OAuth2ClientApplications/src/OAuth2ClientApplications.csproj b/Plugins/OAuth2ClientApplications/src/OAuth2ClientApplications.csproj index 7ade7cc..80f1e48 100644 --- a/Plugins/OAuth2ClientApplications/src/OAuth2ClientApplications.csproj +++ b/Plugins/OAuth2ClientApplications/src/OAuth2ClientApplications.csproj @@ -52,9 +52,9 @@ - - - + + + diff --git a/Taskfile.yaml b/Taskfile.yaml index fb902aa..2857d21 100644 --- a/Taskfile.yaml +++ b/Taskfile.yaml @@ -12,7 +12,6 @@ version: '3' vars: TARGET: '{{.USER_WORKING_DIR}}/bin' RELEASE_DIR: "./bin/release/{{.TARGET_FRAMEWORK}}/publish" - SOURCE_OUT: "{{.USER_WORKING_DIR}}/bin/source" tasks: @@ -37,8 +36,7 @@ tasks: postbuild_failed: dir: '{{.USER_WORKING_DIR}}' - cmds: - - echo "postbuild failed {{.PROJECT_NAME}}" + cmds: [] postbuild: @@ -49,7 +47,6 @@ tasks: BUILD_OUT: "{{.USER_WORKING_DIR}}/bin/{{.BUILD_MODE}}/{{.TARGET_FRAMEWORK}}/publish" cmds: - #copy license and readme to target - cd .. && powershell -Command "Copy-Item -Path ./build.readme.md -Destination '{{.BUILD_OUT}}/readme.md'" @@ -69,5 +66,5 @@ tasks: dir: '{{.USER_WORKING_DIR}}' ignore_error: true cmds: - - cmd: powershell Remove-Item -Recurse './bin' - - cmd: powershell Remove-Item -Recurse './obj' + - for: ['bin/', 'obj/'] + cmd: powershell Remove-Item -Recurse '{{.ITEM}}' -- cgit