From 6d4868cd307be32bb517d6edca1189c635e24005 Mon Sep 17 00:00:00 2001 From: Daniel Scott-Raynsford Date: Sun, 25 Mar 2018 15:22:50 +1300 Subject: [PATCH 1/4] Renamed ComputerManagement to ComputerManagementDsc --- .vscode/RunAllTests.ps1 | 2 +- CHANGELOG.md | 12 ++ LICENSE | 2 +- .../ComputerManagementDsc.psd1} | 19 +- .../MSFT_Computer/MSFT_Computer.psm1} | 2 +- .../MSFT_Computer/MSFT_Computer.schema.mof} | 4 +- .../DSCResources/MSFT_Computer}/README.md | 0 .../en-US/MSFT_Computer.strings.psd1} | 0 .../MSFT_OfflineDomainJoin.psm1} | 2 +- .../MSFT_OfflineDomainJoin.schema.mof} | 4 +- .../MSFT_OfflineDomainJoin}/README.md | 0 .../en-US/MSFT_OfflineDomainJoin.strings.psd1 | 11 + .../MSFT_PowerPlan/MSFT_PowerPlan.psm1} | 2 +- .../MSFT_PowerPlan/MSFT_PowerPlan.schema.mof} | 4 +- .../DSCResources/MSFT_PowerPlan}/README.md | 0 .../en-US/MSFT_PowerPlan.schema.mfl} | 2 +- .../en-US/MSFT_PowerPlan.strings.psd1} | 0 .../MSFT_ScheduledTask.psm1} | 6 +- .../MSFT_ScheduledTask.schema.mof} | 4 +- .../MSFT_ScheduledTask}/README.md | 0 .../en-US/MSFT_ScheduledTask.strings.psd1} | 0 .../MSFT_VirtualMemory.psm1} | 2 +- .../MSFT_VirtualMemory.schema.mof} | 4 +- .../MSFT_VirtualMemory}/README.md | 0 .../en-US/MSFT_VirtualMemory.strings.psd1} | 0 .../1-RenameComputerAndSetWorkgroup.ps1 | 4 +- .../Resources/Computer}/2-JoinDomain.ps1 | 4 +- .../Computer}/3-RenameComputerInDomain.ps1 | 4 +- .../Computer}/4-RenameComputerInWorkgroup.ps1 | 4 +- .../5-UnjoinDomainAndJoinWorkgroup.ps1 | 4 +- .../6-SetComputerDescriptionInWorkgroup.ps1 | 4 +- .../1-JoinDomainUsingODJBlob.ps1 | 4 +- .../Resources/PowerPlan}/1-SetPowerPlan.ps1 | 4 +- .../1-CreateScheduledTaskOnce.ps1 | 4 +- ...owerShellTaskOnceAsUserInteractiveOnly.ps1 | 4 +- .../ScheduledTask}/11-DisableABuiltInTask.ps1 | 4 +- .../ScheduledTask}/12-DeleteABuiltInTask.ps1 | 4 +- .../2-CreateScheduledTaskDaily.ps1 | 4 +- ...-CreateScheduledTasksDailyIndefinitely.ps1 | 4 +- .../4-CreateScheduledTasksWeekly.ps1 | 4 +- .../5-CreateScheduledTasksAtLogon.ps1 | 4 +- .../6-CreateScheduledTasksAtStartup.ps1 | 4 +- .../7-RunPowerShellTaskEvery15Minutes.ps1 | 4 +- ...werShellTaskEvery15MinutesIndefinitely.ps1 | 4 +- ...ellTaskOnceAsUserWithHighestPriveleges.ps1 | 4 +- .../VirtualMemory}/1-SetVirtualMemory.ps1 | 4 +- .../ComputerManagementDsc.Common.psm1 | 0 .../ComputerManagementDsc.Common.strings.psd1 | 0 .../ComputerManagementDsc.ResourceHelper.psm1 | 0 .../MSFT_xOfflineDomainJoin.strings.psd1 | 11 - README.md | 28 +-- ...nfig.ps1 => MSFT_ScheduledTask.Config.ps1} | 192 +++++++++--------- ... MSFT_ScheduledTask.Integration.Tests.ps1} | 38 ++-- ...nfig.ps1 => MSFT_VirtualMemory.Config.ps1} | 16 +- ... MSFT_VirtualMemory.Integration.Tests.ps1} | 55 +++-- Tests/TestHarness.psm1 | 6 +- .../ComputerManagementDsc.Common.Tests.ps1 | 2 +- ...uter.Tests.ps1 => MSFT_Computer.Tests.ps1} | 8 +- ...s.ps1 => MSFT_OfflineDomainJoin.Tests.ps1} | 8 +- ...lan.Tests.ps1 => MSFT_PowerPlan.Tests.ps1} | 6 +- ...Tests.ps1 => MSFT_ScheduledTask.Tests.ps1} | 8 +- ...Tests.ps1 => MSFT_VirtualMemory.Tests.ps1} | 22 +- appveyor.yml | 2 +- 63 files changed, 284 insertions(+), 284 deletions(-) rename Modules/{xComputerManagement/xComputerManagement.psd1 => ComputerManagementDsc/ComputerManagementDsc.psd1} (78%) rename Modules/{xComputerManagement/DSCResources/MSFT_xComputer/MSFT_xComputer.psm1 => ComputerManagementDsc/DSCResources/MSFT_Computer/MSFT_Computer.psm1} (99%) rename Modules/{xComputerManagement/DSCResources/MSFT_xComputer/MSFT_xComputer.schema.mof => ComputerManagementDsc/DSCResources/MSFT_Computer/MSFT_Computer.schema.mof} (90%) rename Modules/{xComputerManagement/DSCResources/MSFT_xComputer => ComputerManagementDsc/DSCResources/MSFT_Computer}/README.md (100%) rename Modules/{xComputerManagement/DSCResources/MSFT_xComputer/en-US/MSFT_xComputer.strings.psd1 => ComputerManagementDsc/DSCResources/MSFT_Computer/en-US/MSFT_Computer.strings.psd1} (100%) rename Modules/{xComputerManagement/DSCResources/MSFT_xOfflineDomainJoin/MSFT_xOfflineDomainJoin.psm1 => ComputerManagementDsc/DSCResources/MSFT_OfflineDomainJoin/MSFT_OfflineDomainJoin.psm1} (99%) rename Modules/{xComputerManagement/DSCResources/MSFT_xOfflineDomainJoin/MSFT_xOfflineDomainJoin.schema.mof => ComputerManagementDsc/DSCResources/MSFT_OfflineDomainJoin/MSFT_OfflineDomainJoin.schema.mof} (70%) rename Modules/{xComputerManagement/DSCResources/MSFT_xOfflineDomainJoin => ComputerManagementDsc/DSCResources/MSFT_OfflineDomainJoin}/README.md (100%) create mode 100644 Modules/ComputerManagementDsc/DSCResources/MSFT_OfflineDomainJoin/en-US/MSFT_OfflineDomainJoin.strings.psd1 rename Modules/{xComputerManagement/DSCResources/MSFT_xPowerPlan/MSFT_xPowerPlan.psm1 => ComputerManagementDsc/DSCResources/MSFT_PowerPlan/MSFT_PowerPlan.psm1} (99%) rename Modules/{xComputerManagement/DSCResources/MSFT_xPowerPlan/MSFT_xPowerPlan.schema.mof => ComputerManagementDsc/DSCResources/MSFT_PowerPlan/MSFT_PowerPlan.schema.mof} (71%) rename Modules/{xComputerManagement/DSCResources/MSFT_xPowerPlan => ComputerManagementDsc/DSCResources/MSFT_PowerPlan}/README.md (100%) rename Modules/{xComputerManagement/DSCResources/MSFT_xPowerPlan/en-US/MSFT_xPowerPlan.schema.mfl => ComputerManagementDsc/DSCResources/MSFT_PowerPlan/en-US/MSFT_PowerPlan.schema.mfl} (88%) rename Modules/{xComputerManagement/DSCResources/MSFT_xPowerPlan/en-US/MSFT_xPowerPlan.strings.psd1 => ComputerManagementDsc/DSCResources/MSFT_PowerPlan/en-US/MSFT_PowerPlan.strings.psd1} (100%) rename Modules/{xComputerManagement/DSCResources/MSFT_xScheduledTask/MSFT_xScheduledTask.psm1 => ComputerManagementDsc/DSCResources/MSFT_ScheduledTask/MSFT_ScheduledTask.psm1} (99%) rename Modules/{xComputerManagement/DSCResources/MSFT_xScheduledTask/MSFT_xScheduledTask.schema.mof => ComputerManagementDsc/DSCResources/MSFT_ScheduledTask/MSFT_ScheduledTask.schema.mof} (98%) rename Modules/{xComputerManagement/DSCResources/MSFT_xScheduledTask => ComputerManagementDsc/DSCResources/MSFT_ScheduledTask}/README.md (100%) rename Modules/{xComputerManagement/DSCResources/MSFT_xScheduledTask/en-US/MSFT_xScheduledTask.strings.psd1 => ComputerManagementDsc/DSCResources/MSFT_ScheduledTask/en-US/MSFT_ScheduledTask.strings.psd1} (100%) rename Modules/{xComputerManagement/DSCResources/MSFT_xVirtualMemory/MSFT_xVirtualMemory.psm1 => ComputerManagementDsc/DSCResources/MSFT_VirtualMemory/MSFT_VirtualMemory.psm1} (99%) rename Modules/{xComputerManagement/DSCResources/MSFT_xVirtualMemory/MSFT_xVirtualMemory.schema.mof => ComputerManagementDsc/DSCResources/MSFT_VirtualMemory/MSFT_VirtualMemory.schema.mof} (88%) rename Modules/{xComputerManagement/DSCResources/MSFT_xVirtualMemory => ComputerManagementDsc/DSCResources/MSFT_VirtualMemory}/README.md (100%) rename Modules/{xComputerManagement/DSCResources/MSFT_xVirtualMemory/en-US/MSFT_xVirtualMemory.strings.psd1 => ComputerManagementDsc/DSCResources/MSFT_VirtualMemory/en-US/MSFT_VirtualMemory.strings.psd1} (100%) rename Modules/{xComputerManagement/Examples/Resources/xComputer => ComputerManagementDsc/Examples/Resources/Computer}/1-RenameComputerAndSetWorkgroup.ps1 (81%) rename Modules/{xComputerManagement/Examples/Resources/xComputer => ComputerManagementDsc/Examples/Resources/Computer}/2-JoinDomain.ps1 (88%) rename Modules/{xComputerManagement/Examples/Resources/xComputer => ComputerManagementDsc/Examples/Resources/Computer}/3-RenameComputerInDomain.ps1 (88%) rename Modules/{xComputerManagement/Examples/Resources/xComputer => ComputerManagementDsc/Examples/Resources/Computer}/4-RenameComputerInWorkgroup.ps1 (80%) rename Modules/{xComputerManagement/Examples/Resources/xComputer => ComputerManagementDsc/Examples/Resources/Computer}/5-UnjoinDomainAndJoinWorkgroup.ps1 (88%) rename Modules/{xComputerManagement/Examples/Resources/xComputer => ComputerManagementDsc/Examples/Resources/Computer}/6-SetComputerDescriptionInWorkgroup.ps1 (79%) rename Modules/{xComputerManagement/Examples/Resources/xOfflineDomainJoin => ComputerManagementDsc/Examples/Resources/OfflineDomainJoin}/1-JoinDomainUsingODJBlob.ps1 (81%) rename Modules/{xComputerManagement/Examples/Resources/xPowerPlan => ComputerManagementDsc/Examples/Resources/PowerPlan}/1-SetPowerPlan.ps1 (78%) rename Modules/{xComputerManagement/Examples/Resources/xScheduledTask => ComputerManagementDsc/Examples/Resources/ScheduledTask}/1-CreateScheduledTaskOnce.ps1 (92%) rename Modules/{xComputerManagement/Examples/Resources/xScheduledTask => ComputerManagementDsc/Examples/Resources/ScheduledTask}/10-RunPowerShellTaskOnceAsUserInteractiveOnly.ps1 (91%) rename Modules/{xComputerManagement/Examples/Resources/xScheduledTask => ComputerManagementDsc/Examples/Resources/ScheduledTask}/11-DisableABuiltInTask.ps1 (78%) rename Modules/{xComputerManagement/Examples/Resources/xScheduledTask => ComputerManagementDsc/Examples/Resources/ScheduledTask}/12-DeleteABuiltInTask.ps1 (79%) rename Modules/{xComputerManagement/Examples/Resources/xScheduledTask => ComputerManagementDsc/Examples/Resources/ScheduledTask}/2-CreateScheduledTaskDaily.ps1 (92%) rename Modules/{xComputerManagement/Examples/Resources/xScheduledTask => ComputerManagementDsc/Examples/Resources/ScheduledTask}/3-CreateScheduledTasksDailyIndefinitely.ps1 (87%) rename Modules/{xComputerManagement/Examples/Resources/xScheduledTask => ComputerManagementDsc/Examples/Resources/ScheduledTask}/4-CreateScheduledTasksWeekly.ps1 (92%) rename Modules/{xComputerManagement/Examples/Resources/xScheduledTask => ComputerManagementDsc/Examples/Resources/ScheduledTask}/5-CreateScheduledTasksAtLogon.ps1 (87%) rename Modules/{xComputerManagement/Examples/Resources/xScheduledTask => ComputerManagementDsc/Examples/Resources/ScheduledTask}/6-CreateScheduledTasksAtStartup.ps1 (87%) rename Modules/{xComputerManagement/Examples/Resources/xScheduledTask => ComputerManagementDsc/Examples/Resources/ScheduledTask}/7-RunPowerShellTaskEvery15Minutes.ps1 (88%) rename Modules/{xComputerManagement/Examples/Resources/xScheduledTask => ComputerManagementDsc/Examples/Resources/ScheduledTask}/8-RunPowerShellTaskEvery15MinutesIndefinitely.ps1 (88%) rename Modules/{xComputerManagement/Examples/Resources/xScheduledTask => ComputerManagementDsc/Examples/Resources/ScheduledTask}/9-RunPowerShellTaskOnceAsUserWithHighestPriveleges.ps1 (91%) rename Modules/{xComputerManagement/Examples/Resources/xVirtualMemory => ComputerManagementDsc/Examples/Resources/VirtualMemory}/1-SetVirtualMemory.ps1 (82%) rename Modules/{xComputerManagement => ComputerManagementDsc}/Modules/ComputerManagementDsc.Common/ComputerManagementDsc.Common.psm1 (100%) rename Modules/{xComputerManagement => ComputerManagementDsc}/Modules/ComputerManagementDsc.Common/en-us/ComputerManagementDsc.Common.strings.psd1 (100%) rename Modules/{xComputerManagement => ComputerManagementDsc}/Modules/ComputerManagementDsc.ResourceHelper/ComputerManagementDsc.ResourceHelper.psm1 (100%) delete mode 100644 Modules/xComputerManagement/DSCResources/MSFT_xOfflineDomainJoin/en-US/MSFT_xOfflineDomainJoin.strings.psd1 rename Tests/Integration/{MSFT_xScheduledTask.Config.ps1 => MSFT_ScheduledTask.Config.ps1} (67%) rename Tests/Integration/{MSFT_xScheduledTask.Integration.Tests.ps1 => MSFT_ScheduledTask.Integration.Tests.ps1} (90%) rename Tests/Integration/{MSFT_xVirtualMemory.Config.ps1 => MSFT_VirtualMemory.Config.ps1} (65%) rename Tests/Integration/{MSFT_xVirtualMemory.Integration.Tests.ps1 => MSFT_VirtualMemory.Integration.Tests.ps1} (72%) rename Tests/Unit/{MSFT_xComputer.Tests.ps1 => MSFT_Computer.Tests.ps1} (99%) rename Tests/Unit/{MSFT_xOfflineDomainJoin.Tests.ps1 => MSFT_OfflineDomainJoin.Tests.ps1} (97%) rename Tests/Unit/{MSFT_xPowerPlan.Tests.ps1 => MSFT_PowerPlan.Tests.ps1} (98%) rename Tests/Unit/{MSFT_xScheduledTask.Tests.ps1 => MSFT_ScheduledTask.Tests.ps1} (99%) rename Tests/Unit/{MSFT_xVirtualMemory.Tests.ps1 => MSFT_VirtualMemory.Tests.ps1} (98%) diff --git a/.vscode/RunAllTests.ps1 b/.vscode/RunAllTests.ps1 index 598956b3..e22af184 100644 --- a/.vscode/RunAllTests.ps1 +++ b/.vscode/RunAllTests.ps1 @@ -7,5 +7,5 @@ if ( (-not (Test-Path -Path (Join-Path -Path $repoRoot -ChildPath 'DSCResource.T Import-Module (Join-Path $PSScriptRoot "..\Tests\TestHarness.psm1" -Resolve) $dscTestsPath = Join-Path -Path $PSScriptRoot ` - -ChildPath "..\Modules\xComputerManagement\DscResource.Tests\Meta.Tests.ps1" + -ChildPath "..\Modules\ComputerManagementDsc\DscResource.Tests\Meta.Tests.ps1" Invoke-TestHarness -DscTestsPath $dscTestsPath diff --git a/CHANGELOG.md b/CHANGELOG.md index 93860cbc..c49aa7a8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,18 @@ ## Unreleased +- BREAKING CHANGE: + - Renamed ComputerManagement to ComputerManagementDsc - fixes [Issue #119](https://github.com/PowerShell/xComputerManagement/issues/119). + - Changed all MSFT_xResourceName to MSFT_ResourceName. + - Updated DSCResources, Examples, Modules and Tests with new naming. + - Updated Year to 2018 in License and Manifest. + - Updated README.md from xComputerManagement to ComputerManagementDsc. +- OfflineDomainJoin: + - Cleaned up spacing in strings file to make consistent with other + resources. +- VirtualMemory: + - Converted strings to single quotes in integration test. + ## 4.1.0.0 - xScheduledTask: diff --git a/LICENSE b/LICENSE index a1d2d916..6bf8d3ab 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2017 Microsoft Corporation. +Copyright (c) 2018 Microsoft Corporation. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/Modules/xComputerManagement/xComputerManagement.psd1 b/Modules/ComputerManagementDsc/ComputerManagementDsc.psd1 similarity index 78% rename from Modules/xComputerManagement/xComputerManagement.psd1 rename to Modules/ComputerManagementDsc/ComputerManagementDsc.psd1 index 22f88755..e94b9ffb 100644 --- a/Modules/xComputerManagement/xComputerManagement.psd1 +++ b/Modules/ComputerManagementDsc/ComputerManagementDsc.psd1 @@ -12,10 +12,10 @@ Author = 'Microsoft Corporation' CompanyName = 'Microsoft Corporation' # Copyright statement for this module -Copyright = '(c) 2017 Microsoft Corporation. All rights reserved.' +Copyright = '(c) 2018 Microsoft Corporation. All rights reserved.' # Description of the functionality provided by this module -Description = 'The xComputerManagement module is originally part of the Windows PowerShell Desired State Configuration (DSC) Resource Kit. This version has been modified for use in Azure. This module contains the xComputer and xDisk resources. These DSC Resources allow you to perform computer management tasks, like joining a domain or initializing disks. +Description = 'The ComputerManagementDsc module is originally part of the Windows PowerShell Desired State Configuration (DSC) Resource Kit. This version has been modified for use in Azure. This module contains the xComputer and xDisk resources. These DSC Resources allow you to perform computer management tasks, like joining a domain or initializing disks. All of the resources in the DSC Resource Kit are provided AS IS, and are not supported through any Microsoft standard support program or service.' @@ -40,10 +40,10 @@ PrivateData = @{ Tags = @('DesiredStateConfiguration', 'DSC', 'DSCResourceKit', 'DSCResource') # A URL to the license for this module. - LicenseUri = 'https://github.com/PowerShell/xComputerManagement/blob/master/LICENSE' + LicenseUri = 'https://github.com/PowerShell/ComputerManagementDsc/blob/master/LICENSE' # A URL to the main website for this project. - ProjectUri = 'https://github.com/PowerShell/xComputerManagement' + ProjectUri = 'https://github.com/PowerShell/ComputerManagementDsc' # A URL to an icon representing this module. # IconUri = '' @@ -65,14 +65,3 @@ PrivateData = @{ } # End of PrivateData hashtable } - - - - - - - - - - - diff --git a/Modules/xComputerManagement/DSCResources/MSFT_xComputer/MSFT_xComputer.psm1 b/Modules/ComputerManagementDsc/DSCResources/MSFT_Computer/MSFT_Computer.psm1 similarity index 99% rename from Modules/xComputerManagement/DSCResources/MSFT_xComputer/MSFT_xComputer.psm1 rename to Modules/ComputerManagementDsc/DSCResources/MSFT_Computer/MSFT_Computer.psm1 index aec77f67..2a169b70 100644 --- a/Modules/xComputerManagement/DSCResources/MSFT_xComputer/MSFT_xComputer.psm1 +++ b/Modules/ComputerManagementDsc/DSCResources/MSFT_Computer/MSFT_Computer.psm1 @@ -17,7 +17,7 @@ Import-Module -Name (Join-Path -Path $modulePath ` # Import Localization Strings $script:localizedData = Get-LocalizedData ` - -ResourceName 'MSFT_xComputer' ` + -ResourceName 'MSFT_Computer' ` -ResourcePath (Split-Path -Parent $Script:MyInvocation.MyCommand.Path) <# diff --git a/Modules/xComputerManagement/DSCResources/MSFT_xComputer/MSFT_xComputer.schema.mof b/Modules/ComputerManagementDsc/DSCResources/MSFT_Computer/MSFT_Computer.schema.mof similarity index 90% rename from Modules/xComputerManagement/DSCResources/MSFT_xComputer/MSFT_xComputer.schema.mof rename to Modules/ComputerManagementDsc/DSCResources/MSFT_Computer/MSFT_Computer.schema.mof index 902746fd..98c45191 100644 --- a/Modules/xComputerManagement/DSCResources/MSFT_xComputer/MSFT_xComputer.schema.mof +++ b/Modules/ComputerManagementDsc/DSCResources/MSFT_Computer/MSFT_Computer.schema.mof @@ -1,5 +1,5 @@ -[ClassVersion("1.0.1.0"), FriendlyName("xComputer")] -class MSFT_xComputer : OMI_BaseResource +[ClassVersion("1.0.1.0"), FriendlyName("Computer")] +class MSFT_Computer : OMI_BaseResource { [Key, Description("The desired computer name.")] String Name; [Write, Description("The name of the domain to join.")] String DomainName; diff --git a/Modules/xComputerManagement/DSCResources/MSFT_xComputer/README.md b/Modules/ComputerManagementDsc/DSCResources/MSFT_Computer/README.md similarity index 100% rename from Modules/xComputerManagement/DSCResources/MSFT_xComputer/README.md rename to Modules/ComputerManagementDsc/DSCResources/MSFT_Computer/README.md diff --git a/Modules/xComputerManagement/DSCResources/MSFT_xComputer/en-US/MSFT_xComputer.strings.psd1 b/Modules/ComputerManagementDsc/DSCResources/MSFT_Computer/en-US/MSFT_Computer.strings.psd1 similarity index 100% rename from Modules/xComputerManagement/DSCResources/MSFT_xComputer/en-US/MSFT_xComputer.strings.psd1 rename to Modules/ComputerManagementDsc/DSCResources/MSFT_Computer/en-US/MSFT_Computer.strings.psd1 diff --git a/Modules/xComputerManagement/DSCResources/MSFT_xOfflineDomainJoin/MSFT_xOfflineDomainJoin.psm1 b/Modules/ComputerManagementDsc/DSCResources/MSFT_OfflineDomainJoin/MSFT_OfflineDomainJoin.psm1 similarity index 99% rename from Modules/xComputerManagement/DSCResources/MSFT_xOfflineDomainJoin/MSFT_xOfflineDomainJoin.psm1 rename to Modules/ComputerManagementDsc/DSCResources/MSFT_OfflineDomainJoin/MSFT_OfflineDomainJoin.psm1 index b027f9bd..70272798 100644 --- a/Modules/xComputerManagement/DSCResources/MSFT_xOfflineDomainJoin/MSFT_xOfflineDomainJoin.psm1 +++ b/Modules/ComputerManagementDsc/DSCResources/MSFT_OfflineDomainJoin/MSFT_OfflineDomainJoin.psm1 @@ -17,7 +17,7 @@ Import-Module -Name (Join-Path -Path $modulePath ` # Import Localization Strings $script:localizedData = Get-LocalizedData ` - -ResourceName 'MSFT_xOfflineDomainJoin' ` + -ResourceName 'MSFT_OfflineDomainJoin' ` -ResourcePath (Split-Path -Parent $Script:MyInvocation.MyCommand.Path) <# diff --git a/Modules/xComputerManagement/DSCResources/MSFT_xOfflineDomainJoin/MSFT_xOfflineDomainJoin.schema.mof b/Modules/ComputerManagementDsc/DSCResources/MSFT_OfflineDomainJoin/MSFT_OfflineDomainJoin.schema.mof similarity index 70% rename from Modules/xComputerManagement/DSCResources/MSFT_xOfflineDomainJoin/MSFT_xOfflineDomainJoin.schema.mof rename to Modules/ComputerManagementDsc/DSCResources/MSFT_OfflineDomainJoin/MSFT_OfflineDomainJoin.schema.mof index dde265e1..4301693c 100644 --- a/Modules/xComputerManagement/DSCResources/MSFT_xOfflineDomainJoin/MSFT_xOfflineDomainJoin.schema.mof +++ b/Modules/ComputerManagementDsc/DSCResources/MSFT_OfflineDomainJoin/MSFT_OfflineDomainJoin.schema.mof @@ -1,5 +1,5 @@ -[ClassVersion("1.0.0.0"), FriendlyName("xOfflineDomainJoin")] -class MSFT_xOfflineDomainJoin : OMI_BaseResource +[ClassVersion("1.0.0.0"), FriendlyName("OfflineDomainJoin")] +class MSFT_OfflineDomainJoin : OMI_BaseResource { [Key, Description("Specifies the resource is a single instance, the value must be 'Yes'."), ValueMap{"Yes"}, Values{"Yes"}] String IsSingleInstance; [Required, Description("The full path to the Offline Domain Join Request file to use.")] String RequestFile; diff --git a/Modules/xComputerManagement/DSCResources/MSFT_xOfflineDomainJoin/README.md b/Modules/ComputerManagementDsc/DSCResources/MSFT_OfflineDomainJoin/README.md similarity index 100% rename from Modules/xComputerManagement/DSCResources/MSFT_xOfflineDomainJoin/README.md rename to Modules/ComputerManagementDsc/DSCResources/MSFT_OfflineDomainJoin/README.md diff --git a/Modules/ComputerManagementDsc/DSCResources/MSFT_OfflineDomainJoin/en-US/MSFT_OfflineDomainJoin.strings.psd1 b/Modules/ComputerManagementDsc/DSCResources/MSFT_OfflineDomainJoin/en-US/MSFT_OfflineDomainJoin.strings.psd1 new file mode 100644 index 00000000..3cacc145 --- /dev/null +++ b/Modules/ComputerManagementDsc/DSCResources/MSFT_OfflineDomainJoin/en-US/MSFT_OfflineDomainJoin.strings.psd1 @@ -0,0 +1,11 @@ +ConvertFrom-StringData @' + GettingOfflineDomainJoinMessage = Getting the Offline Domain Join State. + ApplyingOfflineDomainJoinMessage = Applying the Offline Domain Join State. + AttemptingDomainJoinMessage = Attempting domain join using ODJ Request file '{0}'. + DomainJoinedMessage = Domain joined using ODJ Request file '{0}'. Reboot will be required. + CheckingOfflineDomainJoinMessage = Checking the Offline Domain Join State. + DomainAlreadyJoinedMessage = The computer is already joined to a domain '{0}'. Change not required. + DomainNotJoinedMessage = The computer is not joined to a domain. Change required. + RequestFileNotFoundError = The ODJ Request file '{0}' does not exist. + DjoinError = Error {0} occured requesting the Offline Domain Join. +'@ diff --git a/Modules/xComputerManagement/DSCResources/MSFT_xPowerPlan/MSFT_xPowerPlan.psm1 b/Modules/ComputerManagementDsc/DSCResources/MSFT_PowerPlan/MSFT_PowerPlan.psm1 similarity index 99% rename from Modules/xComputerManagement/DSCResources/MSFT_xPowerPlan/MSFT_xPowerPlan.psm1 rename to Modules/ComputerManagementDsc/DSCResources/MSFT_PowerPlan/MSFT_PowerPlan.psm1 index ad3af418..372dcf15 100644 --- a/Modules/xComputerManagement/DSCResources/MSFT_xPowerPlan/MSFT_xPowerPlan.psm1 +++ b/Modules/ComputerManagementDsc/DSCResources/MSFT_PowerPlan/MSFT_PowerPlan.psm1 @@ -12,7 +12,7 @@ Import-Module -Name (Join-Path -Path $modulePath ` # Import Localization Strings $script:localizedData = Get-LocalizedData ` - -ResourceName 'MSFT_xPowerPlan' ` + -ResourceName 'MSFT_PowerPlan' ` -ResourcePath (Split-Path -Parent $Script:MyInvocation.MyCommand.Path) <# diff --git a/Modules/xComputerManagement/DSCResources/MSFT_xPowerPlan/MSFT_xPowerPlan.schema.mof b/Modules/ComputerManagementDsc/DSCResources/MSFT_PowerPlan/MSFT_PowerPlan.schema.mof similarity index 71% rename from Modules/xComputerManagement/DSCResources/MSFT_xPowerPlan/MSFT_xPowerPlan.schema.mof rename to Modules/ComputerManagementDsc/DSCResources/MSFT_PowerPlan/MSFT_PowerPlan.schema.mof index d300b3e5..26c9a2e9 100644 --- a/Modules/xComputerManagement/DSCResources/MSFT_xPowerPlan/MSFT_xPowerPlan.schema.mof +++ b/Modules/ComputerManagementDsc/DSCResources/MSFT_PowerPlan/MSFT_PowerPlan.schema.mof @@ -1,5 +1,5 @@ -[ClassVersion("1.0.0.0"), FriendlyName("xPowerPlan")] -class MSFT_xPowerPlan : OMI_BaseResource +[ClassVersion("1.0.0.0"), FriendlyName("PowerPlan")] +class MSFT_PowerPlan : OMI_BaseResource { [Key, Description("Specifies the resource is a single instance, the value must be 'Yes'."), ValueMap{"Yes"}, Values{"Yes"}] String IsSingleInstance; [Required, Description("The name of the power plan to activate.")] String Name; diff --git a/Modules/xComputerManagement/DSCResources/MSFT_xPowerPlan/README.md b/Modules/ComputerManagementDsc/DSCResources/MSFT_PowerPlan/README.md similarity index 100% rename from Modules/xComputerManagement/DSCResources/MSFT_xPowerPlan/README.md rename to Modules/ComputerManagementDsc/DSCResources/MSFT_PowerPlan/README.md diff --git a/Modules/xComputerManagement/DSCResources/MSFT_xPowerPlan/en-US/MSFT_xPowerPlan.schema.mfl b/Modules/ComputerManagementDsc/DSCResources/MSFT_PowerPlan/en-US/MSFT_PowerPlan.schema.mfl similarity index 88% rename from Modules/xComputerManagement/DSCResources/MSFT_xPowerPlan/en-US/MSFT_xPowerPlan.schema.mfl rename to Modules/ComputerManagementDsc/DSCResources/MSFT_PowerPlan/en-US/MSFT_PowerPlan.schema.mfl index 2a72c759..9ad6c2a6 100644 --- a/Modules/xComputerManagement/DSCResources/MSFT_xPowerPlan/en-US/MSFT_xPowerPlan.schema.mfl +++ b/Modules/ComputerManagementDsc/DSCResources/MSFT_PowerPlan/en-US/MSFT_PowerPlan.schema.mfl @@ -1,5 +1,5 @@ [Description("This resource is used to activate a power plan.") : Amended,AMENDMENT, LOCALE("MS_409")] -class MSFT_xPowerPlan : OMI_BaseResource +class MSFT_PowerPlan : OMI_BaseResource { [Key, Description("Specifies the resource is a single instance, the value must be 'Yes'.") : Amended] String IsSingleInstance; [Description("The name of the power plan to activate.") : Amended] String Name; diff --git a/Modules/xComputerManagement/DSCResources/MSFT_xPowerPlan/en-US/MSFT_xPowerPlan.strings.psd1 b/Modules/ComputerManagementDsc/DSCResources/MSFT_PowerPlan/en-US/MSFT_PowerPlan.strings.psd1 similarity index 100% rename from Modules/xComputerManagement/DSCResources/MSFT_xPowerPlan/en-US/MSFT_xPowerPlan.strings.psd1 rename to Modules/ComputerManagementDsc/DSCResources/MSFT_PowerPlan/en-US/MSFT_PowerPlan.strings.psd1 diff --git a/Modules/xComputerManagement/DSCResources/MSFT_xScheduledTask/MSFT_xScheduledTask.psm1 b/Modules/ComputerManagementDsc/DSCResources/MSFT_ScheduledTask/MSFT_ScheduledTask.psm1 similarity index 99% rename from Modules/xComputerManagement/DSCResources/MSFT_xScheduledTask/MSFT_xScheduledTask.psm1 rename to Modules/ComputerManagementDsc/DSCResources/MSFT_ScheduledTask/MSFT_ScheduledTask.psm1 index 75655a7d..7d7329d9 100644 --- a/Modules/xComputerManagement/DSCResources/MSFT_xScheduledTask/MSFT_xScheduledTask.psm1 +++ b/Modules/ComputerManagementDsc/DSCResources/MSFT_ScheduledTask/MSFT_ScheduledTask.psm1 @@ -1,5 +1,5 @@ Add-Type -TypeDefinition @' -namespace xScheduledTask +namespace ScheduledTask { public enum DaysOfWeek { @@ -28,7 +28,7 @@ Import-Module -Name (Join-Path -Path $modulePath ` # Import Localization Strings $script:localizedData = Get-LocalizedData ` - -ResourceName 'MSFT_xScheduledTask' ` + -ResourceName 'MSFT_ScheduledTask' ` -ResourcePath (Split-Path -Parent $Script:MyInvocation.MyCommand.Path) <# @@ -453,7 +453,7 @@ function Get-TargetResource if ($day -ne 0) { - $daysOfWeek += [xScheduledTask.DaysOfWeek] $day + $daysOfWeek += [ScheduledTask.DaysOfWeek] $day } } diff --git a/Modules/xComputerManagement/DSCResources/MSFT_xScheduledTask/MSFT_xScheduledTask.schema.mof b/Modules/ComputerManagementDsc/DSCResources/MSFT_ScheduledTask/MSFT_ScheduledTask.schema.mof similarity index 98% rename from Modules/xComputerManagement/DSCResources/MSFT_xScheduledTask/MSFT_xScheduledTask.schema.mof rename to Modules/ComputerManagementDsc/DSCResources/MSFT_ScheduledTask/MSFT_ScheduledTask.schema.mof index 8d408a90..494409fb 100644 --- a/Modules/xComputerManagement/DSCResources/MSFT_xScheduledTask/MSFT_xScheduledTask.schema.mof +++ b/Modules/ComputerManagementDsc/DSCResources/MSFT_ScheduledTask/MSFT_ScheduledTask.schema.mof @@ -1,5 +1,5 @@ -[ClassVersion("1.0.0.0"), FriendlyName("xScheduledTask")] -class MSFT_xScheduledTask : OMI_BaseResource +[ClassVersion("1.0.0.0"), FriendlyName("ScheduledTask")] +class MSFT_ScheduledTask : OMI_BaseResource { [Key, Description("The name of the task")] string TaskName; [Write, Description("The path to the task - defaults to the root directory")] string TaskPath; diff --git a/Modules/xComputerManagement/DSCResources/MSFT_xScheduledTask/README.md b/Modules/ComputerManagementDsc/DSCResources/MSFT_ScheduledTask/README.md similarity index 100% rename from Modules/xComputerManagement/DSCResources/MSFT_xScheduledTask/README.md rename to Modules/ComputerManagementDsc/DSCResources/MSFT_ScheduledTask/README.md diff --git a/Modules/xComputerManagement/DSCResources/MSFT_xScheduledTask/en-US/MSFT_xScheduledTask.strings.psd1 b/Modules/ComputerManagementDsc/DSCResources/MSFT_ScheduledTask/en-US/MSFT_ScheduledTask.strings.psd1 similarity index 100% rename from Modules/xComputerManagement/DSCResources/MSFT_xScheduledTask/en-US/MSFT_xScheduledTask.strings.psd1 rename to Modules/ComputerManagementDsc/DSCResources/MSFT_ScheduledTask/en-US/MSFT_ScheduledTask.strings.psd1 diff --git a/Modules/xComputerManagement/DSCResources/MSFT_xVirtualMemory/MSFT_xVirtualMemory.psm1 b/Modules/ComputerManagementDsc/DSCResources/MSFT_VirtualMemory/MSFT_VirtualMemory.psm1 similarity index 99% rename from Modules/xComputerManagement/DSCResources/MSFT_xVirtualMemory/MSFT_xVirtualMemory.psm1 rename to Modules/ComputerManagementDsc/DSCResources/MSFT_VirtualMemory/MSFT_VirtualMemory.psm1 index 0d5046a5..f75f5359 100644 --- a/Modules/xComputerManagement/DSCResources/MSFT_xVirtualMemory/MSFT_xVirtualMemory.psm1 +++ b/Modules/ComputerManagementDsc/DSCResources/MSFT_VirtualMemory/MSFT_VirtualMemory.psm1 @@ -17,7 +17,7 @@ Import-Module -Name (Join-Path -Path $modulePath ` # Import Localization Strings $script:localizedData = Get-LocalizedData ` - -ResourceName 'MSFT_xVirtualMemory' ` + -ResourceName 'MSFT_VirtualMemory' ` -ResourcePath (Split-Path -Parent $Script:MyInvocation.MyCommand.Path) <# diff --git a/Modules/xComputerManagement/DSCResources/MSFT_xVirtualMemory/MSFT_xVirtualMemory.schema.mof b/Modules/ComputerManagementDsc/DSCResources/MSFT_VirtualMemory/MSFT_VirtualMemory.schema.mof similarity index 88% rename from Modules/xComputerManagement/DSCResources/MSFT_xVirtualMemory/MSFT_xVirtualMemory.schema.mof rename to Modules/ComputerManagementDsc/DSCResources/MSFT_VirtualMemory/MSFT_VirtualMemory.schema.mof index 6e66732e..9dc46109 100644 --- a/Modules/xComputerManagement/DSCResources/MSFT_xVirtualMemory/MSFT_xVirtualMemory.schema.mof +++ b/Modules/ComputerManagementDsc/DSCResources/MSFT_VirtualMemory/MSFT_VirtualMemory.schema.mof @@ -1,6 +1,6 @@ -[ClassVersion("1.0.0.0"), FriendlyName("xVirtualMemory")] -class MSFT_xVirtualMemory : OMI_BaseResource +[ClassVersion("1.0.0.0"), FriendlyName("VirtualMemory")] +class MSFT_VirtualMemory : OMI_BaseResource { [Key, Description("The drive letter for which paging settings should be set. Can be letter only, letter and colon or letter with colon and trailing slash.")] String Drive; [Key, Description("The type of the paging setting to use. If set to AutoManagePagingFile, the drive letter will be ignored. If set to SystemManagedSize, the values for InitialSize and MaximumSize will be ignored"), ValueMap{"AutoManagePagingFile","CustomSize","SystemManagedSize","NoPagingFile"}, Values{"AutoManagePagingFile","CustomSize","SystemManagedSize","NoPagingFile"}] String Type; diff --git a/Modules/xComputerManagement/DSCResources/MSFT_xVirtualMemory/README.md b/Modules/ComputerManagementDsc/DSCResources/MSFT_VirtualMemory/README.md similarity index 100% rename from Modules/xComputerManagement/DSCResources/MSFT_xVirtualMemory/README.md rename to Modules/ComputerManagementDsc/DSCResources/MSFT_VirtualMemory/README.md diff --git a/Modules/xComputerManagement/DSCResources/MSFT_xVirtualMemory/en-US/MSFT_xVirtualMemory.strings.psd1 b/Modules/ComputerManagementDsc/DSCResources/MSFT_VirtualMemory/en-US/MSFT_VirtualMemory.strings.psd1 similarity index 100% rename from Modules/xComputerManagement/DSCResources/MSFT_xVirtualMemory/en-US/MSFT_xVirtualMemory.strings.psd1 rename to Modules/ComputerManagementDsc/DSCResources/MSFT_VirtualMemory/en-US/MSFT_VirtualMemory.strings.psd1 diff --git a/Modules/xComputerManagement/Examples/Resources/xComputer/1-RenameComputerAndSetWorkgroup.ps1 b/Modules/ComputerManagementDsc/Examples/Resources/Computer/1-RenameComputerAndSetWorkgroup.ps1 similarity index 81% rename from Modules/xComputerManagement/Examples/Resources/xComputer/1-RenameComputerAndSetWorkgroup.ps1 rename to Modules/ComputerManagementDsc/Examples/Resources/Computer/1-RenameComputerAndSetWorkgroup.ps1 index 18556e41..65046cf2 100644 --- a/Modules/xComputerManagement/Examples/Resources/xComputer/1-RenameComputerAndSetWorkgroup.ps1 +++ b/Modules/ComputerManagementDsc/Examples/Resources/Computer/1-RenameComputerAndSetWorkgroup.ps1 @@ -12,11 +12,11 @@ Configuration Example $NodeName = 'localhost' ) - Import-DscResource -Module xComputerManagement + Import-DscResource -Module ComputerManagementDsc Node $NodeName { - xComputer NewNameAndWorkgroup + Computer NewNameAndWorkgroup { Name = 'Server01' WorkGroupName = 'ContosoWorkgroup' diff --git a/Modules/xComputerManagement/Examples/Resources/xComputer/2-JoinDomain.ps1 b/Modules/ComputerManagementDsc/Examples/Resources/Computer/2-JoinDomain.ps1 similarity index 88% rename from Modules/xComputerManagement/Examples/Resources/xComputer/2-JoinDomain.ps1 rename to Modules/ComputerManagementDsc/Examples/Resources/Computer/2-JoinDomain.ps1 index aa0f31c3..a21c0987 100644 --- a/Modules/xComputerManagement/Examples/Resources/xComputer/2-JoinDomain.ps1 +++ b/Modules/ComputerManagementDsc/Examples/Resources/Computer/2-JoinDomain.ps1 @@ -18,11 +18,11 @@ Configuration Example $Credential ) - Import-DscResource -Module xComputerManagement + Import-DscResource -Module ComputerManagementDsc Node $NodeName { - xComputer JoinDomain + Computer JoinDomain { Name = 'Server01' DomainName = 'Contoso' diff --git a/Modules/xComputerManagement/Examples/Resources/xComputer/3-RenameComputerInDomain.ps1 b/Modules/ComputerManagementDsc/Examples/Resources/Computer/3-RenameComputerInDomain.ps1 similarity index 88% rename from Modules/xComputerManagement/Examples/Resources/xComputer/3-RenameComputerInDomain.ps1 rename to Modules/ComputerManagementDsc/Examples/Resources/Computer/3-RenameComputerInDomain.ps1 index 2b8f39f4..ddc6c9ea 100644 --- a/Modules/xComputerManagement/Examples/Resources/xComputer/3-RenameComputerInDomain.ps1 +++ b/Modules/ComputerManagementDsc/Examples/Resources/Computer/3-RenameComputerInDomain.ps1 @@ -19,11 +19,11 @@ Configuration Example $Credential ) - Import-DscResource -Module xComputerManagement + Import-DscResource -Module ComputerManagementDsc Node $NodeName { - xComputer NewName + Computer NewName { Name = 'Server01' Credential = $Credential # Domain credential diff --git a/Modules/xComputerManagement/Examples/Resources/xComputer/4-RenameComputerInWorkgroup.ps1 b/Modules/ComputerManagementDsc/Examples/Resources/Computer/4-RenameComputerInWorkgroup.ps1 similarity index 80% rename from Modules/xComputerManagement/Examples/Resources/xComputer/4-RenameComputerInWorkgroup.ps1 rename to Modules/ComputerManagementDsc/Examples/Resources/Computer/4-RenameComputerInWorkgroup.ps1 index 70b57f2c..2c3dfdf6 100644 --- a/Modules/xComputerManagement/Examples/Resources/xComputer/4-RenameComputerInWorkgroup.ps1 +++ b/Modules/ComputerManagementDsc/Examples/Resources/Computer/4-RenameComputerInWorkgroup.ps1 @@ -12,11 +12,11 @@ Configuration Example $NodeName = 'localhost' ) - Import-DscResource -Module xComputerManagement + Import-DscResource -Module ComputerManagementDsc Node $NodeName { - xComputer NewName + Computer NewName { Name = 'Server01' } diff --git a/Modules/xComputerManagement/Examples/Resources/xComputer/5-UnjoinDomainAndJoinWorkgroup.ps1 b/Modules/ComputerManagementDsc/Examples/Resources/Computer/5-UnjoinDomainAndJoinWorkgroup.ps1 similarity index 88% rename from Modules/xComputerManagement/Examples/Resources/xComputer/5-UnjoinDomainAndJoinWorkgroup.ps1 rename to Modules/ComputerManagementDsc/Examples/Resources/Computer/5-UnjoinDomainAndJoinWorkgroup.ps1 index 00de822c..2bf402e8 100644 --- a/Modules/xComputerManagement/Examples/Resources/xComputer/5-UnjoinDomainAndJoinWorkgroup.ps1 +++ b/Modules/ComputerManagementDsc/Examples/Resources/Computer/5-UnjoinDomainAndJoinWorkgroup.ps1 @@ -18,11 +18,11 @@ Configuration Example $Credential ) - Import-DscResource -Module xComputerManagement + Import-DscResource -Module ComputerManagementDsc Node $NodeName { - xComputer JoinWorkgroup + Computer JoinWorkgroup { Name = 'Server01' WorkGroupName = 'ContosoWorkgroup' diff --git a/Modules/xComputerManagement/Examples/Resources/xComputer/6-SetComputerDescriptionInWorkgroup.ps1 b/Modules/ComputerManagementDsc/Examples/Resources/Computer/6-SetComputerDescriptionInWorkgroup.ps1 similarity index 79% rename from Modules/xComputerManagement/Examples/Resources/xComputer/6-SetComputerDescriptionInWorkgroup.ps1 rename to Modules/ComputerManagementDsc/Examples/Resources/Computer/6-SetComputerDescriptionInWorkgroup.ps1 index ef1de48c..171fd0b8 100644 --- a/Modules/xComputerManagement/Examples/Resources/xComputer/6-SetComputerDescriptionInWorkgroup.ps1 +++ b/Modules/ComputerManagementDsc/Examples/Resources/Computer/6-SetComputerDescriptionInWorkgroup.ps1 @@ -11,11 +11,11 @@ Configuration Example $NodeName = 'localhost' ) - Import-DscResource -Module xComputerManagement + Import-DscResource -Module ComputerManagementDsc Node $NodeName { - xComputer NewDescription + Computer NewDescription { Name = 'localhost' Description = 'This is my computer.' diff --git a/Modules/xComputerManagement/Examples/Resources/xOfflineDomainJoin/1-JoinDomainUsingODJBlob.ps1 b/Modules/ComputerManagementDsc/Examples/Resources/OfflineDomainJoin/1-JoinDomainUsingODJBlob.ps1 similarity index 81% rename from Modules/xComputerManagement/Examples/Resources/xOfflineDomainJoin/1-JoinDomainUsingODJBlob.ps1 rename to Modules/ComputerManagementDsc/Examples/Resources/OfflineDomainJoin/1-JoinDomainUsingODJBlob.ps1 index 3bb6c879..ff51b6cf 100644 --- a/Modules/xComputerManagement/Examples/Resources/xOfflineDomainJoin/1-JoinDomainUsingODJBlob.ps1 +++ b/Modules/ComputerManagementDsc/Examples/Resources/OfflineDomainJoin/1-JoinDomainUsingODJBlob.ps1 @@ -12,11 +12,11 @@ Configuration Example $NodeName = 'localhost' ) - Import-DscResource -ModuleName xComputerManagement + Import-DscResource -ModuleName ComputerManagementDsc Node $NodeName { - xOfflineDomainJoin ODJ + OfflineDomainJoin ODJ { IsSingleInstance = 'Yes' RequestFile = 'C:\ODJ\ODJBlob.txt' diff --git a/Modules/xComputerManagement/Examples/Resources/xPowerPlan/1-SetPowerPlan.ps1 b/Modules/ComputerManagementDsc/Examples/Resources/PowerPlan/1-SetPowerPlan.ps1 similarity index 78% rename from Modules/xComputerManagement/Examples/Resources/xPowerPlan/1-SetPowerPlan.ps1 rename to Modules/ComputerManagementDsc/Examples/Resources/PowerPlan/1-SetPowerPlan.ps1 index f2a16928..1878f988 100644 --- a/Modules/xComputerManagement/Examples/Resources/xPowerPlan/1-SetPowerPlan.ps1 +++ b/Modules/ComputerManagementDsc/Examples/Resources/PowerPlan/1-SetPowerPlan.ps1 @@ -11,11 +11,11 @@ Configuration Example $NodeName = 'localhost' ) - Import-DscResource -ModuleName xComputerManagement + Import-DscResource -ModuleName ComputerManagementDsc Node $NodeName { - xPowerPlan SetPlanHighPerformance + PowerPlan SetPlanHighPerformance { IsSingleInstance = 'Yes' Name = 'High performance' diff --git a/Modules/xComputerManagement/Examples/Resources/xScheduledTask/1-CreateScheduledTaskOnce.ps1 b/Modules/ComputerManagementDsc/Examples/Resources/ScheduledTask/1-CreateScheduledTaskOnce.ps1 similarity index 92% rename from Modules/xComputerManagement/Examples/Resources/xScheduledTask/1-CreateScheduledTaskOnce.ps1 rename to Modules/ComputerManagementDsc/Examples/Resources/ScheduledTask/1-CreateScheduledTaskOnce.ps1 index 8eff3146..3a030f53 100644 --- a/Modules/xComputerManagement/Examples/Resources/xScheduledTask/1-CreateScheduledTaskOnce.ps1 +++ b/Modules/ComputerManagementDsc/Examples/Resources/ScheduledTask/1-CreateScheduledTaskOnce.ps1 @@ -16,11 +16,11 @@ Configuration Example $NodeName = 'localhost' ) - Import-DscResource -ModuleName xComputerManagement + Import-DscResource -ModuleName ComputerManagementDsc Node $NodeName { - xScheduledTask xScheduledTaskOnceAdd + ScheduledTask ScheduledTaskOnceAdd { TaskName = 'Test task Once' TaskPath = '\MyTasks' diff --git a/Modules/xComputerManagement/Examples/Resources/xScheduledTask/10-RunPowerShellTaskOnceAsUserInteractiveOnly.ps1 b/Modules/ComputerManagementDsc/Examples/Resources/ScheduledTask/10-RunPowerShellTaskOnceAsUserInteractiveOnly.ps1 similarity index 91% rename from Modules/xComputerManagement/Examples/Resources/xScheduledTask/10-RunPowerShellTaskOnceAsUserInteractiveOnly.ps1 rename to Modules/ComputerManagementDsc/Examples/Resources/ScheduledTask/10-RunPowerShellTaskOnceAsUserInteractiveOnly.ps1 index 9feaa625..1e78bf56 100644 --- a/Modules/xComputerManagement/Examples/Resources/xScheduledTask/10-RunPowerShellTaskOnceAsUserInteractiveOnly.ps1 +++ b/Modules/ComputerManagementDsc/Examples/Resources/ScheduledTask/10-RunPowerShellTaskOnceAsUserInteractiveOnly.ps1 @@ -19,11 +19,11 @@ Configuration Example $Credential ) - Import-DscResource -ModuleName xComputerManagement + Import-DscResource -ModuleName ComputerManagementDsc Node $NodeName { - xScheduledTask MaintenanceScriptExample + ScheduledTask MaintenanceScriptExample { TaskName = 'Test task Interactive' TaskPath = '\MyTasks' diff --git a/Modules/xComputerManagement/Examples/Resources/xScheduledTask/11-DisableABuiltInTask.ps1 b/Modules/ComputerManagementDsc/Examples/Resources/ScheduledTask/11-DisableABuiltInTask.ps1 similarity index 78% rename from Modules/xComputerManagement/Examples/Resources/xScheduledTask/11-DisableABuiltInTask.ps1 rename to Modules/ComputerManagementDsc/Examples/Resources/ScheduledTask/11-DisableABuiltInTask.ps1 index 9c8f203f..7bc92988 100644 --- a/Modules/xComputerManagement/Examples/Resources/xScheduledTask/11-DisableABuiltInTask.ps1 +++ b/Modules/ComputerManagementDsc/Examples/Resources/ScheduledTask/11-DisableABuiltInTask.ps1 @@ -12,11 +12,11 @@ Configuration Example $NodeName = 'localhost' ) - Import-DscResource -ModuleName xComputerManagement + Import-DscResource -ModuleName ComputerManagementDsc Node $NodeName { - xScheduledTask DisableCreateExplorerShellUnelevatedTask + ScheduledTask DisableCreateExplorerShellUnelevatedTask { TaskName = 'CreateExplorerShellUnelevatedTask' TaskPath = '\' diff --git a/Modules/xComputerManagement/Examples/Resources/xScheduledTask/12-DeleteABuiltInTask.ps1 b/Modules/ComputerManagementDsc/Examples/Resources/ScheduledTask/12-DeleteABuiltInTask.ps1 similarity index 79% rename from Modules/xComputerManagement/Examples/Resources/xScheduledTask/12-DeleteABuiltInTask.ps1 rename to Modules/ComputerManagementDsc/Examples/Resources/ScheduledTask/12-DeleteABuiltInTask.ps1 index f520f563..6d0499a0 100644 --- a/Modules/xComputerManagement/Examples/Resources/xScheduledTask/12-DeleteABuiltInTask.ps1 +++ b/Modules/ComputerManagementDsc/Examples/Resources/ScheduledTask/12-DeleteABuiltInTask.ps1 @@ -12,11 +12,11 @@ Configuration Example $NodeName = 'localhost' ) - Import-DscResource -ModuleName xComputerManagement + Import-DscResource -ModuleName ComputerManagementDsc Node $NodeName { - xScheduledTask DeleteCreateExplorerShellUnelevatedTask + ScheduledTask DeleteCreateExplorerShellUnelevatedTask { TaskName = 'CreateExplorerShellUnelevatedTask' TaskPath = '\' diff --git a/Modules/xComputerManagement/Examples/Resources/xScheduledTask/2-CreateScheduledTaskDaily.ps1 b/Modules/ComputerManagementDsc/Examples/Resources/ScheduledTask/2-CreateScheduledTaskDaily.ps1 similarity index 92% rename from Modules/xComputerManagement/Examples/Resources/xScheduledTask/2-CreateScheduledTaskDaily.ps1 rename to Modules/ComputerManagementDsc/Examples/Resources/ScheduledTask/2-CreateScheduledTaskDaily.ps1 index b90a5135..55dea61e 100644 --- a/Modules/xComputerManagement/Examples/Resources/xScheduledTask/2-CreateScheduledTaskDaily.ps1 +++ b/Modules/ComputerManagementDsc/Examples/Resources/ScheduledTask/2-CreateScheduledTaskDaily.ps1 @@ -15,11 +15,11 @@ Configuration Example $NodeName = 'localhost' ) - Import-DscResource -ModuleName xComputerManagement + Import-DscResource -ModuleName ComputerManagementDsc Node $NodeName { - xScheduledTask xScheduledTaskDailyAdd + ScheduledTask ScheduledTaskDailyAdd { TaskName = 'Test task Daily' TaskPath = '\MyTasks' diff --git a/Modules/xComputerManagement/Examples/Resources/xScheduledTask/3-CreateScheduledTasksDailyIndefinitely.ps1 b/Modules/ComputerManagementDsc/Examples/Resources/ScheduledTask/3-CreateScheduledTasksDailyIndefinitely.ps1 similarity index 87% rename from Modules/xComputerManagement/Examples/Resources/xScheduledTask/3-CreateScheduledTasksDailyIndefinitely.ps1 rename to Modules/ComputerManagementDsc/Examples/Resources/ScheduledTask/3-CreateScheduledTasksDailyIndefinitely.ps1 index dbe4d893..61c455eb 100644 --- a/Modules/xComputerManagement/Examples/Resources/xScheduledTask/3-CreateScheduledTasksDailyIndefinitely.ps1 +++ b/Modules/ComputerManagementDsc/Examples/Resources/ScheduledTask/3-CreateScheduledTasksDailyIndefinitely.ps1 @@ -13,11 +13,11 @@ Configuration Example $NodeName = 'localhost' ) - Import-DscResource -ModuleName xComputerManagement + Import-DscResource -ModuleName ComputerManagementDsc Node $NodeName { - xScheduledTask xScheduledTaskDailyIndefinitelyAdd + ScheduledTask ScheduledTaskDailyIndefinitelyAdd { TaskName = 'Test task Daily Indefinitely' TaskPath = '\MyTasks' diff --git a/Modules/xComputerManagement/Examples/Resources/xScheduledTask/4-CreateScheduledTasksWeekly.ps1 b/Modules/ComputerManagementDsc/Examples/Resources/ScheduledTask/4-CreateScheduledTasksWeekly.ps1 similarity index 92% rename from Modules/xComputerManagement/Examples/Resources/xScheduledTask/4-CreateScheduledTasksWeekly.ps1 rename to Modules/ComputerManagementDsc/Examples/Resources/ScheduledTask/4-CreateScheduledTasksWeekly.ps1 index 63ad9334..e329f7c8 100644 --- a/Modules/xComputerManagement/Examples/Resources/xScheduledTask/4-CreateScheduledTasksWeekly.ps1 +++ b/Modules/ComputerManagementDsc/Examples/Resources/ScheduledTask/4-CreateScheduledTasksWeekly.ps1 @@ -15,11 +15,11 @@ Configuration Example $NodeName = 'localhost' ) - Import-DscResource -ModuleName xComputerManagement + Import-DscResource -ModuleName ComputerManagementDsc Node $NodeName { - xScheduledTask xScheduledTaskWeeklyAdd + ScheduledTask ScheduledTaskWeeklyAdd { TaskName = 'Test task Weekly' TaskPath = '\MyTasks' diff --git a/Modules/xComputerManagement/Examples/Resources/xScheduledTask/5-CreateScheduledTasksAtLogon.ps1 b/Modules/ComputerManagementDsc/Examples/Resources/ScheduledTask/5-CreateScheduledTasksAtLogon.ps1 similarity index 87% rename from Modules/xComputerManagement/Examples/Resources/xScheduledTask/5-CreateScheduledTasksAtLogon.ps1 rename to Modules/ComputerManagementDsc/Examples/Resources/ScheduledTask/5-CreateScheduledTasksAtLogon.ps1 index fc4b7576..ab03b9f7 100644 --- a/Modules/xComputerManagement/Examples/Resources/xScheduledTask/5-CreateScheduledTasksAtLogon.ps1 +++ b/Modules/ComputerManagementDsc/Examples/Resources/ScheduledTask/5-CreateScheduledTasksAtLogon.ps1 @@ -13,11 +13,11 @@ Configuration Example $NodeName = 'localhost' ) - Import-DscResource -ModuleName xComputerManagement + Import-DscResource -ModuleName ComputerManagementDsc Node $NodeName { - xScheduledTask xScheduledTaskLogonAdd + ScheduledTask ScheduledTaskLogonAdd { TaskName = 'Test task Logon' TaskPath = '\MyTasks' diff --git a/Modules/xComputerManagement/Examples/Resources/xScheduledTask/6-CreateScheduledTasksAtStartup.ps1 b/Modules/ComputerManagementDsc/Examples/Resources/ScheduledTask/6-CreateScheduledTasksAtStartup.ps1 similarity index 87% rename from Modules/xComputerManagement/Examples/Resources/xScheduledTask/6-CreateScheduledTasksAtStartup.ps1 rename to Modules/ComputerManagementDsc/Examples/Resources/ScheduledTask/6-CreateScheduledTasksAtStartup.ps1 index 13173c27..8bbdc879 100644 --- a/Modules/xComputerManagement/Examples/Resources/xScheduledTask/6-CreateScheduledTasksAtStartup.ps1 +++ b/Modules/ComputerManagementDsc/Examples/Resources/ScheduledTask/6-CreateScheduledTasksAtStartup.ps1 @@ -14,11 +14,11 @@ Configuration Example $NodeName = 'localhost' ) - Import-DscResource -ModuleName xComputerManagement + Import-DscResource -ModuleName ComputerManagementDsc Node $NodeName { - xScheduledTask xScheduledTaskStartupAdd + ScheduledTask ScheduledTaskStartupAdd { TaskName = 'Test task Startup' TaskPath = '\MyTasks' diff --git a/Modules/xComputerManagement/Examples/Resources/xScheduledTask/7-RunPowerShellTaskEvery15Minutes.ps1 b/Modules/ComputerManagementDsc/Examples/Resources/ScheduledTask/7-RunPowerShellTaskEvery15Minutes.ps1 similarity index 88% rename from Modules/xComputerManagement/Examples/Resources/xScheduledTask/7-RunPowerShellTaskEvery15Minutes.ps1 rename to Modules/ComputerManagementDsc/Examples/Resources/ScheduledTask/7-RunPowerShellTaskEvery15Minutes.ps1 index 7c55da7e..34ddc812 100644 --- a/Modules/xComputerManagement/Examples/Resources/xScheduledTask/7-RunPowerShellTaskEvery15Minutes.ps1 +++ b/Modules/ComputerManagementDsc/Examples/Resources/ScheduledTask/7-RunPowerShellTaskEvery15Minutes.ps1 @@ -13,11 +13,11 @@ Configuration Example $NodeName = 'localhost' ) - Import-DscResource -ModuleName xComputerManagement + Import-DscResource -ModuleName ComputerManagementDsc Node $NodeName { - xScheduledTask MaintenanceScriptExample + ScheduledTask MaintenanceScriptExample { TaskName = "Custom maintenance tasks" ActionExecutable = "C:\windows\system32\WindowsPowerShell\v1.0\powershell.exe" diff --git a/Modules/xComputerManagement/Examples/Resources/xScheduledTask/8-RunPowerShellTaskEvery15MinutesIndefinitely.ps1 b/Modules/ComputerManagementDsc/Examples/Resources/ScheduledTask/8-RunPowerShellTaskEvery15MinutesIndefinitely.ps1 similarity index 88% rename from Modules/xComputerManagement/Examples/Resources/xScheduledTask/8-RunPowerShellTaskEvery15MinutesIndefinitely.ps1 rename to Modules/ComputerManagementDsc/Examples/Resources/ScheduledTask/8-RunPowerShellTaskEvery15MinutesIndefinitely.ps1 index 9d771d04..d4df2e4b 100644 --- a/Modules/xComputerManagement/Examples/Resources/xScheduledTask/8-RunPowerShellTaskEvery15MinutesIndefinitely.ps1 +++ b/Modules/ComputerManagementDsc/Examples/Resources/ScheduledTask/8-RunPowerShellTaskEvery15MinutesIndefinitely.ps1 @@ -13,11 +13,11 @@ Configuration Example $NodeName = 'localhost' ) - Import-DscResource -ModuleName xComputerManagement + Import-DscResource -ModuleName ComputerManagementDsc Node $NodeName { - xScheduledTask MaintenanceScriptExample + ScheduledTask MaintenanceScriptExample { TaskName = "Custom maintenance tasks" ActionExecutable = "C:\windows\system32\WindowsPowerShell\v1.0\powershell.exe" diff --git a/Modules/xComputerManagement/Examples/Resources/xScheduledTask/9-RunPowerShellTaskOnceAsUserWithHighestPriveleges.ps1 b/Modules/ComputerManagementDsc/Examples/Resources/ScheduledTask/9-RunPowerShellTaskOnceAsUserWithHighestPriveleges.ps1 similarity index 91% rename from Modules/xComputerManagement/Examples/Resources/xScheduledTask/9-RunPowerShellTaskOnceAsUserWithHighestPriveleges.ps1 rename to Modules/ComputerManagementDsc/Examples/Resources/ScheduledTask/9-RunPowerShellTaskOnceAsUserWithHighestPriveleges.ps1 index f7e9d0ee..882cb50e 100644 --- a/Modules/xComputerManagement/Examples/Resources/xScheduledTask/9-RunPowerShellTaskOnceAsUserWithHighestPriveleges.ps1 +++ b/Modules/ComputerManagementDsc/Examples/Resources/ScheduledTask/9-RunPowerShellTaskOnceAsUserWithHighestPriveleges.ps1 @@ -19,11 +19,11 @@ Configuration Example $Credential ) - Import-DscResource -ModuleName xComputerManagement + Import-DscResource -ModuleName ComputerManagementDsc Node $NodeName { - xScheduledTask MaintenanceScriptExample + ScheduledTask MaintenanceScriptExample { TaskName = 'Test task Run As Highest Privilege' TaskPath = '\MyTasks' diff --git a/Modules/xComputerManagement/Examples/Resources/xVirtualMemory/1-SetVirtualMemory.ps1 b/Modules/ComputerManagementDsc/Examples/Resources/VirtualMemory/1-SetVirtualMemory.ps1 similarity index 82% rename from Modules/xComputerManagement/Examples/Resources/xVirtualMemory/1-SetVirtualMemory.ps1 rename to Modules/ComputerManagementDsc/Examples/Resources/VirtualMemory/1-SetVirtualMemory.ps1 index 990cdb67..4a1b07e8 100644 --- a/Modules/xComputerManagement/Examples/Resources/xVirtualMemory/1-SetVirtualMemory.ps1 +++ b/Modules/ComputerManagementDsc/Examples/Resources/VirtualMemory/1-SetVirtualMemory.ps1 @@ -12,11 +12,11 @@ Configuration Example $NodeName = 'localhost' ) - Import-DSCResource -ModuleName xComputerManagement + Import-DSCResource -ModuleName ComputerManagementDsc Node $NodeName { - xVirtualMemory pagingSettings + VirtualMemory PagingSettings { Type = 'CustomSize' Drive = 'C' diff --git a/Modules/xComputerManagement/Modules/ComputerManagementDsc.Common/ComputerManagementDsc.Common.psm1 b/Modules/ComputerManagementDsc/Modules/ComputerManagementDsc.Common/ComputerManagementDsc.Common.psm1 similarity index 100% rename from Modules/xComputerManagement/Modules/ComputerManagementDsc.Common/ComputerManagementDsc.Common.psm1 rename to Modules/ComputerManagementDsc/Modules/ComputerManagementDsc.Common/ComputerManagementDsc.Common.psm1 diff --git a/Modules/xComputerManagement/Modules/ComputerManagementDsc.Common/en-us/ComputerManagementDsc.Common.strings.psd1 b/Modules/ComputerManagementDsc/Modules/ComputerManagementDsc.Common/en-us/ComputerManagementDsc.Common.strings.psd1 similarity index 100% rename from Modules/xComputerManagement/Modules/ComputerManagementDsc.Common/en-us/ComputerManagementDsc.Common.strings.psd1 rename to Modules/ComputerManagementDsc/Modules/ComputerManagementDsc.Common/en-us/ComputerManagementDsc.Common.strings.psd1 diff --git a/Modules/xComputerManagement/Modules/ComputerManagementDsc.ResourceHelper/ComputerManagementDsc.ResourceHelper.psm1 b/Modules/ComputerManagementDsc/Modules/ComputerManagementDsc.ResourceHelper/ComputerManagementDsc.ResourceHelper.psm1 similarity index 100% rename from Modules/xComputerManagement/Modules/ComputerManagementDsc.ResourceHelper/ComputerManagementDsc.ResourceHelper.psm1 rename to Modules/ComputerManagementDsc/Modules/ComputerManagementDsc.ResourceHelper/ComputerManagementDsc.ResourceHelper.psm1 diff --git a/Modules/xComputerManagement/DSCResources/MSFT_xOfflineDomainJoin/en-US/MSFT_xOfflineDomainJoin.strings.psd1 b/Modules/xComputerManagement/DSCResources/MSFT_xOfflineDomainJoin/en-US/MSFT_xOfflineDomainJoin.strings.psd1 deleted file mode 100644 index 75a4c4ee..00000000 --- a/Modules/xComputerManagement/DSCResources/MSFT_xOfflineDomainJoin/en-US/MSFT_xOfflineDomainJoin.strings.psd1 +++ /dev/null @@ -1,11 +0,0 @@ -ConvertFrom-StringData @' - GettingOfflineDomainJoinMessage=Getting the Offline Domain Join State. - ApplyingOfflineDomainJoinMessage=Applying the Offline Domain Join State. - AttemptingDomainJoinMessage=Attempting domain join using ODJ Request file '{0}'. - DomainJoinedMessage=Domain joined using ODJ Request file '{0}'. Reboot will be required. - CheckingOfflineDomainJoinMessage=Checking the Offline Domain Join State. - DomainAlreadyJoinedMessage=The computer is already joined to a domain '{0}'. Change not required. - DomainNotJoinedMessage=The computer is not joined to a domain. Change required. - RequestFileNotFoundError=The ODJ Request file '{0}' does not exist. - DjoinError=Error {0} occured requesting the Offline Domain Join. -'@ diff --git a/README.md b/README.md index e12851eb..2d50f19d 100644 --- a/README.md +++ b/README.md @@ -1,22 +1,22 @@ -# xComputerManagement +# ComputerManagementDsc -The **xComputerManagement** module contains the following resources: +The **ComputerManagementDsc** module contains the following resources: -- **xComputer**: allows you to configure a computer by changing its name and +- **Computer**: allows you to configure a computer by changing its name and description and modifying its Active Directory domain or workgroup membership. -- **xOfflineDomainJoin**: allows you to join computers to an Active Directory +- **OfflineDomainJoin**: allows you to join computers to an Active Directory domain using an [Offline Domain Join](https://technet.microsoft.com/en-us/library/offline-domain-join-djoin-step-by-step(v=ws.10).aspx) request file. -- **xPowerPlan**: allows specifying a power plan to activate. -- **xScheduledTask**: is used to define basic run once or recurring scheduled tasks +- **PowerPlan**: allows specifying a power plan to activate. +- **ScheduledTask**: is used to define basic run once or recurring scheduled tasks on the local computer. It can also be used to delete or disable built-in scheduled tasks. - _The **xScheduledTask** resource requires the `ScheduledTasks` PowerShell module + _The **ScheduledTask** resource requires the `ScheduledTasks` PowerShell module which is only available on Windows Server 2012/Windows 8 and above. DSC configurations containing this resource may be compiled on Windows Server 2008 R2/Windows 7 but can not be applied._ -- **xVirtualMemory**: allows configuration of properties of the paging file on +- **VirtualMemory**: allows configuration of properties of the paging file on the local computer. This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). @@ -26,23 +26,23 @@ additional questions or comments. ## Documentation and Examples -For a full list of resources in xComputerManagement and examples on their use, check -out the [xComputerManagement wiki](https://github.com/PowerShell/xComputerManagement/wiki). +For a full list of resources in ComputerManagementDsc and examples on their use, check +out the [ComputerManagementDsc wiki](https://github.com/PowerShell/ComputerManagementDsc/wiki). ## Branches ### master -[![Build status](https://ci.appveyor.com/api/projects/status/cg28qxeco39wgo9l/branch/master?svg=true)](https://ci.appveyor.com/project/PowerShell/xComputerManagement/branch/master) -[![codecov](https://codecov.io/gh/PowerShell/xComputerManagement/branch/master/graph/badge.svg)](https://codecov.io/gh/PowerShell/xComputerManagement/branch/master) +[![Build status](https://ci.appveyor.com/api/projects/status/cg28qxeco39wgo9l/branch/master?svg=true)](https://ci.appveyor.com/project/PowerShell/ComputerManagementDsc/branch/master) +[![codecov](https://codecov.io/gh/PowerShell/ComputerManagementDsc/branch/master/graph/badge.svg)](https://codecov.io/gh/PowerShell/ComputerManagementDsc/branch/master) This is the branch containing the latest release - no contributions should be made directly to this branch. ### dev -[![Build status](https://ci.appveyor.com/api/projects/status/cg28qxeco39wgo9l/branch/dev?svg=true)](https://ci.appveyor.com/project/PowerShell/xComputerManagement/branch/dev) -[![codecov](https://codecov.io/gh/PowerShell/xComputerManagement/branch/dev/graph/badge.svg)](https://codecov.io/gh/PowerShell/xComputerManagement/branch/dev) +[![Build status](https://ci.appveyor.com/api/projects/status/cg28qxeco39wgo9l/branch/dev?svg=true)](https://ci.appveyor.com/project/PowerShell/ComputerManagementDsc/branch/dev) +[![codecov](https://codecov.io/gh/PowerShell/ComputerManagementDsc/branch/dev/graph/badge.svg)](https://codecov.io/gh/PowerShell/ComputerManagementDsc/branch/dev) This is the development branch to which contributions should be proposed by contributors as pull requests. This development branch will periodically be merged to the master diff --git a/Tests/Integration/MSFT_xScheduledTask.Config.ps1 b/Tests/Integration/MSFT_ScheduledTask.Config.ps1 similarity index 67% rename from Tests/Integration/MSFT_xScheduledTask.Config.ps1 rename to Tests/Integration/MSFT_ScheduledTask.Config.ps1 index 02767dd4..b3d85910 100644 --- a/Tests/Integration/MSFT_xScheduledTask.Config.ps1 +++ b/Tests/Integration/MSFT_ScheduledTask.Config.ps1 @@ -1,12 +1,12 @@ -Configuration xScheduledTaskOnceCrossTimezone +Configuration ScheduledTaskOnceCrossTimezone { - Import-DscResource -ModuleName xComputerManagement + Import-DscResource -ModuleName ComputerManagementDsc node 'localhost' { - xScheduledTask xScheduledTaskOnceAdd + ScheduledTask ScheduledTaskOnceAdd { TaskName = 'Test task once cross timezone' - TaskPath = '\xComputerManagement\' + TaskPath = '\ComputerManagementDsc\' ActionExecutable = 'C:\windows\system32\WindowsPowerShell\v1.0\powershell.exe' ScheduleType = 'Once' RepeatInterval = '00:15:00' @@ -22,15 +22,15 @@ Configuration xScheduledTaskOnceCrossTimezone } } -Configuration xScheduledTaskOnceAdd +Configuration ScheduledTaskOnceAdd { - Import-DscResource -ModuleName xComputerManagement + Import-DscResource -ModuleName ComputerManagementDsc node 'localhost' { - xScheduledTask xScheduledTaskOnceAdd + ScheduledTask ScheduledTaskOnceAdd { TaskName = 'Test task once' - TaskPath = '\xComputerManagement\' + TaskPath = '\ComputerManagementDsc\' ActionExecutable = 'C:\windows\system32\WindowsPowerShell\v1.0\powershell.exe' ScheduleType = 'Once' RepeatInterval = '00:15:00' @@ -46,15 +46,15 @@ Configuration xScheduledTaskOnceAdd } } -Configuration xScheduledTaskDailyAdd +Configuration ScheduledTaskDailyAdd { - Import-DscResource -ModuleName xComputerManagement + Import-DscResource -ModuleName ComputerManagementDsc node 'localhost' { - xScheduledTask xScheduledTaskDailyAdd + ScheduledTask ScheduledTaskDailyAdd { TaskName = 'Test task Daily' - TaskPath = '\xComputerManagement\' + TaskPath = '\ComputerManagementDsc\' ActionExecutable = 'C:\windows\system32\WindowsPowerShell\v1.0\powershell.exe' ScheduleType = 'Daily' DaysInterval = 1 @@ -68,15 +68,15 @@ Configuration xScheduledTaskDailyAdd } } -Configuration xScheduledTaskDailyIndefinitelyAdd +Configuration ScheduledTaskDailyIndefinitelyAdd { - Import-DscResource -ModuleName xComputerManagement + Import-DscResource -ModuleName ComputerManagementDsc node 'localhost' { - xScheduledTask xScheduledTaskDailyAdd + ScheduledTask ScheduledTaskDailyAdd { TaskName = 'Test task Daily Indefinitely' - TaskPath = '\xComputerManagement\' + TaskPath = '\ComputerManagementDsc\' ActionExecutable = 'C:\windows\system32\WindowsPowerShell\v1.0\powershell.exe' ScheduleType = 'Daily' DaysInterval = 1 @@ -90,15 +90,15 @@ Configuration xScheduledTaskDailyIndefinitelyAdd } } -Configuration xScheduledTaskWeeklyAdd +Configuration ScheduledTaskWeeklyAdd { - Import-DscResource -ModuleName xComputerManagement + Import-DscResource -ModuleName ComputerManagementDsc node 'localhost' { - xScheduledTask xScheduledTaskWeeklyAdd + ScheduledTask ScheduledTaskWeeklyAdd { TaskName = 'Test task Weekly' - TaskPath = '\xComputerManagement\' + TaskPath = '\ComputerManagementDsc\' ActionExecutable = 'C:\windows\system32\WindowsPowerShell\v1.0\powershell.exe' ScheduleType = 'Weekly' WeeksInterval = 1 @@ -112,15 +112,15 @@ Configuration xScheduledTaskWeeklyAdd } } -Configuration xScheduledTaskLogonAdd +Configuration ScheduledTaskLogonAdd { - Import-DscResource -ModuleName xComputerManagement + Import-DscResource -ModuleName ComputerManagementDsc node 'localhost' { - xScheduledTask xScheduledTaskOnceAdd + ScheduledTask ScheduledTaskOnceAdd { TaskName = 'Test task Logon' - TaskPath = '\xComputerManagement\' + TaskPath = '\ComputerManagementDsc\' ActionExecutable = 'C:\windows\system32\WindowsPowerShell\v1.0\powershell.exe' ScheduleType = 'AtLogOn' RepeatInterval = '00:15:00' @@ -129,15 +129,15 @@ Configuration xScheduledTaskLogonAdd } } -Configuration xScheduledTaskStartupAdd +Configuration ScheduledTaskStartupAdd { - Import-DscResource -ModuleName xComputerManagement + Import-DscResource -ModuleName ComputerManagementDsc node 'localhost' { - xScheduledTask xScheduledTaskOnceAdd + ScheduledTask ScheduledTaskOnceAdd { TaskName = 'Test task Startup' - TaskPath = '\xComputerManagement\' + TaskPath = '\ComputerManagementDsc\' ActionExecutable = 'C:\windows\system32\WindowsPowerShell\v1.0\powershell.exe' ScheduleType = 'AtStartup' RepeatInterval = '00:15:00' @@ -146,19 +146,19 @@ Configuration xScheduledTaskStartupAdd } } -Configuration xScheduledTaskExecuteAsAdd +Configuration ScheduledTaskExecuteAsAdd { - Import-DscResource -ModuleName xComputerManagement + Import-DscResource -ModuleName ComputerManagementDsc node 'localhost' { $executeAsCredential = New-Object ` -TypeName System.Management.Automation.PSCredential ` -ArgumentList ($ENV:USERNAME, (ConvertTo-SecureString -String 'Ignore' -AsPlainText -Force)) - xScheduledTask xScheduledTaskOnceAdd + ScheduledTask ScheduledTaskOnceAdd { TaskName = 'Test task Logon' - TaskPath = '\xComputerManagement\' + TaskPath = '\ComputerManagementDsc\' ActionExecutable = 'C:\windows\system32\WindowsPowerShell\v1.0\powershell.exe' ScheduleType = 'AtLogOn' ExecuteAsCredential = $executeAsCredential @@ -168,15 +168,15 @@ Configuration xScheduledTaskExecuteAsAdd } } -Configuration xScheduledTaskOnceMod +Configuration ScheduledTaskOnceMod { - Import-DscResource -ModuleName xComputerManagement + Import-DscResource -ModuleName ComputerManagementDsc node 'localhost' { - xScheduledTask xScheduledTaskOnceMod + ScheduledTask ScheduledTaskOnceMod { TaskName = 'Test task once' - TaskPath = '\xComputerManagement\' + TaskPath = '\ComputerManagementDsc\' ActionExecutable = 'C:\windows\system32\WindowsPowerShell\v1.0\powershell.exe' ScheduleType = 'Once' RepeatInterval = '00:20:00' @@ -187,15 +187,15 @@ Configuration xScheduledTaskOnceMod } } -Configuration xScheduledTaskDailyMod +Configuration ScheduledTaskDailyMod { - Import-DscResource -ModuleName xComputerManagement + Import-DscResource -ModuleName ComputerManagementDsc node 'localhost' { - xScheduledTask xScheduledTaskDailyMod + ScheduledTask ScheduledTaskDailyMod { TaskName = 'Test task Daily' - TaskPath = '\xComputerManagement\' + TaskPath = '\ComputerManagementDsc\' ActionExecutable = 'C:\windows\system32\WindowsPowerShell\v1.0\powershell.exe' ScheduleType = 'Daily' DaysInterval = 2 @@ -206,15 +206,15 @@ Configuration xScheduledTaskDailyMod } } -Configuration xScheduledTaskDailyIndefinitelyMod +Configuration ScheduledTaskDailyIndefinitelyMod { - Import-DscResource -ModuleName xComputerManagement + Import-DscResource -ModuleName ComputerManagementDsc node 'localhost' { - xScheduledTask xScheduledTaskDailyMod + ScheduledTask ScheduledTaskDailyMod { TaskName = 'Test task Daily Indefinitely' - TaskPath = '\xComputerManagement\' + TaskPath = '\ComputerManagementDsc\' ActionExecutable = 'C:\windows\system32\WindowsPowerShell\v1.0\powershell.exe' ScheduleType = 'Daily' DaysInterval = 2 @@ -225,15 +225,15 @@ Configuration xScheduledTaskDailyIndefinitelyMod } } -Configuration xScheduledTaskWeeklyMod +Configuration ScheduledTaskWeeklyMod { - Import-DscResource -ModuleName xComputerManagement + Import-DscResource -ModuleName ComputerManagementDsc node 'localhost' { - xScheduledTask xScheduledTaskWeeklyMod + ScheduledTask ScheduledTaskWeeklyMod { TaskName = 'Test task Weekly' - TaskPath = '\xComputerManagement\' + TaskPath = '\ComputerManagementDsc\' ActionExecutable = 'C:\windows\system32\WindowsPowerShell\v1.0\powershell.exe' ScheduleType = 'Weekly' WeeksInterval = 1 @@ -244,15 +244,15 @@ Configuration xScheduledTaskWeeklyMod } } -Configuration xScheduledTaskLogonMod +Configuration ScheduledTaskLogonMod { - Import-DscResource -ModuleName xComputerManagement + Import-DscResource -ModuleName ComputerManagementDsc node 'localhost' { - xScheduledTask xScheduledTaskOnceMod + ScheduledTask ScheduledTaskOnceMod { TaskName = 'Test task Logon' - TaskPath = '\xComputerManagement\' + TaskPath = '\ComputerManagementDsc\' ActionExecutable = 'C:\windows\system32\WindowsPowerShell\v1.0\powershell.exe' ScheduleType = 'AtStartup' RepeatInterval = '00:12:00' @@ -261,15 +261,15 @@ Configuration xScheduledTaskLogonMod } } -Configuration xScheduledTaskStartupMod +Configuration ScheduledTaskStartupMod { - Import-DscResource -ModuleName xComputerManagement + Import-DscResource -ModuleName ComputerManagementDsc node 'localhost' { - xScheduledTask xScheduledTaskOnceMod + ScheduledTask ScheduledTaskOnceMod { TaskName = 'Test task Startup' - TaskPath = '\xComputerManagement\' + TaskPath = '\ComputerManagementDsc\' ActionExecutable = 'C:\windows\system32\WindowsPowerShell\v1.0\powershell.exe' ScheduleType = 'AtLogOn' RepeatInterval = '00:10:00' @@ -278,15 +278,15 @@ Configuration xScheduledTaskStartupMod } } -Configuration xScheduledTaskExecuteAsMod +Configuration ScheduledTaskExecuteAsMod { - Import-DscResource -ModuleName xComputerManagement + Import-DscResource -ModuleName ComputerManagementDsc node 'localhost' { - xScheduledTask xScheduledTaskOnceMod + ScheduledTask ScheduledTaskOnceMod { TaskName = 'Test task Logon' - TaskPath = '\xComputerManagement\' + TaskPath = '\ComputerManagementDsc\' ActionExecutable = 'C:\windows\system32\WindowsPowerShell\v1.0\powershell.exe' ScheduleType = 'AtLogOn' RunLevel = 'Limited' @@ -294,15 +294,15 @@ Configuration xScheduledTaskExecuteAsMod } } -Configuration xScheduledTaskOnceDel +Configuration ScheduledTaskOnceDel { - Import-DscResource -ModuleName xComputerManagement + Import-DscResource -ModuleName ComputerManagementDsc node 'localhost' { - xScheduledTask xScheduledTaskOnceDel + ScheduledTask ScheduledTaskOnceDel { TaskName = 'Test task once' - TaskPath = '\xComputerManagement\' + TaskPath = '\ComputerManagementDsc\' ActionExecutable = 'C:\windows\system32\WindowsPowerShell\v1.0\powershell.exe' ScheduleType = 'Once' RepeatInterval = '00:20:00' @@ -313,15 +313,15 @@ Configuration xScheduledTaskOnceDel } } -Configuration xScheduledTaskDailyDel +Configuration ScheduledTaskDailyDel { - Import-DscResource -ModuleName xComputerManagement + Import-DscResource -ModuleName ComputerManagementDsc node 'localhost' { - xScheduledTask xScheduledTaskDailyDel + ScheduledTask ScheduledTaskDailyDel { TaskName = 'Test task Daily' - TaskPath = '\xComputerManagement\' + TaskPath = '\ComputerManagementDsc\' ActionExecutable = 'C:\windows\system32\WindowsPowerShell\v1.0\powershell.exe' ScheduleType = 'Daily' DaysInterval = 2 @@ -333,15 +333,15 @@ Configuration xScheduledTaskDailyDel } } -Configuration xScheduledTaskDailyIndefinitelyDel +Configuration ScheduledTaskDailyIndefinitelyDel { - Import-DscResource -ModuleName xComputerManagement + Import-DscResource -ModuleName ComputerManagementDsc node 'localhost' { - xScheduledTask xScheduledTaskDailyDel + ScheduledTask ScheduledTaskDailyDel { TaskName = 'Test task Daily Indefinitely' - TaskPath = '\xComputerManagement\' + TaskPath = '\ComputerManagementDsc\' ActionExecutable = 'C:\windows\system32\WindowsPowerShell\v1.0\powershell.exe' ScheduleType = 'Daily' DaysInterval = 2 @@ -353,15 +353,15 @@ Configuration xScheduledTaskDailyIndefinitelyDel } } -Configuration xScheduledTaskWeeklyDel +Configuration ScheduledTaskWeeklyDel { - Import-DscResource -ModuleName xComputerManagement + Import-DscResource -ModuleName ComputerManagementDsc node 'localhost' { - xScheduledTask xScheduledTaskWeeklyDel + ScheduledTask ScheduledTaskWeeklyDel { TaskName = 'Test task Weekly' - TaskPath = '\xComputerManagement\' + TaskPath = '\ComputerManagementDsc\' ActionExecutable = 'C:\windows\system32\WindowsPowerShell\v1.0\powershell.exe' ScheduleType = 'Weekly' WeeksInterval = 1 @@ -373,15 +373,15 @@ Configuration xScheduledTaskWeeklyDel } } -Configuration xScheduledTaskLogonDel +Configuration ScheduledTaskLogonDel { - Import-DscResource -ModuleName xComputerManagement + Import-DscResource -ModuleName ComputerManagementDsc node 'localhost' { - xScheduledTask xScheduledTaskLogonDel + ScheduledTask ScheduledTaskLogonDel { TaskName = 'Test task Logon' - TaskPath = '\xComputerManagement\' + TaskPath = '\ComputerManagementDsc\' ActionExecutable = 'C:\windows\system32\WindowsPowerShell\v1.0\powershell.exe' ScheduleType = 'AtStartup' RepeatInterval = '00:12:00' @@ -391,15 +391,15 @@ Configuration xScheduledTaskLogonDel } } -Configuration xScheduledTaskStartupDel +Configuration ScheduledTaskStartupDel { - Import-DscResource -ModuleName xComputerManagement + Import-DscResource -ModuleName ComputerManagementDsc node 'localhost' { - xScheduledTask xScheduledTaskStartupDel + ScheduledTask ScheduledTaskStartupDel { TaskName = 'Test task Startup' - TaskPath = '\xComputerManagement\' + TaskPath = '\ComputerManagementDsc\' ActionExecutable = 'C:\windows\system32\WindowsPowerShell\v1.0\powershell.exe' ScheduleType = 'AtLogOn' RepeatInterval = '00:10:00' @@ -409,15 +409,15 @@ Configuration xScheduledTaskStartupDel } } -Configuration xScheduledTaskExecuteAsDel +Configuration ScheduledTaskExecuteAsDel { - Import-DscResource -ModuleName xComputerManagement + Import-DscResource -ModuleName ComputerManagementDsc node 'localhost' { - xScheduledTask xScheduledTaskOnceDel + ScheduledTask ScheduledTaskOnceDel { TaskName = 'Test task Logon' - TaskPath = '\xComputerManagement\' + TaskPath = '\ComputerManagementDsc\' ActionExecutable = 'C:\windows\system32\WindowsPowerShell\v1.0\powershell.exe' ScheduleType = 'AtLogOn' Ensure = 'Absent' @@ -425,29 +425,29 @@ Configuration xScheduledTaskExecuteAsDel } } -Configuration xScheduledTaskDisableBuiltIn +Configuration ScheduledTaskDisableBuiltIn { - Import-DscResource -ModuleName xComputerManagement + Import-DscResource -ModuleName ComputerManagementDsc node 'localhost' { - xScheduledTask xScheduledTaskDisableBuiltIn + ScheduledTask ScheduledTaskDisableBuiltIn { TaskName = 'Test task builtin' - TaskPath = '\xComputerManagement\' + TaskPath = '\ComputerManagementDsc\' Enable = $false } } } -Configuration xScheduledTaskRemoveBuiltIn +Configuration ScheduledTaskRemoveBuiltIn { - Import-DscResource -ModuleName xComputerManagement + Import-DscResource -ModuleName ComputerManagementDsc node 'localhost' { - xScheduledTask xScheduledTaskRemoveBuiltIn + ScheduledTask ScheduledTaskRemoveBuiltIn { TaskName = 'Test task builtin' - TaskPath = '\xComputerManagement\' + TaskPath = '\ComputerManagementDsc\' Ensure = 'Absent' } } diff --git a/Tests/Integration/MSFT_xScheduledTask.Integration.Tests.ps1 b/Tests/Integration/MSFT_ScheduledTask.Integration.Tests.ps1 similarity index 90% rename from Tests/Integration/MSFT_xScheduledTask.Integration.Tests.ps1 rename to Tests/Integration/MSFT_ScheduledTask.Integration.Tests.ps1 index f78335f6..bf36ddd4 100644 --- a/Tests/Integration/MSFT_xScheduledTask.Integration.Tests.ps1 +++ b/Tests/Integration/MSFT_ScheduledTask.Integration.Tests.ps1 @@ -1,9 +1,9 @@ #Requires -Version 5.0 -$Global:DSCModuleName = 'xComputerManagement' -$Global:DSCResourceName = 'MSFT_xScheduledTask' +$Global:DSCModuleName = 'ComputerManagementDsc' +$Global:DSCResourceName = 'MSFT_ScheduledTask' #region HEADER # Integration Test Template Version: 1.1.1 -$script:moduleRoot = Join-Path -Path $(Split-Path -Parent (Split-Path -Parent (Split-Path -Parent $Script:MyInvocation.MyCommand.Path))) -ChildPath 'Modules\xComputerManagement' +$script:moduleRoot = Join-Path -Path $(Split-Path -Parent (Split-Path -Parent (Split-Path -Parent $Script:MyInvocation.MyCommand.Path))) -ChildPath 'Modules\ComputerManagementDsc' if ( (-not (Test-Path -Path (Join-Path -Path $script:moduleRoot -ChildPath 'DSCResource.Tests'))) -or ` (-not (Test-Path -Path (Join-Path -Path $script:moduleRoot -ChildPath 'DSCResource.Tests\TestHelper.psm1'))) ) { @@ -29,13 +29,13 @@ try Describe $Global:DSCResourceName { $contexts = @{ - Once = 'xScheduledTaskOnce' - Daily = 'xScheduledTaskDaily' - DailyIndefinitely = 'xScheduledTaskDailyIndefinitely' - Weekly = 'xScheduledTaskWeekly' - AtLogon = 'xScheduledTaskLogon' - AtStartup = 'xScheduledTaskStartup' - ExecuteAs = 'xScheduledTaskExecuteAs' + Once = 'ScheduledTaskOnce' + Daily = 'ScheduledTaskDaily' + DailyIndefinitely = 'ScheduledTaskDailyIndefinitely' + Weekly = 'ScheduledTaskWeekly' + AtLogon = 'ScheduledTaskLogon' + AtStartup = 'ScheduledTaskStartup' + ExecuteAs = 'ScheduledTaskExecuteAs' } $configData = @{ @@ -142,7 +142,7 @@ try $currentTimeZoneId = Get-TimeZoneId } - $currentConfig = 'xScheduledTaskOnceCrossTimezone' + $currentConfig = 'ScheduledTaskOnceCrossTimezone' $configDir = (Join-Path -Path $TestDrive -ChildPath $currentConfig) $configMof = (Join-Path -Path $configDir -ChildPath 'localhost.mof') @@ -174,7 +174,7 @@ try It 'Should have set the resource and all the parameters should match' { $current = Get-DscConfiguration | Where-Object {$_.ConfigurationName -eq $currentConfig} $current.TaskName | Should -Be 'Test task once cross timezone' - $current.TaskPath | Should -Be '\xComputerManagement\' + $current.TaskPath | Should -Be '\ComputerManagementDsc\' $current.ActionExecutable | Should -Be 'C:\windows\system32\WindowsPowerShell\v1.0\powershell.exe' $current.ScheduleType | Should -Be 'Once' $current.RepeatInterval | Should -Be '00:15:00' @@ -198,10 +198,10 @@ try $action = New-ScheduledTaskAction -Execute 'C:\windows\system32\WindowsPowerShell\v1.0\powershell.exe' $trigger = New-ScheduledTaskTrigger -Once -At (Get-Date) $task = New-ScheduledTask -Action $action -Trigger $trigger - Register-ScheduledTask -InputObject $task -TaskName 'Test task builtin' -TaskPath '\xComputerManagement\' -User 'NT AUTHORITY\SYSTEM' + Register-ScheduledTask -InputObject $task -TaskName 'Test task builtin' -TaskPath '\ComputerManagementDsc\' -User 'NT AUTHORITY\SYSTEM' Context 'Built-in task needs to be disabled' { - $currentConfig = 'xScheduledTaskDisableBuiltIn' + $currentConfig = 'ScheduledTaskDisableBuiltIn' $configDir = (Join-Path -Path $TestDrive -ChildPath $currentConfig) $configMof = (Join-Path -Path $configDir -ChildPath 'localhost.mof') @@ -233,13 +233,13 @@ try $_.ConfigurationName -eq $currentConfig } $current.TaskName | Should -Be 'Test task builtin' - $current.TaskPath | Should -Be '\xComputerManagement\' + $current.TaskPath | Should -Be '\ComputerManagementDsc\' $current.Enable | Should -Be $false } } Context 'Built-in task needs to be removed' { - $currentConfig = 'xScheduledTaskRemoveBuiltIn' + $currentConfig = 'ScheduledTaskRemoveBuiltIn' $configDir = (Join-Path -Path $TestDrive -ChildPath $currentConfig) $configMof = (Join-Path -Path $configDir -ChildPath 'localhost.mof') @@ -272,7 +272,7 @@ try $_.ConfigurationName -eq $currentConfig } $current.TaskName | Should -Be 'Test task builtin' - $current.TaskPath | Should -Be '\xComputerManagement\' + $current.TaskPath | Should -Be '\ComputerManagementDsc\' $current.Ensure | Should -Be 'Absent' } } @@ -283,12 +283,12 @@ finally #region FOOTER # Remove any traces of the created tasks - Get-ScheduledTask -TaskPath '\xComputerManagement\' -ErrorAction SilentlyContinue | Unregister-ScheduledTask -ErrorAction SilentlyContinue -Confirm:$false + Get-ScheduledTask -TaskPath '\ComputerManagementDsc\' -ErrorAction SilentlyContinue | Unregister-ScheduledTask -ErrorAction SilentlyContinue -Confirm:$false $scheduler = New-Object -ComObject Schedule.Service $scheduler.Connect() $rootFolder = $scheduler.GetFolder('\') - $rootFolder.DeleteFolder('xComputerManagement', 0) + $rootFolder.DeleteFolder('ComputerManagementDsc', 0) Restore-TestEnvironment -TestEnvironment $TestEnvironment #endregion diff --git a/Tests/Integration/MSFT_xVirtualMemory.Config.ps1 b/Tests/Integration/MSFT_VirtualMemory.Config.ps1 similarity index 65% rename from Tests/Integration/MSFT_xVirtualMemory.Config.ps1 rename to Tests/Integration/MSFT_VirtualMemory.Config.ps1 index 8edd95d8..f1c00c4e 100644 --- a/Tests/Integration/MSFT_xVirtualMemory.Config.ps1 +++ b/Tests/Integration/MSFT_VirtualMemory.Config.ps1 @@ -1,8 +1,8 @@ Configuration setToAuto { - Import-DscResource -ModuleName xComputerManagement + Import-DscResource -ModuleName ComputerManagementDsc node "localhost" { - xVirtualMemory vMem + VirtualMemory vMem { Type = 'AutoManagePagingFile' Drive = 'C' @@ -12,9 +12,9 @@ Configuration setToAuto Configuration setToCustom { - Import-DscResource -ModuleName xComputerManagement + Import-DscResource -ModuleName ComputerManagementDsc node "localhost" { - xVirtualMemory vMem + VirtualMemory vMem { Type = 'CustomSize' Drive = 'C' @@ -26,9 +26,9 @@ Configuration setToCustom Configuration setToSystemManaged { - Import-DscResource -ModuleName xComputerManagement + Import-DscResource -ModuleName ComputerManagementDsc node "localhost" { - xVirtualMemory vMem + VirtualMemory vMem { Type = 'SystemManagedSize' Drive = 'C' @@ -38,9 +38,9 @@ Configuration setToSystemManaged Configuration setToNone { - Import-DscResource -ModuleName xComputerManagement + Import-DscResource -ModuleName ComputerManagementDsc node "localhost" { - xVirtualMemory vMem + VirtualMemory vMem { Type = 'NoPagingFile' Drive = 'C' diff --git a/Tests/Integration/MSFT_xVirtualMemory.Integration.Tests.ps1 b/Tests/Integration/MSFT_VirtualMemory.Integration.Tests.ps1 similarity index 72% rename from Tests/Integration/MSFT_xVirtualMemory.Integration.Tests.ps1 rename to Tests/Integration/MSFT_VirtualMemory.Integration.Tests.ps1 index 599230cf..50971a06 100644 --- a/Tests/Integration/MSFT_xVirtualMemory.Integration.Tests.ps1 +++ b/Tests/Integration/MSFT_VirtualMemory.Integration.Tests.ps1 @@ -1,9 +1,9 @@ -$script:DSCModuleName = 'xComputerManagement' -$script:DSCResourceName = 'MSFT_xVirtualMemory' +$script:DSCModuleName = 'ComputerManagementDsc' +$script:DSCResourceName = 'MSFT_VirtualMemory' #region HEADER # Integration Test Template Version: 1.1.1 -$script:moduleRoot = Join-Path -Path $(Split-Path -Parent (Split-Path -Parent (Split-Path -Parent $Script:MyInvocation.MyCommand.Path))) -ChildPath 'Modules\xComputerManagement' +$script:moduleRoot = Join-Path -Path $(Split-Path -Parent (Split-Path -Parent (Split-Path -Parent $Script:MyInvocation.MyCommand.Path))) -ChildPath 'Modules\ComputerManagementDsc' if ( (-not (Test-Path -Path (Join-Path -Path $script:moduleRoot -ChildPath 'DSCResource.Tests'))) -or ` (-not (Test-Path -Path (Join-Path -Path $script:moduleRoot -ChildPath 'DSCResource.Tests\TestHelper.psm1'))) ) { @@ -27,90 +27,90 @@ try Describe "$($script:DSCResourceName)_Integration" { - Context "Set page file to automatically managed" { - $CurrentConfig = "setToAuto" + Context 'Set page file to automatically managed' { + $CurrentConfig = 'setToAuto' $ConfigDir = (Join-Path -Path $TestDrive -ChildPath $CurrentConfig) - $ConfigMof = (Join-Path -Path $ConfigDir -ChildPath "localhost.mof") + $ConfigMof = (Join-Path -Path $ConfigDir -ChildPath 'localhost.mof') - It "should compile a MOF file without error" { + It 'Should compile a MOF file without error' { { . $CurrentConfig -OutputPath $ConfigDir } | Should -Not -Throw } - It "should apply the MOF correctly" { + It 'Should apply the MOF correctly' { { Start-DscConfiguration -Path $ConfigDir -Wait -Verbose -Force } | Should -Not -Throw } - It "should return a compliant state after being applied" { + It 'Should return a compliant state after being applied' { (Test-DscConfiguration -ReferenceConfiguration $ConfigMof -Verbose).InDesiredState | Should -Be $true } } - Context "Set page file to custom size" { - $CurrentConfig = "setToCustom" + Context 'Set page file to custom size' { + $CurrentConfig = 'setToCustom' $ConfigDir = (Join-Path -Path $TestDrive -ChildPath $CurrentConfig) - $ConfigMof = (Join-Path -Path $ConfigDir -ChildPath "localhost.mof") + $ConfigMof = (Join-Path -Path $ConfigDir -ChildPath 'localhost.mof') - It "should compile a MOF file without error" { + It 'Should compile a MOF file without error' { { . $CurrentConfig -OutputPath $ConfigDir } | Should -Not -Throw } - It "should apply the MOF correctly" { + It 'Should apply the MOF correctly' { { Start-DscConfiguration -Path $ConfigDir -Wait -Verbose -Force } | Should -Not -Throw } - It "should return a compliant state after being applied" { + It 'Should return a compliant state after being applied' { (Test-DscConfiguration -ReferenceConfiguration $ConfigMof -Verbose).InDesiredState | Should -Be $true } } - Context "Set page file to system managed" { - $CurrentConfig = "setToSystemManaged" + Context 'Set page file to system managed' { + $CurrentConfig = 'setToSystemManaged' $ConfigDir = (Join-Path -Path $TestDrive -ChildPath $CurrentConfig) - $ConfigMof = (Join-Path -Path $ConfigDir -ChildPath "localhost.mof") + $ConfigMof = (Join-Path -Path $ConfigDir -ChildPath 'localhost.mof') - It "should compile a MOF file without error" { + It 'Should compile a MOF file without error' { { . $CurrentConfig -OutputPath $ConfigDir } | Should -Not -Throw } - It "should apply the MOF correctly" { + It 'Should apply the MOF correctly' { { Start-DscConfiguration -Path $ConfigDir -Wait -Verbose -Force } | Should -Not -Throw } - It "should return a compliant state after being applied" { + It 'Should return a compliant state after being applied' { (Test-DscConfiguration -ReferenceConfiguration $ConfigMof -Verbose).InDesiredState | Should -Be $true } } - Context "Set page file to none" { - $CurrentConfig = "setToNone" + Context 'Set page file to none' { + $CurrentConfig = 'setToNone' $ConfigDir = (Join-Path -Path $TestDrive -ChildPath $CurrentConfig) - $ConfigMof = (Join-Path -Path $ConfigDir -ChildPath "localhost.mof") + $ConfigMof = (Join-Path -Path $ConfigDir -ChildPath 'localhost.mof') - It "should compile a MOF file without error" { + It 'Should compile a MOF file without error' { { . $CurrentConfig -OutputPath $ConfigDir } | Should -Not -Throw } - It "should apply the MOF correctly" { + It 'Should apply the MOF correctly' { { Start-DscConfiguration -Path $ConfigDir -Wait -Verbose -Force } | Should -Not -Throw } - It "should return a compliant state after being applied" { + It 'Should return a compliant state after being applied' { (Test-DscConfiguration -ReferenceConfiguration $ConfigMof -Verbose).InDesiredState | Should -Be $true } } @@ -124,4 +124,3 @@ finally #endregion } - diff --git a/Tests/TestHarness.psm1 b/Tests/TestHarness.psm1 index 861a38cb..3459360d 100644 --- a/Tests/TestHarness.psm1 +++ b/Tests/TestHarness.psm1 @@ -10,12 +10,12 @@ function Invoke-TestHarness $DscTestsPath ) - Write-Verbose -Message 'Commencing all xComputerManagement tests' + Write-Verbose -Message 'Commencing all ComputerManagementDsc tests' $repoDir = Join-Path -Path $PSScriptRoot -ChildPath '..\' -Resolve $testCoverageFiles = @() - Get-ChildItem -Path "$repoDir\modules\xComputerManagement\DSCResources\**\*.psm1" -Recurse | ForEach-Object { + Get-ChildItem -Path "$repoDir\modules\ComputerManagementDsc\DSCResources\**\*.psm1" -Recurse | ForEach-Object { if ($_.FullName -notlike '*\DSCResource.Tests\*') { $testCoverageFiles += $_.FullName } @@ -27,7 +27,7 @@ function Invoke-TestHarness $testResultSettings.Add('OutputFile', $TestResultsFile) } - Import-Module -Name "$repoDir\modules\xComputerManagement\xComputerManagement.psd1" + Import-Module -Name "$repoDir\modules\ComputerManagementDsc\ComputerManagementDsc.psd1" $testsToRun = @() # Run Unit Tests diff --git a/Tests/Unit/ComputerManagementDsc.Common.Tests.ps1 b/Tests/Unit/ComputerManagementDsc.Common.Tests.ps1 index bc308010..1a1462aa 100644 --- a/Tests/Unit/ComputerManagementDsc.Common.Tests.ps1 +++ b/Tests/Unit/ComputerManagementDsc.Common.Tests.ps1 @@ -4,7 +4,7 @@ Import-Module -Name (Join-Path -Path (Join-Path -Path (Split-Path $PSScriptRoot #region HEADER # Unit Test Template Version: 1.1.0 -$script:moduleRoot = Join-Path -Path $(Split-Path -Parent (Split-Path -Parent (Split-Path -Parent $Script:MyInvocation.MyCommand.Path))) -ChildPath 'Modules\xComputerManagement' +$script:moduleRoot = Join-Path -Path $(Split-Path -Parent (Split-Path -Parent (Split-Path -Parent $Script:MyInvocation.MyCommand.Path))) -ChildPath 'Modules\ComputerManagementDsc' if ( (-not (Test-Path -Path (Join-Path -Path $script:moduleRoot -ChildPath 'DSCResource.Tests'))) -or ` (-not (Test-Path -Path (Join-Path -Path $script:moduleRoot -ChildPath 'DSCResource.Tests\TestHelper.psm1'))) ) { diff --git a/Tests/Unit/MSFT_xComputer.Tests.ps1 b/Tests/Unit/MSFT_Computer.Tests.ps1 similarity index 99% rename from Tests/Unit/MSFT_xComputer.Tests.ps1 rename to Tests/Unit/MSFT_Computer.Tests.ps1 index 308bfe9e..037b084f 100644 --- a/Tests/Unit/MSFT_xComputer.Tests.ps1 +++ b/Tests/Unit/MSFT_Computer.Tests.ps1 @@ -1,10 +1,10 @@ -$script:DSCModuleName = 'xComputerManagement' -$script:DSCResourceName = 'MSFT_xComputer' +$script:DSCModuleName = 'ComputerManagementDsc' +$script:DSCResourceName = 'MSFT_Computer' Import-Module -Name (Join-Path -Path (Join-Path -Path (Split-Path $PSScriptRoot -Parent) -ChildPath 'TestHelpers') -ChildPath 'CommonTestHelper.psm1') -Global # Unit Test Template Version: 1.2.0 -$script:moduleRoot = Join-Path -Path $(Split-Path -Parent (Split-Path -Parent (Split-Path -Parent $Script:MyInvocation.MyCommand.Path))) -ChildPath 'Modules\xComputerManagement' +$script:moduleRoot = Join-Path -Path $(Split-Path -Parent (Split-Path -Parent (Split-Path -Parent $Script:MyInvocation.MyCommand.Path))) -ChildPath 'Modules\ComputerManagementDsc' if ( (-not (Test-Path -Path (Join-Path -Path $script:moduleRoot -ChildPath 'DSCResource.Tests'))) -or ` (-not (Test-Path -Path (Join-Path -Path $script:moduleRoot -ChildPath 'DSCResource.Tests\TestHelper.psm1'))) ) { @@ -25,7 +25,7 @@ try #region Pester Tests InModuleScope $script:DSCResourceName { - $script:DSCResourceName = 'MSFT_xComputer' + $script:DSCResourceName = 'MSFT_Computer' Describe $script:DSCResourceName { # A real password isn't needed here - use this next line to avoid triggering PSSA rule diff --git a/Tests/Unit/MSFT_xOfflineDomainJoin.Tests.ps1 b/Tests/Unit/MSFT_OfflineDomainJoin.Tests.ps1 similarity index 97% rename from Tests/Unit/MSFT_xOfflineDomainJoin.Tests.ps1 rename to Tests/Unit/MSFT_OfflineDomainJoin.Tests.ps1 index a04877c1..4964c322 100644 --- a/Tests/Unit/MSFT_xOfflineDomainJoin.Tests.ps1 +++ b/Tests/Unit/MSFT_OfflineDomainJoin.Tests.ps1 @@ -1,10 +1,10 @@ -$script:DSCModuleName = 'xComputerManagement' -$script:DSCResourceName = 'MSFT_xOfflineDomainJoin' +$script:DSCModuleName = 'ComputerManagementDsc' +$script:DSCResourceName = 'MSFT_OfflineDomainJoin' Import-Module -Name (Join-Path -Path (Join-Path -Path (Split-Path $PSScriptRoot -Parent) -ChildPath 'TestHelpers') -ChildPath 'CommonTestHelper.psm1') -Global # Unit Test Template Version: 1.2.0 -$script:moduleRoot = Join-Path -Path $(Split-Path -Parent (Split-Path -Parent (Split-Path -Parent $Script:MyInvocation.MyCommand.Path))) -ChildPath 'Modules\xComputerManagement' +$script:moduleRoot = Join-Path -Path $(Split-Path -Parent (Split-Path -Parent (Split-Path -Parent $Script:MyInvocation.MyCommand.Path))) -ChildPath 'Modules\ComputerManagementDsc' if ( (-not (Test-Path -Path (Join-Path -Path $script:moduleRoot -ChildPath 'DSCResource.Tests'))) -or ` (-not (Test-Path -Path (Join-Path -Path $script:moduleRoot -ChildPath 'DSCResource.Tests\TestHelper.psm1'))) ) { @@ -24,7 +24,7 @@ try { #region Pester Tests InModuleScope $script:DSCResourceName { - $script:DSCResourceName = 'MSFT_xOfflineDomainJoin' + $script:DSCResourceName = 'MSFT_OfflineDomainJoin' $testOfflineDomainJoin = @{ IsSingleInstance = 'Yes' diff --git a/Tests/Unit/MSFT_xPowerPlan.Tests.ps1 b/Tests/Unit/MSFT_PowerPlan.Tests.ps1 similarity index 98% rename from Tests/Unit/MSFT_xPowerPlan.Tests.ps1 rename to Tests/Unit/MSFT_PowerPlan.Tests.ps1 index f82c2b59..5eafc68c 100644 --- a/Tests/Unit/MSFT_xPowerPlan.Tests.ps1 +++ b/Tests/Unit/MSFT_PowerPlan.Tests.ps1 @@ -1,10 +1,10 @@ -$script:DSCModuleName = 'xComputerManagement' -$script:DSCResourceName = 'MSFT_xPowerPlan' +$script:DSCModuleName = 'ComputerManagementDsc' +$script:DSCResourceName = 'MSFT_PowerPlan' Import-Module -Name (Join-Path -Path (Join-Path -Path (Split-Path $PSScriptRoot -Parent) -ChildPath 'TestHelpers') -ChildPath 'CommonTestHelper.psm1') -Global # Unit Test Template Version: 1.2.0 -$script:moduleRoot = Join-Path -Path $(Split-Path -Parent (Split-Path -Parent (Split-Path -Parent $Script:MyInvocation.MyCommand.Path))) -ChildPath 'Modules\xComputerManagement' +$script:moduleRoot = Join-Path -Path $(Split-Path -Parent (Split-Path -Parent (Split-Path -Parent $Script:MyInvocation.MyCommand.Path))) -ChildPath 'Modules\ComputerManagementDsc' if ( (-not (Test-Path -Path (Join-Path -Path $script:moduleRoot -ChildPath 'DSCResource.Tests'))) -or ` (-not (Test-Path -Path (Join-Path -Path $script:moduleRoot -ChildPath 'DSCResource.Tests\TestHelper.psm1'))) ) { diff --git a/Tests/Unit/MSFT_xScheduledTask.Tests.ps1 b/Tests/Unit/MSFT_ScheduledTask.Tests.ps1 similarity index 99% rename from Tests/Unit/MSFT_xScheduledTask.Tests.ps1 rename to Tests/Unit/MSFT_ScheduledTask.Tests.ps1 index 564b1a34..ffae5045 100644 --- a/Tests/Unit/MSFT_xScheduledTask.Tests.ps1 +++ b/Tests/Unit/MSFT_ScheduledTask.Tests.ps1 @@ -3,13 +3,13 @@ param ( ) -$script:DSCModuleName = 'xComputerManagement' -$script:DSCResourceName = 'MSFT_xScheduledTask' +$script:DSCModuleName = 'ComputerManagementDsc' +$script:DSCResourceName = 'MSFT_ScheduledTask' Import-Module -Name (Join-Path -Path (Join-Path -Path (Split-Path $PSScriptRoot -Parent) -ChildPath 'TestHelpers') -ChildPath 'CommonTestHelper.psm1') -Global # Unit Test Template Version: 1.2.0 -$script:moduleRoot = Join-Path -Path $(Split-Path -Parent (Split-Path -Parent (Split-Path -Parent $Script:MyInvocation.MyCommand.Path))) -ChildPath 'Modules\xComputerManagement' +$script:moduleRoot = Join-Path -Path $(Split-Path -Parent (Split-Path -Parent (Split-Path -Parent $Script:MyInvocation.MyCommand.Path))) -ChildPath 'Modules\ComputerManagementDsc' if ( (-not (Test-Path -Path (Join-Path -Path $script:moduleRoot -ChildPath 'DSCResource.Tests'))) -or ` (-not (Test-Path -Path (Join-Path -Path $script:moduleRoot -ChildPath 'DSCResource.Tests\TestHelper.psm1'))) ) { @@ -33,7 +33,7 @@ try #region Pester Tests InModuleScope $script:DSCResourceName { - $script:DSCResourceName = 'MSFT_xScheduledTask' + $script:DSCResourceName = 'MSFT_ScheduledTask' # Function to allow mocking pipeline input function Register-ScheduledTask diff --git a/Tests/Unit/MSFT_xVirtualMemory.Tests.ps1 b/Tests/Unit/MSFT_VirtualMemory.Tests.ps1 similarity index 98% rename from Tests/Unit/MSFT_xVirtualMemory.Tests.ps1 rename to Tests/Unit/MSFT_VirtualMemory.Tests.ps1 index 7ecd961d..3cad50aa 100644 --- a/Tests/Unit/MSFT_xVirtualMemory.Tests.ps1 +++ b/Tests/Unit/MSFT_VirtualMemory.Tests.ps1 @@ -1,11 +1,11 @@ #region HEADER -$script:DSCModuleName = 'xComputerManagement' -$script:DSCResourceName = 'MSFT_xVirtualMemory' +$script:DSCModuleName = 'ComputerManagementDsc' +$script:DSCResourceName = 'MSFT_VirtualMemory' Import-Module -Name (Join-Path -Path (Join-Path -Path (Split-Path $PSScriptRoot -Parent) -ChildPath 'TestHelpers') -ChildPath 'CommonTestHelper.psm1') -Global # Unit Test Template Version: 1.2.0 -$script:moduleRoot = Join-Path -Path $(Split-Path -Parent (Split-Path -Parent (Split-Path -Parent $Script:MyInvocation.MyCommand.Path))) -ChildPath 'Modules\xComputerManagement' +$script:moduleRoot = Join-Path -Path $(Split-Path -Parent (Split-Path -Parent (Split-Path -Parent $Script:MyInvocation.MyCommand.Path))) -ChildPath 'Modules\ComputerManagementDsc' if ( (-not (Test-Path -Path (Join-Path -Path $script:moduleRoot -ChildPath 'DSCResource.Tests'))) -or ` (-not (Test-Path -Path (Join-Path -Path $script:moduleRoot -ChildPath 'DSCResource.Tests\TestHelper.psm1'))) ) { @@ -31,7 +31,7 @@ function Invoke-TestCleanup { try { Invoke-TestSetup - InModuleScope 'MSFT_xVirtualMemory' { + InModuleScope 'MSFT_VirtualMemory' { <# Remove-CimInstance overridden to enable PSObject to be passed to mocked version. @@ -114,7 +114,7 @@ try { $Filter -eq "SettingID='pagefile.sys @ $testDrive'" } - Describe 'MSFT_xVirtualMemory\Get-TargetResource' { + Describe 'MSFT_VirtualMemory\Get-TargetResource' { BeforeEach { $testParameters = @{ Drive = $testDrive @@ -243,7 +243,7 @@ try { } } - Describe 'MSFT_xVirtualMemory\Set-TargetResource' { + Describe 'MSFT_VirtualMemory\Set-TargetResource' { BeforeEach { <# These mocks are to handle when disk drive @@ -675,7 +675,7 @@ try { } } - Describe 'MSFT_xVirtualMemory\Test-TargetResource' { + Describe 'MSFT_VirtualMemory\Test-TargetResource' { Context 'In desired state' { Context 'When automatic managed page file is enabled' { Mock ` @@ -1028,7 +1028,7 @@ try { } } - Describe 'MSFT_xVirtualMemory\Get-PageFileSetting' { + Describe 'MSFT_VirtualMemory\Get-PageFileSetting' { Context "Page file defined on drive $testDrive" { Mock ` -CommandName Get-CimInstance ` @@ -1057,7 +1057,7 @@ try { } } - Describe 'MSFT_xVirtualMemory\Set-PageFileSetting' { + Describe 'MSFT_VirtualMemory\Set-PageFileSetting' { Context "Set page file settings on drive $testDrive" { Mock ` -CommandName Set-CimInstance ` @@ -1082,7 +1082,7 @@ try { } } - Describe 'MSFT_xVirtualMemory\Set-AutoManagePaging' { + Describe 'MSFT_VirtualMemory\Set-AutoManagePaging' { Context "Enable auto managed page file" { Mock ` -CommandName Set-CimInstance ` @@ -1118,7 +1118,7 @@ try { } } - Describe 'MSFT_xVirtualMemory\New-PageFile' { + Describe 'MSFT_VirtualMemory\New-PageFile' { Context "Create a new page file" { Mock ` -CommandName New-CimInstance ` diff --git a/appveyor.yml b/appveyor.yml index 44610415..61454424 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -6,7 +6,7 @@ install: - git clone https://github.com/PowerShell/DscResource.Tests - ps: | - $moduleName = 'xComputerManagement' + $moduleName = 'ComputerManagementDsc' $mainModuleFolder = "Modules\$moduleName" Import-Module "$env:APPVEYOR_BUILD_FOLDER\DscResource.Tests\AppVeyor.psm1" Invoke-AppveyorInstallTask -PesterMaximumVersion 4.0.8 From 782ad59bd8f17533e2851da04605be799a004f7c Mon Sep 17 00:00:00 2001 From: Daniel Scott-Raynsford Date: Sun, 25 Mar 2018 16:25:44 +1300 Subject: [PATCH 2/4] Correct README.MD line length violation --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 2d50f19d..91d667d1 100644 --- a/README.md +++ b/README.md @@ -26,8 +26,8 @@ additional questions or comments. ## Documentation and Examples -For a full list of resources in ComputerManagementDsc and examples on their use, check -out the [ComputerManagementDsc wiki](https://github.com/PowerShell/ComputerManagementDsc/wiki). +For a full list of resources in ComputerManagementDsc and examples on their use, +check out the [ComputerManagementDsc wiki](https://github.com/PowerShell/ComputerManagementDsc/wiki). ## Branches From e44a14225fcae68dac8cc1b637ddea8c96d102bf Mon Sep 17 00:00:00 2001 From: Daniel Scott-Raynsford Date: Thu, 26 Apr 2018 19:16:01 +1200 Subject: [PATCH 3/4] Changes as per PR comments --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c49aa7a8..71b8cbf5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,8 +3,8 @@ ## Unreleased - BREAKING CHANGE: - - Renamed ComputerManagement to ComputerManagementDsc - fixes [Issue #119](https://github.com/PowerShell/xComputerManagement/issues/119). - - Changed all MSFT_xResourceName to MSFT_ResourceName. + - Renamed ComputerManagement to ComputerManagementDsc - fixes [Issue #119](https://github.com/PowerShell/ComputerManagementDsc/issues/119). + - Changed all MSFT\_xResourceName to MSFT\_ResourceName. - Updated DSCResources, Examples, Modules and Tests with new naming. - Updated Year to 2018 in License and Manifest. - Updated README.md from xComputerManagement to ComputerManagementDsc. From 134208a9ffe54a41fe8ed69b7223aea1553ae62a Mon Sep 17 00:00:00 2001 From: Katie Keim Date: Wed, 2 May 2018 14:26:39 -0700 Subject: [PATCH 4/4] Releasing version 5.0.0.0 --- CHANGELOG.md | 2 ++ .../ComputerManagementDsc.psd1 | 23 +++++++++++-------- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 71b8cbf5..1102a814 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## Unreleased +## 5.0.0.0 + - BREAKING CHANGE: - Renamed ComputerManagement to ComputerManagementDsc - fixes [Issue #119](https://github.com/PowerShell/ComputerManagementDsc/issues/119). - Changed all MSFT\_xResourceName to MSFT\_ResourceName. diff --git a/Modules/ComputerManagementDsc/ComputerManagementDsc.psd1 b/Modules/ComputerManagementDsc/ComputerManagementDsc.psd1 index e94b9ffb..38e5e42e 100644 --- a/Modules/ComputerManagementDsc/ComputerManagementDsc.psd1 +++ b/Modules/ComputerManagementDsc/ComputerManagementDsc.psd1 @@ -1,6 +1,6 @@ @{ # Version number of this module. -moduleVersion = '4.1.0.0' +moduleVersion = '5.0.0.0' # ID used to uniquely identify this module GUID = 'B5004952-489E-43EA-999C-F16A25355B89' @@ -49,15 +49,17 @@ PrivateData = @{ # IconUri = '' # ReleaseNotes of this module - ReleaseNotes = '- xScheduledTask: - - Update existing Scheduled Task using SetScheduleTask - instead of UnRegister/Register - See [Issue 134](https://github.com/PowerShell/xComputerManagement/issues/134). -- Fix master branch AppVeyor badge link URL in README.MD - See [Issue 140](https://github.com/PowerShell/xComputerManagement/issues/140). -- Fix deletion of scheduled task with unknown or empty task trigger. - Get-TargetResource returns an empty ScheduleType string if the task - trigger is empty or unknown - See [Issue - 137](https://github.com/PowerShell/xComputerManagement/issues/137). -- Added dependency information for xScheduledTask to README.MD. + ReleaseNotes = '- BREAKING CHANGE: + - Renamed ComputerManagement to ComputerManagementDsc - fixes [Issue 119](https://github.com/PowerShell/ComputerManagementDsc/issues/119). + - Changed all MSFT\_xResourceName to MSFT\_ResourceName. + - Updated DSCResources, Examples, Modules and Tests with new naming. + - Updated Year to 2018 in License and Manifest. + - Updated README.md from xComputerManagement to ComputerManagementDsc. +- OfflineDomainJoin: + - Cleaned up spacing in strings file to make consistent with other + resources. +- VirtualMemory: + - Converted strings to single quotes in integration test. ' @@ -65,3 +67,4 @@ PrivateData = @{ } # End of PrivateData hashtable } +