From 9983582db08d3e6c456295ea96e482cbb4f31f42 Mon Sep 17 00:00:00 2001 From: vnugent Date: Sun, 10 Mar 2024 21:58:28 -0400 Subject: source tree project location updated --- Module.Taskfile.yaml | 24 ++++++++++------------ Taskfile.yaml | 13 +++++------- .../src/VNLib.Data.Caching.Extensions.csproj | 8 ++++---- .../src/VNLib.Data.Caching.csproj | 2 +- .../src/VNLib.Plugins.Extensions.VNCache.csproj | 2 +- .../ObjectCacheServer/src/ObjectCacheServer.csproj | 4 ++-- .../src/VNLib.Data.Caching.Providers.Redis.csproj | 2 +- .../VNLib.Data.Caching.Providers.VNCache.csproj | 2 +- 8 files changed, 26 insertions(+), 31 deletions(-) diff --git a/Module.Taskfile.yaml b/Module.Taskfile.yaml index e36c517..0d4cd95 100644 --- a/Module.Taskfile.yaml +++ b/Module.Taskfile.yaml @@ -16,13 +16,14 @@ vars: PACK_OUT: '{{.OUTPUT_DIR}}/{{.HEAD_SHA}}/pkg' tasks: + #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 @@ -34,24 +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 diff --git a/Taskfile.yaml b/Taskfile.yaml index 48aef59..0b441a3 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,9 +36,7 @@ tasks: postbuild_failed: dir: '{{.USER_WORKING_DIR}}' - cmds: - - echo "postbuild failed {{.PROJECT_NAME}}" - + cmds: [] postbuild: dir: '{{.USER_WORKING_DIR}}' @@ -48,8 +45,7 @@ tasks: #the build output directory BUILD_OUT: "{{.USER_WORKING_DIR}}/bin/{{.BUILD_MODE}}/{{.TARGET_FRAMEWORK}}/publish" - cmds: - + cmds: #copy license and readme to target - cd .. && powershell -Command "Copy-Item -Path ./build.readme.md -Destination '{{.BUILD_OUT}}/readme.md'" @@ -67,7 +63,8 @@ tasks: #Remove the output dirs on clean clean: dir: '{{.USER_WORKING_DIR}}' + ignore_error: true cmds: - - for: ['./bin', './obj'] + - for: ['bin/', 'obj/'] cmd: powershell Remove-Item -Recurse '{{.ITEM}}' - ignore_error: true + diff --git a/lib/VNLib.Data.Caching.Extensions/src/VNLib.Data.Caching.Extensions.csproj b/lib/VNLib.Data.Caching.Extensions/src/VNLib.Data.Caching.Extensions.csproj index 99879c4..87772ab 100644 --- a/lib/VNLib.Data.Caching.Extensions/src/VNLib.Data.Caching.Extensions.csproj +++ b/lib/VNLib.Data.Caching.Extensions/src/VNLib.Data.Caching.Extensions.csproj @@ -47,10 +47,10 @@ - - - - + + + + diff --git a/lib/VNLib.Data.Caching/src/VNLib.Data.Caching.csproj b/lib/VNLib.Data.Caching/src/VNLib.Data.Caching.csproj index d906985..3208d12 100644 --- a/lib/VNLib.Data.Caching/src/VNLib.Data.Caching.csproj +++ b/lib/VNLib.Data.Caching/src/VNLib.Data.Caching.csproj @@ -47,7 +47,7 @@ - + diff --git a/lib/VNLib.Plugins.Extensions.VNCache/src/VNLib.Plugins.Extensions.VNCache.csproj b/lib/VNLib.Plugins.Extensions.VNCache/src/VNLib.Plugins.Extensions.VNCache.csproj index 37b292f..4d1827e 100644 --- a/lib/VNLib.Plugins.Extensions.VNCache/src/VNLib.Plugins.Extensions.VNCache.csproj +++ b/lib/VNLib.Plugins.Extensions.VNCache/src/VNLib.Plugins.Extensions.VNCache.csproj @@ -36,7 +36,7 @@ - + diff --git a/plugins/ObjectCacheServer/src/ObjectCacheServer.csproj b/plugins/ObjectCacheServer/src/ObjectCacheServer.csproj index c903511..009e905 100644 --- a/plugins/ObjectCacheServer/src/ObjectCacheServer.csproj +++ b/plugins/ObjectCacheServer/src/ObjectCacheServer.csproj @@ -48,8 +48,8 @@ - - + + diff --git a/plugins/VNLib.Data.Caching.Providers.Redis/src/VNLib.Data.Caching.Providers.Redis.csproj b/plugins/VNLib.Data.Caching.Providers.Redis/src/VNLib.Data.Caching.Providers.Redis.csproj index c6da1e6..ac5fb63 100644 --- a/plugins/VNLib.Data.Caching.Providers.Redis/src/VNLib.Data.Caching.Providers.Redis.csproj +++ b/plugins/VNLib.Data.Caching.Providers.Redis/src/VNLib.Data.Caching.Providers.Redis.csproj @@ -43,7 +43,7 @@ - + diff --git a/plugins/VNLib.Data.Caching.Providers.VNCache/src/VNLib.Data.Caching.Providers.VNCache.csproj b/plugins/VNLib.Data.Caching.Providers.VNCache/src/VNLib.Data.Caching.Providers.VNCache.csproj index 99a5962..ded805a 100644 --- a/plugins/VNLib.Data.Caching.Providers.VNCache/src/VNLib.Data.Caching.Providers.VNCache.csproj +++ b/plugins/VNLib.Data.Caching.Providers.VNCache/src/VNLib.Data.Caching.Providers.VNCache.csproj @@ -39,7 +39,7 @@ - + -- cgit