BugFix to only import nested PSSwaggerUtility

Author: deathly809

src/StackAdmin/Azs.AzureBridge.Admin/Module/Azs.AzureBridge.Admin/Azs.Azurebridge.Admin.psm1

@@ -7,16 +7,8 @@ Microsoft.PowerShell.Core\Set-StrictMode -Version Latest
 
 Write-Warning "Preview version of the module Azs.Azurebridge.Admin loaded. Future release of this module may have breaking changes."
 
-# If the user supplied -Prefix to Import-Module, that applies to the nested module as well
-# Force import the nested module again without -Prefix
-if (-not (Get-Command Get-OperatingSystemInfo -Module PSSwaggerUtility -ErrorAction Ignore)) {
-    # Simply doing "Import-Module PSSwaggerUtility" doesn't work for local case
-	if (Test-Path -Path (Join-Path -Path $PSScriptRoot -ChildPath PSSwaggerUtility)) {
-		Import-Module (Join-Path -Path $PSScriptRoot -ChildPath PSSwaggerUtility) -Force
-	} else {
-		Import-Module PSSwaggerUtility -Force
-	}
-}
+# We always import embedded version.
+Import-Module (Join-Path -Path $PSScriptRoot -ChildPath PSSwaggerUtility) -Force
 
 if ((Get-OperatingSystemInfo).IsCore) {
     $clr = 'coreclr'

src/StackAdmin/Azs.Backup.Admin/Module/Azs.Backup.Admin/Azs.Backup.Admin.psm1

@@ -7,16 +7,8 @@ Microsoft.PowerShell.Core\Set-StrictMode -Version Latest
 
 Write-Warning "Preview version of the module Azs.Backup.Admin loaded. Future release of this module may have breaking changes."
 
-# If the user supplied -Prefix to Import-Module, that applies to the nested module as well
-# Force import the nested module again without -Prefix
-if (-not (Get-Command Get-OperatingSystemInfo -Module PSSwaggerUtility -ErrorAction Ignore)) {
-    # Simply doing "Import-Module PSSwaggerUtility" doesn't work for local case
-	if (Test-Path -Path (Join-Path -Path $PSScriptRoot -ChildPath PSSwaggerUtility)) {
-		Import-Module (Join-Path -Path $PSScriptRoot -ChildPath PSSwaggerUtility) -Force
-	} else {
-		Import-Module PSSwaggerUtility -Force
-	}
-}
+# We always import embedded version.
+Import-Module (Join-Path -Path $PSScriptRoot -ChildPath PSSwaggerUtility) -Force
 
 if ((Get-OperatingSystemInfo).IsCore) {
     $clr = 'coreclr'

src/StackAdmin/Azs.Commerce.Admin/Module/Azs.Commerce.Admin/Azs.Commerce.Admin.psm1

@@ -7,16 +7,8 @@ Microsoft.PowerShell.Core\Set-StrictMode -Version Latest
 
 Write-Warning "Preview version of the module Azs.Commerce.Admin loaded. Future release of this module may have breaking changes."
 
-# If the user supplied -Prefix to Import-Module, that applies to the nested module as well
-# Force import the nested module again without -Prefix
-if (-not (Get-Command Get-OperatingSystemInfo -Module PSSwaggerUtility -ErrorAction Ignore)) {
-    # Simply doing "Import-Module PSSwaggerUtility" doesn't work for local case
-	if (Test-Path -Path (Join-Path -Path $PSScriptRoot -ChildPath PSSwaggerUtility)) {
-		Import-Module (Join-Path -Path $PSScriptRoot -ChildPath PSSwaggerUtility) -Force
-	} else {
-		Import-Module PSSwaggerUtility -Force
-	}
-}
+# We always import embedded version.
+Import-Module (Join-Path -Path $PSScriptRoot -ChildPath PSSwaggerUtility) -Force
 
 if ((Get-OperatingSystemInfo).IsCore) {
     $clr = 'coreclr'

src/StackAdmin/Azs.Compute.Admin/Module/Azs.Compute.Admin/Azs.Compute.Admin.psm1

@@ -7,16 +7,8 @@ Microsoft.PowerShell.Core\Set-StrictMode -Version Latest
 
 Write-Warning "Preview version of the module Azs.Compute.Admin loaded. Future release of this module may have breaking changes."
 
-# If the user supplied -Prefix to Import-Module, that applies to the nested module as well
-# Force import the nested module again without -Prefix
-if (-not (Get-Command Get-OperatingSystemInfo -Module PSSwaggerUtility -ErrorAction Ignore)) {
-    # Simply doing "Import-Module PSSwaggerUtility" doesn't work for local case
-	if (Test-Path -Path (Join-Path -Path $PSScriptRoot -ChildPath PSSwaggerUtility)) {
-		Import-Module (Join-Path -Path $PSScriptRoot -ChildPath PSSwaggerUtility) -Force
-	} else {
-		Import-Module PSSwaggerUtility -Force
-	}
-}
+# We always import embedded version.
+Import-Module (Join-Path -Path $PSScriptRoot -ChildPath PSSwaggerUtility) -Force
 
 if ((Get-OperatingSystemInfo).IsCore) {
     $clr = 'coreclr'

src/StackAdmin/Azs.Fabric.Admin/Module/Azs.Fabric.Admin/Azs.Fabric.Admin.psm1

@@ -7,16 +7,8 @@ Microsoft.PowerShell.Core\Set-StrictMode -Version Latest
 
 Write-Warning "Preview version of the module Azs.Fabric.Admin loaded. Future release of this module may have breaking changes."
 
-# If the user supplied -Prefix to Import-Module, that applies to the nested module as well
-# Force import the nested module again without -Prefix
-if (-not (Get-Command Get-OperatingSystemInfo -Module PSSwaggerUtility -ErrorAction Ignore)) {
-    # Simply doing "Import-Module PSSwaggerUtility" doesn't work for local case
-	if (Test-Path -Path (Join-Path -Path $PSScriptRoot -ChildPath PSSwaggerUtility)) {
-		Import-Module (Join-Path -Path $PSScriptRoot -ChildPath PSSwaggerUtility) -Force
-	} else {
-		Import-Module PSSwaggerUtility -Force
-	}
-}
+# We always import embedded version.
+Import-Module (Join-Path -Path $PSScriptRoot -ChildPath PSSwaggerUtility) -Force
 
 if ((Get-OperatingSystemInfo).IsCore) {
     $clr = 'coreclr'

src/StackAdmin/Azs.Gallery.Admin/Module/Azs.Gallery.Admin/Azs.Gallery.Admin.psm1

@@ -7,16 +7,8 @@ Microsoft.PowerShell.Core\Set-StrictMode -Version Latest
 
 Write-Warning "Preview version of the module Azs.Gallery.Admin loaded. Future release of this module may have breaking changes."
 
-# If the user supplied -Prefix to Import-Module, that applies to the nested module as well
-# Force import the nested module again without -Prefix
-if (-not (Get-Command Get-OperatingSystemInfo -Module PSSwaggerUtility -ErrorAction Ignore)) {
-    # Simply doing "Import-Module PSSwaggerUtility" doesn't work for local case
-	if (Test-Path -Path (Join-Path -Path $PSScriptRoot -ChildPath PSSwaggerUtility)) {
-		Import-Module (Join-Path -Path $PSScriptRoot -ChildPath PSSwaggerUtility) -Force
-	} else {
-		Import-Module PSSwaggerUtility -Force
-	}
-}
+# We always import embedded version.
+Import-Module (Join-Path -Path $PSScriptRoot -ChildPath PSSwaggerUtility) -Force
 
 if ((Get-OperatingSystemInfo).IsCore) {
     $clr = 'coreclr'

src/StackAdmin/Azs.InfrastructureInsights.Admin/Module/Azs.InfrastructureInsights.Admin/Azs.Infrastructureinsights.Admin.psm1

@@ -7,16 +7,8 @@ Microsoft.PowerShell.Core\Set-StrictMode -Version Latest
 
 Write-Warning "Preview version of the module Azs.Infrastructureinsights.Admin loaded. Future release of this module may have breaking changes."
 
-# If the user supplied -Prefix to Import-Module, that applies to the nested module as well
-# Force import the nested module again without -Prefix
-if (-not (Get-Command Get-OperatingSystemInfo -Module PSSwaggerUtility -ErrorAction Ignore)) {
-    # Simply doing "Import-Module PSSwaggerUtility" doesn't work for local case
-	if (Test-Path -Path (Join-Path -Path $PSScriptRoot -ChildPath PSSwaggerUtility)) {
-		Import-Module (Join-Path -Path $PSScriptRoot -ChildPath PSSwaggerUtility) -Force
-	} else {
-		Import-Module PSSwaggerUtility -Force
-	}
-}
+# We always import embedded version.
+Import-Module (Join-Path -Path $PSScriptRoot -ChildPath PSSwaggerUtility) -Force
 
 if ((Get-OperatingSystemInfo).IsCore) {
     $clr = 'coreclr'

src/StackAdmin/Azs.KeyVault.Admin/Module/Azs.KeyVault.Admin/Azs.Keyvault.Admin.psm1

@@ -7,16 +7,8 @@ Microsoft.PowerShell.Core\Set-StrictMode -Version Latest
 
 Write-Warning "Preview version of the module Azs.Keyvault.Admin loaded. Future release of this module may have breaking changes."
 
-# If the user supplied -Prefix to Import-Module, that applies to the nested module as well
-# Force import the nested module again without -Prefix
-if (-not (Get-Command Get-OperatingSystemInfo -Module PSSwaggerUtility -ErrorAction Ignore)) {
-    # Simply doing "Import-Module PSSwaggerUtility" doesn't work for local case
-	if (Test-Path -Path (Join-Path -Path $PSScriptRoot -ChildPath PSSwaggerUtility)) {
-		Import-Module (Join-Path -Path $PSScriptRoot -ChildPath PSSwaggerUtility) -Force
-	} else {
-		Import-Module PSSwaggerUtility -Force
-	}
-}
+# We always import embedded version.
+Import-Module (Join-Path -Path $PSScriptRoot -ChildPath PSSwaggerUtility) -Force
 
 if ((Get-OperatingSystemInfo).IsCore) {
     $clr = 'coreclr'

src/StackAdmin/Azs.Network.Admin/Module/Azs.Network.Admin/Azs.Network.Admin.psm1

@@ -7,16 +7,8 @@ Microsoft.PowerShell.Core\Set-StrictMode -Version Latest
 
 Write-Warning "Preview version of the module Azs.Netowrk.Admin loaded. Future release of this module may have breaking changes."
 
-# If the user supplied -Prefix to Import-Module, that applies to the nested module as well
-# Force import the nested module again without -Prefix
-if (-not (Get-Command Get-OperatingSystemInfo -Module PSSwaggerUtility -ErrorAction Ignore)) {
-    # Simply doing "Import-Module PSSwaggerUtility" doesn't work for local case
-	if (Test-Path -Path (Join-Path -Path $PSScriptRoot -ChildPath PSSwaggerUtility)) {
-		Import-Module (Join-Path -Path $PSScriptRoot -ChildPath PSSwaggerUtility) -Force
-	} else {
-		Import-Module PSSwaggerUtility -Force
-	}
-}
+# We always import embedded version.
+Import-Module (Join-Path -Path $PSScriptRoot -ChildPath PSSwaggerUtility) -Force
 
 if ((Get-OperatingSystemInfo).IsCore) {
     $clr = 'coreclr'

src/StackAdmin/Azs.Storage.Admin/Module/Azs.Storage.Admin/Azs.Storage.Admin.psm1

@@ -7,16 +7,8 @@ Microsoft.PowerShell.Core\Set-StrictMode -Version Latest
 
 Write-Warning "Preview version of the module Azs.Storage.Admin loaded. Future release of this module may have breaking changes."
 
-# If the user supplied -Prefix to Import-Module, that applies to the nested module as well
-# Force import the nested module again without -Prefix
-if (-not (Get-Command Get-OperatingSystemInfo -Module PSSwaggerUtility -ErrorAction Ignore)) {
-    # Simply doing "Import-Module PSSwaggerUtility" doesn't work for local case
-	if (Test-Path -Path (Join-Path -Path $PSScriptRoot -ChildPath PSSwaggerUtility)) {
-		Import-Module (Join-Path -Path $PSScriptRoot -ChildPath PSSwaggerUtility) -Force
-	} else {
-		Import-Module PSSwaggerUtility -Force
-	}
-}
+# We always import embedded version.
+Import-Module (Join-Path -Path $PSScriptRoot -ChildPath PSSwaggerUtility) -Force
 
 if ((Get-OperatingSystemInfo).IsCore) {
     $clr = 'coreclr'

src/StackAdmin/Azs.Subscriptions.Admin/Module/Azs.Subscriptions.Admin/Azs.Subscriptions.Admin.psm1

@@ -7,16 +7,8 @@ Microsoft.PowerShell.Core\Set-StrictMode -Version Latest
 
 Write-Warning "Preview version of the module Azs.Subscriptions.Admin loaded. Future release of this module may have breaking changes."
 
-# If the user supplied -Prefix to Import-Module, that applies to the nested module as well
-# Force import the nested module again without -Prefix
-if (-not (Get-Command Get-OperatingSystemInfo -Module PSSwaggerUtility -ErrorAction Ignore)) {
-    # Simply doing "Import-Module PSSwaggerUtility" doesn't work for local case
-	if (Test-Path -Path (Join-Path -Path $PSScriptRoot -ChildPath PSSwaggerUtility)) {
-		Import-Module (Join-Path -Path $PSScriptRoot -ChildPath PSSwaggerUtility) -Force
-	} else {
-		Import-Module PSSwaggerUtility -Force
-	}
-}
+# We always import embedded version.
+Import-Module (Join-Path -Path $PSScriptRoot -ChildPath PSSwaggerUtility) -Force
 
 if ((Get-OperatingSystemInfo).IsCore) {
     $clr = 'coreclr'

src/StackAdmin/Azs.Subscriptions/Module/Azs.Subscriptions/Azs.Subscriptions.psm1

@@ -7,16 +7,8 @@ Microsoft.PowerShell.Core\Set-StrictMode -Version Latest
 
 Write-Warning "Preview version of the module Azs.Subscriptions loaded. Future release of this module may have breaking changes."
 
-# If the user supplied -Prefix to Import-Module, that applies to the nested module as well
-# Force import the nested module again without -Prefix
-if (-not (Get-Command Get-OperatingSystemInfo -Module PSSwaggerUtility -ErrorAction Ignore)) {
-    # Simply doing "Import-Module PSSwaggerUtility" doesn't work for local case
-	if (Test-Path -Path (Join-Path -Path $PSScriptRoot -ChildPath PSSwaggerUtility)) {
-		Import-Module (Join-Path -Path $PSScriptRoot -ChildPath PSSwaggerUtility) -Force
-	} else {
-		Import-Module PSSwaggerUtility -Force
-	}
-}
+# We always import embedded version.
+Import-Module (Join-Path -Path $PSScriptRoot -ChildPath PSSwaggerUtility) -Force
 
 if ((Get-OperatingSystemInfo).IsCore) {
     $clr = 'coreclr'

src/StackAdmin/Azs.Update.Admin/Module/Azs.Update.Admin/Azs.Update.Admin.psm1

@@ -7,16 +7,8 @@ Microsoft.PowerShell.Core\Set-StrictMode -Version Latest
 
 Write-Warning "Preview version of the module Azs.Update.Admin loaded. Future release of this module may have breaking changes."
 
-# If the user supplied -Prefix to Import-Module, that applies to the nested module as well
-# Force import the nested module again without -Prefix
-if (-not (Get-Command Get-OperatingSystemInfo -Module PSSwaggerUtility -ErrorAction Ignore)) {
-    # Simply doing "Import-Module PSSwaggerUtility" doesn't work for local case
-	if (Test-Path -Path (Join-Path -Path $PSScriptRoot -ChildPath PSSwaggerUtility)) {
-		Import-Module (Join-Path -Path $PSScriptRoot -ChildPath PSSwaggerUtility) -Force
-	} else {
-		Import-Module PSSwaggerUtility -Force
-	}
-}
+# We always import embedded version.
+Import-Module (Join-Path -Path $PSScriptRoot -ChildPath PSSwaggerUtility) -Force
 
 if ((Get-OperatingSystemInfo).IsCore) {
     $clr = 'coreclr'