v3.0.0 cross-platform reorg

jdhitsolutions · jdhitsolutions · commit 5ea2bb58b6f3 · 2018-10-22T15:41:17.000-04:00
diff --git a/README.md b/README.md
@@ -21,4 +21,4 @@ Or check out the individual commands:
 
 The long-term goal is to ensure that this module will work cross-platform and in PowerShell Core. Basic functionality should exist running this module on PowerShell Core, both in Windows and non-Windows environments. Support for CMS messages is limited to Windows platforms through the use of dynamic parameters. `Register-PSRemoteOperationWatcher` requires a Windows platform but should work under PowerShell Core. For non-Windows systems, you will have to come up with your own tooling for monitoring and execution using `Invoke-PSRemoteOperation`.
 
- *last updated 12 October 2018*
+ *last updated 22 October 2018*
diff --git a/changelog.md b/changelog.md
@@ -1,5 +1,9 @@
 # Change Log for PSRemoteOperations
 
+## v3.0.0
+
++ restructured module to support Core and Windows through nested modules. (Issue #9)
+
 ## v2.0.0
 
 + Added SupportsShouldProcess to `New-PSRemoteOperation`
diff --git a/core/PSRemoteOperations.psm1 b/core/PSRemoteOperations.psm1
@@ -0,0 +1,16 @@
+#region main code
+
+. $PSScriptRoot\..\functions.ps1
+. $PSScriptRoot\..\private.ps1
+
+#if running Windows on Powershell Core, include another command
+if ($isWindows) {
+    . $PSScriptRoot\..\windows\Register-PSRemoteOperationWatcher.ps1
+}
+#endregion
+
+#add default properties for the custom result object
+Update-Typedata -TypeName RemoteOpResult -DefaultDisplayPropertySet "Computername", "Date", "Scriptblock", "Filepath", "ArgumentList", "Completed", "Error" -force
+
+#add AutoCompleters
+. $PSScriptRoot\..\autocompleters.ps1
diff --git a/private.ps1 b/private.ps1
@@ -1,12 +1,4 @@
 
-#region main code
-
-. $PSScriptRoot\functions.ps1
-. $PSScriptRoot\Register-PSRemoteOperationWatcher.ps1
-
-#endregion
-
-
 #region private functions
 Function Convert-HashtableString {
     [cmdletbinding()]
@@ -108,10 +100,3 @@ Function Convert-HashTableToCode {
 } #end function
 
 #endregion
-
-#add default properties for the custom result object
-Update-Typedata -TypeName RemoteOpResult -DefaultDisplayPropertySet "Computername", "Date", "Scriptblock", "Filepath", "ArgumentList", "Completed", "Error" -force
-
-#add AutoCompleters
-. $PSScriptRoot\autocompleters.ps1
-
diff --git a/windows/PSRemoteOperations.psm1 b/windows/PSRemoteOperations.psm1
@@ -0,0 +1,15 @@
+
+#region main code
+
+. $PSScriptRoot\..\functions.ps1
+. $PSScriptRoot\..\private.ps1
+. $PSScriptRoot\Register-PSRemoteOperationWatcher.ps1
+
+#endregion
+
+#add default properties for the custom result object
+Update-Typedata -TypeName RemoteOpResult -DefaultDisplayPropertySet "Computername", "Date", "Scriptblock", "Filepath", "ArgumentList", "Completed", "Error" -force
+
+#add AutoCompleters
+. $PSScriptRoot\..\autocompleters.ps1
+
diff --git a/windows/Register-PSRemoteOperationWatcher.ps1 b/windows/Register-PSRemoteOperationWatcher.ps1
diff --git a/windows/test/PSRemoteOperations.Tests.ps1 b/windows/test/PSRemoteOperations.Tests.ps1

Original file line number	Diff line number	Diff line change
`@@ -21,4 +21,4 @@ Or check out the individual commands:`
`21`	`21`
`22`	`22`	The long-term goal is to ensure that this module will work cross-platform and in PowerShell Core. Basic functionality should exist running this module on PowerShell Core, both in Windows and non-Windows environments. Support for CMS messages is limited to Windows platforms through the use of dynamic parameters. `Register-PSRemoteOperationWatcher` requires a Windows platform but should work under PowerShell Core. For non-Windows systems, you will have to come up with your own tooling for monitoring and execution using `Invoke-PSRemoteOperation`.
`23`	`23`
`24`		`- last updated 12 October 2018`
	`24`	`+ last updated 22 October 2018`