Merge pull request #773 from d365collaborative/development

Merge: 0.7.4
d365collaborative · Oct 24, 2023 · 1e1095d · 1e1095d
2 parents 6569e69 + cd8ac78
commit 1e1095d
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 9 deletions.
diff --git a/d365fo.tools/d365fo.tools.psd1 b/d365fo.tools/d365fo.tools.psd1
@@ -3,7 +3,7 @@
 	RootModule        = 'd365fo.tools.psm1'
 
 	# Version number of this module.
-	ModuleVersion     = '0.7.3'
+	ModuleVersion     = '0.7.4'
 
 	# ID used to uniquely identify this module
 	GUID              = '7c7b26d4-f764-4cb0-a692-459a0a689dbb'

diff --git a/d365fo.tools/d365fo.tools.psm1 b/d365fo.tools/d365fo.tools.psm1
@@ -1,5 +1,5 @@
 $script:ModuleRoot = $PSScriptRoot
-$script:ModuleVersion = "0.7.3"
+$script:ModuleVersion = "0.7.4"
 
 # Detect whether at some level dotsourcing was enforced
 $script:doDotSource = Get-PSFConfigValue -FullName d365fo.tools.Import.DoDotSource -Fallback $false

diff --git a/d365fo.tools/functions/invoke-d365installsqlpackage.ps1 b/d365fo.tools/functions/invoke-d365installsqlpackage.ps1
@@ -73,14 +73,14 @@ function Invoke-D365InstallSqlPackage {
     )
 
     if (-not $SkipExtractFromPage) {
-        $content = (Invoke-WebRequest -Uri "https://docs.microsoft.com/en-us/sql/tools/sqlpackage-download" -UseBasicParsing).content
+        $content = (Invoke-WebRequest -Uri "https://learn.microsoft.com/en-us/sql/tools/sqlpackage-download" -UseBasicParsing).content
         $res = $content -match '<td.*>Windows .NET Core<.*/td>\s*<td.*><a href="(https://.*)" .*'
 
         if ($res) {
             $Url = ([string]$Matches[1]).Trim()
         }
         else {
-            Write-PSFMessage -Level Host -Message "Parsing the web page didn't succeed. Will fall back to the download url." -Target "https://docs.microsoft.com/en-us/sql/tools/sqlpackage-download"
+            Write-PSFMessage -Level Host -Message "Parsing the web page didn't succeed. Will fall back to the download url." -Target "https://learn.microsoft.com/en-us/sql/tools/sqlpackage-download"
         }
     }
 

diff --git a/d365fo.tools/internal/functions/get-azureserviceobjective.ps1 b/d365fo.tools/internal/functions/get-azureserviceobjective.ps1
@@ -53,8 +53,11 @@ function Get-AzureServiceObjective {
 
         [switch] $EnableException
     )
-
-    $sqlCommand = Get-SqlCommand @PsBoundParameters -TrustedConnection $false
+
+    $Params = Get-DeepClone $PSBoundParameters
+    if($Params.ContainsKey("EnableException")){$null = $Params.Remove("EnableException")}
+
+    $sqlCommand = Get-SqlCommand @Params -TrustedConnection $false
 
     $commandText = (Get-Content "$script:ModuleRoot\internal\sql\get-azureserviceobjective.sql") -join [Environment]::NewLine
 

diff --git a/d365fo.tools/internal/functions/get-instancevalues.ps1 b/d365fo.tools/internal/functions/get-instancevalues.ps1
@@ -62,7 +62,10 @@ function Get-InstanceValues {
         [switch] $EnableException
     )
 
-    $sqlCommand = Get-SqlCommand @PsBoundParameters
+    $Params = Get-DeepClone $PSBoundParameters
+    if($Params.ContainsKey("EnableException")){$null = $Params.Remove("EnableException")}
+
+    $sqlCommand = Get-SqlCommand @Params
 
     $commandText = (Get-Content "$script:ModuleRoot\internal\sql\get-instancevalues.sql") -join [Environment]::NewLine
 

diff --git a/d365fo.tools/internal/functions/invoke-clearazurespecificobjects.ps1 b/d365fo.tools/internal/functions/invoke-clearazurespecificobjects.ps1
@@ -57,7 +57,10 @@ Function Invoke-ClearAzureSpecificObjects {
         [switch] $EnableException
     )
 
-    $sqlCommand = Get-SQLCommand @PsBoundParameters -TrustedConnection $false
+    $Params = Get-DeepClone $PSBoundParameters
+    if($Params.ContainsKey("EnableException")){$null = $Params.Remove("EnableException")}
+
+    $sqlCommand = Get-SqlCommand @Params -TrustedConnection $false
 
     $commandText = (Get-Content "$script:ModuleRoot\internal\sql\clear-azurebacpacdatabase.sql") -join [Environment]::NewLine
 

diff --git a/d365fo.tools/internal/functions/invoke-clearsqlspecificobjects.ps1 b/d365fo.tools/internal/functions/invoke-clearsqlspecificobjects.ps1
@@ -63,7 +63,10 @@ Function Invoke-ClearSqlSpecificObjects {
         [switch] $EnableException
     )
 
-    $sqlCommand = Get-SQLCommand @PsBoundParameters
+    $Params = Get-DeepClone $PSBoundParameters
+    if($Params.ContainsKey("EnableException")){$null = $Params.Remove("EnableException")}
+
+    $sqlCommand = Get-SqlCommand @Params
 
     $commandText = (Get-Content "$script:ModuleRoot\internal\sql\clear-sqlbacpacdatabase.sql") -join [Environment]::NewLine