Merge pull request #443 from shailesh91/master

v4.0.2 - Minor Fixes
Esri · Jan 20, 2023 · ebd5e9a · ebd5e9a
2 parents 3dbb934 + e1df696
commit ebd5e9a
Show file tree

Hide file tree

Showing 96 changed files with 3,585 additions and 79 deletions.
diff --git a/LICENSE b/LICENSE
@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright (c) 2018-2022 Environmental Systems Research Institute, Inc.
+   Copyright (c) 2018-2023 Environmental Systems Research Institute, Inc.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

diff --git a/Modules/ArcGIS/ArcGIS.psd1 b/Modules/ArcGIS/ArcGIS.psd1
@@ -3,7 +3,7 @@
 #
 # Generated by: Esri
 #
-# Generated on: 11/21/2022
+# Generated on: 1/20/2023
 #
 
 @{
@@ -12,7 +12,7 @@
     # RootModule = ''
 
     # Version number of this module.
-    ModuleVersion = '4.0.1'
+    ModuleVersion = '4.0.2'
 
     # Supported PSEditions
     # CompatiblePSEditions = @()
@@ -27,7 +27,7 @@
     CompanyName = 'Esri'
 
     # Copyright statement for this module
-    Copyright = '(c) 2018-2022 ESRI. All rights reserved.'
+    Copyright = '(c) 2018-2023 ESRI. All rights reserved.'
 
     # Description of the functionality provided by this module
     Description = 'ArcGIS Module for PowerShell DSC'
@@ -107,7 +107,7 @@
             # IconUri = ''
 
             # ReleaseNotes of this module
-            ReleaseNotes = 'ArcGIS Module for PowerShell DSC - 4.0.1'
+            ReleaseNotes = 'ArcGIS Module for PowerShell DSC - 4.0.2'
 
             # External dependent modules of this module
             # ExternalModuleDependencies = ''

diff --git a/Modules/ArcGIS/ArcGIS.psm1 b/Modules/ArcGIS/ArcGIS.psm1
@@ -2261,7 +2261,7 @@ function Invoke-ServerUpgradeScript {
 
     Write-Information -InformationAction Continue "ArcGIS Server Upgrades"
 
-    $cfServiceAccountIsDomainAccount = $cf.ConfigData.Credentials.ServiceAccount.IsDomainAccount
+    $cfServiceAccountIsDomainAccount =  if($cf.ConfigData.Credentials.ServiceAccount.IsDomainAccount){$cf.ConfigData.Credentials.ServiceAccount.IsDomainAccount}else{ $false}
     $cfServiceAccountIsMSA = if($cf.ConfigData.Credentials.ServiceAccount.IsMSAAccount){$cf.ConfigData.Credentials.ServiceAccount.IsMSAAccount}else{ $false }
     $cfServiceAccountPassword = ConvertTo-SecureString "PlaceHolder" -AsPlainText -Force
     if(-not($cfServiceAccountIsMSA)){
@@ -2517,7 +2517,7 @@ function Invoke-DataStoreUpgradeScript {
         }
     }
 
-    $DSServiceAccountIsDomainAccount = $DSConfig.ConfigData.Credentials.ServiceAccount.IsDomainAccount
+    $DSServiceAccountIsDomainAccount = if($DSConfig.ConfigData.Credentials.ServiceAccount.IsDomainAccount){$DSConfig.ConfigData.Credentials.ServiceAccount.IsDomainAccount}else{ $false}
     $DSServiceAccountIsMSA = if($DSConfig.ConfigData.Credentials.ServiceAccount.IsMSAAccount){$DSConfig.ConfigData.Credentials.ServiceAccount.IsMSAAccount}else{ $false}  
     $DSSAPassword = ConvertTo-SecureString "PlaceHolder" -AsPlainText -Force
     if(-not($DSServiceAccountIsMSA)){

diff --git a/Modules/ArcGIS/Configurations-OnPrem/ArcGISDataStore.ps1 b/Modules/ArcGIS/Configurations-OnPrem/ArcGISDataStore.ps1
@@ -77,7 +77,7 @@
     )
 
     Import-DscResource -ModuleName PSDesiredStateConfiguration
-    Import-DscResource -ModuleName ArcGIS -ModuleVersion 4.0.1
+    Import-DscResource -ModuleName ArcGIS -ModuleVersion 4.0.2
     Import-DscResource -Name ArcGIS_xFirewall
     Import-DscResource -Name ArcGIS_Service_Account
     Import-DscResource -Name ArcGIS_DataStore

diff --git a/Modules/ArcGIS/Configurations-OnPrem/ArcGISDataStoreBackup.ps1 b/Modules/ArcGIS/Configurations-OnPrem/ArcGISDataStoreBackup.ps1
@@ -35,7 +35,7 @@
     )
 
     Import-DscResource -ModuleName PSDesiredStateConfiguration
-    Import-DscResource -ModuleName ArcGIS -ModuleVersion 4.0.1
+    Import-DscResource -ModuleName ArcGIS -ModuleVersion 4.0.2
     Import-DscResource -Name ArcGIS_DataStoreBackup
 
     Node $AllNodes.NodeName 

diff --git a/Modules/ArcGIS/Configurations-OnPrem/ArcGISDataStoreCertificateUpdate.ps1 b/Modules/ArcGIS/Configurations-OnPrem/ArcGISDataStoreCertificateUpdate.ps1
@@ -1,7 +1,7 @@
 Configuration ArcGISDataStoreCertificateUpdate 
 {
     Import-DscResource -ModuleName PSDesiredStateConfiguration
-    Import-DscResource -ModuleName ArcGIS -ModuleVersion 4.0.1
+    Import-DscResource -ModuleName ArcGIS -ModuleVersion 4.0.2
     Import-DscResource -Name ArcGIS_DataStore_TLS
 
     Node $AllNodes.NodeName 

diff --git a/Modules/ArcGIS/Configurations-OnPrem/ArcGISDownloads.ps1 b/Modules/ArcGIS/Configurations-OnPrem/ArcGISDownloads.ps1
@@ -6,7 +6,7 @@
     )
 
     Import-DscResource -ModuleName PSDesiredStateConfiguration
-    Import-DscResource -ModuleName ArcGIS -ModuleVersion 4.0.1
+    Import-DscResource -ModuleName ArcGIS -ModuleVersion 4.0.2
     Import-DscResource -Name ArcGIS_RemoteFile
 
     Node $AllNodes.NodeName {
@@ -260,13 +260,15 @@
                 }
                 'Pro'
                 {
+                    $ProDownloadFolder = if($ConfigurationData.ConfigData.ProVersion -ieq "3.0.3"){ "3.0" }else{ $ConfigurationData.ConfigData.ProVersion }
+
                     ArcGIS_RemoteFile "ProDownload$($Node.NodeName)"
                     {
                         Source = $ConfigurationData.ConfigData.Pro.Installer.Path
                         Destination = $ConfigurationData.ConfigData.Pro.Installer.Path 
                         FileSourceType = "ArcGISDownloadsAPI"
                         Credential = $AGOCredential
-                        ArcGISDownloadAPIFolderPath = "software/arcgispro/EXEs/$($ConfigurationData.ConfigData.ProVersion)"
+                        ArcGISDownloadAPIFolderPath = "software/arcgispro/EXEs/$($ProDownloadFolder)"
                         Ensure = $Ensure
                     }
                     if($ConfigurationData.ConfigData.Pro.Extensions){
@@ -278,7 +280,7 @@
                                 Destination = $Extension.Value.Installer.Path 
                                 FileSourceType = "ArcGISDownloadsAPI"
                                 Credential = $AGOCredential
-                                ArcGISDownloadAPIFolderPath = "software/arcgispro/EXEs/$($ConfigurationData.ConfigData.ProVersion)"
+                                ArcGISDownloadAPIFolderPath = "software/arcgispro/EXEs/$($ProDownloadFolder)"
                                 Ensure = $Ensure
                             }
                         }

diff --git a/Modules/ArcGIS/Configurations-OnPrem/ArcGISFederation.ps1 b/Modules/ArcGIS/Configurations-OnPrem/ArcGISFederation.ps1
@@ -64,7 +64,7 @@
         $IsFederatedWithRestrictedPublishing
     )
     Import-DscResource -ModuleName PSDesiredStateConfiguration
-    Import-DscResource -ModuleName ArcGIS -ModuleVersion 4.0.1
+    Import-DscResource -ModuleName ArcGIS -ModuleVersion 4.0.2
     Import-DscResource -Name ArcGIS_Federation
 
     Node $AllNodes.NodeName

diff --git a/Modules/ArcGIS/Configurations-OnPrem/ArcGISFileShare.ps1 b/Modules/ArcGIS/Configurations-OnPrem/ArcGISFileShare.ps1
@@ -28,7 +28,7 @@
     )
 
     Import-DscResource -ModuleName PSDesiredStateConfiguration
-    Import-DscResource -ModuleName ArcGIS -ModuleVersion 4.0.1
+    Import-DscResource -ModuleName ArcGIS -ModuleVersion 4.0.2
     Import-DscResource -Name ArcGIS_FileShare
 
     Node $AllNodes.NodeName 

diff --git a/Modules/ArcGIS/Configurations-OnPrem/ArcGISInstall.ps1 b/Modules/ArcGIS/Configurations-OnPrem/ArcGISInstall.ps1
@@ -18,7 +18,7 @@
     )
 
     Import-DscResource -ModuleName PSDesiredStateConfiguration
-    Import-DscResource -ModuleName ArcGIS -ModuleVersion 4.0.1
+    Import-DscResource -ModuleName ArcGIS -ModuleVersion 4.0.2
     Import-DscResource -Name ArcGIS_Install
     Import-DscResource -Name ArcGIS_InstallMsiPackage
     Import-DscResource -Name ArcGIS_InstallPatch

diff --git a/Modules/ArcGIS/Configurations-OnPrem/ArcGISLicense.ps1 b/Modules/ArcGIS/Configurations-OnPrem/ArcGISLicense.ps1
@@ -6,7 +6,7 @@
     )
 
     Import-DscResource -ModuleName PSDesiredStateConfiguration
-    Import-DscResource -ModuleName ArcGIS -ModuleVersion 4.0.1
+    Import-DscResource -ModuleName ArcGIS -ModuleVersion 4.0.2
     Import-DscResource -Name ArcGIS_License
 
     Node $AllNodes.NodeName 

diff --git a/Modules/ArcGIS/Configurations-OnPrem/ArcGISMissionServer.ps1 b/Modules/ArcGIS/Configurations-OnPrem/ArcGISMissionServer.ps1
@@ -97,7 +97,7 @@
     )
 
     Import-DscResource -ModuleName PSDesiredStateConfiguration
-    Import-DscResource -ModuleName ArcGIS -ModuleVersion 4.0.1
+    Import-DscResource -ModuleName ArcGIS -ModuleVersion 4.0.2
     Import-DscResource -Name ArcGIS_MissionServer
     Import-DscResource -Name ArcGIS_MissionServerSettings
     Import-DscResource -Name ArcGIS_Server_TLS

diff --git a/Modules/ArcGIS/Configurations-OnPrem/ArcGISMissionServerSettings.ps1 b/Modules/ArcGIS/Configurations-OnPrem/ArcGISMissionServerSettings.ps1
@@ -20,7 +20,7 @@
 
 
     Import-DscResource -ModuleName PSDesiredStateConfiguration
-    Import-DscResource -ModuleName ArcGIS -ModuleVersion 4.0.1
+    Import-DscResource -ModuleName ArcGIS -ModuleVersion 4.0.2
     Import-DscResource -Name ArcGIS_MissionServerSettings
 
     Node $AllNodes.NodeName

diff --git a/Modules/ArcGIS/Configurations-OnPrem/ArcGISNotebookServer.ps1 b/Modules/ArcGIS/Configurations-OnPrem/ArcGISNotebookServer.ps1
@@ -105,7 +105,7 @@
     )
 
     Import-DscResource -ModuleName PSDesiredStateConfiguration
-    Import-DscResource -ModuleName ArcGIS -ModuleVersion 4.0.1
+    Import-DscResource -ModuleName ArcGIS -ModuleVersion 4.0.2
     Import-DscResource -Name ArcGIS_NotebookServer
     Import-DscResource -Name ArcGIS_NotebookPostInstall
     Import-DscResource -Name ArcGIS_NotebookServerSettings

diff --git a/Modules/ArcGIS/Configurations-OnPrem/ArcGISNotebookServerSettings.ps1 b/Modules/ArcGIS/Configurations-OnPrem/ArcGISNotebookServerSettings.ps1
@@ -20,7 +20,7 @@
 
 
     Import-DscResource -ModuleName PSDesiredStateConfiguration
-    Import-DscResource -ModuleName ArcGIS -ModuleVersion 4.0.1
+    Import-DscResource -ModuleName ArcGIS -ModuleVersion 4.0.2
     Import-DscResource -Name ArcGIS_NotebookServerSettings
 
     Node $AllNodes.NodeName

diff --git a/Modules/ArcGIS/Configurations-OnPrem/ArcGISPortal.ps1 b/Modules/ArcGIS/Configurations-OnPrem/ArcGISPortal.ps1
@@ -88,7 +88,7 @@
     )
 
     Import-DscResource -ModuleName PSDesiredStateConfiguration
-    Import-DscResource -ModuleName ArcGIS -ModuleVersion 4.0.1
+    Import-DscResource -ModuleName ArcGIS -ModuleVersion 4.0.2
     Import-DscResource -Name ArcGIS_xFirewall
     Import-DscResource -Name ArcGIS_Portal
     Import-DscResource -Name ArcGIS_Service_Account

diff --git a/Modules/ArcGIS/Configurations-OnPrem/ArcGISPortalSettings.ps1 b/Modules/ArcGIS/Configurations-OnPrem/ArcGISPortalSettings.ps1
@@ -76,7 +76,7 @@
     )
 
     Import-DscResource -ModuleName PSDesiredStateConfiguration
-    Import-DscResource -ModuleName ArcGIS -ModuleVersion 4.0.1
+    Import-DscResource -ModuleName ArcGIS -ModuleVersion 4.0.2
     Import-DscResource -Name ArcGIS_PortalSettings
 
     Node $AllNodes.NodeName

diff --git a/Modules/ArcGIS/Configurations-OnPrem/ArcGISRasterDataStoreItem.ps1 b/Modules/ArcGIS/Configurations-OnPrem/ArcGISRasterDataStoreItem.ps1
@@ -32,7 +32,7 @@
         $FileShareLocalPath
     )
     Import-DscResource -ModuleName PSDesiredStateConfiguration
-    Import-DscResource -ModuleName ArcGIS -ModuleVersion 4.0.1
+    Import-DscResource -ModuleName ArcGIS -ModuleVersion 4.0.2
     Import-DscResource -Name ArcGIS_FileShare
     Import-DSCResource -Name ArcGIS_DataStoreItem
 

diff --git a/Modules/ArcGIS/Configurations-OnPrem/ArcGISRegisterSQLEGDB.ps1 b/Modules/ArcGIS/Configurations-OnPrem/ArcGISRegisterSQLEGDB.ps1
@@ -45,7 +45,7 @@
     )
 
     Import-DscResource -ModuleName PSDesiredStateConfiguration
-    Import-DscResource -ModuleName ArcGIS -ModuleVersion 4.0.1
+    Import-DscResource -ModuleName ArcGIS -ModuleVersion 4.0.2
     Import-DSCResource -Name ArcGIS_EGDB
 
     Node $AllNodes.NodeName

diff --git a/Modules/ArcGIS/Configurations-OnPrem/ArcGISServer.ps1 b/Modules/ArcGIS/Configurations-OnPrem/ArcGISServer.ps1
@@ -125,7 +125,7 @@
     )
 
     Import-DscResource -ModuleName PSDesiredStateConfiguration
-    Import-DscResource -ModuleName ArcGIS -ModuleVersion 4.0.1
+    Import-DscResource -ModuleName ArcGIS -ModuleVersion 4.0.2
     Import-DscResource -Name ArcGIS_xFirewall
     Import-DscResource -Name ArcGIS_Server
     Import-DscResource -Name ArcGIS_Service_Account

diff --git a/Modules/ArcGIS/Configurations-OnPrem/ArcGISServerSettings.ps1 b/Modules/ArcGIS/Configurations-OnPrem/ArcGISServerSettings.ps1
@@ -24,7 +24,7 @@
 
 
     Import-DscResource -ModuleName PSDesiredStateConfiguration
-    Import-DscResource -ModuleName ArcGIS -ModuleVersion 4.0.1
+    Import-DscResource -ModuleName ArcGIS -ModuleVersion 4.0.2
     Import-DscResource -Name ArcGIS_ServerSettings
 
     Node $AllNodes.NodeName

diff --git a/Modules/ArcGIS/Configurations-OnPrem/ArcGISUninstall.ps1 b/Modules/ArcGIS/Configurations-OnPrem/ArcGISUninstall.ps1
@@ -14,7 +14,7 @@
         $ServiceCredentialIsMSA = $false
     )
     Import-DscResource -ModuleName PSDesiredStateConfiguration 
-    Import-DscResource -ModuleName ArcGIS -ModuleVersion 4.0.1
+    Import-DscResource -ModuleName ArcGIS -ModuleVersion 4.0.2
     Import-DscResource -Name ArcGIS_Install
     Import-DscResource -Name ArcGIS_FileShare
     Import-DscResource -Name ArcGIS_InstallMsiPackage

diff --git a/Modules/ArcGIS/Configurations-OnPrem/ArcGISWebAdaptor.ps1 b/Modules/ArcGIS/Configurations-OnPrem/ArcGISWebAdaptor.ps1
@@ -28,7 +28,7 @@
     )
 
     Import-DscResource -ModuleName PSDesiredStateConfiguration
-    Import-DscResource -ModuleName ArcGIS -ModuleVersion 4.0.1
+    Import-DscResource -ModuleName ArcGIS -ModuleVersion 4.0.2
     Import-DscResource -Name ArcGIS_xFirewall
     Import-DscResource -Name ArcGIS_IIS_TLS
     Import-DscResource -Name ArcGIS_WebAdaptor

diff --git a/Modules/ArcGIS/Configurations-OnPrem/PublishGISService.ps1 b/Modules/ArcGIS/Configurations-OnPrem/PublishGISService.ps1
@@ -35,7 +35,7 @@
     )
 
     Import-DscResource -ModuleName PSDesiredStateConfiguration
-    Import-DscResource -ModuleName ArcGIS -ModuleVersion 4.0.1
+    Import-DscResource -ModuleName ArcGIS -ModuleVersion 4.0.2
     Import-DscResource -Name ArcGIS_Server_Service
 
     Node $AllNodes.NodeName

diff --git a/Modules/ArcGIS/Configurations-OnPrem/Upgrades/DataStoreUpgradeConfigure.ps1 b/Modules/ArcGIS/Configurations-OnPrem/Upgrades/DataStoreUpgradeConfigure.ps1
@@ -17,7 +17,7 @@
     )
 
     Import-DscResource -ModuleName PSDesiredStateConfiguration 
-    Import-DscResource -ModuleName ArcGIS -ModuleVersion 4.0.1 
+    Import-DscResource -ModuleName ArcGIS -ModuleVersion 4.0.2 
     Import-DscResource -Name ArcGIS_DataStoreUpgrade
 
     Node $AllNodes.NodeName {

diff --git a/Modules/ArcGIS/Configurations-OnPrem/Upgrades/DataStoreUpgradeInstall.ps1 b/Modules/ArcGIS/Configurations-OnPrem/Upgrades/DataStoreUpgradeInstall.ps1
@@ -35,7 +35,7 @@
     )
 
     Import-DscResource -ModuleName PSDesiredStateConfiguration 
-    Import-DscResource -ModuleName ArcGIS -ModuleVersion 4.0.1 
+    Import-DscResource -ModuleName ArcGIS -ModuleVersion 4.0.2 
     Import-DscResource -Name ArcGIS_Install
     Import-DscResource -Name ArcGIS_InstallPatch
     Import-DscResource -Name ArcGIS_DataStoreUpgrade

diff --git a/Modules/ArcGIS/Configurations-OnPrem/Upgrades/DataStoreUpgradePreInstall.ps1 b/Modules/ArcGIS/Configurations-OnPrem/Upgrades/DataStoreUpgradePreInstall.ps1
@@ -7,7 +7,7 @@
     )
 
     Import-DscResource -ModuleName PSDesiredStateConfiguration
-    Import-DscResource -ModuleName ArcGIS -ModuleVersion 4.0.1
+    Import-DscResource -ModuleName ArcGIS -ModuleVersion 4.0.2
 
     Node $AllNodes.NodeName {
 

diff --git a/Modules/ArcGIS/Configurations-OnPrem/Upgrades/InsightsUpgradeInstall.ps1 b/Modules/ArcGIS/Configurations-OnPrem/Upgrades/InsightsUpgradeInstall.ps1
@@ -32,7 +32,7 @@
         $EnableMSILogging = $false
     )
     Import-DscResource -ModuleName PSDesiredStateConfiguration
-    Import-DscResource -ModuleName ArcGIS -ModuleVersion 4.0.1
+    Import-DscResource -ModuleName ArcGIS -ModuleVersion 4.0.2
     Import-DscResource -Name ArcGIS_Install
     Import-DscResource -Name ArcGIS_InstallPatch
 

diff --git a/Modules/ArcGIS/Configurations-OnPrem/Upgrades/InsightsUpgradeUninstall.ps1 b/Modules/ArcGIS/Configurations-OnPrem/Upgrades/InsightsUpgradeUninstall.ps1
@@ -4,7 +4,7 @@
         $Version
     )
     Import-DscResource -ModuleName PSDesiredStateConfiguration
-    Import-DscResource -ModuleName ArcGIS -ModuleVersion 4.0.1
+    Import-DscResource -ModuleName ArcGIS -ModuleVersion 4.0.2
     Import-DscResource -Name ArcGIS_Install
 
     Node $AllNodes.NodeName

diff --git a/Modules/ArcGIS/Configurations-OnPrem/Upgrades/PortalPostUpgrade.ps1 b/Modules/ArcGIS/Configurations-OnPrem/Upgrades/PortalPostUpgrade.ps1
@@ -15,7 +15,7 @@
     )
 
     Import-DscResource -ModuleName PSDesiredStateConfiguration 
-    Import-DscResource -ModuleName ArcGIS -ModuleVersion 4.0.1 
+    Import-DscResource -ModuleName ArcGIS -ModuleVersion 4.0.2 
     Import-DscResource -Name ArcGIS_PortalUpgrade 
 
     Node $AllNodes.NodeName {

diff --git a/Modules/ArcGIS/Configurations-OnPrem/Upgrades/PortalUpgrade.ps1 b/Modules/ArcGIS/Configurations-OnPrem/Upgrades/PortalUpgrade.ps1
@@ -45,7 +45,7 @@
     )
 
     Import-DscResource -ModuleName PSDesiredStateConfiguration 
-    Import-DscResource -ModuleName ArcGIS -ModuleVersion 4.0.1 
+    Import-DscResource -ModuleName ArcGIS -ModuleVersion 4.0.2 
     Import-DscResource -Name ArcGIS_Install 
     Import-DscResource -Name ArcGIS_Service_Account
     Import-DscResource -Name ArcGIS_InstallPatch

diff --git a/Modules/ArcGIS/Configurations-OnPrem/Upgrades/ServerUpgrade.ps1 b/Modules/ArcGIS/Configurations-OnPrem/Upgrades/ServerUpgrade.ps1
@@ -81,7 +81,7 @@
     )
 
     Import-DscResource -ModuleName PSDesiredStateConfiguration 
-    Import-DscResource -ModuleName ArcGIS -ModuleVersion 4.0.1 
+    Import-DscResource -ModuleName ArcGIS -ModuleVersion 4.0.2 
     Import-DscResource -Name ArcGIS_Install 
     Import-DscResource -Name ArcGIS_License 
     Import-DscResource -Name ArcGIS_ServerUpgrade 

diff --git a/Modules/ArcGIS/Configurations-OnPrem/Upgrades/WebAdaptorUpgrade.ps1 b/Modules/ArcGIS/Configurations-OnPrem/Upgrades/WebAdaptorUpgrade.ps1
@@ -42,7 +42,7 @@
     )
 
     Import-DscResource -ModuleName PSDesiredStateConfiguration 
-    Import-DscResource -ModuleName ArcGIS -ModuleVersion 4.0.1 
+    Import-DscResource -ModuleName ArcGIS -ModuleVersion 4.0.2 
     Import-DscResource -Name ArcGIS_Install
     Import-DscResource -Name ArcGIS_WebAdaptor
 

diff --git a/Modules/ArcGIS/DSCResources/ArcGIS_Federation/ArcGIS_Federation.psm1 b/Modules/ArcGIS/DSCResources/ArcGIS_Federation/ArcGIS_Federation.psm1
@@ -418,7 +418,7 @@ function Set-TargetResource
                     Write-Verbose 'Federation succeeded. Now updating server role and function.'
                     $Done = $true
                 }
-                $NumOfAttempts++
+                $NumAttempts++
             }
         } else {
             Write-Verbose "Federated Server with Admin URL $ServerSiteAdminUrl already exists"

diff --git a/Modules/ArcGIS/DSCResources/ArcGIS_InstallPatch/ArcGIS_InstallPatch.psm1 b/Modules/ArcGIS/DSCResources/ArcGIS_InstallPatch/ArcGIS_InstallPatch.psm1
@@ -398,7 +398,11 @@ function Test-PatchInstalled
         "HKLM:\SOFTWARE\WOW6432Node\ESRI\Desktop10.6\Updates\*" ,
         "HKLM:\SOFTWARE\WOW6432Node\ESRI\Desktop10.7\Updates\*",
         "HKLM:\SOFTWARE\WOW6432Node\ESRI\Desktop10.8\Updates\*",
-        "HKLM:\SOFTWARE\WOW6432Node\ESRI\ArcGIS Web Adaptor (IIS) 10.8.1\Updates\*"
+        "HKLM:\SOFTWARE\WOW6432Node\ESRI\ArcGIS Web Adaptor (IIS) 10.8\Updates\*",
+        "HKLM:\SOFTWARE\WOW6432Node\ESRI\ArcGIS Web Adaptor (IIS) 10.8.1\Updates\*",
+        "HKLM:\SOFTWARE\WOW6432Node\ESRI\ArcGIS Web Adaptor (IIS) 10.9\Updates\*",
+        "HKLM:\SOFTWARE\WOW6432Node\ESRI\ArcGIS Web Adaptor (IIS) 10.9.1\Updates\*",
+        "HKLM:\SOFTWARE\WOW6432Node\ESRI\ArcGIS Web Adaptor (IIS) 11.0\Updates\*"
     )
 
     foreach($RegPath in $RegPaths){

diff --git a/Modules/ArcGIS/DSCResources/ArcGIS_PortalSettings/ArcGIS_PortalSettings.psm1 b/Modules/ArcGIS/DSCResources/ArcGIS_PortalSettings/ArcGIS_PortalSettings.psm1
@@ -321,7 +321,7 @@ function Set-TargetResource
         Set-PortalSecurityConfig -PortalHostName $PortalFQDN -Token $token.token -SecurityParameters (ConvertTo-Json $securityConfig -Depth 10) -Referer $Referer -Verbose
     }
 
-    if($VersionArray[0] -eq 11 -or ($VersionArray[0] -eq 10 -and $VersionArray[1] -gt 8) -or $Version -eq "10.8.1"){
+    if($VersionArray[0] -eq 11 -or ($VersionArray[0] -eq 10 -and $VersionArray[1] -gt 8) -or $Info.Version -eq "10.8.1"){
         $UpdateEmailSettingsFlag = $False
         try{
             $PortalEmailSettings = Get-PortalEmailSettings -PortalHostName $PortalFQDN -Token $token.token -Referer $Referer
@@ -592,7 +592,7 @@ function Test-TargetResource
         }
     }
 
-    if($result -and ($VersionArray[0] -eq 11 -or ($VersionArray[0] -eq 10 -and $VersionArray[1] -gt 8) -or $Version -eq "10.8.1")){
+    if($result -and ($VersionArray[0] -eq 11 -or ($VersionArray[0] -eq 10 -and $VersionArray[1] -gt 8) -or $Info.Version -eq "10.8.1")){
         Write-Verbose "Checking Portal Email settings."
         try{
             $PortalEmailSettings = Get-PortalEmailSettings -PortalHostName $PortalFQDN -Token $token.token -Referer $Referer