From d0e8f4d94f3ce68d63c14d6344e63f5769afb948 Mon Sep 17 00:00:00 2001 From: Tim Haintz Date: Sun, 4 Nov 2018 14:45:23 +1100 Subject: [PATCH 1/5] Updated LICENSE file to match the Microsoft Open Source Team standard. --- LICENSE | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/LICENSE b/LICENSE index 6ea9b83..2107107 100644 --- a/LICENSE +++ b/LICENSE @@ -1,21 +1,21 @@ -MIT License + MIT License -Copyright (c) 2016 PowerShell Team + Copyright (c) Microsoft Corporation. All rights reserved. -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. + The above copyright notice and this permission notice shall be included in all + copies or substantial portions of the Software. -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + SOFTWARE From 7c354ec30ebefc33902a1aa119b6ebe30523115d Mon Sep 17 00:00:00 2001 From: Tim Haintz Date: Sun, 4 Nov 2018 14:45:47 +1100 Subject: [PATCH 2/5] Updated Unreleased section of README.md to include LICENSE update. --- README.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index b0f2a6d..5ae0540 100644 --- a/README.md +++ b/README.md @@ -360,7 +360,7 @@ None #### Read-Only Properties from Get-TargetResource None - + #### Examples * [Create a new User](https://github.com/PowerShell/PSDscResources/blob/master/Examples/Sample_User_CreateUser.ps1) @@ -577,6 +577,9 @@ The following parameters will be the same for each process in the set: ### Unreleased +* Update LICENSE file to match the Microsoft Open Source Team standard. + * Fixes [Issue #120](https://github.com/PowerShell/PSDscResources/issues/120) + ### 2.9.0.0 * Added Description and Parameter description for composite resources @@ -634,7 +637,7 @@ The following parameters will be the same for each process in the set: * WindowsFeature: * Added Catch to ignore RuntimeException when importing ServerManager module. This solves the issue described [here](https://social.technet.microsoft.com/Forums/en-US/9fc314e1-27bf-4f03-ab78-5e0f7a662b8f/importmodule-servermanager-some-or-all-identity-references-could-not-be-translated?forum=winserverpowershell). - * Updated unit tests. + * Updated unit tests. * Added WindowsProcess * CommonTestHelper: * Added Get-AppVeyorAdministratorCredential. From 2601ffc48233a9b174e6943f87885d38fd53d659 Mon Sep 17 00:00:00 2001 From: Tim Haintz Date: Sun, 13 Jan 2019 17:03:06 +1100 Subject: [PATCH 3/5] Removed * and put - Fixes on same line. As per (https://github.com/PowerShell/PSDscResources/pull/121) --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 5ae0540..8a1ac07 100644 --- a/README.md +++ b/README.md @@ -577,8 +577,7 @@ The following parameters will be the same for each process in the set: ### Unreleased -* Update LICENSE file to match the Microsoft Open Source Team standard. - * Fixes [Issue #120](https://github.com/PowerShell/PSDscResources/issues/120) +* Update LICENSE file to match the Microsoft Open Source Team standard - Fixes [Issue #120](https://github.com/PowerShell/PSDscResources/issues/120) ### 2.9.0.0 From 79b7338686b83abd8e3d4a60f256282af9d1619a Mon Sep 17 00:00:00 2001 From: Tim Haintz Date: Mon, 21 Jan 2019 06:56:45 +1100 Subject: [PATCH 4/5] Updated Unreleased section to reduce line length. --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 8a1ac07..e25b253 100644 --- a/README.md +++ b/README.md @@ -577,7 +577,8 @@ The following parameters will be the same for each process in the set: ### Unreleased -* Update LICENSE file to match the Microsoft Open Source Team standard - Fixes [Issue #120](https://github.com/PowerShell/PSDscResources/issues/120) +* Update LICENSE file to match the Microsoft Open Source Team + standard - Fixes [Issue #120](https://github.com/PowerShell/PSDscResources/issues/120) ### 2.9.0.0 From c8db733ccb7536388d7bbc32904e5fb2fe15c61c Mon Sep 17 00:00:00 2001 From: Tim Haintz Date: Mon, 21 Jan 2019 07:11:45 +1100 Subject: [PATCH 5/5] Added a period to the end of Unreleased comment. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 59f62a1..3bc5590 100644 --- a/README.md +++ b/README.md @@ -578,7 +578,7 @@ The following parameters will be the same for each process in the set: ### Unreleased * Update LICENSE file to match the Microsoft Open Source Team - standard - Fixes [Issue #120](https://github.com/PowerShell/PSDscResources/issues/120) + standard - Fixes [Issue #120](https://github.com/PowerShell/PSDscResources/issues/120). * Update `CommonResourceHelper` unit tests to meet Pester 4.0.0 standards ([issue #129](https://github.com/PowerShell/PSDscResources/issues/129)). * Update `ResourceHelper` unit tests to meet Pester 4.0.0