Merge pull request #13 from PowerShell/dev

Merging release pull request

Author: KarolKaczmarek

DscResources/MSFT_xWindowsUpdate/MSFT_xWindowsUpdate.psm1

@@ -64,10 +64,8 @@ function Get-TargetResource
     $uri, $kbId = Validate-StandardArguments -Path $Path -Id $Id
 
     Write-Verbose $($LocalizedData.GettingHotfixMessage -f ${Id})
-    
-    $PSBoundParameters.Remove('Id')
 
-    $hotfix = Get-HotFix -Id "KB$kbId" @PSBoundParameters
+    $hotfix = Get-HotFix -Id "KB$kbId"
 
     $returnValue = @{
         Path = ''
@@ -174,14 +172,14 @@ function Set-TargetResource
 
     }
 
-    if ($LASTEXITCODE -eq 3010)
+    if (Test-Path -Path 'variable:\LASTEXITCODE')
     {
-        # reboot machine if exitcode indicates reboot.
-        # This seems to be broken
-        $global:DSCMachineStatus = 1        
+        if ($LASTEXITCODE -eq 3010)
+        {
+            # reboot machine if exitcode indicates reboot.
+            $global:DSCMachineStatus = 1        
+        }
     }
-            
-    
 }
 
 

README.md

@@ -1,4 +1,4 @@
-[![Build status](https://ci.appveyor.com/api/projects/status/t4bw4lnmxy1dg3ys/branch/master?svg=true)](https://ci.appveyor.com/project/PowerShell/xwindowsupdate/branch/master)
+[![Build status](https://ci.appveyor.com/api/projects/status/t4bw4lnmxy1dg3ys/branch/master?svg=true)](https://ci.appveyor.com/project/PowerShell/xwindowsupdate/branch/master)
 
 # xWindowsUpdate
 
@@ -26,6 +26,13 @@ If no log is used, a temporary log name is created by the resource.
 
 ## Versions
 
+### Unreleased
+
+### 2.3.0.0
+
+* MSFT_xWindowsUpdate: Fixed an issue in the Get-TargetResource function, resulting in the Get-DscConfiguration cmdlet now working appropriately when the resource is applied.
+* MSFT_xWindowsUpdate: Fixed an issue in the Set-TargetResource function that was causing the function to fail when the installation of a hotfix did not provide an exit code.
+
 ### 2.2.0.0
 
 * Minor fixes
@@ -49,7 +56,7 @@ If the hotfix with the required hotfix ID is already present on the system, the
 ```powershell
 Configuration UpdateWindowsWithPath
 {       
-    Node ‘NodeName’
+    Node ‘NodeName’
     { 
         xHotfix HotfixInstall
         {
@@ -68,7 +75,7 @@ This configuration will install the hotfix from a URI that is connected to a par
 ```powershell
 Configuration UpdateWindowsWithURI
 {
-    Node ‘NodeName’
+    Node ‘NodeName’
     { 
         xHotfix HotfixInstall
         {

appveyor.yml

@@ -1,7 +1,7 @@
 #---------------------------------# 
 #      environment configuration  # 
 #---------------------------------# 
-version: 2.2.{build}.0
+version: 2.3.{build}.0
 install: 
   - cinst -y pester
   - git clone https://github.com/PowerShell/DscResource.Tests
@@ -34,12 +34,12 @@ test_script:
 #---------------------------------# 
 
 # scripts to run before deployment 
-before_deploy: 
+deploy_script: 
   - ps: |
       # Creating project artifact
       $stagingDirectory = (Resolve-Path ..).Path
       $manifest = Join-Path $pwd "xWindowsUpdate.psd1"
-      (Get-Content $manifest -Raw).Replace("2.2.0.0", $env:APPVEYOR_BUILD_VERSION) | Out-File $manifest
+      (Get-Content $manifest -Raw).Replace("2.3.0.0", $env:APPVEYOR_BUILD_VERSION) | Out-File $manifest
       $zipFilePath = Join-Path $stagingDirectory "$(Split-Path $pwd -Leaf).zip"
       Add-Type -assemblyname System.IO.Compression.FileSystem
       [System.IO.Compression.ZipFile]::CreateFromDirectory($pwd, $zipFilePath)

xWindowsUpdate.psd1

@@ -1,6 +1,6 @@
 @{
 # Version number of this module.
-ModuleVersion = '2.2.0.0'
+ModuleVersion = '2.3.0.0'
 
 # ID used to uniquely identify this module
 GUID = 'a9cba250-ea73-4d82-b31b-7e58cc50ffd1'
@@ -28,5 +28,29 @@ FunctionsToExport = '*'
 
 # Cmdlets to export from this module
 CmdletsToExport = '*'
+
+# Private data to pass to the module specified in RootModule/ModuleToProcess. This may also contain a PSData hashtable with additional module metadata used by PowerShell.
+PrivateData = @{
+
+    PSData = @{
+
+        # Tags applied to this module. These help with module discovery in online galleries.
+        Tags = @('DesiredStateConfiguration', 'DSC', 'DSCResourceKit', 'DSCResource')
+
+        # A URL to the license for this module.
+        LicenseUri = 'https://github.com/PowerShell/xWindowsUpdate/blob/master/LICENSE'
+
+        # A URL to the main website for this project.
+        ProjectUri = 'https://github.com/PowerShell/xWindowsUpdate'
+
+        # A URL to an icon representing this module.
+        # IconUri = ''
+
+        # ReleaseNotes of this module
+        # ReleaseNotes = ''
+
+    } # End of PSData hashtable
+
+} # End of PrivateData hashtable
 }