From a21180ebc5693c2d933df8ff05e01343e6a4d42a Mon Sep 17 00:00:00 2001
From: Adam Haynes <adamhay@microsoft.com>
Date: Wed, 30 Jan 2019 14:53:30 +0100
Subject: [PATCH] fixed stigdata lookup

---
 Tools/TestHelper/CompositeResourceFilter.psd1 | 15 ---------------
 Tools/TestHelper/TestHelper.psm1              |  4 ++--
 2 files changed, 2 insertions(+), 17 deletions(-)
 delete mode 100644 Tools/TestHelper/CompositeResourceFilter.psd1

diff --git a/Tools/TestHelper/CompositeResourceFilter.psd1 b/Tools/TestHelper/CompositeResourceFilter.psd1
deleted file mode 100644
index 8ba280d1..00000000
--- a/Tools/TestHelper/CompositeResourceFilter.psd1
+++ /dev/null
@@ -1,15 +0,0 @@
-# This hash table is used filter for applicable stig data for a specific composite resource
-@{
-    Browser          = @("*IE11*")
-    DotNetFramework  = @("*DotNet4*")
-    IisServer        = @("*IISServer*")
-    IisSite          = @("*IISSite*")
-    OracleJRE        = @("*OracleJRE8*")
-    SqlServer        = @("*Instance*", "*Database*")
-    Firefox          = @("*Firefox*")
-    Office           = @("*Excel2013*", "*Outlook2013*", "*PowerPoint2013*", "*Word2013*")
-    WindowsClient    = @("*Client*")
-    WindowsFirewall  = @("*FW*")
-    WindowsDnsServer = @("*DNS*")
-    WindowsServer    = @("*DC*", "*MS*")
-}
diff --git a/Tools/TestHelper/TestHelper.psm1 b/Tools/TestHelper/TestHelper.psm1
index e2bc3d84..8ad093ff 100644
--- a/Tools/TestHelper/TestHelper.psm1
+++ b/Tools/TestHelper/TestHelper.psm1
@@ -316,11 +316,11 @@ function Get-StigVersionTable
         $Filter
     )
 
-    $include = Import-PowerShellDataFile -Path $PSScriptRoot\CompositeResourceFilter.psd1
+    #$include = Import-PowerShellDataFile -Path $PSScriptRoot\CompositeResourceFilter.psd1
 
     $path = "$(Get-StigDataRootPath)\Processed"
 
-    $versions = Get-ChildItem -Path $path -Exclude '*.org.*', '*.xsd', '*.md' -Include $include.$CompositeResourceName -File -Recurse
+    $versions = Get-ChildItem -Path $path -Exclude '*.org.*', '*.xsd', '*.md' -Include "$($CompositeResourceName)-*" -File -Recurse
 
     $versionTable = @()
     foreach ($version in $versions)