Merge pull request #74 from PowerShell/dev

Merging release pull request
dsccommunity · Dec 14, 2016 · 05859c4 · 05859c4
2 parents 7e557ba + f02c9a2
commit 05859c4
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 11 deletions.
diff --git a/DSCResources/MSFT_xVHD/MSFT_xVHD.psm1 b/DSCResources/MSFT_xVHD/MSFT_xVHD.psm1
@@ -196,15 +196,15 @@ function Test-TargetResource
 
     if(! ($ParentPath -or $MaximumSizeBytes))
     {
-       Throw "Either specify ParentPath or MaximumSize property." 
+       Throw "Either specify ParentPath or MaximumSizeBytes property." 
     }
 
     if($ParentPath)
     {
         # Ensure only one value is specified - differencing disk or new disk
         if($MaximumSizeBytes)
         {
-            Throw "Cannot specify both ParentPath and MaximumSize. Specify only one and try again."
+            Throw "Cannot specify both ParentPath and MaximumSizeBytes. Specify only one and try again."
         }
 
         if(! (Test-Path -Path $ParentPath))

diff --git a/Examples/Sample_xVMHyperV_Complete.ps1 b/Examples/Sample_xVMHyperV_Complete.ps1
@@ -54,7 +54,7 @@ configuration Sample_xVMHyperV_Complete
             SwitchName      = $SwitchName
             State           = $State
             Path            = $Path
-            Generation      = $VhdPath.Split('.')[-1]
+            Generation      = 2
             StartupMemory   = $StartupMemory
             MinimumMemory   = $MinimumMemory
             MaximumMemory   = $MaximumMemory

diff --git a/Examples/Sample_xVMHyperV_DynamicMemory.ps1 b/Examples/Sample_xVMHyperV_DynamicMemory.ps1
@@ -37,7 +37,7 @@ configuration Sample_xVMHyperV_DynamicMemory
             Ensure        = 'Present'
             Name          = $VMName
             VhdPath       = $VhdPath
-            Generation    = $VhdPath.Split('.')[-1]
+            Generation    = 2
             StartupMemory = $StartupMemory
             MinimumMemory = $MinimumMemory
             MaximumMemory = $MaximumMemory

diff --git a/Examples/Sample_xVMHyperV_Simple.ps1 b/Examples/Sample_xVMHyperV_Simple.ps1
@@ -28,7 +28,7 @@ configuration Sample_xVMHyperV_Simple
             Ensure    = 'Present'
             Name      = $VMName
             VhdPath   = $VhdPath
-            Generation = $VhdPath.Split('.')[-1]
+            Generation = 2
             DependsOn = '[WindowsFeature]HyperV'
         }
     }

diff --git a/README.md b/README.md
@@ -78,6 +78,10 @@ Please see the Examples section for more details.
 
 ### Unreleased
 
+### 3.6.0.0
+
+* xVHD: Updated incorrect property name MaximumSize in error message
+
 ### 3.5.0.0
 * Converted appveyor.yml to install Pester from PSGallery instead of from Chocolatey.
 

diff --git a/appveyor.yml b/appveyor.yml
@@ -1,7 +1,7 @@
 #---------------------------------# 
 #      environment configuration  # 
 #---------------------------------# 
-version: 3.5.{build}.0
+version: 3.6.{build}.0
 install: 
     - git clone https://github.com/PowerShell/DscResource.Tests
     - ps: |
@@ -38,7 +38,7 @@ deploy_script:
       # Creating project artifact
       $stagingDirectory = (Resolve-Path ..).Path
       $manifest = Join-Path $pwd "xHyper-V.psd1"
-      (Get-Content $manifest -Raw).Replace("3.5.0.0", $env:APPVEYOR_BUILD_VERSION) | Out-File $manifest
+      (Get-Content $manifest -Raw).Replace("3.6.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)

diff --git a/xHyper-V.psd1 b/xHyper-V.psd1
@@ -1,6 +1,6 @@
 @{
 # Version number of this module.
-ModuleVersion = '3.5.0.0'
+ModuleVersion = '3.6.0.0'
 
 # ID used to uniquely identify this module
 GUID = 'f5a5f169-7026-4053-932a-19a7c37b1ca5'
@@ -47,9 +47,7 @@ PrivateData = @{
         # IconUri = ''
 
         # ReleaseNotes of this module
-        ReleaseNotes = '* Converted appveyor.yml to install Pester from PSGallery instead of from Chocolatey.
-
-* MSFT_xVMHyperV: Fixed bug in Test-TargetResource throwing when a Vhd"s ParentPath property was null.
+        ReleaseNotes = '* xVHD: Updated incorrect property name MaximumSize in error message
 
 '
 
@@ -61,3 +59,4 @@ PrivateData = @{
 
 
 
+