Merge pull request PowerShell#4 from PowerShell/mergeparser

Merge GPRegistryPolicyParser into GPRegistryPolicy

Author: zjalali

GPRegistryPolicy.psd1

@@ -6,7 +6,7 @@ RootModule = 'GPRegistryPolicy.psm1'
 #DscResourcesToExport = ''
 
 # Version number of this module.
-ModuleVersion = '0.2'
+ModuleVersion = '0.3'
 
 # ID used to uniquely identify this module
 GUID = 'dad09e6f-22bf-4f90-94ba-4d1505c6b8ea'
@@ -24,7 +24,7 @@ Copyright = '(c) 2016 Microsoft. All rights reserved.'
 Description = 'Module with cmdlets to work with GP Registry Policy .pol files'
 
 # Required Modules - Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName="GPRegistryPolicyParser";ModuleVersion="0.2";Guid="136973e7-64da-494b-bf2d-38d4564bb8f5"})
+RequiredModules = @()
 
 # Nested Modules - Modules that must be imported into the global environment prior to importing this module
 NestedModules = @('GPRegistryPolicyResource.psd1')
@@ -59,5 +59,5 @@ PrivateData = @{
 
 } # End of PrivateData hashtable
 
-FunctionsToExport = @('Import-GPRegistryPolicy','Export-GPRegistryPolicy','Test-GPRegistryPolicy')
+FunctionsToExport = @('Import-GPRegistryPolicy','Export-GPRegistryPolicy','Test-GPRegistryPolicy','Parse-PolFile','Read-RegistryPolicies','Create-RegistrySettingsEntry','Create-GPRegistryPolicyFile','Append-RegistryPolicies')
 }

GPRegistryPolicy.psm1

@@ -22,7 +22,7 @@ data LocalizedData
 }
 
 Import-LocalizedData  LocalizedData -filename GPRegistryPolicy.Strings.psd1
-Import-Module "GPRegistryPolicyParser" -DisableNameChecking
+Import-Module "$PSScriptRoot\GPRegistryPolicyParser.psm1" -DisableNameChecking
 
 $script:SystemAndAdminAccounts = @(
     'NT AUTHORITY\SYSTEM',
@@ -665,4 +665,6 @@ Function Assert
     }
 }
 
-Export-ModuleMember -Function 'Import-GPRegistryPolicy','Export-GPRegistryPolicy','Test-GPRegistryPolicy'
+#Export-ModuleMember -Function 'Import-GPRegistryPolicy','Export-GPRegistryPolicy','Test-GPRegistryPolicy'
+#Export-ModuleMember -Function 'Parse-PolFile','Read-RegistryPolicies','Create-RegistrySettingsEntry','Create-GPRegistryPolicyFile','Append-RegistryPolicies'
+Export-ModuleMember -Function 'Import-GPRegistryPolicy','Export-GPRegistryPolicy','Test-GPRegistryPolicy','Parse-PolFile','Read-RegistryPolicies','Create-RegistrySettingsEntry','Create-GPRegistryPolicyFile','Append-RegistryPolicies'