From 278bdf30497dd339c60cabb0ce7a643c429bfcf1 Mon Sep 17 00:00:00 2001
From: Andrii Voznesenskyi <voznesenskijandrej5@gmail.com>
Date: Sun, 22 Sep 2024 03:08:09 +0200
Subject: [PATCH] (#34) paralax: update scripts

---
 scripts/build-and-test.sh                              | 10 +++++-----
 src/Paralax.CQRS.Commands/scripts/build-and-pack.sh    |  2 +-
 .../scripts/test-and-collect-coverage.sh               |  2 +-
 .../scripts/build-and-pack.sh                          |  2 +-
 .../scripts/test-and-collect-coverage.sh               |  4 ++--
 src/Paralax.CQRS.Logging/scripts/build-and-pack.sh     |  2 +-
 .../scripts/test-and-collect-coverage.sh               |  4 ++--
 src/Paralax.CQRS.Queries/scripts/build-and-pack.sh     |  2 +-
 .../scripts/test-and-collect-coverage.sh               |  2 +-
 src/Paralax.HTTP/scripts/build-and-pack.sh             |  2 +-
 src/Paralax.HTTP/scripts/test-and-collect-coverage.sh  |  2 +-
 src/Paralax.Logging/scripts/build-and-pack.sh          | 10 +++++-----
 .../scripts/test-and-collect-coverage.sh               |  2 +-
 src/Paralax.Security/scripts/build-and-pack.sh         | 10 +++++-----
 .../scripts/test-and-collect-coverage.sh               |  2 +-
 src/Paralax/scripts/build-and-pack.sh                  |  2 +-
 src/Paralax/scripts/test-and-collect-coverage.sh       |  2 +-
 17 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/scripts/build-and-test.sh b/scripts/build-and-test.sh
index a2b54a8..015f256 100644
--- a/scripts/build-and-test.sh
+++ b/scripts/build-and-test.sh
@@ -15,19 +15,19 @@ for LIBRARY in $LIBRARIES; do
   echo "Processing $LIBRARY"
 
   # Ensure we are working with valid library paths
-  if [ -d "src/$LIBRARY/src" ]; then
+  if [ -d "src/$LIBRARY/src/$LIBRARY" ]; then
 
     # Either force build/test or run only if changes detected
     if [ "$FORCE_BUILD_TEST" = true ] || [ -n "$(git diff --name-only HEAD~1 HEAD | grep "src/$LIBRARY")" ]; then
       echo "Restoring dependencies for $LIBRARY"
-      dotnet restore "src/$LIBRARY/src"
+      dotnet restore "src/$LIBRARY/src/$LIBRARY"
 
       echo "Building $LIBRARY"
-      dotnet build "src/$LIBRARY/src" --configuration Release --no-restore
+      dotnet build "src/$LIBRARY/src/$LIBRARY" --configuration Release --no-restore
 
-      if [ -d "src/$LIBRARY/tests" ]; then
+      if [ -d "src/$LIBRARY/tests/$LIBRARY.Tests" ]; then
         echo "Running tests for $LIBRARY"
-        dotnet test "src/$LIBRARY/tests" --configuration Release \
+        dotnet test "src/$LIBRARY/tests/$LIBRARY.Tests" --configuration Release \
           --collect:"XPlat Code Coverage" \
           --results-directory "src/$LIBRARY/TestResults/" \
           /p:CollectCoverage=true \
diff --git a/src/Paralax.CQRS.Commands/scripts/build-and-pack.sh b/src/Paralax.CQRS.Commands/scripts/build-and-pack.sh
index e5360a5..7ae483b 100755
--- a/src/Paralax.CQRS.Commands/scripts/build-and-pack.sh
+++ b/src/Paralax.CQRS.Commands/scripts/build-and-pack.sh
@@ -3,7 +3,7 @@
 echo "Executing post-success scripts for branch $GITHUB_REF_NAME"
 echo "Starting build and NuGet package creation for Paralax.CQRS.Commands..."
 
-cd src/Paralax.CQRS.Commands/src
+cd src/Paralax.CQRS.Commands/src/Paralax.CQRS.Commands
 
 echo "Restoring NuGet packages..."
 dotnet restore
diff --git a/src/Paralax.CQRS.Commands/scripts/test-and-collect-coverage.sh b/src/Paralax.CQRS.Commands/scripts/test-and-collect-coverage.sh
index 38119a4..ec46657 100644
--- a/src/Paralax.CQRS.Commands/scripts/test-and-collect-coverage.sh
+++ b/src/Paralax.CQRS.Commands/scripts/test-and-collect-coverage.sh
@@ -2,7 +2,7 @@
 
 echo "Running tests and collecting coverage for Paralax.CQRS.Commands..."
 
-cd src/Paralax.CQRS.Commands/src
+cd src/Paralax.CQRS.Commands/src/Paralax.CQRS.Commands
 
 echo "Restoring NuGet packages..."
 dotnet restore
diff --git a/src/Paralax.CQRS.EventSourcing/scripts/build-and-pack.sh b/src/Paralax.CQRS.EventSourcing/scripts/build-and-pack.sh
index 4b51e53..61e90cc 100755
--- a/src/Paralax.CQRS.EventSourcing/scripts/build-and-pack.sh
+++ b/src/Paralax.CQRS.EventSourcing/scripts/build-and-pack.sh
@@ -3,7 +3,7 @@
 echo "Executing post-success scripts for branch $GITHUB_REF_NAME"
 echo "Starting build and NuGet package creation for Paralax.CQRS.EventSourcing..."
 
-cd src/Paralax.CQRS.EventSourcing/src
+cd src/Paralax.CQRS.EventSourcing/src/Paralax.CQRS.EventSourcing
 
 echo "Restoring NuGet packages..."
 dotnet restore
diff --git a/src/Paralax.CQRS.EventSourcing/scripts/test-and-collect-coverage.sh b/src/Paralax.CQRS.EventSourcing/scripts/test-and-collect-coverage.sh
index 30fa605..6ca1a9d 100644
--- a/src/Paralax.CQRS.EventSourcing/scripts/test-and-collect-coverage.sh
+++ b/src/Paralax.CQRS.EventSourcing/scripts/test-and-collect-coverage.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-echo "Running tests and collecting coverage for Paralax.Security..."
+echo "Running tests and collecting coverage for Paralax.CQRS.EventSourcing..."
 
-cd src/Paralax.Security/src
+cd src/Paralax.CQRS.EventSourcing/src/Paralax.CQRS.EventSourcing
 
 echo "Restoring NuGet packages..."
 dotnet restore
diff --git a/src/Paralax.CQRS.Logging/scripts/build-and-pack.sh b/src/Paralax.CQRS.Logging/scripts/build-and-pack.sh
index f704388..f7177b3 100755
--- a/src/Paralax.CQRS.Logging/scripts/build-and-pack.sh
+++ b/src/Paralax.CQRS.Logging/scripts/build-and-pack.sh
@@ -3,7 +3,7 @@
 echo "Executing post-success scripts for branch $GITHUB_REF_NAME"
 echo "Starting build and NuGet package creation for Paralax.CQRS.Logging..."
 
-cd src/Paralax.CQRS.Logging/src
+cd src/Paralax.CQRS.Logging/src/Paralax.CQRS.Logging
 
 echo "Restoring NuGet packages..."
 dotnet restore
diff --git a/src/Paralax.CQRS.Logging/scripts/test-and-collect-coverage.sh b/src/Paralax.CQRS.Logging/scripts/test-and-collect-coverage.sh
index b202fd6..ce4c6a5 100644
--- a/src/Paralax.CQRS.Logging/scripts/test-and-collect-coverage.sh
+++ b/src/Paralax.CQRS.Logging/scripts/test-and-collect-coverage.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-echo "Running tests and collecting coverage for Paralax.HTTP..."
+echo "Running tests and collecting coverage for Paralax.CQRS.Logging..."
 
-cd src/Paralax.HTTP/src
+cd src/Paralax.CQRS.Logging/src/Paralax.CQRS.Logging
 
 echo "Restoring NuGet packages..."
 dotnet restore
diff --git a/src/Paralax.CQRS.Queries/scripts/build-and-pack.sh b/src/Paralax.CQRS.Queries/scripts/build-and-pack.sh
index 1539b82..351bc10 100755
--- a/src/Paralax.CQRS.Queries/scripts/build-and-pack.sh
+++ b/src/Paralax.CQRS.Queries/scripts/build-and-pack.sh
@@ -3,7 +3,7 @@
 echo "Executing post-success scripts for branch $GITHUB_REF_NAME"
 echo "Starting build and NuGet package creation for Paralax.CQRS.Queries..."
 
-cd src/Paralax.CQRS.Queries/src
+cd src/Paralax.CQRS.Queries/src/Paralax.CQRS.Queries
 
 echo "Restoring NuGet packages..."
 dotnet restore
diff --git a/src/Paralax.CQRS.Queries/scripts/test-and-collect-coverage.sh b/src/Paralax.CQRS.Queries/scripts/test-and-collect-coverage.sh
index fbe5dd3..e5f71bc 100644
--- a/src/Paralax.CQRS.Queries/scripts/test-and-collect-coverage.sh
+++ b/src/Paralax.CQRS.Queries/scripts/test-and-collect-coverage.sh
@@ -2,7 +2,7 @@
 
 echo "Running tests and collecting coverage for Paralax.CQRS.Queries..."
 
-cd src/Paralax.CQRS.Queries/src
+cd src/Paralax.CQRS.Queries/src/Paralax.CQRS.Queries
 
 echo "Restoring NuGet packages..."
 dotnet restore
diff --git a/src/Paralax.HTTP/scripts/build-and-pack.sh b/src/Paralax.HTTP/scripts/build-and-pack.sh
index 2f2b9e5..1e5d562 100755
--- a/src/Paralax.HTTP/scripts/build-and-pack.sh
+++ b/src/Paralax.HTTP/scripts/build-and-pack.sh
@@ -3,7 +3,7 @@
 echo "Executing post-success scripts for branch $GITHUB_REF_NAME"
 echo "Starting build and NuGet package creation for Paralax.HTTP..."
 
-cd src/Paralax.HTTP/src
+cd src/Paralax.HTTP/src/Paralax.HTTP
 
 echo "Restoring NuGet packages..."
 dotnet restore
diff --git a/src/Paralax.HTTP/scripts/test-and-collect-coverage.sh b/src/Paralax.HTTP/scripts/test-and-collect-coverage.sh
index b202fd6..a5edc9a 100644
--- a/src/Paralax.HTTP/scripts/test-and-collect-coverage.sh
+++ b/src/Paralax.HTTP/scripts/test-and-collect-coverage.sh
@@ -2,7 +2,7 @@
 
 echo "Running tests and collecting coverage for Paralax.HTTP..."
 
-cd src/Paralax.HTTP/src
+cd src/Paralax.HTTP/src/Paralax.HTTP
 
 echo "Restoring NuGet packages..."
 dotnet restore
diff --git a/src/Paralax.Logging/scripts/build-and-pack.sh b/src/Paralax.Logging/scripts/build-and-pack.sh
index 7e96e37..1939980 100755
--- a/src/Paralax.Logging/scripts/build-and-pack.sh
+++ b/src/Paralax.Logging/scripts/build-and-pack.sh
@@ -1,18 +1,18 @@
 #!/bin/bash
 
 echo "Executing post-success scripts for branch $GITHUB_REF_NAME"
-echo "Starting build and NuGet package creation for Paralax.Security..."
+echo "Starting build and NuGet package creation for Paralax.Logging..."
 
-cd src/Paralax.Security/src
+cd src/Paralax.Logging/src/Paralax.Logging
 
 echo "Restoring NuGet packages..."
 dotnet restore
 
 PACKAGE_VERSION="1.0.$GITHUB_RUN_NUMBER"
-echo "Building and packing the Paralax.Security library..."
+echo "Building and packing the Paralax.Logging library..."
 dotnet pack -c release /p:PackageVersion=$PACKAGE_VERSION --no-restore -o ./nupkg
 
-PACKAGE_PATH="./nupkg/Paralax.Security.$PACKAGE_VERSION.nupkg"
+PACKAGE_PATH="./nupkg/Paralax.Logging.$PACKAGE_VERSION.nupkg"
 
 if [ -f "$PACKAGE_PATH" ]; then
   echo "Checking if the package is already signed..."
@@ -25,7 +25,7 @@ if [ -f "$PACKAGE_PATH" ]; then
       --timestamper http://timestamp.digicert.com
   fi
 
-  echo "Uploading Paralax.Security package to NuGet..."
+  echo "Uploading Paralax.Logging package to NuGet..."
   dotnet nuget push "$PACKAGE_PATH" -k "$NUGET_API_KEY" \
     -s https://api.nuget.org/v3/index.json --skip-duplicate
   echo "Package uploaded to NuGet."
diff --git a/src/Paralax.Logging/scripts/test-and-collect-coverage.sh b/src/Paralax.Logging/scripts/test-and-collect-coverage.sh
index 68a780c..898452a 100644
--- a/src/Paralax.Logging/scripts/test-and-collect-coverage.sh
+++ b/src/Paralax.Logging/scripts/test-and-collect-coverage.sh
@@ -2,7 +2,7 @@
 
 echo "Running tests and collecting coverage for Paralax.Logging..."
 
-cd src/Paralax.Logging/src
+cd src/Paralax.Logging/src/Paralax.Logging
 
 echo "Restoring NuGet packages..."
 dotnet restore
diff --git a/src/Paralax.Security/scripts/build-and-pack.sh b/src/Paralax.Security/scripts/build-and-pack.sh
index b9d4c96..4f5514c 100755
--- a/src/Paralax.Security/scripts/build-and-pack.sh
+++ b/src/Paralax.Security/scripts/build-and-pack.sh
@@ -1,18 +1,18 @@
 #!/bin/bash
 
 echo "Executing post-success scripts for branch $GITHUB_REF_NAME"
-echo "Starting build and NuGet package creation for Paralax.Logging..."
+echo "Starting build and NuGet package creation for Paralax.Security..."
 
-cd src/Paralax.Logging/src
+cd src/Paralax.Security/src/Paralax.Security
 
 echo "Restoring NuGet packages..."
 dotnet restore
 
 PACKAGE_VERSION="1.0.$GITHUB_RUN_NUMBER"
-echo "Building and packing the Paralax.Logging library..."
+echo "Building and packing the Paralax.Security library..."
 dotnet pack -c release /p:PackageVersion=$PACKAGE_VERSION --no-restore -o ./nupkg
 
-PACKAGE_PATH="./nupkg/Paralax.Logging.$PACKAGE_VERSION.nupkg"
+PACKAGE_PATH="./nupkg/Paralax.Security.$PACKAGE_VERSION.nupkg"
 
 if [ -f "$PACKAGE_PATH" ]; then
   echo "Checking if the package is already signed..."
@@ -25,7 +25,7 @@ if [ -f "$PACKAGE_PATH" ]; then
       --timestamper http://timestamp.digicert.com
   fi
 
-  echo "Uploading Paralax.Logging package to NuGet..."
+  echo "Uploading Paralax.Security package to NuGet..."
   dotnet nuget push "$PACKAGE_PATH" -k "$NUGET_API_KEY" \
     -s https://api.nuget.org/v3/index.json --skip-duplicate
   echo "Package uploaded to NuGet."
diff --git a/src/Paralax.Security/scripts/test-and-collect-coverage.sh b/src/Paralax.Security/scripts/test-and-collect-coverage.sh
index 30fa605..52ce0ab 100644
--- a/src/Paralax.Security/scripts/test-and-collect-coverage.sh
+++ b/src/Paralax.Security/scripts/test-and-collect-coverage.sh
@@ -2,7 +2,7 @@
 
 echo "Running tests and collecting coverage for Paralax.Security..."
 
-cd src/Paralax.Security/src
+cd src/Paralax.Security/src/Paralax.Security
 
 echo "Restoring NuGet packages..."
 dotnet restore
diff --git a/src/Paralax/scripts/build-and-pack.sh b/src/Paralax/scripts/build-and-pack.sh
index bc8e6d3..feb1896 100755
--- a/src/Paralax/scripts/build-and-pack.sh
+++ b/src/Paralax/scripts/build-and-pack.sh
@@ -3,7 +3,7 @@
 echo "Executing post-success scripts for branch $GITHUB_REF_NAME"
 echo "Starting build and NuGet package creation for Paralax framework..."
 
-cd src/Paralax/src
+cd src/Paralax/src/Paralax
 
 echo "Restoring NuGet packages..."
 dotnet restore
diff --git a/src/Paralax/scripts/test-and-collect-coverage.sh b/src/Paralax/scripts/test-and-collect-coverage.sh
index 823063a..310e261 100644
--- a/src/Paralax/scripts/test-and-collect-coverage.sh
+++ b/src/Paralax/scripts/test-and-collect-coverage.sh
@@ -2,7 +2,7 @@
 
 echo "Running tests and collecting coverage for Paralax..."
 
-cd src/Paralax/tests
+cd src/Paralax/tests/Paralax
 
 echo "Restoring NuGet packages..."
 dotnet restore