wip

Author: radical

eng/scripts/get-aspire-cli-pr.ps1

@@ -93,7 +93,7 @@ $Script:GHReposBase = "repos/dotnet/aspire"
 $InvokedFromFile = -not [string]::IsNullOrEmpty($PSCommandPath)
 
 # =============================================================================
-# START: Code shared with get-aspire-cli-pr.ps1
+# START: Shared code
 # =============================================================================
 
 # Consolidated output function with fallback for platforms that don't support Write-Host
@@ -388,24 +388,10 @@ function Expand-AspireCliArchive {
 }
 
 # Simplified installation path determination
-function Get-InstallPrefix {
+function Get-DefaultInstallPrefix {
     [CmdletBinding()]
     [OutputType([string])]
-    param(
-        [Parameter()]
-        [string]$InstallPrefix
-    )
-
-    if (-not [string]::IsNullOrWhiteSpace($InstallPrefix)) {
-        # Validate that the path is not just whitespace and can be created
-        try {
-            $resolvedPath = [System.IO.Path]::GetFullPath($InstallPrefix)
-            return $resolvedPath
-        }
-        catch {
-            throw "Invalid installation path: $InstallPrefix - $($_.Exception.Message)"
-        }
-    }
+    param()
 
     # Get home directory cross-platform
     $homeDirectory = Invoke-WithPowerShellVersion -ModernAction {
@@ -560,7 +546,7 @@ function Remove-TempDirectory {
 }
 
 # =============================================================================
-# END: Code shared with get-aspire-cli.ps1
+# END: Shared code
 # =============================================================================
 
 # Function to check if gh command is available
@@ -583,6 +569,29 @@ function Test-GitHubCLIDependency {
     }
 }
 
+# Simplified installation path determination
+function Get-InstallPrefix {
+    [CmdletBinding()]
+    [OutputType([string])]
+    param(
+        [Parameter()]
+        [string]$InstallPrefix
+    )
+
+    if (-not [string]::IsNullOrWhiteSpace($InstallPrefix)) {
+        # Validate that the path is not just whitespace and can be created
+        try {
+            $resolvedPath = [System.IO.Path]::GetFullPath($InstallPrefix)
+            return $resolvedPath
+        }
+        catch {
+            throw "Invalid installation path: $InstallPrefix - $($_.Exception.Message)"
+        }
+    }
+
+    return Get-DefaultInstallPrefix
+}
+
 # Function to make GitHub API calls with proper error handling
 function Invoke-GitHubAPICall {
     [CmdletBinding()]

eng/scripts/get-aspire-cli.ps1

@@ -127,7 +127,7 @@ $Script:Config = @{
 $InvokedFromFile = -not [string]::IsNullOrEmpty($PSCommandPath)
 
 # =============================================================================
-# START: Code shared with get-aspire-cli-pr.ps1
+# START: Shared code
 # =============================================================================
 
 # Consolidated output function with fallback for platforms that don't support Write-Host
@@ -422,24 +422,10 @@ function Expand-AspireCliArchive {
 }
 
 # Simplified installation path determination
-function Get-InstallPath {
+function Get-DefaultInstallPrefix {
     [CmdletBinding()]
     [OutputType([string])]
-    param(
-        [Parameter()]
-        [string]$InstallPath
-    )
-
-    if (-not [string]::IsNullOrWhiteSpace($InstallPath)) {
-        # Validate that the path is not just whitespace and can be created
-        try {
-            $resolvedPath = [System.IO.Path]::GetFullPath($InstallPath)
-            return $resolvedPath
-        }
-        catch {
-            throw "Invalid installation path: $InstallPath - $($_.Exception.Message)"
-        }
-    }
+    param()
 
     # Get home directory cross-platform
     $homeDirectory = Invoke-WithPowerShellVersion -ModernAction {
@@ -466,7 +452,7 @@ function Get-InstallPath {
         throw "Unable to determine user home directory. Please specify -InstallPath parameter."
     }
 
-    $defaultPath = Join-Path $homeDirectory (Join-Path ".aspire" "bin")
+    $defaultPath = Join-Path $homeDirectory ".aspire"
     return [System.IO.Path]::GetFullPath($defaultPath)
 }
 
@@ -594,9 +580,33 @@ function Remove-TempDirectory {
 }
 
 # =============================================================================
-# END: Code shared with get-aspire-cli-pr.ps1
+# END: Shared code
 # =============================================================================
 
+# Simplified installation path determination
+function Get-InstallPath {
+    [CmdletBinding()]
+    [OutputType([string])]
+    param(
+        [Parameter()]
+        [string]$InstallPath
+    )
+
+    if (-not [string]::IsNullOrWhiteSpace($InstallPath)) {
+        # Validate that the path is not just whitespace and can be created
+        try {
+            $resolvedPath = [System.IO.Path]::GetFullPath($InstallPath)
+            return $resolvedPath
+        }
+        catch {
+            throw "Invalid installation path: $InstallPath - $($_.Exception.Message)"
+        }
+    }
+
+    $defaultPath = Join-Path (Get-DefaultInstallPrefix) "bin"
+    return [System.IO.Path]::GetFullPath($defaultPath)
+}
+
 function Get-ContentTypeFromUri {
     [CmdletBinding()]
     [OutputType([string])]