Merge pull request #152 from mgreenegit/patch-1

Install GC module as opposed to Az GC module

Author: maertendMSFT

linux/powershell/Dockerfile.Data.json

@@ -7,6 +7,5 @@
     "AzureADMaxVersion": "2.9999.9999.9999",
     "AzureADStandardMaxVersion": "0.0.9999.9999",
     "SQLServerModuleMaxVersion": "21.9999.99999",
-    "PowerBIMaxVersion": "1.9999.9999",
-    "AzGuestConfigurationMaxVersion": "0.9999.9999"
-}
+    "PowerBIMaxVersion": "1.9999.9999"
+}

linux/powershell/Invoke-PreparePowerShell.ps1

@@ -18,7 +18,7 @@ $moduleList = @(
     "AzurePSDrive",
     "MicrosoftPowerBIMgmt",
     "Az",
-    "Az.GuestConfiguration",
+    "GuestConfiguration",
     "Microsoft.PowerShell.UnixCompleters"
 )
 
@@ -33,4 +33,4 @@ foreach ($module in $moduleList) {
     catch {
         Write-Error -Message "Unexpected error encountered when importing $module. Exception = $($_.Exception)."
     }
-}
+}

linux/powershell/setupPowerShell.ps1

@@ -135,7 +135,7 @@ try {
         # Install modules from PSGallery
         Write-Output "Installing modules from production gallery"    
         PowerShellGet\Install-Module -Name AzurePSDrive @prodAllUsers   
-        PowerShellGet\Install-Module -Name Az.GuestConfiguration -MaximumVersion $script:dockerfileDataObject.AzGuestConfigurationMaxVersion -ErrorAction SilentlyContinue @prodAllUsers
+        PowerShellGet\Install-Module -Name GuestConfiguration -MaximumVersion $script:dockerfileDataObject.GuestConfigurationMaxVersion -ErrorAction SilentlyContinue @prodAllUsers
         PowerShellGet\Install-Module -Name Microsoft.PowerShell.UnixCompleters @prodAllUsers
         PowerShellGet\Install-Module -AllowPreRelease -Force PSReadLine -Repository PSGallery # get psreadline beta
         PowerShellGet\Install-Module -Name Az.Tools.Predictor -Repository PSGallery

tests/PSinLinuxCloudShellImage.Tests.ps1

@@ -190,13 +190,13 @@ Describe "PowerShell Modules" {
 
     }
 
-    It "Az.GuestConfiguration PowerShell Module" {
+    It "GuestConfiguration PowerShell Module" {
 
-        $module = Get-Module -Name Az.GuestConfiguration -ListAvailable
+        $module = Get-Module -Name GuestConfiguration -ListAvailable
         $module | Should -Not -BeNullOrEmpty
 
-        # Az.GuestConfiguration module version must be 0.*.* or greater
-        $module.Version -like "0.*.*" | Should -Be $true
+        # GuestConfiguration module version must be 3.5.4 or greater
+        $module.Version -ge '3.5.4' | Should -Be $true
     }
 
     It "MicrosoftTeams PowerShell Module" {
@@ -222,7 +222,7 @@ Describe "PowerShell Modules" {
         @{ ModuleName = "AzureAD.Standard.Preview" }
         @{ ModuleName = "Az" }
         @{ ModuleName = "MicrosoftPowerBIMgmt" }
-        @{ ModuleName = "Az.GuestConfiguration" }
+        @{ ModuleName = "GuestConfiguration" }
         @{ ModuleName = "EXOPSSessionConnector" }
         @{ ModuleName = "MicrosoftTeams" }
         @{ ModuleName = "Microsoft.PowerShell.UnixCompleters" }