Fixed issues with CI pipeline

.devcontainer/Dockerfile

@@ -1,16 +1,8 @@
-FROM mcr.microsoft.com/devcontainers/miniconda:1-3
-
-# Copy environment.yml (if found) to a temp location so we update the environment. Also
-# copy "noop.txt" so the COPY instruction does not fail if no environment.yml exists.
-COPY environment.yml* noop.txt /tmp/conda-tmp/
-RUN if [ -f "/tmp/conda-tmp/environment.yml" ]; then umask 0002 && /opt/conda/bin/conda env update -n base -f /tmp/conda-tmp/environment.yml; fi \
-    && rm -rf /tmp/conda-tmp
-
-# [Optional] Uncomment to install a different version of Python than the default
-# RUN conda install -y python=3.6 \
-#     && pip install --no-cache-dir pipx \
-#     && pipx reinstall-all
+FROM mcr.microsoft.com/devcontainers/dotnet:1-9.0-bookworm
 
 # [Optional] Uncomment this section to install additional OS packages.
 # RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
 #     && apt-get -y install --no-install-recommends <your-package-list-here>
+
+# [Optional] Uncomment this line to install global node packages.
+# RUN su vscode -c "source /usr/local/share/nvm/nvm.sh && npm install -g <your-package-here>" 2>&1

.devcontainer/devcontainer.json

@@ -1,21 +1,32 @@
 // For format details, see https://aka.ms/devcontainer.json. For config options, see the
-// README at: https://github.com/devcontainers/templates/tree/main/src/debian
+// README at: https://github.com/devcontainers/templates/tree/main/src/dotnet-postgres
 {
-	"name": "Debian",
-	// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
-	"build": {
-		"dockerfile": "Dockerfile"
+    "name": "C# (.NET) and PostgreSQL",
+    "dockerComposeFile": "docker-compose.yml",
+    "service": "app",
+	"workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}",
+	"features": {
+		"ghcr.io/devcontainers/features/node:1": {},
+		"ghcr.io/devcontainers/features/python:1": {}
 	}
 
 	// Features to add to the dev container. More info: https://containers.dev/features.
 	// "features": {},
 
-	// Use 'forwardPorts' to make a list of ports inside the container available locally.
-	// "forwardPorts": [],
-
 	// Configure tool-specific properties.
 	// "customizations": {},
 
+	// Use 'forwardPorts' to make a list of ports inside the container available locally.
+	// "forwardPorts": [5000, 5001, 5432],
+	// "portsAttributes": {
+	//		"5001": {
+	//			"protocol": "https"
+	//		}
+	// }
+
+    // Use 'postCreateCommand' to run commands after the container is created.
+    // "postCreateCommand": "dotnet --info",
+
 	// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
 	// "remoteUser": "root"
 }

.devcontainer/docker-compose.yml

@@ -0,0 +1,38 @@
+version: '3.8'
+
+services:
+  app:
+    build:
+      context: .
+      dockerfile: Dockerfile
+
+    volumes:
+      - ../..:/workspaces:cached
+
+    # Overrides default command so things don't shut down after the process ends.
+    command: sleep infinity
+
+    # Runs app on the same network as the database container, allows "forwardPorts" in devcontainer.json function.
+    network_mode: service:db
+    
+    # Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
+    # user: root
+
+    # Use "forwardPorts" in **devcontainer.json** to forward an app port locally. 
+    # (Adding the "ports" property to this file will not forward from a Codespace.)
+
+  db:
+    image: postgres:14.3
+    restart: unless-stopped
+    volumes:
+      - postgres-data:/var/lib/postgresql/data
+    environment:
+      POSTGRES_PASSWORD: postgres
+      POSTGRES_USER: postgres
+      POSTGRES_DB: postgres
+      
+    # Add "forwardPorts": ["5432"] to **devcontainer.json** to forward PostgreSQL locally.
+    # (Adding the "ports" property to this file will not forward from a Codespace.)
+
+volumes:
+  postgres-data:

.vscode/settings.json

@@ -1,6 +0,0 @@
-{
-    "dotnet.dotnetPath": "/opt/conda/lib/dotnet/",
-    "omnisharp.dotNetCliPaths": [
-        "/opt/conda/lib/dotnet/dotnet"
-    ]
-}

Jenkinsfile

@@ -1,60 +1,54 @@
 pipeline {
-    agent {
-        kubernetes {
-            cloud 'Reslate Systems'
-            defaultContainer 'conda'
-        }
+agent {
+  kubernetes {
+    cloud 'rsys-devel'
+    defaultContainer 'homebrew'
+    inheritFrom 'homebrew'
+  }
+}
+    environment {
+        DOTNET_SYSTEM_GLOBALIZATION_INVARIANT = "1" // TODO Should probably remove this 
     }
-
     stages {
         stage("Install") {
             steps {
-                sh 'conda update conda -y'
-                sh 'conda env update -n base --file .devcontainer/environment.yml'
-                sh 'conda run -n base dotnet restore props.sln'
+                sh 'brew install dotnet@8 node zip'
                 sh 'npm install --prefix ./Props'
             }
         }
-        stage("Props.Shop") {
-            stages {
-                stage("Test") {
-                    steps {
-                        sh returnStatus: true, script: 'conda run -n base dotnet test --logger xunit --no-restore Props.Shop/**/*.Tests.csproj'
-                        xunit([xUnitDotNet(excludesPattern: '', pattern: 'Props.Shop/*.Tests/TestResults/*.xml', stopProcessingIfError: true)])
-                    }
-                }
-                stage("Publish") {
-                    steps {
-                        sh '''#!/bin/bash
-                        for file in Props.Shop/**/*.csproj
-                        do
-                            conda run -n base dotnet publish --configuration Release --output output/shop-modules $file
-                        done
-                        '''
-                        fingerprint 'output/shop-modules/**/Props.Shop.*'
-                        sh 'mkdir -p ./Props/shops/'
-                        sh 'cp ./output/shop-modules/*.dll ./output/shop-modules/*.deps.json ./Props/shops/.'
-                    }
-                }
+        stage("Test Props.Shop") {
+            steps {
+                sh returnStatus: true, script: 'dotnet test --logger xunit Props.Shop/**/*.Tests.csproj'
+                xunit([xUnitDotNet(excludesPattern: '', pattern: 'Props.Shop/*.Tests/TestResults/*.xml', stopProcessingIfError: true)])
             }
         }
-        stage("Props") {
-            stages {
-                stage("Test") {
-                    steps {
-                        sh returnStatus: true, script: 'conda run -n base dotnet test --logger xunit --no-restore Props.Tests/Props.Tests.csproj'
-                        xunit([xUnitDotNet(excludesPattern: '', pattern: 'Props.Tests/TestResults/*.xml', stopProcessingIfError: true)])
-                    }
-                }
-                stage("Publish") {
-                    steps {
-                        sh 'conda run -n base dotnet publish --configuration Release --output output/props/props-linux-x64 --runtime linux-x64 --self-contained Props'
-                        sh 'conda run -n base dotnet publish --configuration Release --output output/props/props-win-x64 --runtime win-x64 --self-contained Props'
-                        fingerprint 'output/props/**/Props*'
-                        tar file: "output/props-linux-x64.tar.gz", archive: true, compress: true, dir: "output/props/props-linux-x64"
-                        zip zipFile: "output/props-win-x64.zip", archive: true, dir: "output/props/props-win-x64"
-                    }
-                }
+        stage("Publish Props.Shop") {
+            steps {
+                sh '''#!/bin/bash
+                for file in Props.Shop/**/*.csproj
+                do
+                    dotnet publish --configuration Release --output output/shop-modules $file
+                done
+                '''
+                fingerprint 'output/shop-modules/**/Props.Shop.*'
+                sh 'mkdir -p ./Props/shops/'
+                sh 'cp ./output/shop-modules/*.dll ./output/shop-modules/*.deps.json ./Props/shops/.'
+            }
+        }
+        stage("Test Props") {
+            steps {
+                sh returnStatus: true, script: 'dotnet test --logger xunit Props.Tests/Props.Tests.csproj'
+                xunit([xUnitDotNet(excludesPattern: '', pattern: 'Props.Tests/TestResults/*.xml', stopProcessingIfError: true)])
+            }
+        }
+        stage("Publish Props") {
+            steps {
+                sh 'dotnet publish --configuration Release --output output/props/props-linux-x64 --runtime linux-x64 --self-contained Props'
+                sh 'dotnet publish --configuration Release --output output/props/props-win-x64 --runtime win-x64 --self-contained Props'
+                fingerprint 'output/props/**/Props*'
+                sh 'tar -czf output/props-linux-x64.tar.gz output/props/props-linux-x64'
+                sh 'zip -r output/props-win-x64.zip output/props/props-win-x64'
+                archiveArtifacts artifacts: 'output/*.tar.gz,output/*.zip', followSymlinks: false
             }
         }
     }

Props/package.json

@@ -10,30 +10,30 @@
   "author": "",
   "license": "ISC",
   "devDependencies": {
-    "@babel/core": "^7.14.8",
-    "@babel/eslint-parser": "^7.14.7",
-    "@babel/plugin-transform-runtime": "^7.14.5",
-    "@babel/preset-env": "^7.14.8",
-    "babel-loader": "^8.2.2",
-    "copy-webpack-plugin": "^9.0.1",
-    "css-loader": "^6.2.0",
-    "eslint": "^7.31.0",
-    "glob": "^7.1.7",
-    "sass": "^1.35.2",
-    "sass-loader": "^12.1.0",
-    "style-loader": "^3.2.1",
-    "webpack": "^5.65.0",
-    "webpack-cli": "^4.9.1",
-    "webpack-merge": "^5.8.0"
+    "@babel/core": "^7.24.9",
+    "@babel/eslint-parser": "^7.24.8",
+    "@babel/plugin-transform-runtime": "^7.24.7",
+    "@babel/preset-env": "^7.24.8",
+    "babel-loader": "^9.1.3",
+    "copy-webpack-plugin": "^12.0.2",
+    "css-loader": "^7.1.2",
+    "eslint": "^9.7.0",
+    "glob": "^11.0.0",
+    "sass": "^1.77.8",
+    "sass-loader": "^14.2.1",
+    "style-loader": "^4.0.0",
+    "webpack": "^5.93.0",
+    "webpack-cli": "^5.1.4",
+    "webpack-merge": "^6.0.1"
   },
   "dependencies": {
-    "@babel/runtime": "^7.14.8",
-    "alpinejs": "^3.2.2",
-    "axios": "^0.21.1",
-    "bootstrap": "^5.0.2",
-    "bootstrap-icons": "^1.5.0",
-    "just-clone": "^3.2.1",
-    "on-change": "^3.0.2",
-    "simplebar": "^5.3.5"
+    "@babel/runtime": "^7.24.8",
+    "alpinejs": "^3.14.1",
+    "axios": "^1.7.2",
+    "bootstrap": "^5.3.3",
+    "bootstrap-icons": "^1.11.3",
+    "just-clone": "^6.2.0",
+    "on-change": "^5.0.1",
+    "simplebar": "^6.2.7"
   }
 }

environment.yml

@@ -4,3 +4,6 @@ channels:
 dependencies:
   - dotnet-sdk=8
   - nodejs=20
+  - icu
+  - tar
+  - zip