Merge pull request #42 from Jackpieking/F11

Author: Jackpieking

Scripts/Clean/clean.ps1

@@ -54,7 +54,7 @@ Write-Output "Project root path determined: $projectRoot"
 Set-Location $projectRoot
 
 Write-Output "Clean project..."
-dotnet clean -c $CONFIGURATION_MODE .\SetupProject.sln
+dotnet clean -c $CONFIGURATION_MODE
 if ($LASTEXITCODE -ne 0) {
     Write-Error "dotnet format failed"
     exit $LASTEXITCODE

Scripts/Clean/clean.sh

@@ -45,7 +45,7 @@ echo "Project root path determined: $project_root"
 cd "$project_root"
 
 echo "Clean project..."
-dotnet clean -c "$CONFIGURATION_MODE" "./SetupProject.sln"
+dotnet clean -c "$CONFIGURATION_MODE"
 if [ $? -ne 0 ]; then
     echo "dotnet format failed"
     exit 1

Scripts/PublishApp/publish.ps1

@@ -2,13 +2,65 @@
 # Run this file for publishing and check the out assets 
 # In out folder (situated in SETUPPROJECT/out)
 
+# Change this to your project name
+$PROJECT_NAME = 'ASPNET_CORE_VSA_Template'
+
 # Set error handling
 $ErrorActionPreference = "Stop"
 
+# Constants
+$CURRENT_PATH = Get-Location
+$CONFIGURATION_MODE = 'Release'
+
+# Function to find the root directory containing the solution file
+function Find-ProjectRoot {
+    param (
+        [string] $currentDir
+    )
+
+    while ($true) {
+        # Try to find the sln in the current directory, if found, return something
+        # otherwise, nothing return
+        #
+        # First 1 is from the first of the list, take 1 element
+        $slnFile = Get-ChildItem -Path $currentDir -Filter *.sln -ErrorAction SilentlyContinue | Select-Object -First 1
+        if ($slnFile) {
+            return $currentDir
+        }
+
+        # Try to back 1 level directory since, the sln is 
+        # always in the root directory, so must go back
+        # not going forward
+        #
+        # Then we assign new path to current dir
+        $parentDir = Split-Path -Path $currentDir -Parent
+        if ($parentDir -contains $PROJECT_NAME) {
+            return $null
+        }
+        $currentDir = $parentDir
+    }
+
+    return $null
+}
+
+# Determine the project root path containing the solution file
+$projectRoot = Find-ProjectRoot -currentDir $(Split-Path -Path $MyInvocation.MyCommand.Path -Parent)
+if (-not $projectRoot) {
+    Write-Error "No solution file (.sln) found in the directory hierarchy."
+    exit 1
+}
+
+# Set to working directory to project root
+Write-Output "Project root path determined: $projectRoot"
+Set-Location $projectRoot
+
 # Format the project
 Write-Output "Publish project..."
-dotnet publish -c Release --no-build --no-restore
+dotnet publish -c $CONFIGURATION_MODE
 if ($LASTEXITCODE -ne 0) {
     Write-Error "dotnet publish failed"
     exit $LASTEXITCODE
 }
+
+# Set back to original directory
+Set-Location $CURRENT_PATH

Scripts/PublishApp/publish.sh

@@ -4,12 +4,53 @@
 # Run this file for publishing and check the out assets 
 # In out folder (situated in SETUPPROJECT/out)
 
-# Set error handling
+# Change this to your project name
+PROJECT_NAME="ASPNET_CORE_VSA_Template"
+
+# Exit on errors
 set -e
 
+# Constants
+CONFIGURATION_MODE="Release"
+CURRENT_PATH=$(pwd)
+
+# Function to find the root directory containing the solution file
+find_project_root() {
+    current_dir=$1
+    while true; do
+        # Try to find the .sln file in the current directory
+        sln_file=$(find "$current_dir" -maxdepth 1 -name "*.sln" -print -quit)
+        if [ -n "$sln_file" ]; then
+            echo "$current_dir"
+            return
+        fi
+
+        # Try to go up one directory level
+        parent_dir=$(dirname "$current_dir")
+        if [[ "$parent_dir" != *"$PROJECT_NAME"* ]]; then
+            return
+        fi
+        current_dir="$parent_dir"
+    done
+}
+
+# Determine the project root path containing the solution file
+project_root=$(find_project_root "$(dirname "$(realpath "$0")")")
+if [ -z "$project_root" ]; then
+    echo "No solution file (.sln) found in the directory hierarchy."
+    exit 1
+fi
+
+# Set to working directory to project root
+echo "Project root path determined: $project_root"
+cd "$project_root"
+
 # Format the project
 echo "Publish project..."
-if ! dotnet publish -c Release --no-build --no-restore; then
+if ! dotnet publish -c "$CONFIGURATION_MODE"; then
     echo "dotnet publish failed"
     exit 1
-fi
+fi
+
+# Go back to original directory
+cd "$CURRENT_PATH"

Scripts/Run/run.ps1

@@ -9,6 +9,7 @@ $ErrorActionPreference = "Stop"
 
 # Constants
 $CURRENT_PATH = Get-Location
+$CONFIGURATION_MODE = 'Release'
 
 # Function to find the root directory containing the solution file
 function Find-ProjectRoot {
@@ -63,7 +64,7 @@ if ($LASTEXITCODE -ne 0) {
 Set-Location $CURRENT_PATH
 
 Write-Output "Run project..."
-dotnet run -c Release --project $projectRoot\Src\Entry\Entry.Src\
+dotnet run -c $CONFIGURATION_MODE --project $projectRoot\Src\Entry\
 if ($LASTEXITCODE -ne 0) {
     Write-Error "dotnet run failed"
     exit $LASTEXITCODE

Scripts/Run/run.sh

@@ -10,6 +10,7 @@ PROJECT_NAME="ASPNET_CORE_VSA_Template"
 set -e
 
 # Constants
+CONFIGURATION_MODE="Release"
 CURRENT_PATH=$(pwd)
 
 # Function to find the root directory containing the solution file
@@ -51,10 +52,10 @@ if [ $? -ne 0 ]; then
 fi
 
 # Go back to original directory
-cd "$CURRENT_PATH
+cd "$CURRENT_PATH"
 
 echo "Run project..."
-dotnet run -c Release --project "$project_root/Src/Entry/Entry.Src/"
+dotnet run -c "$CONFIGURATION_MODE" --project "$project_root/Src/Entry/"
 if [ $? -ne 0 ]; then
     echo "dotnet run failed"
     exit 1