Merge pull request #4858 from MicrosoftDocs/staging

Merge latest changes to live

Author: sdwheeler

dsc/configurations/import-dscresource.md

@@ -11,16 +11,17 @@ title:  Using Import-DSCResource
 The syntax for `Import-DSCResource` is shown below.  When specifying modules by name, it is a requirement to list each on a new line.
 
 ```syntax
-Import-DscResource [-Name <ResourceName(s)>] [-ModuleName <ModuleName>]
+Import-DscResource [-Name <ResourceName(s)>] [-ModuleName <ModuleName>] [-ModuleVersion <ModuleVersion>]
 ```
 
 |Parameter  |Description  |
 |---------|---------|
 |`-Name`|The DSC resource name(s) that you must import. If the module name is specified, the command searches for these DSC resources within this module; otherwise the command searches the DSC resources in all DSC resource paths. Wildcards are supported.|
 |`-ModuleName`|The module name, or module specification.  If you specify resources to import from a module, the command will try to import only those resources. If you specify the module only, the command imports all the DSC resources in the module.|
+|`-ModuleVersion`|Beginning in PowerShell 5.0, you can specify which version of a module a configuration should use. For more information, see [Import a specific version of an installed resource](sxsresource.md).|
 
 ```powershell
-Import-DscResource -ModuleName xActiveDirectory;
+Import-DscResource -ModuleName xActiveDirectory
 ```
 
 ## Example: Use Import-DSCResource within a configuration
@@ -30,7 +31,7 @@ Configuration MSDSCConfiguration
 {
     # Search for and imports Service, File, and Registry from the module PSDesiredStateConfiguration.
     Import-DSCResource -ModuleName PSDesiredStateConfiguration -Name Service, File, Registry
-    
+
     # Search for and import Resource1 from the module that defines it.
     # If only –Name parameter is used then resources can belong to different PowerShell modules as well.
     # TimeZone resource is from the ComputerManagementDSC module which is not installed by default.
@@ -42,7 +43,8 @@ Configuration MSDSCConfiguration
     # Search for and import all DSC resources inside the module PSDesiredStateConfiguration.
     # When specifying the modulename parameter, it is a requirement to list each on a new line.
     Import-DSCResource -ModuleName PSDesiredStateConfiguration
-    Import-DSCResource -ModuleName ComputerManagementDsc
+    # In PowerShell 5.0 and later, you can specify a ModuleVersion parameter
+    Import-DSCResource -ModuleName ComputerManagementDsc -ModuleVersion 6.0.0.0
 ...
 ```
 
@@ -142,6 +144,10 @@ Copy the contents of your desired module version to the top level of the module
 
 When authoring and compiling Configurations, your resources can be stored in any directory specified by your [PSModulePath](/powershell/developer/module/modifying-the-psmodulepath-installation-path). In PowerShell 4.0, the LCM requires all DSC resource modules to be stored under "Program Files\WindowsPowerShell\Modules" or `$pshome\Modules`. Beginning in PowerShell 5.0, this requirement was removed, and resource modules can be stored in any directory specified by `PSModulePath`.
 
+### ModuleVersion added
+
+Beginning in PowerShell 5.0, the `-ModuleVersion` parameter allows you to specify which version of a module to use within your configuration.
+
 ## See also
 
 - [Resources](../resources/resources.md)

reference/3.0/CimCmdlets/Invoke-CimMethod.md

@@ -110,7 +110,7 @@ If the InputObject parameter is specified, the cmdlet works in one of the follow
 ### Example 1: Invoke a method
 
 ```powershell
-PS C:\>Invoke-CimMethod -Query 'select * from Win32_Process where name like "notepad%"' -MethodName "Terminate"
+Invoke-CimMethod -Query 'select * from Win32_Process where name like "notepad%"' -MethodName "Terminate"
 ```
 
 This command invokes the method named Terminate on the CIM class named Win32_Process. The CIM class
@@ -119,8 +119,8 @@ is retrieved by the query "Select * from Win32_Process where name like 'notepad%
 ### Example 2: Invoke a method using CIM instance object
 
 ```powershell
-PS C:\>$x = Get-CimInstance -Query 'Select * from Win32_Process where name like "notepad%"'
-PS C:\>Invoke-CimMethod -InputObject $x -MethodName GetOwner
+$x = Get-CimInstance -Query 'Select * from Win32_Process where name like "notepad%"'
+Invoke-CimMethod -InputObject $x -MethodName GetOwner
 ```
 
 This set of commands retrieves the CIM instance object and stores it in a variable named $x using
@@ -130,24 +130,24 @@ Invoke-CimMethod cmdlet, and the GetOwner method is invoked for the CimInstance.
 ### Example 3: Invoke a static method
 
 ```powershell
-PS C:\>Invoke-CimMethod -ClassName Win32_Process -MethodName "Create" -Arguments @{ Path = "notepad.exe" }
+Invoke-CimMethod -ClassName Win32_Process -MethodName "Create" -Arguments @{ Path = "notepad.exe" }
 ```
 
 This command invokes the static method Create on the class named Win32_Process, with the arguments specified by the Arguments parameter.
 
 ### Example 4: Invoke a method using arguments
 
 ```powershell
-PS C:\>Invoke-CimMethod -ClassName Win32_Process -MethodName "Create" -Arguments @{ CommandLine = 'notepad.exe'; CurrentDirectory = "C:\windows\system32" }
+Invoke-CimMethod -ClassName Win32_Process -MethodName "Create" -Arguments @{ CommandLine = 'notepad.exe'; CurrentDirectory = "C:\windows\system32" }
 ```
 
 This command invokes the method named Create by using the Arguments parameter.
 
 ### Example 5: Client-side validation
 
 ```powershell
-PS C:\>$c = Get-CimClass -ClassName Win32_Process
-PS C:\>Invoke-CimMethod -CimClass $c -MethodName "xyz" -Arguments @{ CommandLine = 'notepad.exe' }
+$c = Get-CimClass -ClassName Win32_Process
+Invoke-CimMethod -CimClass $c -MethodName "xyz" -Arguments @{ CommandLine = 'notepad.exe' }
 ```
 
 This set of commands performs client-side validation for the method named xyz by passing a CimClass
@@ -166,7 +166,7 @@ Parameter Sets: (All)
 Aliases:
 
 Required: False
-Position: 2
+Position: 1
 Default value: None
 Accept pipeline input: True (ByPropertyName)
 Accept wildcard characters: False
@@ -187,7 +187,7 @@ Parameter Sets: CimClassSessionSet, CimClassComputerSet
 Aliases:
 
 Required: True
-Position: 1
+Position: 0
 Default value: None
 Accept pipeline input: True (ByValue)
 Accept wildcard characters: False
@@ -223,7 +223,7 @@ Parameter Sets: ClassNameComputerSet, ClassNameSessionSet
 Aliases: Class
 
 Required: True
-Position: 1
+Position: 0
 Default value: None
 Accept pipeline input: True (ByPropertyName)
 Accept wildcard characters: False
@@ -268,7 +268,7 @@ Parameter Sets: CimInstanceComputerSet, CimInstanceSessionSet
 Aliases: CimInstance
 
 Required: True
-Position: 1
+Position: 0
 Default value: None
 Accept pipeline input: True (ByValue)
 Accept wildcard characters: False
@@ -287,7 +287,7 @@ Parameter Sets: (All)
 Aliases: Name
 
 Required: True
-Position: 3
+Position: 2
 Default value: None
 Accept pipeline input: True (ByPropertyName)
 Accept wildcard characters: False
@@ -298,7 +298,7 @@ Accept wildcard characters: False
 Specifies the namespace for the CIM operation.
 
 The default namespace is root/cimv2. You can use tab completion to browse the list of namespaces,
-because Windows PowerShell gets a list of namespaces from the local WMI server to provide the list
+because PowerShell gets a list of namespaces from the local WMI server to provide the list
 of namespaces.
 
 ```yaml
@@ -388,10 +388,9 @@ The URI is used to identify a specific type of resource, such as disks or proces
 A URI consists of a prefix and a path to a resource.
 For example:
 
-```
-http://schemas.microsoft.com/wbem/wsman/1/wmi/root/cimv2/Win32_LogicalDisk
-http://intel.com/wbem/wscim/1/amt-schema/1/AMT_GeneralSettings
-```
+`http://schemas.microsoft.com/wbem/wsman/1/wmi/root/cimv2/Win32_LogicalDisk`
+
+`http://intel.com/wbem/wscim/1/amt-schema/1/AMT_GeneralSettings`
 
 By default, if you do not specify this parameter, the DMTF standard resource URI `http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/` is used and the class name is appended to it.
 

reference/3.0/CimCmdlets/New-CimInstance.md

@@ -41,16 +41,16 @@ New-CimInstance -ResourceUri <Uri> [-Key <String[]>] [[-Property] <IDictionary>]
  [-OperationTimeoutSec <UInt32>] [-ComputerName <String[]>] [-WhatIf] [-Confirm] [<CommonParameters>]
 ```
 
-### CimClassComputerSet
+### CimClassSessionSet
 ```
 New-CimInstance [-CimClass] <CimClass> [[-Property] <IDictionary>] [-OperationTimeoutSec <UInt32>]
- [-ComputerName <String[]>] [-ClientOnly] [-WhatIf] [-Confirm] [<CommonParameters>]
+ -CimSession <CimSession[]> [-ClientOnly] [-WhatIf] [-Confirm] [<CommonParameters>]
 ```
 
-### CimClassSessionSet
+### CimClassComputerSet
 ```
 New-CimInstance [-CimClass] <CimClass> [[-Property] <IDictionary>] [-OperationTimeoutSec <UInt32>]
- -CimSession <CimSession[]> [-ClientOnly] [-WhatIf] [-Confirm] [<CommonParameters>]
+ [-ComputerName <String[]>] [-ClientOnly] [-WhatIf] [-Confirm] [<CommonParameters>]
 ```
 
 ## DESCRIPTION
@@ -63,8 +63,8 @@ By default, the New-CimInstance cmdlet creates an instance on the local computer
 ## EXAMPLES
 
 ### Example 1: Create an instance of a CIM class
-```
-PS C:\>New-CimInstance -ClassName Win32_Environment -Property @{Name="testvar";VariableValue="testvalue";UserName="domain\user"}
+```powershell
+New-CimInstance -ClassName Win32_Environment -Property @{Name="testvar";VariableValue="testvalue";UserName="domain\user"}
 ```
 
 This command creates an instance of a CIM Class named win32_environment in the root/cimv2 namespace on the computer.
@@ -74,26 +74,26 @@ No client side validation is performed if the class does not exist, the properti
 If the instance is created successfully, then the New-CimInstance cmdlet outputs the newly created instance.
 
 ### Example 2: Create an instance of a CIM class using a class schema
-```
-PS C:\>$class = Get-CimClass -ClassName Win32_Environment
+```powershell
+$class = Get-CimClass -ClassName Win32_Environment
 
 
 
-PS C:\>New-CimInstance -CimClass $class -Property @{Name="testvar";VariableValue="testvalue";UserName="Contoso\User1"}
+New-CimInstance -CimClass $class -Property @{Name="testvar";VariableValue="testvalue";UserName="Contoso\User1"}
 ```
 
 This set of commands retrieves a CIM class object and stores it in a variable named $class using the Get-CimClass cmdlet.
 The contents of the variable are then passed to the New-CimInstance cmdlet.
 
 ### Example 3: Create a dynamic instance on the client
-```
-PS C:\>$a = New-CimInstance -ClassName Win32_Process -Property @{Handle=0} -Key Handle -ClientOnly
+```powershell
+$a = New-CimInstance -ClassName Win32_Process -Property @{Handle=0} -Key Handle -ClientOnly
 
 
-PS C:\>Get-CimInstance -CimInstance $a
+Get-CimInstance -CimInstance $a
 
 
-PS C:\>Invoke-CimMethod -CimInstance $a -MethodName GetOwner
+Invoke-CimMethod -CimInstance $a -MethodName GetOwner
 ```
 
 This set of commands creates a dynamic instance of a CIM class named win32_Process on the client computer without getting the instance from the server.
@@ -103,12 +103,12 @@ The Get-CimInstance cmdlet then retrieves a particular single instance, and invo
 This dynamic instance can be used to perform operations if the instance with this key exists on the server.
 
 ### Example 4: Create an instance for a CIM class of a specific namespace
-```
-PS C:\>$class = Get-CimClass -ClassName MSFT_Something -Namespace root/somewhere
+```powershell
+$class = Get-CimClass -ClassName MSFT_Something -Namespace root/somewhere
 
 
 
-PS C:\>New-CimInstance -CimClass $class -Property @{"Prop1"=1;"Prop2"="value"} -ClientOnly
+New-CimInstance -CimClass $class -Property @{"Prop1"=1;"Prop2"="value"} -ClientOnly
 ```
 
 This set of commands gets an instance of a CIM class named MSFT_Something in the namespace root/somewhere and stores it in a variable named $class using the Get-CimClass cmdlet.
@@ -129,11 +129,11 @@ Using this parameter results in better client side schema validations.
 
 ```yaml
 Type: CimClass
-Parameter Sets: CimClassComputerSet, CimClassSessionSet
+Parameter Sets: CimClassSessionSet, CimClassComputerSet
 Aliases:
 
 Required: True
-Position: 1
+Position: 0
 Default value: None
 Accept pipeline input: True (ByValue)
 Accept wildcard characters: False
@@ -158,27 +158,27 @@ Accept wildcard characters: False
 
 ### -ClassName
 Specifies the name of the CIM class of which the operation creates an instance.
-NOTE: You can use tab completion to browse the list of classes, because Windows PowerShell gets a list of classes from the local WMI server to provide a list of class names.
+NOTE: You can use tab completion to browse the list of classes, because PowerShell gets a list of classes from the local WMI server to provide a list of class names.
 
 ```yaml
 Type: String
 Parameter Sets: ClassNameComputerSet, ClassNameSessionSet
 Aliases:
 
 Required: True
-Position: 1
+Position: 0
 Default value: None
 Accept pipeline input: True (ByPropertyName)
 Accept wildcard characters: False
 ```
 
 ### -ClientOnly
 Indicates that the instance is only created in PowerShell without going to the CIM server.
-You can use this parameter to create an in-memory CIM instance for use in subsequent Windows PowerShell operations.
+You can use this parameter to create an in-memory CIM instance for use in subsequent PowerShell operations.
 
 ```yaml
 Type: SwitchParameter
-Parameter Sets: ClassNameComputerSet, ClassNameSessionSet, CimClassComputerSet, CimClassSessionSet
+Parameter Sets: ClassNameComputerSet, ClassNameSessionSet, CimClassSessionSet, CimClassComputerSet
 Aliases: Local
 
 Required: False
@@ -275,7 +275,7 @@ Parameter Sets: (All)
 Aliases: Arguments
 
 Required: False
-Position: 2
+Position: 1
 Default value: None
 Accept pipeline input: True (ByPropertyName)
 Accept wildcard characters: False
@@ -292,8 +292,6 @@ For example:
 
 `http://intel.com/wbem/wscim/1/amt-schema/1/AMT_GeneralSettings`
 
-
-
 By default, if you do not specify this parameter, the DMTF standard resource URI `http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/` is used and the class name is appended to it.
 
 ResourceURI can only be used with CIM sessions created using the WSMan protocol, or when specifying the ComputerName parameter, which creates a CIM session using WSMan.