v4.3.0

jdhitsolutions · jdhitsolutions · commit 7cc058305472 · 2019-09-30T12:59:33.000-04:00
diff --git a/Configurations/Implement-Windows-Server-DHCP-2016/Instructions.md b/Configurations/Implement-Windows-Server-DHCP-2016/Instructions.md
@@ -1,4 +1,4 @@
-# Lab definition
+# Lab Definition
 
 This lab is specifically designed for the Implementing Windows Server 2016 DHCP from Pluralsight.com. It will provide a fully-function AD environment using company.pri for a domain, and it builds the following servers:
 
diff --git a/Configurations/Implement-Windows-Server-DHCP-2016/VMConfiguration.ps1 b/Configurations/Implement-Windows-Server-DHCP-2016/VMConfiguration.ps1
@@ -23,16 +23,15 @@ $Secure = ConvertTo-SecureString -String "$($labdata.allnodes.labpassword)" -AsP
 $credential = New-Object -typename Pscredential -ArgumentList Administrator, $secure
 
 #region DSC Resources
-    Import-DSCresource -ModuleName PSDesiredStateConfiguration,
-    @{ModuleName="xPSDesiredStateConfiguration";ModuleVersion="8.9.0.0"},
-    @{ModuleName="xActiveDirectory";ModuleVersion="3.0.0.0"},
-    @{ModuleName="xComputerManagement";ModuleVersion="4.1.0.0"},
-    @{ModuleName="xNetworking";ModuleVersion="5.7.0.0"},
-    @{ModuleName="xDhcpServer";ModuleVersion="2.0.0.0"},
-    @{ModuleName='xWindowsUpdate';ModuleVersion = '2.8.0.0'},
-    @{ModuleName='xPendingReboot';ModuleVersion = '0.4.0.0'},
-    @{ModuleName='xADCSDeployment';ModuleVersion = '1.4.0.0'}
-
+Import-DSCresource -ModuleName "PSDesiredStateConfiguration" -ModuleVersion "1.1"
+Import-DSCResource -modulename "xPSDesiredStateConfiguration" -ModuleVersion  "8.9.0.0"
+Import-DSCResource -modulename "xActiveDirectory" -ModuleVersion  "3.0.0.0"
+Import-DSCResource -modulename "xComputerManagement" -ModuleVersion  "4.1.0.0"
+Import-DSCResource -modulename "xNetworking" -ModuleVersion  "5.7.0.0"
+Import-DSCResource -modulename "xDhcpServer" -ModuleVersion  "2.0.0.0"
+Import-DSCResource -modulename 'xWindowsUpdate' -ModuleVersion  '2.8.0.0'
+Import-DSCResource -modulename 'xPendingReboot' -ModuleVersion  '0.4.0.0'
+Import-DSCResource -modulename 'xADCSDeployment' -ModuleVersion  '1.4.0.0'
 #endregion
 #region All Nodes
     node $AllNodes.Where({$true}).NodeName {
diff --git a/Configurations/Jason-DSC-Env/Instructions.md b/Configurations/Jason-DSC-Env/Instructions.md
@@ -1,4 +1,4 @@
-# Lab definition
+# Lab Definition
 
 This lab builds the following:
 
@@ -17,7 +17,7 @@ This lab builds the following:
     Run the following for initial setup:
     PS> Setup-Lab
 
-    To start the LAb, and apply configurations the first time:
+    To start the Lab, and apply configurations the first time:
     PS> Run-Lab
 
     To enable Internet access for the VM's, run:
diff --git a/Configurations/Jason-DSC-Env/VMConfiguration.ps1 b/Configurations/Jason-DSC-Env/VMConfiguration.ps1
@@ -23,15 +23,15 @@ Configuration AutoLab {
     $credential = New-Object -typename Pscredential -ArgumentList Administrator, $secure
 
     #region DSC Resources
-    Import-DSCresource -ModuleName PSDesiredStateConfiguration,
-    @{ModuleName = 'xActiveDirectory'; ModuleVersion = '3.0.0.0'},
-    @{ModuleName = 'xComputerManagement'; ModuleVersion = '4.1.0.0'},
-    @{ModuleName = 'xNetworking'; ModuleVersion = '5.7.0.0'},
-    @{ModuleName = 'xDhcpServer'; ModuleVersion = '2.0.0.0'},
-    @{ModuleName = 'xWindowsUpdate'; ModuleVersion = '2.8.0.0'},
-    @{ModuleName = 'xPSDesiredStateConfiguration'; ModuleVersion = '8.9.0.0'},
-    @{ModuleName = 'xPendingReboot'; ModuleVersion = '0.4.0.0'},
-    @{ModuleName = 'xADCSDeployment'; ModuleVersion = '1.4.0.0'}
+    Import-DSCResource -ModuleName 'PSDesiredStateConfiguration' -ModuleVersion '1.1'
+    Import-DSCResource -ModuleName 'xActiveDirectory' -ModuleVersion '3.0.0.0'
+    Import-DSCResource -ModuleName 'xComputerManagement' -ModuleVersion '4.1.0.0'
+    Import-DSCResource -ModuleName 'xNetworking' -ModuleVersion '5.7.0.0'
+    Import-DSCResource -ModuleName 'xDhcpServer' -ModuleVersion '2.0.0.0'
+    Import-DSCResource -ModuleName 'xWindowsUpdate' -ModuleVersion '2.8.0.0'
+    Import-DSCResource -ModuleName 'xPSDesiredStateConfiguration' -ModuleVersion '8.9.0.0'
+    Import-DSCResource -ModuleName 'xPendingReboot' -ModuleVersion '0.4.0.0'
+    Import-DSCResource -ModuleName 'xADCSDeployment' -ModuleVersion '1.4.0.0'
 
 
     #endregion
diff --git a/Configurations/MultiRole/Instructions.md b/Configurations/MultiRole/Instructions.md
@@ -5,8 +5,8 @@ If you were instructed to use that configuration, this one should work for you.
 
 The lab builds the following:
 
-* 1 DC
-* 1 Server (s1)
+* 1 DC (DC1)
+* 1 Server (S1)
 * 1 Nano (N1)
 * 1 Client with RSAT (Cli1)
 
@@ -20,7 +20,7 @@ The lab builds the following:
     Run the following for initial setup:
     PS> Setup-Lab
 
-    To start the LAb, and apply configurations the first time:
+    To start the Lab, and apply configurations the first time:
     PS> Run-Lab
 
     To enable Internet access for the VM's, run:
diff --git a/Configurations/MultiRole/VMConfiguration.ps1 b/Configurations/MultiRole/VMConfiguration.ps1
@@ -7,16 +7,17 @@ $Secure = ConvertTo-SecureString -String "$($labdata.allnodes.labpassword)" -AsP
 $credential = New-Object -typename Pscredential -ArgumentList Administrator, $secure
 
 #region DSC Resources
-    Import-DSCresource -ModuleName PSDesiredStateConfiguration,
-    @{ModuleName = "xPSDesiredStateConfiguration"; ModuleVersion = "8.9.0.0"},
-    @{ModuleName = "xActiveDirectory"; ModuleVersion = "3.0.0.0"},
-    @{ModuleName = "xComputerManagement"; ModuleVersion = "4.1.0.0"},
-    @{ModuleName = "xNetworking"; ModuleVersion = "5.7.0.0"},
-    @{ModuleName = "xDhcpServer"; ModuleVersion = "2.0.0.0"},
-    @{ModuleName = 'xWindowsUpdate'; ModuleVersion = '2.8.0.0'},
-    @{ModuleName = 'xPendingReboot'; ModuleVersion = '0.4.0.0'},
-    @{ModuleName = 'xADCSDeployment'; ModuleVersion = '1.4.0.0'},
-    @{ModuleName = 'xDnsServer'; ModuleVersion = '1.14.0.0'}
+    Import-DSCresource -ModuleName "PSDesiredStateConfiguration" -ModuleVersion "1.1"
+    Import-DSCResource -modulename "xPSDesiredStateConfiguration" -ModuleVersion  "8.9.0.0"
+    Import-DSCResource -modulename "xActiveDirectory" -ModuleVersion  "3.0.0.0"
+    Import-DSCResource -modulename "xComputerManagement" -ModuleVersion  "4.1.0.0"
+    Import-DSCResource -modulename "xNetworking" -ModuleVersion  "5.7.0.0"
+    Import-DSCResource -modulename "xDhcpServer" -ModuleVersion  "2.0.0.0"
+    Import-DSCResource -modulename 'xWindowsUpdate' -ModuleVersion  '2.8.0.0'
+    Import-DSCResource -modulename 'xPendingReboot' -ModuleVersion  '0.4.0.0'
+    Import-DSCResource -modulename 'xADCSDeployment' -ModuleVersion  '1.4.0.0'
+    Import-DSCResource -modulename 'xDnsServer' -ModuleVersion  '1.14.0.0'
+
 
 #endregion
 #region All Nodes
diff --git a/Configurations/PowerShellLab/Instructions.md b/Configurations/PowerShellLab/Instructions.md
@@ -1,12 +1,12 @@
-# Lab definition
+# Lab Definition
 
 This lab builds the following:
 
-* 1 Windows Server 2016 domain controller with users, groups and OU's - GUI
-* 1 DHCP server on the DOM1
+* 1 Windows Server 2016 domain controller (DOM1) with users, groups and OU's - Server Core
+* 1 DHCP server on DOM1
 * 2 Domain joined servers (SRV1 and SRV2) running Windows Server 2016 Core
 * 1 workgroup based server (SRV3) running Windows Server 2019 Core
-* 1 Domain joined Windows 10 Client with RSAT tools installed
+* 1 Domain joined Windows 10 Client (Win10) with RSAT tools installed
 
 ## To get started
 
@@ -21,7 +21,7 @@ To run the commands individually to setup the lab environment:
 Run the following for initial setup:
 
 ```powershell
-PS> Setup-Lab 
+PS> Setup-Lab
 ```
 
 To start the Lab, and apply configurations the first time:
diff --git a/Configurations/PowerShellLab/VMConfiguration.ps1 b/Configurations/PowerShellLab/VMConfiguration.ps1
@@ -23,17 +23,17 @@ Configuration AutoLab {
     $credential = New-Object -typename Pscredential -ArgumentList Administrator, $secure
 
     #region DSC Resources
-    Import-DSCresource -ModuleName PSDesiredStateConfiguration,
-    @{ModuleName = "xPSDesiredStateConfiguration"; ModuleVersion = "8.9.0.0"},
-    @{ModuleName = "xActiveDirectory"; ModuleVersion = "3.0.0.0"},
-    @{ModuleName = "xComputerManagement"; ModuleVersion = "4.1.0.0"},
-    @{ModuleName = "xNetworking"; ModuleVersion = "5.7.0.0"},
-    @{ModuleName = "xDhcpServer"; ModuleVersion = "2.0.0.0"},
-    @{ModuleName = 'xWindowsUpdate'; ModuleVersion = '2.8.0.0'},
-    @{ModuleName = 'xPendingReboot'; ModuleVersion = '0.4.0.0'},
-    @{ModuleName = 'xADCSDeployment'; ModuleVersion = '1.4.0.0'},
-    @{ModuleName = 'xDnsServer'; ModuleVersion = '1.14.0.0'},
-    @{ModuleName = 'xWebAdministration'; ModuleVersion = '2.7.0.0'}
+    Import-DSCresource -ModuleName "PSDesiredStateConfiguration" -ModuleVersion "1.1"
+    Import-DSCResource -modulename "xPSDesiredStateConfiguration" -ModuleVersion  "8.9.0.0"
+    Import-DSCResource -modulename "xActiveDirectory" -ModuleVersion  "3.0.0.0"
+    Import-DSCResource -modulename "xComputerManagement" -ModuleVersion  "4.1.0.0"
+    Import-DSCResource -modulename "xNetworking" -ModuleVersion  "5.7.0.0"
+    Import-DSCResource -modulename "xDhcpServer" -ModuleVersion  "2.0.0.0"
+    Import-DSCResource -modulename 'xWindowsUpdate' -ModuleVersion  '2.8.0.0'
+    Import-DSCResource -modulename 'xPendingReboot' -ModuleVersion  '0.4.0.0'
+    Import-DSCResource -modulename 'xADCSDeployment' -ModuleVersion  '1.4.0.0'
+    Import-DSCResource -modulename 'xDnsServer' -ModuleVersion  '1.14.0.0'
+    Import-DSCResource -modulename 'xWebAdministration' -ModuleVersion  '2.7.0.0'
 
     #endregion
     #region All Nodes
diff --git a/Configurations/SingleServer/VMConfiguration.ps1 b/Configurations/SingleServer/VMConfiguration.ps1
@@ -6,10 +6,10 @@ Configuration AutoLab {
     $credential = New-Object -typename Pscredential -ArgumentList Administrator, $secure
 
     #region DSC Resources
-    Import-DSCresource -ModuleName PSDesiredStateConfiguration,
-    @{ModuleName = "xPSDesiredStateConfiguration"; ModuleVersion = "8.9.0.0"},
-    @{ModuleName = "xComputerManagement"; ModuleVersion = "4.1.0.0"},
-    @{ModuleName = "xNetworking"; ModuleVersion = "5.7.0.0"}
+    Import-DSCresource -ModuleName "PSDesiredStateConfiguration" -ModuleVersion "1.1"
+    Import-DSCResource -modulename "xPSDesiredStateConfiguration" -ModuleVersion  "8.9.0.0"
+    Import-DSCResource -modulename "xComputerManagement" -ModuleVersion  "4.1.0.0"
+    Import-DSCResource -modulename "xNetworking" -ModuleVersion  "5.7.0.0"
 
     #endregion
     #region All Nodes
diff --git a/Configurations/Windows10/Instructions.md b/Configurations/Windows10/Instructions.md
@@ -1,4 +1,4 @@
-# Lab definition
+# Lab Definition
 
 This lab builds the following:
 
@@ -16,7 +16,7 @@ It will also create a local user account with a password of `P@ssw0rd` using sam
     Run the following for initial setup:
     PS> Setup-Lab
 
-    To start the LAb, and apply configurations the first time:
+    To start the Lab, and apply configurations the first time:
     PS> Run-Lab
 
     To enable Internet access for the VM's, run:
diff --git a/Configurations/Windows10/VMConfiguration.ps1 b/Configurations/Windows10/VMConfiguration.ps1
@@ -16,20 +16,24 @@ demonstrations and would need to be modified for your environment.
 
 #>
 
+
 Configuration AutoLab {
 
     $LabData = Import-PowerShellDataFile -Path $PSScriptroot\VMConfigurationData.psd1
     $Secure = ConvertTo-SecureString -String "$($labdata.allnodes.labpassword)" -AsPlainText -Force
     $credential = New-Object -typename Pscredential -ArgumentList Administrator, $secure
 
     Import-DscResource -ModuleName "PSDesiredStateConfiguration" -ModuleVersion "1.1"
+
+    #import dscresources from the configuration data
     Import-DscResource -ModuleName "xPSDesiredStateConfiguration" -ModuleVersion "8.9.0.0"
     Import-DscResource -ModuleName "xComputerManagement" -ModuleVersion "4.1.0.0"
     Import-DscResource -ModuleName "xNetworking" -ModuleVersion "5.7.0.0"
     Import-DscResource -ModuleName "xWindowsUpdate" -ModuleVersion "2.8.0.0"
     Import-DscResource -ModuleName "xPendingReboot" -ModuleVersion "0.4.0.0"
 
-    Node $AllNodes.Where( {$true}).NodeName {
+
+    Node $AllNodes.Where( { $true }).NodeName {
         xComputer ComputerName {
             Name          = $Node.NodeName
             WorkGroupName = "Lab"
@@ -122,7 +126,7 @@ Configuration AutoLab {
     #endregion
 
     #region RSAT config
-    node $AllNodes.Where( {$_.Role -eq 'RSAT'}).NodeName {
+    node $AllNodes.Where( { $_.Role -eq 'RSAT' }).NodeName {
         # Adds RSAT which is now a Windows Capability in Windows 10
 
         Script RSAT {
@@ -138,18 +142,18 @@ Configuration AutoLab {
 
             GetScript  = {
                 $packages = Get-WindowsCapability -online -Name Rsat* | Select-Object Displayname, State
-                $installed = $packages.Where( {$_.state -eq "Installed"})
-                Return @{Result = "$($installed.count)/$($packages.count) RSAT features installed"}
+                $installed = $packages.Where( { $_.state -eq "Installed" })
+                Return @{Result = "$($installed.count)/$($packages.count) RSAT features installed" }
             }
 
             SetScript  = {
-                Get-WindowsCapability -online -Name Rsat* | Where-Object {$_.state -ne "installed"} | Add-WindowsCapability -online
+                Get-WindowsCapability -online -Name Rsat* | Where-Object { $_.state -ne "installed" } | Add-WindowsCapability -online
             }
         }
     } #end RSAT Config
 
     #region RDP config
-    node $AllNodes.Where( {$_.Role -eq 'RDP'}).NodeName {
+    node $AllNodes.Where( { $_.Role -eq 'RDP' }).NodeName {
         # Adds RDP support and opens Firewall rules
 
         Registry RDP {
diff --git a/Configurations/microsoft-powershell-implementing-jea/Instructions.md b/Configurations/microsoft-powershell-implementing-jea/Instructions.md
@@ -1,9 +1,9 @@
-# Lab definition
+# Lab Definition
 
 This lab builds the following:
 
-* 1 DC
-* 1 Server (s1)
+* 1 DC (DC1)
+* 1 Server (S1)
 * 1 Nano (N1)
 * 1 Client with RSAT (Cli1)
 
diff --git a/Configurations/microsoft-powershell-implementing-jea/VMConfiguration.ps1 b/Configurations/microsoft-powershell-implementing-jea/VMConfiguration.ps1
@@ -23,15 +23,15 @@ Configuration AutoLab {
     $credential = New-Object -typename Pscredential -ArgumentList Administrator, $secure
 
     #region DSC Resources
-    Import-DSCresource -ModuleName PSDesiredStateConfiguration,
-    @{ModuleName = "xPSDesiredStateConfiguration"; ModuleVersion = "8.9.0.0"},
-    @{ModuleName = "xActiveDirectory"; ModuleVersion = "3.0.0.0"},
-    @{ModuleName = "xComputerManagement"; ModuleVersion = "4.1.0.0"},
-    @{ModuleName = "xNetworking"; ModuleVersion = "5.7.0.0"},
-    @{ModuleName = "xDhcpServer"; ModuleVersion = "2.0.0.0"},
-    @{ModuleName = 'xWindowsUpdate'; ModuleVersion = '2.8.0.0'},
-    @{ModuleName = 'xPendingReboot'; ModuleVersion = '0.4.0.0'},
-    @{ModuleName = 'xADCSDeployment'; ModuleVersion = '1.4.0.0'}
+    Import-DSCresource -ModuleName "PSDesiredStateConfiguration" -ModuleVersion "1.1"
+    Import-DSCResource -modulename "xPSDesiredStateConfiguration" -ModuleVersion  "8.9.0.0"
+    Import-DSCResource -modulename "xActiveDirectory" -ModuleVersion  "3.0.0.0"
+    Import-DSCResource -modulename "xComputerManagement" -ModuleVersion  "4.1.0.0"
+    Import-DSCResource -modulename "xNetworking" -ModuleVersion  "5.7.0.0"
+    Import-DSCResource -modulename "xDhcpServer" -ModuleVersion  "2.0.0.0"
+    Import-DSCResource -modulename 'xWindowsUpdate' -ModuleVersion  '2.8.0.0'
+    Import-DSCResource -modulename 'xPendingReboot' -ModuleVersion  '0.4.0.0'
+    Import-DSCResource -modulename 'xADCSDeployment' -ModuleVersion  '1.4.0.0'
 
     #endregion
     #region All Nodes
diff --git a/PSAutoLab.psd1 b/PSAutoLab.psd1
diff --git a/README.md b/README.md
@@ -151,6 +151,7 @@ Unattend-Lab
 
 Assuming you don't need to install a newer version of nuget, you can leave the setup alone.
 It will run all of the manual steps for you.
+Beginning in version 4.3.0 you also have the option to run the unattend process in a PowerShell background job.
 
 ### Stopping a Lab
 
@@ -288,6 +289,6 @@ These are some of the items that are being considered for future updates:
 * Integrate the [PostSetup](.\Configurations\PowerShellLab\PostSetup\README.md) tools from the PowerShellLab configuration
 * Offer an easy way to customize a lab configuration such as time zone, node names and operating systems.
 
-A complete list of enhancements can be found in Issues.
+A complete list of enhancements can be found in [Issues](https://github.com/pluralsight/PS-AutoLab-Env/issues).
 
-Last Updated 2019-09-21 03:35:56Z UTC
+Last Updated 2019-09-30 16:50:51Z UTC
diff --git a/changelog.txt b/changelog.txt
@@ -1,5 +1,16 @@
 Changelog for PSAutoLab
 
+v4.3.0
+
+Added code when setting up host to update Pester (Issue #195)
+Updated configurations to use xComputerManagement (Issue #196)
+Updated configuration scripts to better import DSC resource modules
+Modified Wipe-Lab to allow removing lab elements without prompting and removing Lab switch is now optional. (Issue #191)
+Modified Unattend-Lab to run in a background job (Issue #190)
+Updated Get-PSAutolabSetting to get Pester version (Issue #197)
+Updated Get-Labsnapshot (Issue #192)
+Help updates
+
 v4.2.0
 
 Updates to Setup-Lab to better handle DSCResource installation (Issue #194)
diff --git a/docs/Invoke-UnattendLab.md b/docs/Invoke-UnattendLab.md
@@ -14,7 +14,8 @@ Create an Autolab configuration unattended
 ## SYNTAX
 
 ```yaml
-Invoke-UnattendLab [[-Path] <String>] [-WhatIf] [-Confirm] [<CommonParameters>]
+
+Invoke-UnattendLab [[-Path] <String>] [-AsJob] [-WhatIf] [-Confirm] [<CommonParameters>]
 ```
 
 ## DESCRIPTION
@@ -45,6 +46,15 @@ PS C:\Autolab\Configurations\PowerShellLab> Unattend-Lab
 
 Follow any onscreen instructions or prompts.
 
+
+### Example 2
+
+```powershell
+PS C:\Autolab\Configurations\MultiRole> Unattend-Lab -asJob
+```
+
+Run the setup unattended in a background job.
+
 ## PARAMETERS
 
 ### -Confirm
@@ -96,6 +106,22 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
+### -AsJob
+
+Run the unattend process in a PowerShell background job.
+
+```yaml
+Type: SwitchParameter
+Parameter Sets: (All)
+Aliases:
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
 ### CommonParameters
 
 This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see [about_CommonParameters](http://go.microsoft.com/fwlink/?LinkID=113216).
diff --git a/docs/Invoke-WipeLab.md b/docs/Invoke-WipeLab.md
diff --git a/en-us/PSAutoLab-help.xml b/en-us/PSAutoLab-help.xml
diff --git a/functions/private.ps1 b/functions/private.ps1
diff --git a/functions/public.ps1 b/functions/public.ps1

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# Lab definition`
	`1`	`+# Lab Definition`
`2`	`2`
`3`	`3`	`This lab is specifically designed for the Implementing Windows Server 2016 DHCP from Pluralsight.com. It will provide a fully-function AD environment using company.pri for a domain, and it builds the following servers:`
`4`	`4`