package updates & social auth setup

4 files changed, 11 insertions, 25 deletions

diff --git a/ci/config/config.json b/ci/config/config.json
index ac83b0c..b410399 100644
--- a/ci/config/config.json
+++ b/ci/config/config.json
@@ -124,7 +124,8 @@
     //Hot-reload creates collectable assemblies that allow full re-load support in the host application, should only be used for development purposes!
     "hot_reload": false,
     "reload_delay_sec": 2,
-    "path": "plugins"
+    "path": "plugins",
+    "config_dir": "config"
   },
 
   "disabled sys_log": {
diff --git a/ci/package.json b/ci/package.json
index d899975..890b03d 100644
--- a/ci/package.json
+++ b/ci/package.json
@@ -1,10 +1,10 @@
 {
-  "name": "Full-Package",
+  "name": "CMNext",
   "version": "0.1.0",
   "type": "module",
-  "copyright": "Copyright \u00A9 2023 Vaughn Nugent",
+  "copyright": "Copyright \u00A9 2024 Vaughn Nugent",
   "author": "Vaughn Nugent",
-  "description": "The project contains a ready-to-run, CMNext admin server installation for Windows, Linux, and MacOS for .NET/6.0 Runtime.",
+  "description": "The project contains a ready-to-run, CMNext admin server installation for Windows, Linux, and MacOS for .NET/8.0 Runtime.",
   "repository": "https://github.com/VnUgE/CMNext/tree/master/ci",
   "output_dir": "bin"
 }
\ No newline at end of file
diff --git a/ci/plugins.taskfile.yaml b/ci/plugins.taskfile.yaml
index de62e00..4ff46d9 100644
--- a/ci/plugins.taskfile.yaml
+++ b/ci/plugins.taskfile.yaml
@@ -29,16 +29,13 @@ tasks:
     #move dist files to web root
     - powershell -Command "cp -Recurse -Force ../front-end/dist {{.USER_WORKING_DIR}}"
     #move the plugin output
-    - powershell -Command "cp -Recurse -Force ../back-end/src/bin/release/net6.0/publish/* ./plugins/CMNext"
-    #move cmnext config file
-    - powershell -Command "cp -Force config/CMNext.json ./plugins/CMNext/CMNext.json"
+    - powershell -Command "cp -Recurse -Force ../back-end/src/bin/release/net8.0/publish/* ./plugins/CMNext"
 
   install-accounts:
     cmds:
     #install accounts plugin
     - task: install-plugin
       vars:
-        NAME: 'Essentials.Accounts'
         PROJECT_NAME: 'VNLib.Plugins.Essentials.Accounts'
         MODULE_NAME: "Plugins.Essentials"
         FILE_NAME: "release.tgz"
@@ -49,7 +46,6 @@ tasks:
     #install router plugin
     - task: install-plugin
       vars:
-        NAME: 'PageRouter'
         PROJECT_NAME: 'VNLib.Plugins.Essentials.Content.Routing'
         MODULE_NAME: "Plugins.Essentials"
         FILE_NAME: "release.tgz"
@@ -60,7 +56,6 @@ tasks:
     #install sessions plugin
     - task: install-plugin
       vars:
-        NAME: 'SessionProvider'
         PROJECT_NAME: 'SessionProvider'
         MODULE_NAME: "VNLib.Plugins.Sessions"
         FILE_NAME: "release.tgz"
@@ -71,21 +66,16 @@ tasks:
     #install users plugin
     - task: install-plugin
       vars:
-        NAME: 'VNLib.Plugins.Essentials.Users'
         PROJECT_NAME: 'VNLib.Plugins.Essentials.Users'
         MODULE_NAME: "VNLib.Plugins.Essentials.Users"
         FILE_NAME: "release.tgz"
         DIR: './plugins/assets/VNLib.Plugins.Essentials.Users'
 
-    #move routes xml files
-    - cmd: powershell -Command "cp -Force config/routes.xml ./plugins/routes.xml"
-
   install-vncache:
     cmds:
     #install vncache global cache provider plugin
     - task: install-plugin
       vars:
-        NAME: 'VNLib.Data.Caching.Providers.VNCache'
         PROJECT_NAME: 'VNLib.Data.Caching.Providers.VNCache'
         MODULE_NAME: "VNLib.Data.Caching"
         FILE_NAME: "release.tgz"
@@ -96,7 +86,6 @@ tasks:
     #install vncache-web-sessions plugin
     - task: install-plugin
       vars:
-        NAME: 'VNLib.Plugins.Sessions.VNCache'
         PROJECT_NAME: 'VNLib.Plugins.Sessions.VNCache'
         MODULE_NAME: "VNLib.Plugins.Sessions"
         FILE_NAME: "release.tgz"
@@ -107,7 +96,6 @@ tasks:
     #install the argon2 binary for Windows
     - task: install-plugin
       vars:
-        NAME: 'argon2'
         PROJECT_NAME: 'phc-winner-argon2'
         MODULE_NAME: "VNLib.Core"
         FILE_NAME: "win-x64-release-Argon2.tgz"
@@ -116,7 +104,6 @@ tasks:
     #install the argon2 source code package for Linux and Mac
     - task: install-plugin
       vars:
-        NAME: 'argon2'
         PROJECT_NAME: 'phc-winner-argon2'
         MODULE_NAME: "VNLib.Core"
         FILE_NAME: "src.tgz"
@@ -142,7 +129,4 @@ tasks:
     - cd {{.DIR}} && powershell "{{.USER_WORKING_DIR}}/install.ps1" -BaseUrl {{.BUILDS_URL}} -ModuleName {{.MODULE_NAME}} -ProjectName {{.PROJECT_NAME}} -FileName {{.FILE_NAME}}
     - cd {{.DIR}} && tar -xzf {{.FILE_NAME}} 
     #remove the archive file 
-    - cd {{.DIR}} && powershell -Command "rm {{.FILE_NAME}}"
-    #copy config file from config dir
-    - cmd: powershell -Command "cp -Force ./config/{{.NAME}}.json {{.DIR}}/{{.NAME}}.json"
-      ignore_error: true
\ No newline at end of file
+    - cd {{.DIR}} && powershell -Command "rm {{.FILE_NAME}}"
\ No newline at end of file
diff --git a/ci/taskfile.yaml b/ci/taskfile.yaml
index 10cadc7..db3da7b 100644
--- a/ci/taskfile.yaml
+++ b/ci/taskfile.yaml
@@ -78,12 +78,14 @@ tasks:
 
     #copy libraries
     - cmd: powershell -Command "cp -Recurse -Force lib {{.BUILD_DIR}}"
+
+    #copy config
+    - cmd: powershell -Command "cp -Recurse -Force config {{.BUILD_DIR}}"
     
     - task: get-webserver
       vars:
         TARGET_OS: '{{.TARGET_OS}}'
         BUILD_DIR: '{{.BUILD_DIR}}'
-  
 
   get-webserver:
     internal: true
@@ -91,7 +93,6 @@ tasks:
     #install accounts plugin
     - task: install
       vars:
-        NAME: 'webserver'
         PROJECT_NAME: 'VNLib.Webserver'
         MODULE_NAME: "VNLib.Webserver"
         FILE_NAME: "{{.TARGET_OS}}-release.tgz"
@@ -108,7 +109,7 @@ tasks:
     - cmd: powershell -Command "mkdir {{.DIR}} -Force"
       ignore_error: true
     - cd {{.DIR}} && powershell "{{.USER_WORKING_DIR}}/install.ps1" -BaseUrl {{.BUILDS_URL}} -ModuleName {{.MODULE_NAME}} -ProjectName {{.PROJECT_NAME}} -FileName {{.FILE_NAME}}
-    - cd {{.DIR}} && tar -xzf {{.FILE_NAME}}    
+    - cd {{.DIR}} && tar -xzf {{.FILE_NAME}}
     #remove the tar file
     - cd {{.DIR}} && powershell -Command "rm {{.FILE_NAME}}"