4.4.2 Into Dev - Release (4.4.2) (#666)

* removed Vmware.VpshereDSC dependency

* updated changelog

* updated changelog

* updated integration test

* updated changelog.md

Co-authored-by: erjenkin <[email protected]>

Author: bcwilhite

CHANGELOG.md

@@ -2,8 +2,9 @@
 
 ## [Unreleased]
 
-## [4.4.0] - 2020-07-01
+## [4.4.2] - 2020-07-06
 
+* Removed required dependency of Vmware.VsphereDSC due to cyclic redundancy error when importing PowerSTIG
 * Update PowerSTIG to successfully parse/apply MS SQL Server 2012 Instance Ver. 1 Rel. 20: [#639](https://github.com/microsoft/PowerStig/issues/639)
 * Update PowerSTIG to successfully parse/apply MS SQL Server 2016 Instance Ver. 1 Rel. 9: [#636](https://github.com/microsoft/PowerStig/issues/636)
 * Update PowerSTIG to successfully parse/apply Windows Server 2012 DNS STIG - Ver 1, Rel 14:  [#633](https://github.com/microsoft/PowerStig/issues/633)

Tests/Integration/Module/PowerStig.Integration.tests.ps1

@@ -20,9 +20,11 @@ Describe "$moduleName module" {
         foreach ($moduleInfo in $dscModuleInfo)
         {
             $moduleData = $manifestRequiredModules | Where-Object -FilterScript {$PSItem.ModuleName -eq $moduleInfo.ModuleName}
-
-            It "Should require the same module listed in the manifest for DscResource $dscCompositeFile Module: $($moduleInfo.ModuleName)" {
-                $moduleInfo.ModuleVersion | Should -Be $moduleData.ModuleVersion
+            if ($moduleInfo.ModuleName -ne "Vmware.vSphereDSC")
+            {
+                It "Should require the same module listed in the manifest for DscResource $dscCompositeFile Module: $($moduleInfo.ModuleName)" {
+                    $moduleInfo.ModuleVersion | Should -Be $moduleData.ModuleVersion
+                }
             }
         }
     }

build.ps1

@@ -247,6 +247,7 @@ Begin
     'DscResource.Test'              = '0.13.1'
     'DscResource.AnalyzerRules'     = 'latest'
     'powershell-yaml'               = 'latest'
+    'Vmware.VsphereDSC'             = '2.1.0.58'
     # The modules below are dynamically inserted from the Begin block of .\build.ps1
 
 '@

source/PowerStig.psd1

@@ -47,15 +47,7 @@ RequiredModules  = @(
     @{ModuleName = 'SqlServerDsc'; ModuleVersion = '13.3.0'},
     @{ModuleName = 'WindowsDefenderDsc'; ModuleVersion = '1.0.0.0'},
     @{ModuleName = 'xDnsServer'; ModuleVersion = '1.11.0.0'},
-    @{ModuleName = 'xWebAdministration'; ModuleVersion = '2.5.0.0'},
-    @{ModuleName = 'VMware.VimAutomation.Sdk'; ModuleVersion = '12.0.0.15939651'},
-    @{ModuleName = 'VMware.VimAutomation.Common'; ModuleVersion = '12.0.0.15939652'},
-    @{ModuleName = 'VMware.Vim'; ModuleVersion ='7.0.0.15939650'},
-    @{ModuleName = 'VMware.VimAutomation.Cis.Core'; ModuleVersion = '12.0.0.15939657'},
-    @{ModuleName = 'VMware.VimAutomation.Core'; ModuleVersion = '12.0.0.15939655'},
-    @{ModuleName = 'VMware.VimAutomation.Storage'; ModuleVersion = '11.5.0.14901686'},
-    @{ModuleName = 'VMware.VimAutomation.Vds'; ModuleVersion = '11.2.0.12483615'},
-    @{ModuleName = 'Vmware.vSphereDsc'; ModuleVersion = '2.1.0.58'}
+    @{ModuleName = 'xWebAdministration'; ModuleVersion = '2.5.0.0'}
 )
 
 # DSC resources to export from this module