From c5fab793feae9230b7271e35530cd5bcc25cf985 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wictor=20Wil=C3=A9n?= Date: Thu, 26 Nov 2015 09:20:47 +0100 Subject: [PATCH 1/8] Fixed bug where AllocationUnitSize was not used --- DSCResources/MSFT_xDisk/MSFT_xDisk.psm1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DSCResources/MSFT_xDisk/MSFT_xDisk.psm1 b/DSCResources/MSFT_xDisk/MSFT_xDisk.psm1 index 91db72fa..bff9a55e 100644 --- a/DSCResources/MSFT_xDisk/MSFT_xDisk.psm1 +++ b/DSCResources/MSFT_xDisk/MSFT_xDisk.psm1 @@ -197,7 +197,7 @@ function Test-TargetResource } } $BlockSize = Get-WmiObject -Query "SELECT BlockSize from Win32_Volume WHERE DriveLetter = '$($DriveLetter):'" -ErrorAction SilentlyContinue | select BlockSize - if($BlockSize) + if($BlockSize -gt 0 -and $AllocationUnitSize -ne 0) { if($AllocationUnitSize -ne $BlockSize.BlockSize) { From 87e15061018867b48ce4c89755744de8ea3cf7b2 Mon Sep 17 00:00:00 2001 From: Karol Kaczmarek Date: Mon, 7 Dec 2015 16:50:48 -0800 Subject: [PATCH 2/8] Replacing before_deploy with deploy_script --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 246e75b5..df5812ee 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -34,7 +34,7 @@ test_script: #---------------------------------# # scripts to run before deployment -before_deploy: +deploy_script: - ps: | # Creating project artifact $stagingDirectory = (Resolve-Path ..).Path From 6399aa8b9a63a3301bd7a593ec4c0e11aea619af Mon Sep 17 00:00:00 2001 From: Karol Kaczmarek Date: Wed, 16 Dec 2015 15:23:53 -0800 Subject: [PATCH 3/8] Temporary workaround for pester issue causing build to get stuck --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index df5812ee..c754f7a7 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -3,7 +3,7 @@ #---------------------------------# version: 2.3.{build}.0 install: - - cinst -y pester + - cinst -y pester --version 3.3.13 - git clone https://github.com/PowerShell/DscResource.Tests - ps: Push-Location - cd DscResource.Tests From ed475ec8505f1261a0c96e96a03efa5856750cdc Mon Sep 17 00:00:00 2001 From: Karol Kaczmarek Date: Thu, 7 Jan 2016 10:18:56 -0800 Subject: [PATCH 4/8] Reverting temporary workaround for pester issue causing build to get stuck --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index c754f7a7..df5812ee 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -3,7 +3,7 @@ #---------------------------------# version: 2.3.{build}.0 install: - - cinst -y pester --version 3.3.13 + - cinst -y pester - git clone https://github.com/PowerShell/DscResource.Tests - ps: Push-Location - cd DscResource.Tests From 5bc001df1e1055044577671edfcc0a90b343e668 Mon Sep 17 00:00:00 2001 From: KarolKaczmarek Date: Tue, 2 Feb 2016 12:33:10 -0800 Subject: [PATCH 5/8] Update xStorage.psd1 --- xStorage.psd1 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xStorage.psd1 b/xStorage.psd1 index 5bb4644f..3694df15 100644 --- a/xStorage.psd1 +++ b/xStorage.psd1 @@ -90,13 +90,13 @@ PrivateData = @{ PSData = @{ # Tags applied to this module. These help with module discovery in online galleries. - # Tags = @() + Tags = @('DesiredStateConfiguration', 'DSC', 'DSCResourceKit', 'DSCResource') # A URL to the license for this module. - # LicenseUri = '' + LicenseUri = 'https://github.com/PowerShell/xStorage/blob/master/LICENSE' # A URL to the main website for this project. - # ProjectUri = '' + ProjectUri = 'https://github.com/PowerShell/xStorage' # A URL to an icon representing this module. # IconUri = '' From 942435566263e9255e4c5090909082897fb7c22b Mon Sep 17 00:00:00 2001 From: KarolKaczmarek Date: Tue, 2 Feb 2016 12:34:21 -0800 Subject: [PATCH 6/8] Update README.md --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 584bbe01..a58943c4 100644 --- a/README.md +++ b/README.md @@ -86,14 +86,12 @@ choice We reserve resource and module names without prefixes ("x" or "c") for future use (e.g. "MSFT_Resource"). If the next version of Windows Server ships with a "DiskImage" resource, we don't want to break any configurations that use any community modifications. Please keep a prefix such as "c" on all community modifications. -Versions --------- - -This module was previously named **xDisk**, the version is regressing to a ".1" release with the addition of xMountImage. +## Versions ### Unreleased ### 2.3.0.0 + * Added support for `AllocationUnitSize` in `xDisk`. ### 2.2.0.0 @@ -109,12 +107,14 @@ This module was previously named **xDisk**, the version is regressing to a ".1" * Breaking change: Added support for following properties: DriveLetter, Size, FSLabel. DriveLetter is a new key property. ### 1.0.0.0 +This module was previously named **xDisk**, the version is regressing to a "1.0.0.0" release with the addition of xMountImage. * Initial release of xStorage module with following resources (contains resources from deprecated xDisk module): * xDisk (from xDisk) * xMountImage * xWaitForDisk (from xDisk) + Examples -------- From a6b4c0481cceb03eaa99748d44a134ea4102009b Mon Sep 17 00:00:00 2001 From: Karol Kaczmarek Date: Tue, 2 Feb 2016 14:51:00 -0800 Subject: [PATCH 7/8] Releasing version 2.4.0.0 --- README.md | 8 +++++--- appveyor.yml | 4 ++-- xStorage.psd1 | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index a58943c4..87330a01 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,9 @@ -[![Build status](https://ci.appveyor.com/api/projects/status/1j95juvceu39ekm7/branch/master?svg=true)](https://ci.appveyor.com/project/PowerShell/xstorage/branch/master) +[![Build status](https://ci.appveyor.com/api/projects/status/1j95juvceu39ekm7/branch/master?svg=true)](https://ci.appveyor.com/project/PowerShell/xstorage/branch/master) # xStorage -The **xStorage** module is a part of the Windows PowerShell Desired State Configuration (DSC) Resource Kit, which is a collection of DSC Resources. +?The **xStorage** module is a part of the Windows PowerShell Desired State Configuration (DSC) Resource Kit, which is a collection of DSC Resources. This module contains the **xMountImage, xDisk, and xWaitForDisk** resources. The xMountImage resource can be used to mount or unmount an ISO/VHD disk image to the local file system, with simple declarative language. The xDisk and xWaitforDisk resources enable you to wait for a disk to become available and then initialize, format, and bring it online using PowerShell DSC. @@ -27,7 +27,7 @@ To install **xstorage** module - If you are using WMF4 / PowerShell Version 4: Unzip the content under $env:ProgramFilesWindowsPowerShellModules folder -- If you are using WMF5 Preview: From an elevated PowerShell session run ‘Install-Module xDiskImage’ +- If you are using WMF5 Preview: From an elevated PowerShell session run ‘Install-Module xDiskImage’ To confirm installation @@ -90,6 +90,8 @@ We reserve resource and module names without prefixes ("x" or "c") for future us ### Unreleased +### 2.4.0.0 + ### 2.3.0.0 * Added support for `AllocationUnitSize` in `xDisk`. diff --git a/appveyor.yml b/appveyor.yml index df5812ee..644f768c 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,7 +1,7 @@ #---------------------------------# # environment configuration # #---------------------------------# -version: 2.3.{build}.0 +version: 2.4.{build}.0 install: - cinst -y pester - git clone https://github.com/PowerShell/DscResource.Tests @@ -39,7 +39,7 @@ deploy_script: # Creating project artifact $stagingDirectory = (Resolve-Path ..).Path $manifest = Join-Path $pwd "xStorage.psd1" - (Get-Content $manifest -Raw).Replace("2.3.0.0", $env:APPVEYOR_BUILD_VERSION) | Out-File $manifest + (Get-Content $manifest -Raw).Replace("2.4.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/xStorage.psd1 b/xStorage.psd1 index 3694df15..2cc287cc 100644 --- a/xStorage.psd1 +++ b/xStorage.psd1 @@ -10,7 +10,7 @@ # RootModule = '' # Version number of this module. -ModuleVersion = '2.3.0.0' +ModuleVersion = '2.4.0.0' # ID used to uniquely identify this module GUID = '00d73ca1-58b5-46b7-ac1a-5bfcf5814faf' From 2ed35c98a5c762156af695ec6d0ed654c5484c52 Mon Sep 17 00:00:00 2001 From: KarolKaczmarek Date: Tue, 2 Feb 2016 16:23:17 -0800 Subject: [PATCH 8/8] Update README.md --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 87330a01..e822d6c6 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ To install **xstorage** module - If you are using WMF4 / PowerShell Version 4: Unzip the content under $env:ProgramFilesWindowsPowerShellModules folder -- If you are using WMF5 Preview: From an elevated PowerShell session run ‘Install-Module xDiskImage’ +- If you are using WMF5 Preview: From an elevated PowerShell session run ‘Install-Module xDiskImage’ To confirm installation @@ -92,6 +92,8 @@ We reserve resource and module names without prefixes ("x" or "c") for future us ### 2.4.0.0 +* Fixed bug where AllocationUnitSize was not used + ### 2.3.0.0 * Added support for `AllocationUnitSize` in `xDisk`.