Merge pull request #189 from PowerShell/dev

Release of version 4.5.0.0 of CertificateDsc

CHANGELOG.md

@@ -2,11 +2,20 @@
 
 ## Unreleased
 
+## 4.5.0.0
+
+- Fix example publish to PowerShell Gallery by adding `gallery_api`
+ environment variable to `AppVeyor.yml` - fixes [Issue #187](https://github.com/PowerShell/CertificateDsc/issues/187).
+- CertificateDsc.Common.psm1
+ - Exclude assemblies that set DefinedTypes to null instead of an empty array
+ to prevent failures on GetTypes(). This issue occurred with the
+ Microsoft.WindowsAzure.Storage.dll assembly.
+
 ## 4.4.0.0
 
 - Minor style corrections from PR for
  [Issue #161](https://github.com/PowerShell/CertificateDsc/issues/161)
-that were missed.
+ that were missed.
 - Opt-in to Example publishing to PowerShell Gallery - fixes
  [Issue #177](https://github.com/PowerShell/CertificateDsc/issues/177).
 - Changed Test-CertificateAuthority to return the template name if it finds the

CertificateDsc.psd1

@@ -1,6 +1,6 @@
 @{
  # Version number of this module.
- moduleVersion = '4.4.0.0'
+ moduleVersion = '4.5.0.0'
 
  # ID used to uniquely identify this module
  GUID = '1b8d785e-79ae-4d95-ae58-b2460aec1031'
@@ -53,14 +53,12 @@
  # IconUri = ''
 
  # ReleaseNotes of this module
- ReleaseNotes = '- Minor style corrections from PR for
- [Issue 161](https://github.com/PowerShell/CertificateDsc/issues/161)
-that were missed.
-- Opt-in to Example publishing to PowerShell Gallery - fixes
- [Issue 177](https://github.com/PowerShell/CertificateDsc/issues/177).
-- Changed Test-CertificateAuthority to return the template name if it finds the
- display name of the template in the certificate -fixes
- [Issue 147](https://github.com/PowerShell/CertificateDsc/issues/147).
+ ReleaseNotes = '- Fix example publish to PowerShell Gallery by adding `gallery_api`
+ environment variable to `AppVeyor.yml` - fixes [Issue 187](https://github.com/PowerShell/CertificateDsc/issues/187).
+- CertificateDsc.Common.psm1
+ - Exclude assemblies that set DefinedTypes to null instead of an empty array
+ to prevent failures on GetTypes(). This issue occurred with the
+ Microsoft.WindowsAzure.Storage.dll assembly.
 
 '
 
@@ -85,3 +83,4 @@ that were missed.
 
 
 
+

Modules/CertificateDsc.Common/CertificateDsc.Common.psm1

@@ -117,8 +117,11 @@ function Test-Thumbprint
  # Get FIPS registry key
  $fips = [System.Int32] (Get-ItemProperty -Path 'HKLM:\SYSTEM\CurrentControlSet\Control\Lsa\FipsAlgorithmPolicy' -ErrorAction SilentlyContinue).Enabled
 
- # Get a list of Hash Providers
- $allHashProviders = [System.AppDomain]::CurrentDomain.GetAssemblies().GetTypes()
+ <#
+ Get a list of Hash Providers, but exclude assemblies that set DefinedTypes to null instead of an empty array.
+ Otherwise, the call to GetTypes() fails.
+ #>
+ $allHashProviders = ([System.AppDomain]::CurrentDomain.GetAssemblies() | Where-Object { $null -ne $_.DefinedTypes}).GetTypes()
 
  if ($fips -eq $true)
  {
@@ -740,7 +743,7 @@ function Get-CertificateTemplateName
 
  if ($null -ne $templateExtensionText)
  {
- return Get-CertificateTemplateInformation -FormattedTemplate $templateExtensionText | 
+ return Get-CertificateTemplateInformation -FormattedTemplate $templateExtensionText |
  Select-Object -ExpandProperty Name
  }
 }

Tests/Unit/CertificateDsc.Common.Tests.ps1

@@ -24,26 +24,27 @@ try
  InModuleScope $script:ModuleName {
  $DSCResourceName = 'CertificateDsc.Common'
  $invalidThumbprint = 'Zebra'
+ $definedRuntimeTypes = ([System.AppDomain]::CurrentDomain.GetAssemblies() | Where-Object -FilterScript { $null -ne $_.DefinedTypes}).GetTypes()
 
  # This thumbprint is valid (but not FIPS valid)
  $validThumbprint = (
- [System.AppDomain]::CurrentDomain.GetAssemblies().GetTypes() | Where-Object {
+ $definedRuntimeTypes | Where-Object -FilterScript {
  $_.BaseType.BaseType -eq [System.Security.Cryptography.HashAlgorithm] -and
  ($_.Name -cmatch 'Managed$' -or $_.Name -cmatch 'Provider$')
- } | Select-Object -First 1 | ForEach-Object {
- (New-Object $_).ComputeHash([String]::Empty) | ForEach-Object {
+ } | Select-Object -First 1 | ForEach-Object -Process {
+ (New-Object $_).ComputeHash([String]::Empty) | ForEach-Object -Process {
  '{0:x2}' -f $_
  }
  }
  ) -join ''
 
  # This thumbprint is valid for FIPS
  $validFipsThumbprint = (
- [System.AppDomain]::CurrentDomain.GetAssemblies().GetTypes() | Where-Object {
+ $definedRuntimeTypes | Where-Object -FilterScript {
  $_.BaseType.BaseType -eq [System.Security.Cryptography.HashAlgorithm] -and
  ($_.Name -cmatch 'Provider$' -and $_.Name -cnotmatch 'MD5')
- } | Select-Object -First 1 | ForEach-Object {
- (New-Object $_).ComputeHash([String]::Empty) | ForEach-Object {
+ } | Select-Object -First 1 | ForEach-Object -Process {
+ (New-Object $_).ComputeHash([String]::Empty) | ForEach-Object -Process {
  '{0:x2}' -f $_
  }
  }
@@ -1287,7 +1288,7 @@ Major Version Number=100
 Minor Version Number=5
 
 '@
- 
+
  $params = @{
  TemplateExtensions = $testCertificateWithAltTemplateInformation.Extensions
  }

Tests/Unit/MSFT_CertReq.Tests.ps1

@@ -26,12 +26,13 @@ $TestEnvironment = Initialize-TestEnvironment `
 try
 {
  InModuleScope $script:DSCResourceName {
+ $definedRuntimeTypes = ([System.AppDomain]::CurrentDomain.GetAssemblies() | Where-Object -FilterScript { $null -ne $_.DefinedTypes}).GetTypes()
  $validThumbprint = (
- [System.AppDomain]::CurrentDomain.GetAssemblies().GetTypes() | Where-Object {
+ $definedRuntimeTypes | Where-Object -FilterScript {
  $_.BaseType.BaseType -eq [System.Security.Cryptography.HashAlgorithm] -and
  ($_.Name -cmatch 'Managed$' -or $_.Name -cmatch 'Provider$')
- } | Select-Object -First 1 | ForEach-Object {
- (New-Object $_).ComputeHash([String]::Empty) | ForEach-Object {
+ } | Select-Object -First 1 | ForEach-Object -Process {
+ (New-Object $_).ComputeHash([String]::Empty) | ForEach-Object -Process {
  '{0:x2}' -f $_
  }
  }

Tests/Unit/MSFT_CertificateImport.Tests.ps1

@@ -22,12 +22,13 @@ try
 {
  InModuleScope $script:DSCResourceName {
  $DSCResourceName = 'MSFT_CertificateImport'
+ $definedRuntimeTypes = ([System.AppDomain]::CurrentDomain.GetAssemblies() | Where-Object -FilterScript { $null -ne $_.DefinedTypes}).GetTypes()
  $validThumbprint = (
- [System.AppDomain]::CurrentDomain.GetAssemblies().GetTypes() | Where-Object {
+ $definedRuntimeTypes | Where-Object -FilterScript {
  $_.BaseType.BaseType -eq [System.Security.Cryptography.HashAlgorithm] -and
  ($_.Name -cmatch 'Managed$' -or $_.Name -cmatch 'Provider$')
- } | Select-Object -First 1 | ForEach-Object {
- (New-Object $_).ComputeHash([String]::Empty) | ForEach-Object {
+ } | Select-Object -First 1 | ForEach-Object -Process {
+ (New-Object $_).ComputeHash([String]::Empty) | ForEach-Object -Process {
  '{0:x2}' -f $_
  }
  }

Tests/Unit/MSFT_PfxImport.Tests.ps1

@@ -28,12 +28,13 @@ try
 {
  InModuleScope $script:DSCResourceName {
  $DSCResourceName = 'MSFT_PfxImport'
+ $definedRuntimeTypes = ([System.AppDomain]::CurrentDomain.GetAssemblies() | Where-Object -FilterScript { $null -ne $_.DefinedTypes}).GetTypes()
  $validThumbprint = (
- [System.AppDomain]::CurrentDomain.GetAssemblies().GetTypes() | Where-Object {
+ $definedRuntimeTypes | Where-Object -FilterScript {
  $_.BaseType.BaseType -eq [System.Security.Cryptography.HashAlgorithm] -and
  ($_.Name -cmatch 'Managed$' -or $_.Name -cmatch 'Provider$')
- } | Select-Object -First 1 | ForEach-Object {
- (New-Object $_).ComputeHash([String]::Empty) | ForEach-Object {
+ } | Select-Object -First 1 | ForEach-Object -Process {
+ (New-Object $_).ComputeHash([String]::Empty) | ForEach-Object -Process {
  '{0:x2}' -f $_
  }
  }

appveyor.yml

@@ -2,6 +2,9 @@
 # environment configuration #
 #---------------------------------#
 version: 2.3.{build}.0
+environment:
+ gallery_api:
+ secure: 9ekJzfsPCDBkyLrfmov83XbbhZ6E2N3z+B/Io8NbDetbHc6hWS19zsDmy7t0Vvxv
 install:
  - git clone https://github.com/PowerShell/DscResource.Tests