Merge pull request #126 from cesmii/main

Main -> CO5/Develop

Author: scoxen1

.github/workflows/backend-publish-azure.yml

@@ -42,14 +42,14 @@ env:
 
 jobs:
   build:
-    name: Build and Deploy .NET5 Web API
+    name: Build and Deploy .NET6 Web API
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: true
       - name: Set up dotnet Core ${{ env.NETCORE_VERSION }}
-        uses: actions/setup-dotnet@v1
+        uses: actions/setup-dotnet@v4
         with:
           dotnet-version: ${{ env.NETCORE_VERSION }}
       - name: Restore dependencies (${{env.SOLUTION_FILE}})

.github/workflows/backend-publish-stage-azure.yml

@@ -25,6 +25,7 @@ on:
     branches:
       - develop
       - CO5/Develop
+      - PLY/Develop
 
 env:
   # set this to your application's name
@@ -47,11 +48,11 @@ jobs:
     name: Build and Deploy .NET6 Web API
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: true
       - name: Set up dotnet Core ${{ env.NETCORE_VERSION }}
-        uses: actions/setup-dotnet@v1
+        uses: actions/setup-dotnet@v4
         with:
           dotnet-version: ${{ env.NETCORE_VERSION }}
       - name: Restore dependencies (${{env.SOLUTION_FILE}})

.github/workflows/frontend-publish-azure.yml

@@ -38,9 +38,9 @@ jobs:
     name: 'Job: Build and Deploy React frontend'
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Use Node.js ${{ env.NODE_VERSION }}
-      uses: actions/setup-node@v1
+      uses: actions/setup-node@v4
       with:
         node-version: ${{ env.NODE_VERSION }}
     - name: 'Build React Code - npm install, build'

.github/workflows/frontend-publish-stage-azure.yml

@@ -25,6 +25,7 @@ on:
     branches:
       - develop
       - CO5/Develop
+      - PLY/Develop
 
 env:
   # set this to your application's name
@@ -40,9 +41,9 @@ jobs:
     name: 'Job: Build and Deploy React frontend'
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Use Node.js ${{ env.NODE_VERSION }}
-      uses: actions/setup-node@v1
+      uses: actions/setup-node@v4
       with:
         node-version: ${{ env.NODE_VERSION }}
     - name: 'Build React Code - npm install, build'

.github/workflows/sonar-cloud-scan-stage.yml

@@ -11,6 +11,7 @@ on:
     branches:
       - develop
       - CO5/Develop
+      - PLY/Develop
 
 env:
   # set this to the organization name, project key in Sonar
@@ -45,20 +46,20 @@ jobs:
     steps:
       #Set up Java which is needed for SonarScan post processing step
       - name: Setup Java JDK
-        uses: actions/setup-java@v3.4.0
+        uses: actions/setup-java@v4.2.1
         with:
           distribution: 'microsoft' # See 'Supported distributions' for available options
-          java-version: '11'
+          java-version: '17'
 
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           # Shallow clones should be disabled for a better relevancy of analysis
           fetch-depth: 0
           submodules: true
 
       # Speed-up analysis by caching the scanner workspace
       - name: SonarScan - Cache SonarCloud workspace
-        uses: actions/cache@v1
+        uses: actions/cache@v4
         with:
           path: ~\.sonar\cache
           key: ${{ runner.os }}-sonar-cache
@@ -67,7 +68,7 @@ jobs:
       # Speed-up analysis by caching the scanner installation
       - name: SonarScan - Cache SonarCloud scanner
         id: cache-sonar-scanner
-        uses: actions/cache@v1
+        uses: actions/cache@v4
         with:
           path: ${{env.SONAR_TOOL_PATH}}
           key: ${{ runner.os }}-sonar-scanner

.github/workflows/sonar-cloud-scan.yml

@@ -44,20 +44,20 @@ jobs:
     steps:
       #Set up Java which is needed for SonarScan post processing step
       - name: Setup Java JDK
-        uses: actions/setup-java@v3.4.0
+        uses: actions/setup-java@v4.2.1
         with:
           distribution: 'microsoft' # See 'Supported distributions' for available options
-          java-version: '11'
+          java-version: '17'
 
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
         #  # Shallow clones should be disabled for a better relevancy of analysis
         #  fetch-depth: 0
           submodules: true
 
       # Speed-up analysis by caching the scanner workspace
       - name: SonarScan - Cache SonarCloud workspace
-        uses: actions/cache@v1
+        uses: actions/cache@v4
         with:
           path: ~\.sonar\cache
           key: ${{ runner.os }}-sonar-cache
@@ -66,7 +66,7 @@ jobs:
       # Speed-up analysis by caching the scanner installation
       - name: SonarScan - Cache SonarCloud scanner
         id: cache-sonar-scanner
-        uses: actions/cache@v1
+        uses: actions/cache@v4
         with:
           path: ${{env.SONAR_TOOL_PATH}}
           key: ${{ runner.os }}-sonar-scanner
@@ -85,4 +85,4 @@ jobs:
       - name: Build (${{env.SOLUTION_FILE}})
         run: dotnet build ${{env.SOLUTION_DIRECTORY}}/${{env.SOLUTION_FILE}} --configuration ${{ env.BUILD_CONFIGURATION }} --no-restore
       - name: SonarScan - End (${{env.SONAR_PROJECT_KEY}})
-        run: ${{env.SONAR_TOOL_PATH}}\dotnet-sonarscanner end /d:sonar.login="${{ secrets.SONAR_ACCESS_TOKEN }}"
+        run: ${{env.SONAR_TOOL_PATH}}\dotnet-sonarscanner end /d:sonar.login="${{ secrets.SONAR_ACCESS_TOKEN }}"

.github/workflows/tests-in-browser.yml

@@ -10,11 +10,13 @@ on:
     branches:
       - develop
       - CO5/Develop
+      - PLY/Develop
       - main
   pull_request:
     branches:
       - develop
       - CO5/Develop
+      - PLY/Develop
       - main
 
 env:
@@ -34,11 +36,11 @@ jobs:
     name: Build and Test .NET6 Web API
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: true
       - name: Set up dotnet Core ${{ env.NETCORE_VERSION }}
-        uses: actions/setup-dotnet@v1
+        uses: actions/setup-dotnet@v4
         with:
           dotnet-version: ${{ env.NETCORE_VERSION }}
 

.github/workflows/tests.yml

@@ -2,10 +2,10 @@
 <h2>Prerequisites</h2>
 <ul>
 <li>
-	Install node.js (version > 10.16) - https://nodejs.org/en/
+Install node.js (version > 18.17) - https://nodejs.org/en/
 </li>
 <li>
-	Install npm (version > 5.6) - https://www.npmjs.com/ (note I just upgraded to 7.17 =>  npm install -g npm)
+Install npm (version > 8.5.4) - https://www.npmjs.com/ (npm install -g npm)
 </li>
 <li>
 	React - https://reactjs.org/ - First time React users, install React using create-react-app from a node.js command prompt, a tool that installs all of the dependencies to build and run a full React.js application.

README.md

@@ -646,7 +646,7 @@ public async System.Threading.Tasks.Task<Dictionary<string, ProfileTypeDefinitio
             string exportedNodeSetXml;
             using (MemoryStream ms = new())
             {
-                using (StreamWriter writer = new(ms, Encoding.UTF8))
+                using (StreamWriter writer = new(ms, new UTF8Encoding(false)))
                 {
                     try
                     {