Merge pull request #146 from PowerShell/dev

Release of version 4.0.0.0 of StorageDsc

.github/ISSUE_TEMPLATE.md

@@ -1,7 +1,7 @@
 <!--
 Your feedback and support is greatly appreciated, thanks for contributing!
 
-Please prefix the issue title with the resource name, i.e. 'xDisk: Short description of my issue'
+Please prefix the issue title with the resource name, i.e. 'Disk: Short description of my issue'
 Please provide the following information regarding your issue (place N/A if the fields that don't apply to your issue):
 -->
 **Details of the scenario you tried and the problem that is occurring:**

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,8 +1,8 @@
 <!--
 Thanks for submitting a Pull Request (PR) to this project. Your contribution to this project is greatly appreciated!
 
-Please prefix the PR title with the resource name, i.e. 'xDisk: My short description'
-If this is a breaking change, then also prefix the PR title with 'BREAKING CHANGE:', i.e. 'BREAKING CHANGE: xDisk: My short description'
+Please prefix the PR title with the resource name, i.e. 'Disk: My short description'
+If this is a breaking change, then also prefix the PR title with 'BREAKING CHANGE:', i.e. 'BREAKING CHANGE: Disk: My short description'
 
 To aid community reviewers in reviewing and merging your PR, please take the time to run through the below checklist.
 Change to [x] for each task in the task list that applies to this PR.

.gitignore

@@ -6,8 +6,8 @@
 .sln
 DscResource.Tests
 DscResource.Tests/*
-Modules/xStorage/DscResource.Tests
-Modules/xStorage/DscResource.Tests/*
+Modules/StorageDsc/DscResource.Tests
+Modules/StorageDsc/DscResource.Tests/*
 node_modules
 node_modules/*
 markdownissues.txt

CHANGELOG.md

@@ -2,6 +2,19 @@
 
 ## Unreleased
 
+## 4.0.0.0
+
+- BREAKING CHANGE:
+  - Renamed xStorage to StorageDsc
+  - Renamed MSFT_xDisk to MSFT_Disk
+  - Renamed MSFT_xDiskAccessPath to MSFT_DiskAccessPath
+  - Renamed MSFT_xMountImage to MSFT_MountImage
+  - Renamed MSFT_xOpticalDiskDriveLetter to MSFT_OpticalDiskDriveLetter
+  - Renamed MSFT_xWaitForDisk to MSFT_WaitForDisk
+  - Renamed MSFT_xWaitForVolume to MSFT_WaitforVolume
+  - Deleted xStorage folder under StorageDsc/Modules
+  - See [Issue 129](https://github.com/PowerShell/xStorage/issues/129)
+
 ## 3.4.0.0
 
 - xDisk:
@@ -13,7 +26,6 @@
   - Added new contexts to integration tests improve clarity.
   - Fix bug when size not specified and disk partitioned and
     formatted but not assigned to path - See [Issue 103](https://github.com/PowerShell/xStorage/issues/103).
-- Updated tests to meet Pester V4 guidelines - fixes [Issue #120](https://github.com/PowerShell/xStorage/issues/120).
 
 ## 3.3.0.0
 
@@ -41,6 +53,7 @@
   [issue #116](https://github.com/PowerShell/xStorage/issues/116).
 - Prevent unit tests from DSCResource.Tests from running during test
   execution - fixes [Issue #118](https://github.com/PowerShell/xStorage/issues/118).
+- Updated tests to meet Pester V4 guidelines - fixes [Issue #120](https://github.com/PowerShell/xStorage/issues/120).
 
 ## 3.2.0.0
 

Modules/xStorage/DSCResources/MSFT_xDisk/MSFT_xDisk.psm1 → Modules/StorageDsc/DSCResources/MSFT_Disk/MSFT_Disk.psm1

@@ -17,7 +17,7 @@ Import-Module -Name (Join-Path -Path $modulePath `
 
 # Import Localization Strings
 $localizedData = Get-LocalizedData `
-    -ResourceName 'MSFT_xDisk' `
+    -ResourceName 'MSFT_Disk' `
     -ResourcePath (Split-Path -Parent $Script:MyInvocation.MyCommand.Path)
 
 <#

Modules/xStorage/DSCResources/MSFT_xDisk/MSFT_xDisk.schema.mof → Modules/StorageDsc/DSCResources/MSFT_Disk/MSFT_Disk.schema.mof

@@ -1,6 +1,6 @@
 
-[ClassVersion("1.0.0.0"), FriendlyName("xDisk")]
-class MSFT_xDisk : OMI_BaseResource
+[ClassVersion("1.0.0.0"), FriendlyName("Disk")]
+class MSFT_Disk : OMI_BaseResource
 {
     [Key, Description("Specifies the identifier for which disk to modify.")] String DriveLetter;
     [Required, Description("Specifies the disk identifier for the disk to modify.")] String DiskId;

Modules/xStorage/DSCResources/MSFT_xDiskAccessPath/MSFT_xDiskAccessPath.psm1 → Modules/StorageDsc/DSCResources/MSFT_DiskAccessPath/MSFT_DiskAccessPath.psm1

@@ -17,7 +17,7 @@ Import-Module -Name (Join-Path -Path $modulePath `
 
 # Import Localization Strings
 $localizedData = Get-LocalizedData `
-    -ResourceName 'MSFT_xDiskAccessPath' `
+    -ResourceName 'MSFT_DiskAccessPath' `
     -ResourcePath (Split-Path -Parent $Script:MyInvocation.MyCommand.Path)
 
 <#

Modules/xStorage/DSCResources/MSFT_xDiskAccessPath/MSFT_xDiskAccessPath.schema.mof → Modules/StorageDsc/DSCResources/MSFT_DiskAccessPath/MSFT_DiskAccessPath.schema.mof

@@ -1,6 +1,6 @@
 
-[ClassVersion("1.0.0.0"), FriendlyName("xDiskAccessPath")]
-class MSFT_xDiskAccessPath : OMI_BaseResource
+[ClassVersion("1.0.0.0"), FriendlyName("DiskAccessPath")]
+class MSFT_DiskAccessPath : OMI_BaseResource
 {
     [Key, Description("Specifies the access path folder to the assign the disk volume to.")] String AccessPath;
     [Required, Description("Specifies the disk identifier for the disk to modify.")] String DiskId;

Modules/xStorage/DSCResources/MSFT_xMountImage/MSFT_xMountImage.psm1 → Modules/StorageDsc/DSCResources/MSFT_MountImage/MSFT_MountImage.psm1

@@ -19,7 +19,7 @@ Import-Module -Name (Join-Path -Path $modulePath `
 
 # Import Localization Strings
 $localizedData = Get-LocalizedData `
-    -ResourceName 'MSFT_xMountImage' `
+    -ResourceName 'MSFT_MountImage' `
     -ResourcePath (Split-Path -Parent $Script:MyInvocation.MyCommand.Path)
 
 <#

Modules/xStorage/DSCResources/MSFT_xMountImage/MSFT_xMountImage.schema.mof → Modules/StorageDsc/DSCResources/MSFT_MountImage/MSFT_MountImage.schema.mof

@@ -1,6 +1,6 @@
 
-[ClassVersion("1.0.0.0"), FriendlyName("xMountImage")]
-class MSFT_xMountImage : OMI_BaseResource
+[ClassVersion("1.0.0.0"), FriendlyName("MountImage")]
+class MSFT_MountImage : OMI_BaseResource
 {
     [Key, Description("Specifies the path of the VHD or ISO file.")] String ImagePath;
     [Write, Description("Specifies the drive letter to mount this VHD or ISO to.")] String DriveLetter;