Merge pull request #1379 from ykuijs/master

Update pipeline and fixing issues

.gitattributes

@@ -6,4 +6,6 @@
 *.jpg binary
 *.xl* binary
 *.pfx binary
+*.png binary
 *.dll binary
+*.so  binary

.github/ISSUE_TEMPLATE/Problem_with_resource.yml

@@ -0,0 +1,97 @@
+name: Problem with a resource
+description: If you have a problem, bug, or enhancement with a resource in this resource module.
+labels: []
+assignees: []
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Please prefix the issue title (above) with the resource name, e.g. 'ResourceName: Short description of my issue'!
+
+        Your feedback and support is greatly appreciated, thanks for contributing!
+  - type: textarea
+    id: description
+    attributes:
+      label: Problem description
+      description: Details of the scenario you tried and the problem that is occurring.
+    validations:
+      required: true
+  - type: textarea
+    id: logs
+    attributes:
+      label: Verbose logs
+      description: |
+        Verbose logs showing the problem. **NOTE! Sensitive information should be obfuscated.** _Will be automatically formatted as plain text._
+      placeholder: |
+        Paste verbose logs here
+      render: text
+    validations:
+      required: true
+  - type: textarea
+    id: configuration
+    attributes:
+      label: DSC configuration
+      description: |
+        The DSC configuration that is used to reproduce the issue (as detailed as possible). **NOTE! Sensitive information should be obfuscated.** _Will be automatically formatted as PowerShell code._
+      placeholder: |
+        Paste DSC configuration here
+      render: powershell
+    validations:
+      required: true
+  - type: textarea
+    id: suggestedSolution
+    attributes:
+      label: Suggested solution
+      description: Do you have any suggestions how to solve the issue?
+    validations:
+      required: true
+  - type: textarea
+    id: targetSPVersion
+    attributes:
+      label: SharePoint version and build
+      description: |
+        Please provide version and build information of the SharePoint Server the target node is running. _Will be automatically formatted as plain text._
+      placeholder: |
+        Add SharePoint Server information here
+      render: text
+    validations:
+      required: true
+  - type: textarea
+    id: targetNodeOS
+    attributes:
+      label: Operating system the target node is running
+      description: |
+        Please provide as much as possible about the target node, for example edition, version, build, and language. _Will be automatically formatted as plain text._
+
+        On OS with WMF 5.1 the following command can help get this information: `Get-ComputerInfo -Property @('OsName','OsOperatingSystemSKU','OSArchitecture','WindowsVersion','WindowsBuildLabEx','OsLanguage','OsMuiLanguages')`
+      placeholder: |
+        Add operating system information here
+      render: text
+    validations:
+      required: true
+  - type: textarea
+    id: targetNodePS
+    attributes:
+      label: PowerShell version and build the target node is running
+      description: |
+        Please provide the version and build of PowerShell the target node is running. _Will be automatically formatted as plain text._
+
+        To help with this information, please run this command: `$PSVersionTable`
+      placeholder: |
+        Add PowerShell information here
+      render: text
+    validations:
+      required: true
+  - type: textarea
+    id: moduleVersion
+    attributes:
+      label: SharePointDsc version
+      description: |
+        Please provide the version of the SharePointDsc module that was used. _Will be automatically formatted as plain text._
+
+        To help with this information, please run this command: `Get-Module -Name 'SharePointDsc' -ListAvailable | ft Name,Version,Path`
+      placeholder: |
+        Add module information here
+      render: text
+    validations:
+      required: true

.github/ISSUE_TEMPLATE/Resource_proposal.yml

@@ -0,0 +1,39 @@
+name: New resource proposal
+description: If you have a new resource proposal that you think should be added to this resource module.
+title: "NewResourceName: New resource proposal"
+labels: []
+assignees: []
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Please replace `NewResourceName` in the issue title (above) with your proposed resource name.
+
+        Thank you for contributing and making this resource module better!
+  - type: textarea
+    id: description
+    attributes:
+      label: Resource proposal
+      description: Provide information how this resource will/should work and how it will help users.
+    validations:
+      required: true
+  - type: textarea
+    id: proposedProperties
+    attributes:
+      label: Proposed properties
+      description: |
+        List all the proposed properties that the resource should have (key, required, write, and/or read). For each property provide a detailed description, the data type, if a default value should be used, and if the property is limited to a set of values.
+      value: |
+        Property | Type qualifier | Data type | Description | Default value | Allowed values
+        --- | --- | --- | --- | --- | ---
+        PropertyName | Key | String | Detailed description | None | None
+    validations:
+      required: true
+  - type: textarea
+    id: considerations
+    attributes:
+      label: Special considerations or limitations
+      description: |
+        Provide any considerations or limitations you can think of that a contributor should take in account when coding the proposed resource, and or what limitations a user will encounter or should consider when using the proposed resource.
+    validations:
+      required: true

CHANGELOG.md

@@ -9,11 +9,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - SharePointDsc
   - Added generic unit tests files to quickly run all or a specific unit test
+  - Updated pipeline scripts to a recent version
 - SPTrustedIdentityTokenIssuer
   - Added parameters to support OIDC authentication in SharePoint Server Subscription Edition
+- SPWebAppPeoplePickerSettings
+  - Added the PeopleEditorOnlyResolveWithinSiteCollection parameter to the resource
 
 ### Changed
 
+- SharePointDsc
+  - Updated ReverseDsc version requirement to 2.0.0.10 to fix an issue
+    with Exporting an array of CIM instances
 - SPFarm
   - Suppress a useless reboot that was triggered once a server joined the farm
   - Suppress a useless 5 minutes sleep triggered once a server joined the farm

CODE_OF_CONDUCT.md

@@ -1,9 +1,3 @@
-# Microsoft Open Source Code of Conduct
+# Code of Conduct
 
-This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/).
-
-Resources:
-
-- [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/)
-- [Microsoft Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/)
-- Contact [[email protected]](mailto:[email protected]) with questions or concerns
+This project has adopted the [DSC Community Code of Conduct](https://dsccommunity.org/code_of_conduct).

RequiredModules.psd1

@@ -26,5 +26,5 @@
     xWebAdministration          = '3.1.0'
 
     # Required for Export of Config
-    ReverseDSC                  = "2.0.0.7"
+    ReverseDSC                  = "2.0.0.10"
 }

Resolve-Dependency.ps1

@@ -290,7 +290,14 @@ try
 
     if ($PSBoundParameters.ContainsKey('MinimumPSDependVersion'))
     {
-        $psDependModule = $psDependModule | Where-Object -Property -eq $MinimumPSDependVersion
+        try
+        {
+            $psDependModule = $psDependModule | Where-Object -FilterScript { $_.Version -ge $MinimumPSDependVersion }
+        }
+        catch
+        {
+            throw ('There was a problem finding the minimum version of PSDepend. Error: {0}' -f $_)
+        }
     }
 
     if (-not $psDependModule)
@@ -328,6 +335,7 @@ try
                 Name       = 'PSDepend'
                 Repository = $Gallery
                 Path       = $PSDependTarget
+                Force      = $true
             }
 
             if ($MinimumPSDependVersion)
@@ -371,6 +379,7 @@ try
                 Name       = 'PowerShell-Yaml'
                 Repository = $Gallery
                 Path       = $PSDependTarget
+                Force      = $true
             }
 
             Save-Module @SaveModuleParam

SECURITY.md

@@ -0,0 +1,30 @@
+## Security
+
+The DSC Community takes the security of our modules seriously, which includes all source code repositories managed through our GitHub organization.
+
+If you believe you have found a security vulnerability in any DSC Community owned repository, please report it to us as described below.
+
+## Reporting Security Issues
+
+**Please do not report security vulnerabilities through public GitHub issues.**
+
+Instead, please report them to one or several members of the DSC Community organization.
+The easiest way to do so is to send us a direct message via twitter or slack.
+
+You should receive a response within 48 hours. If for some reason you do not, please follow up to other member of the community.
+
+Please include the requested information listed below (as much as you can provide) to help us better understand the nature and scope of the possible issue:
+
+  * Type of issue
+  * Full paths of source file(s) related to the manifestation of the issue
+  * The location of the affected source code (tag/branch/commit or direct URL)
+  * Any special configuration required to reproduce the issue
+  * Step-by-step instructions to reproduce the issue
+  * Proof-of-concept or exploit code (if possible)
+  * Impact of the issue, including how an attacker might exploit the issue
+
+This information will help us triage your report more quickly.
+
+## Preferred Languages
+
+We prefer all communications to be in English.

SharePointDsc/DSCResources/MSFT_SPLogLevel/MSFT_SPLogLevel.psm1

@@ -405,7 +405,7 @@ function Export-TargetResource
         $currentBlock = Convert-DSCStringParamToVariable -DSCBlock $currentBlock -ParameterName "PsDscRunAsCredential"
 
         # Change hashtable format into CIM Instance format
-        $currentBlock = $currentBlock -replace "@{", "`r`n                MSFT_SPLogLevelItem {" -replace '}', '},' -replace ',\);', "`r`n            );" -replace '(\w+)=', '$1="' -replace '; ', '"; ' -replace '}', '"}'
+        $currentBlock = $currentBlock -replace "@{", "`r`n                MSFT_SPLogLevelItem {" -replace '\);', "`r`n            );" -replace '(\w+)=', '$1="' -replace '; ', '"; ' -replace '}', '"}'
 
         $PartialContent += $currentBlock
         $PartialContent += "        }`r`n"