source tree project location updated

4 files changed, 23 insertions, 30 deletions

diff --git a/Module.Taskfile.yaml b/Module.Taskfile.yaml
index 378faca..0d4cd95 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,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 bb95e21..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'"
 
@@ -67,8 +64,7 @@ tasks:
 #Remove the output dirs on clean
   clean:
     dir: '{{.USER_WORKING_DIR}}'
+    ignore_error: true
     cmds:
-     - cmd: powershell Remove-Item -Recurse './bin'
-       ignore_error: true
-     - cmd: powershell Remove-Item -Recurse './obj'
-       ignore_error: true
+     - for: ['bin/', 'obj/']
+       cmd: powershell Remove-Item -Recurse '{{.ITEM}}'
diff --git a/lib/Emails.Transactional.Client/src/Emails.Transactional.Client.csproj b/lib/Emails.Transactional.Client/src/Emails.Transactional.Client.csproj
index cb0edcf..dc53162 100644
--- a/lib/Emails.Transactional.Client/src/Emails.Transactional.Client.csproj
+++ b/lib/Emails.Transactional.Client/src/Emails.Transactional.Client.csproj
@@ -57,8 +57,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\core\lib\Net.Rest.Client\src\VNLib.Net.Rest.Client.csproj" />
-    <ProjectReference Include="..\..\..\..\Extensions\lib\VNLib.Plugins.Extensions.Loading\src\VNLib.Plugins.Extensions.Loading.csproj" />
+    <ProjectReference Include="..\..\..\..\core\lib\Net.Rest.Client\src\VNLib.Net.Rest.Client.csproj" />
+    <ProjectReference Include="..\..\..\..\VNLib.Plugins.Extensions\lib\VNLib.Plugins.Extensions.Loading\src\VNLib.Plugins.Extensions.Loading.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/lib/Emails.Transactional.Plugin/src/Emails.Transactional.csproj b/lib/Emails.Transactional.Plugin/src/Emails.Transactional.csproj
index e1433fc..6ef0b9a 100644
--- a/lib/Emails.Transactional.Plugin/src/Emails.Transactional.csproj
+++ b/lib/Emails.Transactional.Plugin/src/Emails.Transactional.csproj
@@ -52,12 +52,12 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\core\lib\Net.Rest.Client\src\VNLib.Net.Rest.Client.csproj" />
-    <ProjectReference Include="..\..\..\..\..\core\lib\Plugins.Essentials\src\VNLib.Plugins.Essentials.csproj" />
-    <ProjectReference Include="..\..\..\..\Extensions\lib\VNLib.Plugins.Extensions.Data\src\VNLib.Plugins.Extensions.Data.csproj" />
-    <ProjectReference Include="..\..\..\..\Extensions\lib\VNLib.Plugins.Extensions.Loading.Sql\src\VNLib.Plugins.Extensions.Loading.Sql.csproj" />
-    <ProjectReference Include="..\..\..\..\Extensions\lib\VNLib.Plugins.Extensions.Loading\src\VNLib.Plugins.Extensions.Loading.csproj" />
-    <ProjectReference Include="..\..\..\..\Extensions\lib\VNLib.Plugins.Extensions.Validation\src\VNLib.Plugins.Extensions.Validation.csproj" />
+    <ProjectReference Include="..\..\..\..\core\lib\Net.Rest.Client\src\VNLib.Net.Rest.Client.csproj" />
+    <ProjectReference Include="..\..\..\..\core\lib\Plugins.Essentials\src\VNLib.Plugins.Essentials.csproj" />
+    <ProjectReference Include="..\..\..\..\VNLib.Plugins.Extensions\lib\VNLib.Plugins.Extensions.Data\src\VNLib.Plugins.Extensions.Data.csproj" />
+    <ProjectReference Include="..\..\..\..\VNLib.Plugins.Extensions\lib\VNLib.Plugins.Extensions.Loading.Sql\src\VNLib.Plugins.Extensions.Loading.Sql.csproj" />
+    <ProjectReference Include="..\..\..\..\VNLib.Plugins.Extensions\lib\VNLib.Plugins.Extensions.Loading\src\VNLib.Plugins.Extensions.Loading.csproj" />
+    <ProjectReference Include="..\..\..\..\VNLib.Plugins.Extensions\lib\VNLib.Plugins.Extensions.Validation\src\VNLib.Plugins.Extensions.Validation.csproj" />
   </ItemGroup>
 
   <Target Condition="'$(BuildingInsideVisualStudio)' == true" Name="PostBuild" AfterTargets="PostBuildEvent">