Skip to content

Commit

Permalink
Merge pull request #16 from PowerShell/dev
Browse files Browse the repository at this point in the history
Release of version 2.4.0.0 of xStorage
  • Loading branch information
KarolKaczmarek committed Feb 3, 2016
2 parents 01d2d6d + 2ed35c9 commit f8e501b
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 14 deletions.
2 changes: 1 addition & 1 deletion DSCResources/MSFT_xDisk/MSFT_xDisk.psm1
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
16 changes: 10 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -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.

Expand Down Expand Up @@ -86,14 +86,16 @@ 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.4.0.0

* Fixed bug where AllocationUnitSize was not used

### 2.3.0.0

* Added support for `AllocationUnitSize` in `xDisk`.

### 2.2.0.0
Expand All @@ -109,12 +111,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
--------

Expand Down
6 changes: 3 additions & 3 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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 "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)
Expand Down
8 changes: 4 additions & 4 deletions xStorage.psd1
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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 = ''
Expand Down

0 comments on commit f8e501b

Please sign in to comment.