Merge branch 'development'

Author: alerickson

CHANGELOG.md

@@ -157,7 +157,7 @@ Bug fixes
 New features
 
 - Allow Pester/PSReadline installation when signed by non-Microsoft certificate (#258)
-  - Whitelist installation of non-Microsoft signed Pester and PSReadline over Microsoft signed Pester and PSReadline.
+  - Allowlist installation of non-Microsoft signed Pester and PSReadline over Microsoft signed Pester and PSReadline.
 
 Build and Code Cleanup Improvements
 

Tests/PSGetInstallModule.Tests.ps1

@@ -81,7 +81,7 @@ function SuiteSetup {
         # If it doesn't exist, attempt to download it.
         # If this is run offline, just fail the test for now.
         # This module is expected to be Microsoft-signed.
-        # This is essentially a test hook to get around the hardcoded whitelist.
+        # This is essentially a test hook to get around the hardcoded allowlist.
         $signedPester = (Get-Module Pester -ListAvailable | Where-Object { $_.Version -eq '3.4.0' }).ModuleBase
         if (-not $signedPester) {
             $psName = [System.Guid]::NewGuid().ToString()
@@ -849,7 +849,7 @@ Describe PowerShell.PSGet.InstallModuleTests -Tags 'BVT', 'InnerLoop' {
         AssertEquals $res.Name $moduleName2 "Install-Module failed to install with Find-Command output"
     }
 
-    # Purpose: Install a whitelisted non-Microsoft signed Pester or PSReadline version without -SkipPublisherCheck
+    # Purpose: Install a allowlisted non-Microsoft signed Pester or PSReadline version without -SkipPublisherCheck
     #
     # Action: Install-Module -Name Pester -RequiredVersion <Anything non-Microsoft signed>
     #

appveyor.yml

@@ -45,7 +45,7 @@ build: off
 
 # branches to build
 branches:
-  # whitelist
+  # allowlist
   only:
     - master
     - development

src/PowerShellGet/PowerShellGet.psd1

@@ -1,60 +1,60 @@
 @{
-    RootModule        = 'PSModule.psm1'
-    ModuleVersion     = '2.2.5.1'
-    GUID              = '1d73a601-4a6c-43c5-ba3f-619b18bbb404'
-    Author            = 'Microsoft Corporation'
-    CompanyName       = 'Microsoft Corporation'
-    Copyright         = '(c) Microsoft Corporation. All rights reserved.'
-    Description       = 'PowerShell module with commands for discovering, installing, updating and publishing the PowerShell artifacts like Modules, DSC Resources, Role Capabilities and Scripts.'
-    PowerShellVersion = '3.0'
-    FormatsToProcess  = 'PSGet.Format.ps1xml'
-    FunctionsToExport = @(
-        'Find-Command',
-        'Find-DSCResource',
-        'Find-Module',
-        'Find-RoleCapability',
-        'Find-Script',
-        'Get-CredsFromCredentialProvider',
-        'Get-InstalledModule',
-        'Get-InstalledScript',
-        'Get-PSRepository',
-        'Install-Module',
-        'Install-Script',
-        'New-ScriptFileInfo',
-        'Publish-Module',
-        'Publish-Script',
-        'Register-PSRepository',
-        'Save-Module',
-        'Save-Script',
-        'Set-PSRepository',
-        'Test-ScriptFileInfo',
-        'Uninstall-Module',
-        'Uninstall-Script',
-        'Unregister-PSRepository',
-        'Update-Module',
-        'Update-ModuleManifest',
-        'Update-Script',
-        'Update-ScriptFileInfo')
-
-    VariablesToExport = 'PSGetPath'
-    AliasesToExport   = @('inmo', 'fimo', 'upmo', 'pumo')
-    FileList          = @('PSModule.psm1',
-        'PSGet.Format.ps1xml',
-        'PSGet.Resource.psd1')
-    RequiredModules   = @(@{ModuleName = 'PackageManagement'; ModuleVersion = '1.4.4' })
-    PrivateData       = @{
-        "PackageManagementProviders"           = 'PSModule.psm1'
-        "SupportedPowerShellGetFormatVersions" = @('1.x', '2.x')
-        PSData                                 = @{
-            Tags         = @('Packagemanagement',
-                'Provider',
-                'PSEdition_Desktop',
-                'PSEdition_Core',
-                'Linux',
-                'Mac')
-            ProjectUri   = 'https://go.microsoft.com/fwlink/?LinkId=828955'
-            LicenseUri   = 'https://go.microsoft.com/fwlink/?LinkId=829061'
-            ReleaseNotes = @'
+  RootModule        = 'PSModule.psm1'
+  ModuleVersion     = '2.2.5'
+  GUID              = '1d73a601-4a6c-43c5-ba3f-619b18bbb404'
+  Author            = 'Microsoft Corporation'
+  CompanyName       = 'Microsoft Corporation'
+  Copyright         = '(c) Microsoft Corporation. All rights reserved.'
+  Description       = 'PowerShell module with commands for discovering, installing, updating and publishing the PowerShell artifacts like Modules, DSC Resources, Role Capabilities and Scripts.'
+  PowerShellVersion = '3.0'
+  FormatsToProcess  = 'PSGet.Format.ps1xml'
+  FunctionsToExport = @(
+    'Find-Command',
+    'Find-DSCResource',
+    'Find-Module',
+    'Find-RoleCapability',
+    'Find-Script',
+    'Get-CredsFromCredentialProvider',
+    'Get-InstalledModule',
+    'Get-InstalledScript',
+    'Get-PSRepository',
+    'Install-Module',
+    'Install-Script',
+    'New-ScriptFileInfo',
+    'Publish-Module',
+    'Publish-Script',
+    'Register-PSRepository',
+    'Save-Module',
+    'Save-Script',
+    'Set-PSRepository',
+    'Test-ScriptFileInfo',
+    'Uninstall-Module',
+    'Uninstall-Script',
+    'Unregister-PSRepository',
+    'Update-Module',
+    'Update-ModuleManifest',
+    'Update-Script',
+    'Update-ScriptFileInfo')
+
+  VariablesToExport = 'PSGetPath'
+  AliasesToExport   = @('inmo', 'fimo', 'upmo', 'pumo')
+  FileList          = @('PSModule.psm1',
+    'PSGet.Format.ps1xml',
+    'PSGet.Resource.psd1')
+  RequiredModules   = @(@{ModuleName = 'PackageManagement'; ModuleVersion = '1.4.4' })
+  PrivateData       = @{
+    "PackageManagementProviders"           = 'PSModule.psm1'
+    "SupportedPowerShellGetFormatVersions" = @('1.x', '2.x')
+    PSData                                 = @{
+      Tags         = @('Packagemanagement',
+        'Provider',
+        'PSEdition_Desktop',
+        'PSEdition_Core',
+        'Linux',
+        'Mac')
+      ProjectUri   = 'https://go.microsoft.com/fwlink/?LinkId=828955'
+      LicenseUri   = 'https://go.microsoft.com/fwlink/?LinkId=829061'
+      ReleaseNotes = @'
 ### 2.2.5
 - Security patch for code injection bug
 
@@ -190,7 +190,7 @@ Bug fixes
 
 New features
 * Allow Pester/PSReadline installation when signed by non-Microsoft certificate (#258)
-  - Whitelist installation of non-Microsoft signed Pester and PSReadline over Microsoft signed Pester and PSReadline.
+  - Allowlist installation of non-Microsoft signed Pester and PSReadline over Microsoft signed Pester and PSReadline.
 
 Build and Code Cleanup Improvements
 * Splitting of functions (#229) (Thanks @Benny1007)
@@ -280,8 +280,8 @@ Bug fixes
 ## For full history of release notes see changelog:
 https://github.com/PowerShell/PowerShellGet/blob/master/CHANGELOG.md
 '@
-        }
     }
+  }
 
-    HelpInfoURI       = 'http://go.microsoft.com/fwlink/?linkid=2113539'
+  HelpInfoURI       = 'http://go.microsoft.com/fwlink/?linkid=855963'
 }