Skip to content

Commit 8f9a482

Browse files
kwirkykatkwirkykat
authored
Merge pull request #156 from PowerShell/dev
Release of version 5.0.0.0 of ComputerManagementDsc
2 parents 88277cb + 134208a commit 8f9a482

63 files changed

Lines changed: 298 additions & 293 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.vscode/RunAllTests.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ if ( (-not (Test-Path -Path (Join-Path -Path $repoRoot -ChildPath 'DSCResource.T
77

88
Import-Module (Join-Path $PSScriptRoot "..\Tests\TestHarness.psm1" -Resolve)
99
$dscTestsPath = Join-Path -Path $PSScriptRoot `
10-
-ChildPath "..\Modules\xComputerManagement\DscResource.Tests\Meta.Tests.ps1"
10+
-ChildPath "..\Modules\ComputerManagementDsc\DscResource.Tests\Meta.Tests.ps1"
1111
Invoke-TestHarness -DscTestsPath $dscTestsPath

‎CHANGELOG.md‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,20 @@
22

33
## Unreleased
44

5+
## 5.0.0.0
6+
7+
- BREAKING CHANGE:
8+
- Renamed ComputerManagement to ComputerManagementDsc - fixes [Issue #119](https://github.com/PowerShell/ComputerManagementDsc/issues/119).
9+
- Changed all MSFT\_xResourceName to MSFT\_ResourceName.
10+
- Updated DSCResources, Examples, Modules and Tests with new naming.
11+
- Updated Year to 2018 in License and Manifest.
12+
- Updated README.md from xComputerManagement to ComputerManagementDsc.
13+
- OfflineDomainJoin:
14+
- Cleaned up spacing in strings file to make consistent with other
15+
resources.
16+
- VirtualMemory:
17+
- Converted strings to single quotes in integration test.
18+
519
## 4.1.0.0
620

721
- xScheduledTask:

‎LICENSE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2017 Microsoft Corporation.
3+
Copyright (c) 2018 Microsoft Corporation.
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

Modules/xComputerManagement/xComputerManagement.psd1 renamed to Modules/ComputerManagementDsc/ComputerManagementDsc.psd1

Lines changed: 16 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
@{
22
# Version number of this module.
3-
moduleVersion = '4.1.0.0'
3+
moduleVersion = '5.0.0.0'
44

55
# ID used to uniquely identify this module
66
GUID = 'B5004952-489E-43EA-999C-F16A25355B89'
@@ -12,10 +12,10 @@ Author = 'Microsoft Corporation'
1212
CompanyName = 'Microsoft Corporation'
1313

1414
# Copyright statement for this module
15-
Copyright = '(c) 2017 Microsoft Corporation. All rights reserved.'
15+
Copyright = '(c) 2018 Microsoft Corporation. All rights reserved.'
1616

1717
# Description of the functionality provided by this module
18-
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.
18+
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.
1919
2020
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.'
2121

@@ -40,24 +40,26 @@ PrivateData = @{
4040
Tags = @('DesiredStateConfiguration', 'DSC', 'DSCResourceKit', 'DSCResource')
4141

4242
# A URL to the license for this module.
43-
LicenseUri = 'https://github.com/PowerShell/xComputerManagement/blob/master/LICENSE'
43+
LicenseUri = 'https://github.com/PowerShell/ComputerManagementDsc/blob/master/LICENSE'
4444

4545
# A URL to the main website for this project.
46-
ProjectUri = 'https://github.com/PowerShell/xComputerManagement'
46+
ProjectUri = 'https://github.com/PowerShell/ComputerManagementDsc'
4747

4848
# A URL to an icon representing this module.
4949
# IconUri = ''
5050

5151
# ReleaseNotes of this module
52-
ReleaseNotes = '- xScheduledTask:
53-
- Update existing Scheduled Task using SetScheduleTask
54-
instead of UnRegister/Register - See [Issue 134](https://github.com/PowerShell/xComputerManagement/issues/134).
55-
- Fix master branch AppVeyor badge link URL in README.MD - See [Issue 140](https://github.com/PowerShell/xComputerManagement/issues/140).
56-
- Fix deletion of scheduled task with unknown or empty task trigger.
57-
Get-TargetResource returns an empty ScheduleType string if the task
58-
trigger is empty or unknown - See [Issue
59-
137](https://github.com/PowerShell/xComputerManagement/issues/137).
60-
- Added dependency information for xScheduledTask to README.MD.
52+
ReleaseNotes = '- BREAKING CHANGE:
53+
- Renamed ComputerManagement to ComputerManagementDsc - fixes [Issue 119](https://github.com/PowerShell/ComputerManagementDsc/issues/119).
54+
- Changed all MSFT\_xResourceName to MSFT\_ResourceName.
55+
- Updated DSCResources, Examples, Modules and Tests with new naming.
56+
- Updated Year to 2018 in License and Manifest.
57+
- Updated README.md from xComputerManagement to ComputerManagementDsc.
58+
- OfflineDomainJoin:
59+
- Cleaned up spacing in strings file to make consistent with other
60+
resources.
61+
- VirtualMemory:
62+
- Converted strings to single quotes in integration test.
6163
6264
'
6365

@@ -66,13 +68,3 @@ PrivateData = @{
6668
} # End of PrivateData hashtable
6769
}
6870

69-
70-
71-
72-
73-
74-
75-
76-
77-
78-

Modules/xComputerManagement/DSCResources/MSFT_xComputer/MSFT_xComputer.psm1 renamed to Modules/ComputerManagementDsc/DSCResources/MSFT_Computer/MSFT_Computer.psm1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Import-Module -Name (Join-Path -Path $modulePath `
1717

1818
# Import Localization Strings
1919
$script:localizedData = Get-LocalizedData `
20-
-ResourceName 'MSFT_xComputer' `
20+
-ResourceName 'MSFT_Computer' `
2121
-ResourcePath (Split-Path -Parent $Script:MyInvocation.MyCommand.Path)
2222

2323
<#

Modules/xComputerManagement/DSCResources/MSFT_xComputer/MSFT_xComputer.schema.mof renamed to Modules/ComputerManagementDsc/DSCResources/MSFT_Computer/MSFT_Computer.schema.mof

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
[ClassVersion("1.0.1.0"), FriendlyName("xComputer")]
2-
class MSFT_xComputer : OMI_BaseResource
1+
[ClassVersion("1.0.1.0"), FriendlyName("Computer")]
2+
class MSFT_Computer : OMI_BaseResource
33
{
44
[Key, Description("The desired computer name.")] String Name;
55
[Write, Description("The name of the domain to join.")] String DomainName;

Modules/xComputerManagement/DSCResources/MSFT_xComputer/README.md renamed to Modules/ComputerManagementDsc/DSCResources/MSFT_Computer/README.md

File renamed without changes.

Modules/xComputerManagement/DSCResources/MSFT_xComputer/en-US/MSFT_xComputer.strings.psd1 renamed to Modules/ComputerManagementDsc/DSCResources/MSFT_Computer/en-US/MSFT_Computer.strings.psd1

File renamed without changes.

Modules/xComputerManagement/DSCResources/MSFT_xOfflineDomainJoin/MSFT_xOfflineDomainJoin.psm1 renamed to Modules/ComputerManagementDsc/DSCResources/MSFT_OfflineDomainJoin/MSFT_OfflineDomainJoin.psm1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Import-Module -Name (Join-Path -Path $modulePath `
1717

1818
# Import Localization Strings
1919
$script:localizedData = Get-LocalizedData `
20-
-ResourceName 'MSFT_xOfflineDomainJoin' `
20+
-ResourceName 'MSFT_OfflineDomainJoin' `
2121
-ResourcePath (Split-Path -Parent $Script:MyInvocation.MyCommand.Path)
2222

2323
<#

Modules/xComputerManagement/DSCResources/MSFT_xOfflineDomainJoin/MSFT_xOfflineDomainJoin.schema.mof renamed to Modules/ComputerManagementDsc/DSCResources/MSFT_OfflineDomainJoin/MSFT_OfflineDomainJoin.schema.mof

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
[ClassVersion("1.0.0.0"), FriendlyName("xOfflineDomainJoin")]
2-
class MSFT_xOfflineDomainJoin : OMI_BaseResource
1+
[ClassVersion("1.0.0.0"), FriendlyName("OfflineDomainJoin")]
2+
class MSFT_OfflineDomainJoin : OMI_BaseResource
33
{
44
[Key, Description("Specifies the resource is a single instance, the value must be 'Yes'."), ValueMap{"Yes"}, Values{"Yes"}] String IsSingleInstance;
55
[Required, Description("The full path to the Offline Domain Join Request file to use.")] String RequestFile;

0 commit comments

Comments
 (0)