Merge pull request #377 from PlagueHO/Issue-372

Refactor Module to Remove Test Harness - Fixes #372
dsccommunity · Feb 2, 2019 · 7563b58 · 7563b58
2 parents e714098 + 1a6c3ac
commit 7563b58
Show file tree

Hide file tree

Showing 215 changed files with 341 additions and 338 deletions.
diff --git a/.MetaTestOptIn.json b/.MetaTestOptIn.json
@@ -6,5 +6,8 @@
         "Common Tests - Required Script Analyzer Rules",
         "Common Tests - Flagged Script Analyzer Rules",
         "Common Tests - New Error-Level Script Analyzer Rules",
-        "Common Tests - Custom Script Analyzer Rules"
+        "Common Tests - Custom Script Analyzer Rules",
+        "Common Tests - Validate Example Files To Be Published",
+        "Common Tests - Validate Markdown Links",
+        "Common Tests - Relative Path Length"
 ]
diff --git a/.vscode/RunAllTests.ps1 b/.vscode/RunAllTests.ps1
diff --git a/.vscode/launch.json b/.vscode/launch.json
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,16 @@
 
 ## Unreleased
 
+- Refactored module folder structure to move resource to root folder of
+  repository and remove test harness - fixes [Issue #372](https://github.com/PowerShell/NetworkingDsc/issues/372).
+- Removed module conflict tests because only required for harness style
+  modules.
+- Opted into Common Tests 'Validate Example Files To Be Published',
+  'Validate Markdown Links' and 'Relative Path Length'.
+- Added 'DscResourcesToExport' to manifest to improve information in
+  PowerShell Gallery and removed wildcards from 'FunctionsToExport',
+  'CmdletsToExport', 'VariablesToExport' and 'AliasesToExport' - fixes
+  [Issue #376](https://github.com/PowerShell/NetworkingDsc/issues/376).
 - MSFT_NetIPInterface:
   - Added `Dhcp`, `WeakHostReceive` and `WeakHostSend` parameters so that
     MSFT_DHCPClient, MSFT_WeakHostReceive, MSFT_WeakHostSend can be

diff --git a/...ayAddress/MSFT_DefaultGatewayAddress.psm1 → ...ayAddress/MSFT_DefaultGatewayAddress.psm1 b/...ayAddress/MSFT_DefaultGatewayAddress.psm1 → ...ayAddress/MSFT_DefaultGatewayAddress.psm1
diff --git a/...ess/MSFT_DefaultGatewayAddress.schema.mof → ...ess/MSFT_DefaultGatewayAddress.schema.mof b/...ess/MSFT_DefaultGatewayAddress.schema.mof → ...ess/MSFT_DefaultGatewayAddress.schema.mof
diff --git a/...rces/MSFT_DefaultGatewayAddress/README.md → ...rces/MSFT_DefaultGatewayAddress/README.md b/...rces/MSFT_DefaultGatewayAddress/README.md → ...rces/MSFT_DefaultGatewayAddress/README.md
diff --git a/...S/MSFT_DefaultGatewayAddress.strings.psd1 → ...S/MSFT_DefaultGatewayAddress.strings.psd1 b/...S/MSFT_DefaultGatewayAddress.strings.psd1 → ...S/MSFT_DefaultGatewayAddress.strings.psd1
diff --git a/...ing/MSFT_DnsClientGlobalSetting.data.psd1 → ...ing/MSFT_DnsClientGlobalSetting.data.psd1 b/...ing/MSFT_DnsClientGlobalSetting.data.psd1 → ...ing/MSFT_DnsClientGlobalSetting.data.psd1
diff --git a/...lSetting/MSFT_DnsClientGlobalSetting.psm1 → ...lSetting/MSFT_DnsClientGlobalSetting.psm1 b/...lSetting/MSFT_DnsClientGlobalSetting.psm1 → ...lSetting/MSFT_DnsClientGlobalSetting.psm1
diff --git a/...ng/MSFT_DnsClientGlobalSetting.schema.mof → ...ng/MSFT_DnsClientGlobalSetting.schema.mof b/...ng/MSFT_DnsClientGlobalSetting.schema.mof → ...ng/MSFT_DnsClientGlobalSetting.schema.mof
diff --git a/...ces/MSFT_DnsClientGlobalSetting/README.MD → ...ces/MSFT_DnsClientGlobalSetting/README.MD b/...ces/MSFT_DnsClientGlobalSetting/README.MD → ...ces/MSFT_DnsClientGlobalSetting/README.MD
diff --git a/.../MSFT_DnsClientGlobalSetting.strings.psd1 → .../MSFT_DnsClientGlobalSetting.strings.psd1 b/.../MSFT_DnsClientGlobalSetting.strings.psd1 → .../MSFT_DnsClientGlobalSetting.strings.psd1
diff --git a/...ctionSuffix/MSFT_DnsConnectionSuffix.psm1 → ...ctionSuffix/MSFT_DnsConnectionSuffix.psm1 b/...ctionSuffix/MSFT_DnsConnectionSuffix.psm1 → ...ctionSuffix/MSFT_DnsConnectionSuffix.psm1
diff --git a/...uffix/MSFT_DnsConnectionSuffix.schema.mof → ...uffix/MSFT_DnsConnectionSuffix.schema.mof b/...uffix/MSFT_DnsConnectionSuffix.schema.mof → ...uffix/MSFT_DnsConnectionSuffix.schema.mof
diff --git a/...ources/MSFT_DnsConnectionSuffix/README.MD → ...ources/MSFT_DnsConnectionSuffix/README.MD b/...ources/MSFT_DnsConnectionSuffix/README.MD → ...ources/MSFT_DnsConnectionSuffix/README.MD
diff --git a/...-US/MSFT_DnsConnectionSuffix.strings.psd1 → ...-US/MSFT_DnsConnectionSuffix.strings.psd1 b/...-US/MSFT_DnsConnectionSuffix.strings.psd1 → ...-US/MSFT_DnsConnectionSuffix.strings.psd1
diff --git a/...sServerAddress/MSFT_DnsServerAddress.psm1 → ...sServerAddress/MSFT_DnsServerAddress.psm1 b/...sServerAddress/MSFT_DnsServerAddress.psm1 → ...sServerAddress/MSFT_DnsServerAddress.psm1
diff --git a/...rAddress/MSFT_DnsServerAddress.schema.mof → ...rAddress/MSFT_DnsServerAddress.schema.mof b/...rAddress/MSFT_DnsServerAddress.schema.mof → ...rAddress/MSFT_DnsServerAddress.schema.mof
diff --git a/...Resources/MSFT_DnsServerAddress/README.MD → DSCResources/MSFT_DnsServerAddress/README.MD b/...Resources/MSFT_DnsServerAddress/README.MD → DSCResources/MSFT_DnsServerAddress/README.MD
diff --git a/.../en-US/MSFT_DnsServerAddress.strings.psd1 → .../en-US/MSFT_DnsServerAddress.strings.psd1 b/.../en-US/MSFT_DnsServerAddress.strings.psd1 → .../en-US/MSFT_DnsServerAddress.strings.psd1
diff --git a/...ces/MSFT_Firewall/MSFT_Firewall.data.psd1 → ...ces/MSFT_Firewall/MSFT_Firewall.data.psd1 b/...ces/MSFT_Firewall/MSFT_Firewall.data.psd1 → ...ces/MSFT_Firewall/MSFT_Firewall.data.psd1
diff --git a/...esources/MSFT_Firewall/MSFT_Firewall.psm1 → ...esources/MSFT_Firewall/MSFT_Firewall.psm1 b/...esources/MSFT_Firewall/MSFT_Firewall.psm1 → ...esources/MSFT_Firewall/MSFT_Firewall.psm1
diff --git a/...es/MSFT_Firewall/MSFT_Firewall.schema.mof → ...es/MSFT_Firewall/MSFT_Firewall.schema.mof b/...es/MSFT_Firewall/MSFT_Firewall.schema.mof → ...es/MSFT_Firewall/MSFT_Firewall.schema.mof
diff --git a/...gDsc/DSCResources/MSFT_Firewall/README.MD → DSCResources/MSFT_Firewall/README.MD b/...gDsc/DSCResources/MSFT_Firewall/README.MD → DSCResources/MSFT_Firewall/README.MD
diff --git a/...Firewall/en-US/MSFT_Firewall.strings.psd1 → ...Firewall/en-US/MSFT_Firewall.strings.psd1 b/...Firewall/en-US/MSFT_Firewall.strings.psd1 → ...Firewall/en-US/MSFT_Firewall.strings.psd1
diff --git a/...allProfile/MSFT_FirewallProfile.data.psd1 → ...allProfile/MSFT_FirewallProfile.data.psd1 b/...allProfile/MSFT_FirewallProfile.data.psd1 → ...allProfile/MSFT_FirewallProfile.data.psd1
diff --git a/...FirewallProfile/MSFT_FirewallProfile.psm1 → ...FirewallProfile/MSFT_FirewallProfile.psm1 b/...FirewallProfile/MSFT_FirewallProfile.psm1 → ...FirewallProfile/MSFT_FirewallProfile.psm1
diff --git a/...llProfile/MSFT_FirewallProfile.schema.mof → ...llProfile/MSFT_FirewallProfile.schema.mof b/...llProfile/MSFT_FirewallProfile.schema.mof → ...llProfile/MSFT_FirewallProfile.schema.mof
diff --git a/...CResources/MSFT_FirewallProfile/README.MD → DSCResources/MSFT_FirewallProfile/README.MD b/...CResources/MSFT_FirewallProfile/README.MD → DSCResources/MSFT_FirewallProfile/README.MD
diff --git a/...e/en-US/MSFT_FirewallProfile.strings.psd1 → ...e/en-US/MSFT_FirewallProfile.strings.psd1 b/...e/en-US/MSFT_FirewallProfile.strings.psd1 → ...e/en-US/MSFT_FirewallProfile.strings.psd1
diff --git a/...ources/MSFT_HostsFile/MSFT_HostsFile.psm1 → ...ources/MSFT_HostsFile/MSFT_HostsFile.psm1 b/...ources/MSFT_HostsFile/MSFT_HostsFile.psm1 → ...ources/MSFT_HostsFile/MSFT_HostsFile.psm1
diff --git a/.../MSFT_HostsFile/MSFT_HostsFile.schema.mof → .../MSFT_HostsFile/MSFT_HostsFile.schema.mof b/.../MSFT_HostsFile/MSFT_HostsFile.schema.mof → .../MSFT_HostsFile/MSFT_HostsFile.schema.mof
diff --git a/...Dsc/DSCResources/MSFT_HostsFile/README.MD → DSCResources/MSFT_HostsFile/README.MD b/...Dsc/DSCResources/MSFT_HostsFile/README.MD → DSCResources/MSFT_HostsFile/README.MD
diff --git a/...stsFile/en-US/MSFT_HostsFile.strings.psd1 → ...stsFile/en-US/MSFT_HostsFile.strings.psd1 b/...stsFile/en-US/MSFT_HostsFile.strings.psd1 → ...stsFile/en-US/MSFT_HostsFile.strings.psd1
diff --git a/...ources/MSFT_IPAddress/MSFT_IPAddress.psm1 → ...ources/MSFT_IPAddress/MSFT_IPAddress.psm1 b/...ources/MSFT_IPAddress/MSFT_IPAddress.psm1 → ...ources/MSFT_IPAddress/MSFT_IPAddress.psm1
diff --git a/.../MSFT_IPAddress/MSFT_IPAddress.schema.mof → .../MSFT_IPAddress/MSFT_IPAddress.schema.mof b/.../MSFT_IPAddress/MSFT_IPAddress.schema.mof → .../MSFT_IPAddress/MSFT_IPAddress.schema.mof
diff --git a/...Dsc/DSCResources/MSFT_IPAddress/README.MD → DSCResources/MSFT_IPAddress/README.MD b/...Dsc/DSCResources/MSFT_IPAddress/README.MD → DSCResources/MSFT_IPAddress/README.MD
diff --git a/...Address/en-US/MSFT_IPAddress.strings.psd1 → ...Address/en-US/MSFT_IPAddress.strings.psd1 b/...Address/en-US/MSFT_IPAddress.strings.psd1 → ...Address/en-US/MSFT_IPAddress.strings.psd1
diff --git a/...IPAddressOption/MSFT_IPAddressOption.psm1 → ...IPAddressOption/MSFT_IPAddressOption.psm1 b/...IPAddressOption/MSFT_IPAddressOption.psm1 → ...IPAddressOption/MSFT_IPAddressOption.psm1
diff --git a/...essOption/MSFT_IPAddressOption.schema.mof → ...essOption/MSFT_IPAddressOption.schema.mof b/...essOption/MSFT_IPAddressOption.schema.mof → ...essOption/MSFT_IPAddressOption.schema.mof
diff --git a/...CResources/MSFT_IPAddressOption/README.MD → DSCResources/MSFT_IPAddressOption/README.MD b/...CResources/MSFT_IPAddressOption/README.MD → DSCResources/MSFT_IPAddressOption/README.MD
diff --git a/...n/en-US/MSFT_IPAddressOption.strings.psd1 → ...n/en-US/MSFT_IPAddressOption.strings.psd1 b/...n/en-US/MSFT_IPAddressOption.strings.psd1 → ...n/en-US/MSFT_IPAddressOption.strings.psd1
diff --git a/...erty/MSFT_NetAdapterAdvancedProperty.psm1 → ...erty/MSFT_NetAdapterAdvancedProperty.psm1 b/...erty/MSFT_NetAdapterAdvancedProperty.psm1 → ...erty/MSFT_NetAdapterAdvancedProperty.psm1
diff --git a/...SFT_NetAdapterAdvancedProperty.schema.mof → ...SFT_NetAdapterAdvancedProperty.schema.mof b/...SFT_NetAdapterAdvancedProperty.schema.mof → ...SFT_NetAdapterAdvancedProperty.schema.mof
diff --git a/...MSFT_NetAdapterAdvancedProperty/README.MD → ...MSFT_NetAdapterAdvancedProperty/README.MD b/...MSFT_NetAdapterAdvancedProperty/README.MD → ...MSFT_NetAdapterAdvancedProperty/README.MD
diff --git a/...T_NetAdapterAdvancedProperty.strings.psd1 → ...T_NetAdapterAdvancedProperty.strings.psd1 b/...T_NetAdapterAdvancedProperty.strings.psd1 → ...T_NetAdapterAdvancedProperty.strings.psd1
diff --git a/...dapterBinding/MSFT_NetAdapterBinding.psm1 → ...dapterBinding/MSFT_NetAdapterBinding.psm1 b/...dapterBinding/MSFT_NetAdapterBinding.psm1 → ...dapterBinding/MSFT_NetAdapterBinding.psm1
diff --git a/...Binding/MSFT_NetAdapterBinding.schema.mof → ...Binding/MSFT_NetAdapterBinding.schema.mof b/...Binding/MSFT_NetAdapterBinding.schema.mof → ...Binding/MSFT_NetAdapterBinding.schema.mof
diff --git a/...esources/MSFT_NetAdapterBinding/README.MD → ...esources/MSFT_NetAdapterBinding/README.MD b/...esources/MSFT_NetAdapterBinding/README.MD → ...esources/MSFT_NetAdapterBinding/README.MD
diff --git a/...en-US/MSFT_NetAdapterBinding.strings.psd1 → ...en-US/MSFT_NetAdapterBinding.strings.psd1 b/...en-US/MSFT_NetAdapterBinding.strings.psd1 → ...en-US/MSFT_NetAdapterBinding.strings.psd1
diff --git a/...SFT_NetAdapterLso/MSFT_NetAdapterLso.psm1 → ...SFT_NetAdapterLso/MSFT_NetAdapterLso.psm1 b/...SFT_NetAdapterLso/MSFT_NetAdapterLso.psm1 → ...SFT_NetAdapterLso/MSFT_NetAdapterLso.psm1
diff --git a/...tAdapterLso/MSFT_NetAdapterLso.schema.mof → ...tAdapterLso/MSFT_NetAdapterLso.schema.mof b/...tAdapterLso/MSFT_NetAdapterLso.schema.mof → ...tAdapterLso/MSFT_NetAdapterLso.schema.mof
diff --git a/...DSCResources/MSFT_NetAdapterLso/README.MD → DSCResources/MSFT_NetAdapterLso/README.MD b/...DSCResources/MSFT_NetAdapterLso/README.MD → DSCResources/MSFT_NetAdapterLso/README.MD
diff --git a/...Lso/en-US/MSFT_NetAdapterLso.strings.psd1 → ...Lso/en-US/MSFT_NetAdapterLso.strings.psd1 b/...Lso/en-US/MSFT_NetAdapterLso.strings.psd1 → ...Lso/en-US/MSFT_NetAdapterLso.strings.psd1
diff --git a/...T_NetAdapterName/MSFT_NetAdapterName.psm1 → ...T_NetAdapterName/MSFT_NetAdapterName.psm1 b/...T_NetAdapterName/MSFT_NetAdapterName.psm1 → ...T_NetAdapterName/MSFT_NetAdapterName.psm1
diff --git a/...dapterName/MSFT_NetAdapterName.schema.mof → ...dapterName/MSFT_NetAdapterName.schema.mof b/...dapterName/MSFT_NetAdapterName.schema.mof → ...dapterName/MSFT_NetAdapterName.schema.mof
diff --git a/...SCResources/MSFT_NetAdapterName/README.MD → DSCResources/MSFT_NetAdapterName/README.MD b/...SCResources/MSFT_NetAdapterName/README.MD → DSCResources/MSFT_NetAdapterName/README.MD
diff --git a/...me/en-us/MSFT_NetAdapterName.strings.psd1 → ...me/en-us/MSFT_NetAdapterName.strings.psd1 b/...me/en-us/MSFT_NetAdapterName.strings.psd1 → ...me/en-us/MSFT_NetAdapterName.strings.psd1
diff --git a/...T_NetAdapterRdma/MSFT_NetAdapterRdma.psm1 → ...T_NetAdapterRdma/MSFT_NetAdapterRdma.psm1 b/...T_NetAdapterRdma/MSFT_NetAdapterRdma.psm1 → ...T_NetAdapterRdma/MSFT_NetAdapterRdma.psm1
diff --git a/...dapterRdma/MSFT_NetAdapterRdma.schema.mof → ...dapterRdma/MSFT_NetAdapterRdma.schema.mof b/...dapterRdma/MSFT_NetAdapterRdma.schema.mof → ...dapterRdma/MSFT_NetAdapterRdma.schema.mof
diff --git a/...SCResources/MSFT_NetAdapterRdma/README.MD → DSCResources/MSFT_NetAdapterRdma/README.MD b/...SCResources/MSFT_NetAdapterRdma/README.MD → DSCResources/MSFT_NetAdapterRdma/README.MD
diff --git a/...ma/en-US/MSFT_NetAdapterRdma.strings.psd1 → ...ma/en-US/MSFT_NetAdapterRdma.strings.psd1 b/...ma/en-US/MSFT_NetAdapterRdma.strings.psd1 → ...ma/en-US/MSFT_NetAdapterRdma.strings.psd1
diff --git a/...tAdapterRsc/MSFT_NetAdapterRSC.schema.mof → ...tAdapterRsc/MSFT_NetAdapterRSC.schema.mof b/...tAdapterRsc/MSFT_NetAdapterRSC.schema.mof → ...tAdapterRsc/MSFT_NetAdapterRSC.schema.mof
diff --git a/...SFT_NetAdapterRsc/MSFT_NetAdapterRsc.psm1 → ...SFT_NetAdapterRsc/MSFT_NetAdapterRsc.psm1 b/...SFT_NetAdapterRsc/MSFT_NetAdapterRsc.psm1 → ...SFT_NetAdapterRsc/MSFT_NetAdapterRsc.psm1
diff --git a/...DSCResources/MSFT_NetAdapterRsc/README.MD → DSCResources/MSFT_NetAdapterRsc/README.MD b/...DSCResources/MSFT_NetAdapterRsc/README.MD → DSCResources/MSFT_NetAdapterRsc/README.MD
diff --git a/...Rsc/en-US/MSFT_NetAdapterRsc.strings.psd1 → ...Rsc/en-US/MSFT_NetAdapterRsc.strings.psd1 b/...Rsc/en-US/MSFT_NetAdapterRsc.strings.psd1 → ...Rsc/en-US/MSFT_NetAdapterRsc.strings.psd1
diff --git a/...SFT_NetAdapterRss/MSFT_NetAdapterRss.psm1 → ...SFT_NetAdapterRss/MSFT_NetAdapterRss.psm1 b/...SFT_NetAdapterRss/MSFT_NetAdapterRss.psm1 → ...SFT_NetAdapterRss/MSFT_NetAdapterRss.psm1
diff --git a/...tAdapterRss/MSFT_NetAdapterRss.schema.mof → ...tAdapterRss/MSFT_NetAdapterRss.schema.mof b/...tAdapterRss/MSFT_NetAdapterRss.schema.mof → ...tAdapterRss/MSFT_NetAdapterRss.schema.mof
diff --git a/...DSCResources/MSFT_NetAdapterRss/README.MD → DSCResources/MSFT_NetAdapterRss/README.MD b/...DSCResources/MSFT_NetAdapterRss/README.MD → DSCResources/MSFT_NetAdapterRss/README.MD
diff --git a/...Rss/en-US/MSFT_NetAdapterRss.strings.psd1 → ...Rss/en-US/MSFT_NetAdapterRss.strings.psd1 b/...Rss/en-US/MSFT_NetAdapterRss.strings.psd1 → ...Rss/en-US/MSFT_NetAdapterRss.strings.psd1
diff --git a/...CResources/MSFT_NetBios/MSFT_NetBios.psm1 → DSCResources/MSFT_NetBios/MSFT_NetBios.psm1 b/...CResources/MSFT_NetBios/MSFT_NetBios.psm1 → DSCResources/MSFT_NetBios/MSFT_NetBios.psm1
diff --git a/...rces/MSFT_NetBios/MSFT_NetBios.schema.mof → ...rces/MSFT_NetBios/MSFT_NetBios.schema.mof b/...rces/MSFT_NetBios/MSFT_NetBios.schema.mof → ...rces/MSFT_NetBios/MSFT_NetBios.schema.mof
diff --git a/...ngDsc/DSCResources/MSFT_NetBios/README.MD → DSCResources/MSFT_NetBios/README.MD b/...ngDsc/DSCResources/MSFT_NetBios/README.MD → DSCResources/MSFT_NetBios/README.MD
diff --git a/...T_NetBios/en-US/MSFT_NetBios.strings.psd1 → ...T_NetBios/en-US/MSFT_NetBios.strings.psd1 b/...T_NetBios/en-US/MSFT_NetBios.strings.psd1 → ...T_NetBios/en-US/MSFT_NetBios.strings.psd1
diff --git a/...ionProfile/MSFT_NetConnectionProfile.psm1 → ...ionProfile/MSFT_NetConnectionProfile.psm1 b/...ionProfile/MSFT_NetConnectionProfile.psm1 → ...ionProfile/MSFT_NetConnectionProfile.psm1
diff --git a/...file/MSFT_NetConnectionProfile.schema.mof → ...file/MSFT_NetConnectionProfile.schema.mof b/...file/MSFT_NetConnectionProfile.schema.mof → ...file/MSFT_NetConnectionProfile.schema.mof
diff --git a/...urces/MSFT_NetConnectionProfile/README.MD → ...urces/MSFT_NetConnectionProfile/README.MD b/...urces/MSFT_NetConnectionProfile/README.MD → ...urces/MSFT_NetConnectionProfile/README.MD
diff --git a/...US/MSFT_NetConnectionProfile.strings.psd1 → ...US/MSFT_NetConnectionProfile.strings.psd1 b/...US/MSFT_NetConnectionProfile.strings.psd1 → ...US/MSFT_NetConnectionProfile.strings.psd1
diff --git a/...IPInterface/MSFT_NetIPInterface.data.psd1 → ...IPInterface/MSFT_NetIPInterface.data.psd1 b/...IPInterface/MSFT_NetIPInterface.data.psd1 → ...IPInterface/MSFT_NetIPInterface.data.psd1
diff --git a/...T_NetIPInterface/MSFT_NetIPInterface.psm1 → ...T_NetIPInterface/MSFT_NetIPInterface.psm1 b/...T_NetIPInterface/MSFT_NetIPInterface.psm1 → ...T_NetIPInterface/MSFT_NetIPInterface.psm1
diff --git a/...PInterface/MSFT_NetIPInterface.schema.mof → ...PInterface/MSFT_NetIPInterface.schema.mof b/...PInterface/MSFT_NetIPInterface.schema.mof → ...PInterface/MSFT_NetIPInterface.schema.mof
diff --git a/...SCResources/MSFT_NetIPInterface/README.MD → DSCResources/MSFT_NetIPInterface/README.MD b/...SCResources/MSFT_NetIPInterface/README.MD → DSCResources/MSFT_NetIPInterface/README.MD
diff --git a/...ce/en-US/MSFT_NetIPInterface.strings.psd1 → ...ce/en-US/MSFT_NetIPInterface.strings.psd1 b/...ce/en-US/MSFT_NetIPInterface.strings.psd1 → ...ce/en-US/MSFT_NetIPInterface.strings.psd1
diff --git a/...es/MSFT_NetworkTeam/MSFT_NetworkTeam.psm1 → ...es/MSFT_NetworkTeam/MSFT_NetworkTeam.psm1 b/...es/MSFT_NetworkTeam/MSFT_NetworkTeam.psm1 → ...es/MSFT_NetworkTeam/MSFT_NetworkTeam.psm1
diff --git a/...T_NetworkTeam/MSFT_NetworkTeam.schema.mof → ...T_NetworkTeam/MSFT_NetworkTeam.schema.mof b/...T_NetworkTeam/MSFT_NetworkTeam.schema.mof → ...T_NetworkTeam/MSFT_NetworkTeam.schema.mof
diff --git a/...c/DSCResources/MSFT_NetworkTeam/README.MD → DSCResources/MSFT_NetworkTeam/README.MD b/...c/DSCResources/MSFT_NetworkTeam/README.MD → DSCResources/MSFT_NetworkTeam/README.MD
diff --git a/...kTeam/en-US/MSFT_NetworkTeam.strings.psd1 → ...kTeam/en-US/MSFT_NetworkTeam.strings.psd1 b/...kTeam/en-US/MSFT_NetworkTeam.strings.psd1 → ...kTeam/en-US/MSFT_NetworkTeam.strings.psd1
diff --git a/...mInterface/MSFT_NetworkTeamInterface.psm1 → ...mInterface/MSFT_NetworkTeamInterface.psm1 b/...mInterface/MSFT_NetworkTeamInterface.psm1 → ...mInterface/MSFT_NetworkTeamInterface.psm1
diff --git a/...face/MSFT_NetworkTeamInterface.schema.mof → ...face/MSFT_NetworkTeamInterface.schema.mof b/...face/MSFT_NetworkTeamInterface.schema.mof → ...face/MSFT_NetworkTeamInterface.schema.mof
diff --git a/...urces/MSFT_NetworkTeamInterface/README.MD → ...urces/MSFT_NetworkTeamInterface/README.MD b/...urces/MSFT_NetworkTeamInterface/README.MD → ...urces/MSFT_NetworkTeamInterface/README.MD
diff --git a/...US/MSFT_NetworkTeamInterface.strings.psd1 → ...US/MSFT_NetworkTeamInterface.strings.psd1 b/...US/MSFT_NetworkTeamInterface.strings.psd1 → ...US/MSFT_NetworkTeamInterface.strings.psd1
diff --git a/...SFT_ProxySettings/MSFT_ProxySettings.psm1 → ...SFT_ProxySettings/MSFT_ProxySettings.psm1 b/...SFT_ProxySettings/MSFT_ProxySettings.psm1 → ...SFT_ProxySettings/MSFT_ProxySettings.psm1
diff --git a/...oxySettings/MSFT_ProxySettings.schema.mof → ...oxySettings/MSFT_ProxySettings.schema.mof b/...oxySettings/MSFT_ProxySettings.schema.mof → ...oxySettings/MSFT_ProxySettings.schema.mof
diff --git a/...DSCResources/MSFT_ProxySettings/README.md → DSCResources/MSFT_ProxySettings/README.md b/...DSCResources/MSFT_ProxySettings/README.md → DSCResources/MSFT_ProxySettings/README.md
diff --git a/...ngs/en-US/MSFT_ProxySettings.strings.psd1 → ...ngs/en-US/MSFT_ProxySettings.strings.psd1 b/...ngs/en-US/MSFT_ProxySettings.strings.psd1 → ...ngs/en-US/MSFT_ProxySettings.strings.psd1
diff --git a/...c/DSCResources/MSFT_Route/MSFT_Route.psm1 → DSCResources/MSFT_Route/MSFT_Route.psm1 b/...c/DSCResources/MSFT_Route/MSFT_Route.psm1 → DSCResources/MSFT_Route/MSFT_Route.psm1
diff --git a/...esources/MSFT_Route/MSFT_Route.schema.mof → ...esources/MSFT_Route/MSFT_Route.schema.mof b/...esources/MSFT_Route/MSFT_Route.schema.mof → ...esources/MSFT_Route/MSFT_Route.schema.mof
diff --git a/...kingDsc/DSCResources/MSFT_Route/README.MD → DSCResources/MSFT_Route/README.MD b/...kingDsc/DSCResources/MSFT_Route/README.MD → DSCResources/MSFT_Route/README.MD
diff --git a/.../MSFT_Route/en-US/MSFT_Route.strings.psd1 → .../MSFT_Route/en-US/MSFT_Route.strings.psd1 b/.../MSFT_Route/en-US/MSFT_Route.strings.psd1 → .../MSFT_Route/en-US/MSFT_Route.strings.psd1
diff --git a/...rNetworkTeam/MSFT_WaitForNetworkTeam.psm1 → ...rNetworkTeam/MSFT_WaitForNetworkTeam.psm1 b/...rNetworkTeam/MSFT_WaitForNetworkTeam.psm1 → ...rNetworkTeam/MSFT_WaitForNetworkTeam.psm1
diff --git a/...rkTeam/MSFT_WaitForNetworkTeam.schema.mof → ...rkTeam/MSFT_WaitForNetworkTeam.schema.mof b/...rkTeam/MSFT_WaitForNetworkTeam.schema.mof → ...rkTeam/MSFT_WaitForNetworkTeam.schema.mof
diff --git a/...sources/MSFT_WaitForNetworkTeam/README.md → ...sources/MSFT_WaitForNetworkTeam/README.md b/...sources/MSFT_WaitForNetworkTeam/README.md → ...sources/MSFT_WaitForNetworkTeam/README.md
diff --git a/...n-us/MSFT_WaitForNetworkTeam.strings.psd1 → ...n-us/MSFT_WaitForNetworkTeam.strings.psd1 b/...n-us/MSFT_WaitForNetworkTeam.strings.psd1 → ...n-us/MSFT_WaitForNetworkTeam.strings.psd1
diff --git a/...es/MSFT_WinsSetting/MSFT_WinsSetting.psm1 → ...es/MSFT_WinsSetting/MSFT_WinsSetting.psm1 b/...es/MSFT_WinsSetting/MSFT_WinsSetting.psm1 → ...es/MSFT_WinsSetting/MSFT_WinsSetting.psm1
diff --git a/...T_WinsSetting/MSFT_WinsSetting.schema.mof → ...T_WinsSetting/MSFT_WinsSetting.schema.mof b/...T_WinsSetting/MSFT_WinsSetting.schema.mof → ...T_WinsSetting/MSFT_WinsSetting.schema.mof
diff --git a/...c/DSCResources/MSFT_WinsSetting/README.MD → DSCResources/MSFT_WinsSetting/README.MD b/...c/DSCResources/MSFT_WinsSetting/README.MD → DSCResources/MSFT_WinsSetting/README.MD
diff --git a/...tting/en-US/MSFT_WinsSetting.strings.psd1 → ...tting/en-US/MSFT_WinsSetting.strings.psd1 b/...tting/en-US/MSFT_WinsSetting.strings.psd1 → ...tting/en-US/MSFT_WinsSetting.strings.psd1
diff --git a/...ayAddress_RemoveDefaultGateway_Config.ps1 → ...ayAddress_RemoveDefaultGateway_Config.ps1 b/...ayAddress_RemoveDefaultGateway_Config.ps1 → ...ayAddress_RemoveDefaultGateway_Config.ps1
diff --git a/...tewayAddress_SetDefaultGateway_Config.ps1 → ...tewayAddress_SetDefaultGateway_Config.ps1 b/...tewayAddress_SetDefaultGateway_Config.ps1 → ...tewayAddress_SetDefaultGateway_Config.ps1
diff --git a/...onfigureSuffixSearchListSingle_Config.ps1 → ...onfigureSuffixSearchListSingle_Config.ps1 b/...onfigureSuffixSearchListSingle_Config.ps1 → ...onfigureSuffixSearchListSingle_Config.ps1
diff --git a/...figureSuffixSearchListMultiple_Config.ps1 → ...figureSuffixSearchListMultiple_Config.ps1 b/...figureSuffixSearchListMultiple_Config.ps1 → ...figureSuffixSearchListMultiple_Config.ps1
diff --git a/...ectionSuffix_AddSpecificSuffix_Config.ps1 → ...ectionSuffix_AddSpecificSuffix_Config.ps1 b/...ectionSuffix_AddSpecificSuffix_Config.ps1 → ...ectionSuffix_AddSpecificSuffix_Config.ps1
diff --git a/...rverAddress/1-DnsServerAddress_Config.ps1 → ...rverAddress/1-DnsServerAddress_Config.ps1 b/...rverAddress/1-DnsServerAddress_Config.ps1 → ...rverAddress/1-DnsServerAddress_Config.ps1
diff --git a/...verAddress_PrimaryAndSecondary_Config.ps1 → ...verAddress_PrimaryAndSecondary_Config.ps1 b/...verAddress_PrimaryAndSecondary_Config.ps1 → ...verAddress_PrimaryAndSecondary_Config.ps1
diff --git a/.../3-DnsServerAddress_EnableDHCP_Config.ps1 → .../3-DnsServerAddress_EnableDHCP_Config.ps1 b/.../3-DnsServerAddress_EnableDHCP_Config.ps1 → .../3-DnsServerAddress_EnableDHCP_Config.ps1
diff --git a/...all/1-Firewall_AddFirewallRule_Config.ps1 → ...all/1-Firewall_AddFirewallRule_Config.ps1 b/...all/1-Firewall_AddFirewallRule_Config.ps1 → ...all/1-Firewall_AddFirewallRule_Config.ps1
diff --git a/..._AddFirewallRule_AllParameters_Config.ps1 → ..._AddFirewallRule_AllParameters_Config.ps1 b/..._AddFirewallRule_AllParameters_Config.ps1 → ..._AddFirewallRule_AllParameters_Config.ps1
diff --git a/...AddFirewallRuleToExistingGroup_Config.ps1 → ...AddFirewallRuleToExistingGroup_Config.ps1 b/...AddFirewallRuleToExistingGroup_Config.ps1 → ...AddFirewallRuleToExistingGroup_Config.ps1
diff --git a/...wall_EnableBuiltInFirewallRule_Config.ps1 → ...wall_EnableBuiltInFirewallRule_Config.ps1 b/...wall_EnableBuiltInFirewallRule_Config.ps1 → ...wall_EnableBuiltInFirewallRule_Config.ps1
diff --git a/...onfigurePrivateFirewallProfile_Config.ps1 → ...onfigurePrivateFirewallProfile_Config.ps1 b/...onfigurePrivateFirewallProfile_Config.ps1 → ...onfigurePrivateFirewallProfile_Config.ps1
diff --git a/...HostsFile/1-HostsFile_AddEntry_Config.ps1 → ...HostsFile/1-HostsFile_AddEntry_Config.ps1 b/...HostsFile/1-HostsFile_AddEntry_Config.ps1 → ...HostsFile/1-HostsFile_AddEntry_Config.ps1
diff --git a/...tsFile/2-HostsFile_RemoveEntry_Config.ps1 → ...tsFile/2-HostsFile_RemoveEntry_Config.ps1 b/...tsFile/2-HostsFile_RemoveEntry_Config.ps1 → ...tsFile/2-HostsFile_RemoveEntry_Config.ps1
diff --git a/...ess/1-IPAddress_AddingStaticIP_Config.ps1 → ...ess/1-IPAddress_AddingStaticIP_Config.ps1 b/...ess/1-IPAddress_AddingStaticIP_Config.ps1 → ...ess/1-IPAddress_AddingStaticIP_Config.ps1
diff --git a/...Address_AddingMultipleStaticIP_Config.ps1 → ...Address_AddingMultipleStaticIP_Config.ps1 b/...Address_AddingMultipleStaticIP_Config.ps1 → ...Address_AddingMultipleStaticIP_Config.ps1
diff --git a/...dress_AddingStaticIPWithPrefix_Config.ps1 → ...dress_AddingStaticIPWithPrefix_Config.ps1 b/...dress_AddingStaticIPWithPrefix_Config.ps1 → ...dress_AddingStaticIPWithPrefix_Config.ps1
diff --git a/...ess_AddingStaticIPKeepSettings_Config.ps1 → ...ess_AddingStaticIPKeepSettings_Config.ps1 b/...ess_AddingStaticIPKeepSettings_Config.ps1 → ...ess_AddingStaticIPKeepSettings_Config.ps1
diff --git a/...PAddressOption_SetSkipAsSource_Config.ps1 → ...PAddressOption_SetSkipAsSource_Config.ps1 b/...PAddressOption_SetSkipAsSource_Config.ps1 → ...PAddressOption_SetSkipAsSource_Config.ps1
diff --git a/...erAdvancedProperty_JumboPacket_Config.ps1 → ...erAdvancedProperty_JumboPacket_Config.ps1 b/...erAdvancedProperty_JumboPacket_Config.ps1 → ...erAdvancedProperty_JumboPacket_Config.ps1
diff --git a/...-NetAdapterBinding_DisableIPv6_Config.ps1 → ...-NetAdapterBinding_DisableIPv6_Config.ps1 b/...-NetAdapterBinding_DisableIPv6_Config.ps1 → ...-NetAdapterBinding_DisableIPv6_Config.ps1
diff --git a/...1-NetAdapterLso_DisableLsoIPv6_Config.ps1 → ...1-NetAdapterLso_DisableLsoIPv6_Config.ps1 b/...1-NetAdapterLso_DisableLsoIPv6_Config.ps1 → ...1-NetAdapterLso_DisableLsoIPv6_Config.ps1
diff --git a/...2-NetAdapterLso_DisableLsoIPv4_Config.ps1 → ...2-NetAdapterLso_DisableLsoIPv4_Config.ps1 b/...2-NetAdapterLso_DisableLsoIPv4_Config.ps1 → ...2-NetAdapterLso_DisableLsoIPv4_Config.ps1
diff --git a/...ame_RenameNetAdapterMacAddress_Config.ps1 → ...ame_RenameNetAdapterMacAddress_Config.ps1 b/...ame_RenameNetAdapterMacAddress_Config.ps1 → ...ame_RenameNetAdapterMacAddress_Config.ps1
diff --git a/...terName_RenameNetAdapterDriver_Config.ps1 → ...terName_RenameNetAdapterDriver_Config.ps1 b/...terName_RenameNetAdapterDriver_Config.ps1 → ...terName_RenameNetAdapterDriver_Config.ps1
diff --git a/...dapterRdma_DisableRdmaSettings_Config.ps1 → ...dapterRdma_DisableRdmaSettings_Config.ps1 b/...dapterRdma_DisableRdmaSettings_Config.ps1 → ...dapterRdma_DisableRdmaSettings_Config.ps1
diff --git a/...AdapterRdma_EnableRdmaSettings_Config.ps1 → ...AdapterRdma_EnableRdmaSettings_Config.ps1 b/...AdapterRdma_EnableRdmaSettings_Config.ps1 → ...AdapterRdma_EnableRdmaSettings_Config.ps1
diff --git a/...1-NetAdapterRsc_DisableRscIPv6_Config.ps1 → ...1-NetAdapterRsc_DisableRscIPv6_Config.ps1 b/...1-NetAdapterRsc_DisableRscIPv6_Config.ps1 → ...1-NetAdapterRsc_DisableRscIPv6_Config.ps1
diff --git a/...2-NetAdapterRsc_DisableRscIPv4_Config.ps1 → ...2-NetAdapterRsc_DisableRscIPv4_Config.ps1 b/...2-NetAdapterRsc_DisableRscIPv4_Config.ps1 → ...2-NetAdapterRsc_DisableRscIPv4_Config.ps1
diff --git a/.../3-NetAdapterRsc_DisableRscAll_Config.ps1 → .../3-NetAdapterRsc_DisableRscAll_Config.ps1 b/.../3-NetAdapterRsc_DisableRscAll_Config.ps1 → .../3-NetAdapterRsc_DisableRscAll_Config.ps1
diff --git a/...rRss/1-NetAdapterRss_EnableRss_Config.ps1 → ...rRss/1-NetAdapterRss_EnableRss_Config.ps1 b/...rRss/1-NetAdapterRss_EnableRss_Config.ps1 → ...rRss/1-NetAdapterRss_EnableRss_Config.ps1
diff --git a/...tBios/1-NetBios_DisableNetBios_Config.ps1 → ...tBios/1-NetBios_DisableNetBios_Config.ps1 b/...tBios/1-NetBios_DisableNetBios_Config.ps1 → ...tBios/1-NetBios_DisableNetBios_Config.ps1
diff --git a/...rofile_SetPublicEnableInternet_Config.ps1 → ...rofile_SetPublicEnableInternet_Config.ps1 b/...rofile_SetPublicEnableInternet_Config.ps1 → ...rofile_SetPublicEnableInternet_Config.ps1
diff --git a/...etConnectionProfile_SetPrivate_Config.ps1 → ...etConnectionProfile_SetPrivate_Config.ps1 b/...etConnectionProfile_SetPrivate_Config.ps1 → ...etConnectionProfile_SetPrivate_Config.ps1
diff --git a/...etIPInterface_MultipleSettings_Config.ps1 → ...etIPInterface_MultipleSettings_Config.ps1 b/...etIPInterface_MultipleSettings_Config.ps1 → ...etIPInterface_MultipleSettings_Config.ps1
diff --git a/...ce/2-NetIPInterface_EnableDHCP_Config.ps1 → ...ce/2-NetIPInterface_EnableDHCP_Config.ps1 b/...ce/2-NetIPInterface_EnableDHCP_Config.ps1 → ...ce/2-NetIPInterface_EnableDHCP_Config.ps1
diff --git a/...terface_DisableWeakHostReceive_Config.ps1 → ...terface_DisableWeakHostReceive_Config.ps1 b/...terface_DisableWeakHostReceive_Config.ps1 → ...terface_DisableWeakHostReceive_Config.ps1
diff --git a/...PInterface_DisableWeakHostSend_Config.ps1 → ...PInterface_DisableWeakHostSend_Config.ps1 b/...PInterface_DisableWeakHostSend_Config.ps1 → ...PInterface_DisableWeakHostSend_Config.ps1
diff --git a/...m/1-NetworkTeam_AddNetworkTeam_Config.ps1 → ...m/1-NetworkTeam_AddNetworkTeam_Config.ps1 b/...m/1-NetworkTeam_AddNetworkTeam_Config.ps1 → ...m/1-NetworkTeam_AddNetworkTeam_Config.ps1
diff --git a/...-NetworkTeam_RemoveNetworkTeam_Config.ps1 → ...-NetworkTeam_RemoveNetworkTeam_Config.ps1 b/...-NetworkTeam_RemoveNetworkTeam_Config.ps1 → ...-NetworkTeam_RemoveNetworkTeam_Config.ps1
diff --git a/...workTeamInterface_AddInterface_Config.ps1 → ...workTeamInterface_AddInterface_Config.ps1 b/...workTeamInterface_AddInterface_Config.ps1 → ...workTeamInterface_AddInterface_Config.ps1
diff --git a/...kTeamInterface_RemoveInterface_Config.ps1 → ...kTeamInterface_RemoveInterface_Config.ps1 b/...kTeamInterface_RemoveInterface_Config.ps1 → ...kTeamInterface_RemoveInterface_Config.ps1
diff --git a/...-ProxySettings_AutoDetectProxy_Config.ps1 → ...-ProxySettings_AutoDetectProxy_Config.ps1 b/...-ProxySettings_AutoDetectProxy_Config.ps1 → ...-ProxySettings_AutoDetectProxy_Config.ps1
diff --git a/...ettings_AutoConfigurationProxy_Config.ps1 → ...ettings_AutoConfigurationProxy_Config.ps1 b/...ettings_AutoConfigurationProxy_Config.ps1 → ...ettings_AutoConfigurationProxy_Config.ps1
diff --git a/...gs/3-ProxySettings_ManualProxy_Config.ps1 → ...gs/3-ProxySettings_ManualProxy_Config.ps1 b/...gs/3-ProxySettings_ManualProxy_Config.ps1 → ...gs/3-ProxySettings_ManualProxy_Config.ps1
diff --git a/...sources/Route/1-Route_AddRoute_Config.ps1 → ...sources/Route/1-Route_AddRoute_Config.ps1 b/...sources/Route/1-Route_AddRoute_Config.ps1 → ...sources/Route/1-Route_AddRoute_Config.ps1
diff --git a/...tForNetworkTeam_AddNetworkTeam_Config.ps1 → ...tForNetworkTeam_AddNetworkTeam_Config.ps1 b/...tForNetworkTeam_AddNetworkTeam_Config.ps1 → ...tForNetworkTeam_AddNetworkTeam_Config.ps1
diff --git a/...inSetting_ConfigureWinsSetting_Config.ps1 → ...inSetting_ConfigureWinsSetting_Config.ps1 b/...inSetting_ConfigureWinsSetting_Config.ps1 → ...inSetting_ConfigureWinsSetting_Config.ps1
diff --git a/...rkingDsc.Common/NetworkingDsc.Common.psm1 → ...rkingDsc.Common/NetworkingDsc.Common.psm1 b/...rkingDsc.Common/NetworkingDsc.Common.psm1 → ...rkingDsc.Common/NetworkingDsc.Common.psm1
diff --git a/...n/en-us/NetworkingDsc.Common.strings.psd1 → ...n/en-us/NetworkingDsc.Common.strings.psd1 b/...n/en-us/NetworkingDsc.Common.strings.psd1 → ...n/en-us/NetworkingDsc.Common.strings.psd1
diff --git a/...eHelper/NetworkingDsc.ResourceHelper.psm1 → ...eHelper/NetworkingDsc.ResourceHelper.psm1 b/...eHelper/NetworkingDsc.ResourceHelper.psm1 → ...eHelper/NetworkingDsc.ResourceHelper.psm1
diff --git a/Modules/NetworkingDsc/NetworkingDsc.psd1 b/Modules/NetworkingDsc/NetworkingDsc.psd1
diff --git a/NetworkingDsc.psd1 b/NetworkingDsc.psd1
@@ -0,0 +1,92 @@
+@{
+    # Version number of this module.
+    moduleVersion        = '6.3.0.0'
+
+    # ID used to uniquely identify this module
+    GUID                 = 'e6647cc3-ce9c-4c86-9eb8-2ee8919bf358'
+
+    # Author of this module
+    Author               = 'Microsoft Corporation'
+
+    # Company or vendor of this module
+    CompanyName          = 'Microsoft Corporation'
+
+    # Copyright statement for this module
+    Copyright            = '(c) 2018 Microsoft Corporation. All rights reserved.'
+
+    # Description of the functionality provided by this module
+    Description          = 'Module with DSC Resources for Networking area'
+
+    # Minimum version of the Windows PowerShell engine required by this module
+    PowerShellVersion    = '4.0'
+
+    # Minimum version of the common language runtime (CLR) required by this module
+    CLRVersion           = '4.0'
+
+    # Functions to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no functions to export.
+    FunctionsToExport    = @()
+
+    # Cmdlets to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no cmdlets to export.
+    CmdletsToExport      = @()
+
+    # Variables to export from this module
+    VariablesToExport    = @()
+
+    # Aliases to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no aliases to export.
+    AliasesToExport      = @()
+
+    # DSC resources to export from this module
+    DscResourcesToExport = @(
+        'DefaultGatewayAddress',
+        'DnsClientGlobalSetting',
+        'DnsConnectionSuffix',
+        'DNSServerAddress',
+        'Firewall',
+        'FirewallProfile',
+        'HostsFile',
+        'IPAddress',
+        'IPAddressOption',
+        'NetAdapterAdvancedProperty',
+        'NetAdapterBinding',
+        'NetAdapterLso',
+        'NetAdapterName',
+        'NetAdapterRDMA',
+        'NetAdapterRsc',
+        'NetAdapterRss',
+        'NetBIOS',
+        'NetConnectionProfile',
+        'NetIPInterface',
+        'NetworkTeam',
+        'NetworkTeamInterface',
+        'ProxySettings',
+        'Route',
+        'WINSSetting'
+    )
+
+    # Private data to pass to the module specified in RootModule/ModuleToProcess. This may also contain a PSData hashtable with additional module metadata used by PowerShell.
+    PrivateData          = @{
+
+        PSData = @{
+
+            # Tags applied to this module. These help with module discovery in online galleries.
+            Tags         = @('DesiredStateConfiguration', 'DSC', 'DSCResourceKit', 'DSCResource')
+
+            # A URL to the license for this module.
+            LicenseUri   = 'https://github.com/PowerShell/NetworkingDsc/blob/master/LICENSE'
+
+            # A URL to the main website for this project.
+            ProjectUri   = 'https://github.com/PowerShell/NetworkingDsc'
+
+            # A URL to an icon representing this module.
+            # IconUri = ''
+
+            # ReleaseNotes of this module
+            ReleaseNotes = '- MSFT_IPAddress:
+  - Updated to allow retaining existing addresses in order to support cluster
+    configurations as well
+
+'
+
+} # End of PSData hashtable
+    } # End of PrivateData hashtable
+}
diff --git a/PSScriptAnalyzerSettings.psd1 b/PSScriptAnalyzerSettings.psd1
diff --git a/Tests/Integration/IntegrationHelper.ps1 b/Tests/Integration/IntegrationHelper.ps1
@@ -3,6 +3,7 @@ function New-IntegrationLoopbackAdapter
     [cmdletbinding()]
     param
     (
+        [Parameter()]
         [String]
         $AdapterName
     )
@@ -42,10 +43,13 @@ function Remove-IntegrationLoopbackAdapter
     [cmdletbinding()]
     param
     (
+        [Parameter()]
         [String]
         $AdapterName
     )
-    if ($env:APPVEYOR) {
+
+    if ($env:APPVEYOR)
+    {
         # Running in AppVeyor so force silent install of LoopbackAdapter
         $Splat = @{ Force = $true }
     }

diff --git a/Tests/Integration/MSFT_DNSConnectionSuffix.Integration.Tests.ps1 b/Tests/Integration/MSFT_DNSConnectionSuffix.Integration.Tests.ps1
@@ -1,17 +1,18 @@
 $script:DSCModuleName = 'NetworkingDsc'
 $script:DSCResourceName = 'MSFT_DnsConnectionSuffix'
 
-#region HEADER
-# Integration Test Template Version: 1.1.0
-[string] $script:moduleRoot = Join-Path -Path $(Split-Path -Parent (Split-Path -Parent (Split-Path -Parent $Script:MyInvocation.MyCommand.Path))) -ChildPath 'Modules\NetworkingDsc'
+Import-Module -Name (Join-Path -Path (Join-Path -Path (Split-Path $PSScriptRoot -Parent) -ChildPath 'TestHelpers') -ChildPath 'CommonTestHelper.psm1') -Global
 
+#region HEADER
+# Integration Test Template Version: 1.1.1
+[System.String] $script:moduleRoot = Split-Path -Parent (Split-Path -Parent $PSScriptRoot)
 if ( (-not (Test-Path -Path (Join-Path -Path $script:moduleRoot -ChildPath 'DSCResource.Tests'))) -or `
     (-not (Test-Path -Path (Join-Path -Path $script:moduleRoot -ChildPath 'DSCResource.Tests\TestHelper.psm1'))) )
 {
     & git @('clone', 'https://github.com/PowerShell/DscResource.Tests.git', (Join-Path -Path $script:moduleRoot -ChildPath '\DSCResource.Tests\'))
 }
 
-Import-Module (Join-Path -Path $script:moduleRoot -ChildPath 'DSCResource.Tests\TestHelper.psm1') -Force
+Import-Module -Name (Join-Path -Path $script:moduleRoot -ChildPath 'DSCResource.Tests\TestHelper.psm1') -Force
 $TestEnvironment = Initialize-TestEnvironment `
     -DSCModuleName $script:DSCModuleName `
     -DSCResourceName $script:DSCResourceName `

diff --git a/Tests/Integration/MSFT_DefaultGatewayAddress.Integration.Tests.ps1 b/Tests/Integration/MSFT_DefaultGatewayAddress.Integration.Tests.ps1
@@ -1,18 +1,18 @@
 $script:DSCModuleName = 'NetworkingDsc'
 $script:DSCResourceName = 'MSFT_DefaultGatewayAddress'
 
-#region HEADER
-# Integration Test Template Version: 1.1.0
-[string] $script:moduleRoot = Join-Path -Path $(Split-Path -Parent (Split-Path -Parent (Split-Path -Parent $Script:MyInvocation.MyCommand.Path))) -ChildPath 'Modules\NetworkingDsc'
+Import-Module -Name (Join-Path -Path (Join-Path -Path (Split-Path $PSScriptRoot -Parent) -ChildPath 'TestHelpers') -ChildPath 'CommonTestHelper.psm1') -Global
 
+#region HEADER
+# Integration Test Template Version: 1.1.1
+[System.String] $script:moduleRoot = Split-Path -Parent (Split-Path -Parent $PSScriptRoot)
 if ( (-not (Test-Path -Path (Join-Path -Path $script:moduleRoot -ChildPath 'DSCResource.Tests'))) -or `
     (-not (Test-Path -Path (Join-Path -Path $script:moduleRoot -ChildPath 'DSCResource.Tests\TestHelper.psm1'))) )
 {
     & git @('clone', 'https://github.com/PowerShell/DscResource.Tests.git', (Join-Path -Path $script:moduleRoot -ChildPath '\DSCResource.Tests\'))
 }
 
-Import-Module (Join-Path -Path $script:moduleRoot -ChildPath 'DSCResource.Tests\TestHelper.psm1') -Force
-Import-Module (Join-Path -Path $script:moduleRoot -ChildPath 'NetworkingDsc.psd1') -Force
+Import-Module -Name (Join-Path -Path $script:moduleRoot -ChildPath 'DSCResource.Tests\TestHelper.psm1') -Force
 $TestEnvironment = Initialize-TestEnvironment `
     -DSCModuleName $script:DSCModuleName `
     -DSCResourceName $script:DSCResourceName `

diff --git a/Tests/Integration/MSFT_DnsClientGlobalSetting.Integration.Tests.ps1 b/Tests/Integration/MSFT_DnsClientGlobalSetting.Integration.Tests.ps1
@@ -1,17 +1,18 @@
 $script:DSCModuleName   = 'NetworkingDsc'
 $script:DSCResourceName = 'MSFT_DnsClientGlobalSetting'
 
-#region HEADER
-# Integration Test Template Version: 1.1.0
-[string] $script:moduleRoot = Join-Path -Path $(Split-Path -Parent (Split-Path -Parent (Split-Path -Parent $Script:MyInvocation.MyCommand.Path))) -ChildPath 'Modules\NetworkingDsc'
+Import-Module -Name (Join-Path -Path (Join-Path -Path (Split-Path $PSScriptRoot -Parent) -ChildPath 'TestHelpers') -ChildPath 'CommonTestHelper.psm1') -Global
 
+#region HEADER
+# Integration Test Template Version: 1.1.1
+[System.String] $script:moduleRoot = Split-Path -Parent (Split-Path -Parent $PSScriptRoot)
 if ( (-not (Test-Path -Path (Join-Path -Path $script:moduleRoot -ChildPath 'DSCResource.Tests'))) -or `
-     (-not (Test-Path -Path (Join-Path -Path $script:moduleRoot -ChildPath 'DSCResource.Tests\TestHelper.psm1'))) )
+    (-not (Test-Path -Path (Join-Path -Path $script:moduleRoot -ChildPath 'DSCResource.Tests\TestHelper.psm1'))) )
 {
-    & git @('clone','https://github.com/PowerShell/DscResource.Tests.git',(Join-Path -Path $script:moduleRoot -ChildPath '\DSCResource.Tests\'))
+    & git @('clone', 'https://github.com/PowerShell/DscResource.Tests.git', (Join-Path -Path $script:moduleRoot -ChildPath '\DSCResource.Tests\'))
 }
 
-Import-Module (Join-Path -Path $script:moduleRoot -ChildPath 'DSCResource.Tests\TestHelper.psm1') -Force
+Import-Module -Name (Join-Path -Path $script:moduleRoot -ChildPath 'DSCResource.Tests\TestHelper.psm1') -Force
 $TestEnvironment = Initialize-TestEnvironment `
     -DSCModuleName $script:DSCModuleName `
     -DSCResourceName $script:DSCResourceName `

diff --git a/Tests/Integration/MSFT_DnsServerAddress.Integration.Tests.ps1 b/Tests/Integration/MSFT_DnsServerAddress.Integration.Tests.ps1
@@ -1,17 +1,18 @@
 $script:DSCModuleName      = 'NetworkingDsc'
 $script:DSCResourceName    = 'MSFT_DnsServerAddress'
 
-#region HEADER
-# Integration Test Template Version: 1.1.0
-[string] $script:moduleRoot = Join-Path -Path $(Split-Path -Parent (Split-Path -Parent (Split-Path -Parent $Script:MyInvocation.MyCommand.Path))) -ChildPath 'Modules\NetworkingDsc'
+Import-Module -Name (Join-Path -Path (Join-Path -Path (Split-Path $PSScriptRoot -Parent) -ChildPath 'TestHelpers') -ChildPath 'CommonTestHelper.psm1') -Global
 
+#region HEADER
+# Integration Test Template Version: 1.1.1
+[System.String] $script:moduleRoot = Split-Path -Parent (Split-Path -Parent $PSScriptRoot)
 if ( (-not (Test-Path -Path (Join-Path -Path $script:moduleRoot -ChildPath 'DSCResource.Tests'))) -or `
-     (-not (Test-Path -Path (Join-Path -Path $script:moduleRoot -ChildPath 'DSCResource.Tests\TestHelper.psm1'))) )
+    (-not (Test-Path -Path (Join-Path -Path $script:moduleRoot -ChildPath 'DSCResource.Tests\TestHelper.psm1'))) )
 {
-    & git @('clone','https://github.com/PowerShell/DscResource.Tests.git',(Join-Path -Path $script:moduleRoot -ChildPath '\DSCResource.Tests\'))
+    & git @('clone', 'https://github.com/PowerShell/DscResource.Tests.git', (Join-Path -Path $script:moduleRoot -ChildPath '\DSCResource.Tests\'))
 }
 
-Import-Module (Join-Path -Path $script:moduleRoot -ChildPath 'DSCResource.Tests\TestHelper.psm1') -Force
+Import-Module -Name (Join-Path -Path $script:moduleRoot -ChildPath 'DSCResource.Tests\TestHelper.psm1') -Force
 $TestEnvironment = Initialize-TestEnvironment `
     -DSCModuleName $script:DSCModuleName `
     -DSCResourceName $script:DSCResourceName `

diff --git a/Tests/Integration/MSFT_Firewall.Integration.Tests.ps1 b/Tests/Integration/MSFT_Firewall.Integration.Tests.ps1
@@ -1,17 +1,18 @@
 $script:DSCModuleName = 'NetworkingDsc'
 $script:DSCResourceName = 'MSFT_Firewall'
 
-#region HEADER
-# Integration Test Template Version: 1.1.0
-[string] $script:moduleRoot = Join-Path -Path $(Split-Path -Parent (Split-Path -Parent (Split-Path -Parent $Script:MyInvocation.MyCommand.Path))) -ChildPath 'Modules\NetworkingDsc'
+Import-Module -Name (Join-Path -Path (Join-Path -Path (Split-Path $PSScriptRoot -Parent) -ChildPath 'TestHelpers') -ChildPath 'CommonTestHelper.psm1') -Global
 
+#region HEADER
+# Integration Test Template Version: 1.1.1
+[System.String] $script:moduleRoot = Split-Path -Parent (Split-Path -Parent $PSScriptRoot)
 if ( (-not (Test-Path -Path (Join-Path -Path $script:moduleRoot -ChildPath 'DSCResource.Tests'))) -or `
     (-not (Test-Path -Path (Join-Path -Path $script:moduleRoot -ChildPath 'DSCResource.Tests\TestHelper.psm1'))) )
 {
     & git @('clone', 'https://github.com/PowerShell/DscResource.Tests.git', (Join-Path -Path $script:moduleRoot -ChildPath '\DSCResource.Tests\'))
 }
 
-Import-Module (Join-Path -Path $script:moduleRoot -ChildPath 'DSCResource.Tests\TestHelper.psm1') -Force
+Import-Module -Name (Join-Path -Path $script:moduleRoot -ChildPath 'DSCResource.Tests\TestHelper.psm1') -Force
 $TestEnvironment = Initialize-TestEnvironment `
     -DSCModuleName $script:DSCModuleName `
     -DSCResourceName $script:DSCResourceName `

diff --git a/Tests/Integration/MSFT_FirewallProfile.Integration.Tests.ps1 b/Tests/Integration/MSFT_FirewallProfile.Integration.Tests.ps1
@@ -1,17 +1,18 @@
 $script:DSCModuleName   = 'NetworkingDsc'
 $script:DSCResourceName = 'MSFT_FirewallProfile'
 
-#region HEADER
-# Integration Test Template Version: 1.1.0
-[string] $script:moduleRoot = Join-Path -Path $(Split-Path -Parent (Split-Path -Parent (Split-Path -Parent $Script:MyInvocation.MyCommand.Path))) -ChildPath 'Modules\NetworkingDsc'
+Import-Module -Name (Join-Path -Path (Join-Path -Path (Split-Path $PSScriptRoot -Parent) -ChildPath 'TestHelpers') -ChildPath 'CommonTestHelper.psm1') -Global
 
+#region HEADER
+# Integration Test Template Version: 1.1.1
+[System.String] $script:moduleRoot = Split-Path -Parent (Split-Path -Parent $PSScriptRoot)
 if ( (-not (Test-Path -Path (Join-Path -Path $script:moduleRoot -ChildPath 'DSCResource.Tests'))) -or `
-     (-not (Test-Path -Path (Join-Path -Path $script:moduleRoot -ChildPath 'DSCResource.Tests\TestHelper.psm1'))) )
+    (-not (Test-Path -Path (Join-Path -Path $script:moduleRoot -ChildPath 'DSCResource.Tests\TestHelper.psm1'))) )
 {
-    & git @('clone','https://github.com/PowerShell/DscResource.Tests.git',(Join-Path -Path $script:moduleRoot -ChildPath '\DSCResource.Tests\'))
+    & git @('clone', 'https://github.com/PowerShell/DscResource.Tests.git', (Join-Path -Path $script:moduleRoot -ChildPath '\DSCResource.Tests\'))
 }
 
-Import-Module (Join-Path -Path $script:moduleRoot -ChildPath 'DSCResource.Tests\TestHelper.psm1') -Force
+Import-Module -Name (Join-Path -Path $script:moduleRoot -ChildPath 'DSCResource.Tests\TestHelper.psm1') -Force
 $TestEnvironment = Initialize-TestEnvironment `
     -DSCModuleName $script:DSCModuleName `
     -DSCResourceName $script:DSCResourceName `