From aa0a00b6fb66e7cde3771c7e25b9251bf3075212 Mon Sep 17 00:00:00 2001
From: Sergei Vorobev <sevoroby@microsoft.com>
Date: Thu, 28 Jul 2016 11:47:36 -0700
Subject: [PATCH 1/5] Fix Start-DevPowerShell to use upercase for PSMODULEPATH
 (unix)

---
 build.psm1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.psm1 b/build.psm1
index 4be09aa537..a87ccd54ac 100644
--- a/build.psm1
+++ b/build.psm1
@@ -973,7 +973,7 @@ function Start-DevPowerShell {
                 $ArgumentList = @('-NoExit') + $ArgumentList
             }
 
-            $Command = '$env:PSModulePath = Join-Path $env:DEVPATH Modules; ' + $Command   
+            $Command = '$env:PSMODULEPATH = Join-Path $env:DEVPATH Modules; ' + $Command
         }   
 
         if ($Command)

From e7f07688ff326ba6e1a40b3698363b5dfa58c154 Mon Sep 17 00:00:00 2001
From: Sergei Vorobev <sevoroby@microsoft.com>
Date: Thu, 28 Jul 2016 12:33:25 -0700
Subject: [PATCH 2/5] Scope Microsoft.PowerShell.Security exported functions
 for unix

---
 .../Microsoft.PowerShell.Security.psd1              | 13 +++++++++++++
 .../Microsoft.PowerShell.Security.psd1              |  0
 src/powershell-unix/project.json                    |  1 +
 3 files changed, 14 insertions(+)
 create mode 100644 src/Modules/Unix/Microsoft.PowerShell.Security/Microsoft.PowerShell.Security.psd1
 rename src/Modules/{Windows+Unix-Core => Windows-Core}/Microsoft.PowerShell.Security/Microsoft.PowerShell.Security.psd1 (100%)

diff --git a/src/Modules/Unix/Microsoft.PowerShell.Security/Microsoft.PowerShell.Security.psd1 b/src/Modules/Unix/Microsoft.PowerShell.Security/Microsoft.PowerShell.Security.psd1
new file mode 100644
index 0000000000..3140a1d1f2
--- /dev/null
+++ b/src/Modules/Unix/Microsoft.PowerShell.Security/Microsoft.PowerShell.Security.psd1
@@ -0,0 +1,13 @@
+@{
+GUID="A94C8C7E-9810-47C0-B8AF-65089C13A35A"
+Author="Microsoft Corporation"
+CompanyName="Microsoft Corporation"
+Copyright="© Microsoft Corporation. All rights reserved."
+ModuleVersion="3.0.0.0"
+PowerShellVersion="3.0"
+AliasesToExport = @()
+FunctionsToExport = @()
+CmdletsToExport="Get-Credential", "ConvertFrom-SecureString", "ConvertTo-SecureString"
+NestedModules="Microsoft.PowerShell.Security.dll"
+HelpInfoURI = 'http://go.microsoft.com/fwlink/?linkid=390786'
+}
diff --git a/src/Modules/Windows+Unix-Core/Microsoft.PowerShell.Security/Microsoft.PowerShell.Security.psd1 b/src/Modules/Windows-Core/Microsoft.PowerShell.Security/Microsoft.PowerShell.Security.psd1
similarity index 100%
rename from src/Modules/Windows+Unix-Core/Microsoft.PowerShell.Security/Microsoft.PowerShell.Security.psd1
rename to src/Modules/Windows-Core/Microsoft.PowerShell.Security/Microsoft.PowerShell.Security.psd1
diff --git a/src/powershell-unix/project.json b/src/powershell-unix/project.json
index 70f9d40ad2..3e205aa1af 100644
--- a/src/powershell-unix/project.json
+++ b/src/powershell-unix/project.json
@@ -13,6 +13,7 @@
                 "Modules/" : {
                     "include": [
                         "../Modules/Windows+Unix-Core",
+                        "../Modules/Unix",
                         "../Modules/Shared"
                     ],
                     "exclude": [

From 7a010bc40727b58a5bda6d1eb039d451d2aaba50 Mon Sep 17 00:00:00 2001
From: Sergei Vorobev <sevoroby@microsoft.com>
Date: Thu, 28 Jul 2016 12:35:21 -0700
Subject: [PATCH 3/5] Move Microsoft.PowerShell.ODataUtils to Full windows only
 modules

Fix #1548
---
 .../Microsoft.PowerShell.ODataAdapter.ps1                         | 0
 .../Microsoft.PowerShell.ODataUtils.psd1                          | 0
 .../Microsoft.PowerShell.ODataUtils.psm1                          | 0
 .../Microsoft.PowerShell.ODataUtilsHelper.ps1                     | 0
 .../Microsoft.PowerShell.ODataV4Adapter.ps1                       | 0
 .../en-US/Microsoft.PowerShell.ODataUtilsStrings.psd1             | 0
 6 files changed, 0 insertions(+), 0 deletions(-)
 rename src/Modules/{Shared => Windows-Full}/Microsoft.PowerShell.ODataUtils/Microsoft.PowerShell.ODataAdapter.ps1 (100%)
 rename src/Modules/{Shared => Windows-Full}/Microsoft.PowerShell.ODataUtils/Microsoft.PowerShell.ODataUtils.psd1 (100%)
 rename src/Modules/{Shared => Windows-Full}/Microsoft.PowerShell.ODataUtils/Microsoft.PowerShell.ODataUtils.psm1 (100%)
 rename src/Modules/{Shared => Windows-Full}/Microsoft.PowerShell.ODataUtils/Microsoft.PowerShell.ODataUtilsHelper.ps1 (100%)
 rename src/Modules/{Shared => Windows-Full}/Microsoft.PowerShell.ODataUtils/Microsoft.PowerShell.ODataV4Adapter.ps1 (100%)
 rename src/Modules/{Shared => Windows-Full}/Microsoft.PowerShell.ODataUtils/en-US/Microsoft.PowerShell.ODataUtilsStrings.psd1 (100%)

diff --git a/src/Modules/Shared/Microsoft.PowerShell.ODataUtils/Microsoft.PowerShell.ODataAdapter.ps1 b/src/Modules/Windows-Full/Microsoft.PowerShell.ODataUtils/Microsoft.PowerShell.ODataAdapter.ps1
similarity index 100%
rename from src/Modules/Shared/Microsoft.PowerShell.ODataUtils/Microsoft.PowerShell.ODataAdapter.ps1
rename to src/Modules/Windows-Full/Microsoft.PowerShell.ODataUtils/Microsoft.PowerShell.ODataAdapter.ps1
diff --git a/src/Modules/Shared/Microsoft.PowerShell.ODataUtils/Microsoft.PowerShell.ODataUtils.psd1 b/src/Modules/Windows-Full/Microsoft.PowerShell.ODataUtils/Microsoft.PowerShell.ODataUtils.psd1
similarity index 100%
rename from src/Modules/Shared/Microsoft.PowerShell.ODataUtils/Microsoft.PowerShell.ODataUtils.psd1
rename to src/Modules/Windows-Full/Microsoft.PowerShell.ODataUtils/Microsoft.PowerShell.ODataUtils.psd1
diff --git a/src/Modules/Shared/Microsoft.PowerShell.ODataUtils/Microsoft.PowerShell.ODataUtils.psm1 b/src/Modules/Windows-Full/Microsoft.PowerShell.ODataUtils/Microsoft.PowerShell.ODataUtils.psm1
similarity index 100%
rename from src/Modules/Shared/Microsoft.PowerShell.ODataUtils/Microsoft.PowerShell.ODataUtils.psm1
rename to src/Modules/Windows-Full/Microsoft.PowerShell.ODataUtils/Microsoft.PowerShell.ODataUtils.psm1
diff --git a/src/Modules/Shared/Microsoft.PowerShell.ODataUtils/Microsoft.PowerShell.ODataUtilsHelper.ps1 b/src/Modules/Windows-Full/Microsoft.PowerShell.ODataUtils/Microsoft.PowerShell.ODataUtilsHelper.ps1
similarity index 100%
rename from src/Modules/Shared/Microsoft.PowerShell.ODataUtils/Microsoft.PowerShell.ODataUtilsHelper.ps1
rename to src/Modules/Windows-Full/Microsoft.PowerShell.ODataUtils/Microsoft.PowerShell.ODataUtilsHelper.ps1
diff --git a/src/Modules/Shared/Microsoft.PowerShell.ODataUtils/Microsoft.PowerShell.ODataV4Adapter.ps1 b/src/Modules/Windows-Full/Microsoft.PowerShell.ODataUtils/Microsoft.PowerShell.ODataV4Adapter.ps1
similarity index 100%
rename from src/Modules/Shared/Microsoft.PowerShell.ODataUtils/Microsoft.PowerShell.ODataV4Adapter.ps1
rename to src/Modules/Windows-Full/Microsoft.PowerShell.ODataUtils/Microsoft.PowerShell.ODataV4Adapter.ps1
diff --git a/src/Modules/Shared/Microsoft.PowerShell.ODataUtils/en-US/Microsoft.PowerShell.ODataUtilsStrings.psd1 b/src/Modules/Windows-Full/Microsoft.PowerShell.ODataUtils/en-US/Microsoft.PowerShell.ODataUtilsStrings.psd1
similarity index 100%
rename from src/Modules/Shared/Microsoft.PowerShell.ODataUtils/en-US/Microsoft.PowerShell.ODataUtilsStrings.psd1
rename to src/Modules/Windows-Full/Microsoft.PowerShell.ODataUtils/en-US/Microsoft.PowerShell.ODataUtilsStrings.psd1

From 8889cada694310fa20e177120f5678d9dc96b058 Mon Sep 17 00:00:00 2001
From: Sergei Vorobev <sevoroby@microsoft.com>
Date: Thu, 28 Jul 2016 12:36:34 -0700
Subject: [PATCH 4/5] Update map.json in src/Modules

---
 src/Modules/map.json | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/Modules/map.json b/src/Modules/map.json
index 151c7539da..2e546e2df9 100644
--- a/src/Modules/map.json
+++ b/src/Modules/map.json
@@ -11,12 +11,12 @@
     "monad/src/oneget/PowerShell.Module/PackageManagement.psd1": "Shared/PackageManagement/PackageManagement.psd1",
     "monad/src/oneget/PowerShell.Module/PackageManagement.format.ps1xml": "Shared/PackageManagement/PackageManagement.format.ps1xml",
     "monad/src/oneget/providers/inbox/powershell.metaprovider/PackageProviderFunctions.psm1": "Shared/PackageManagement/PackageProviderFunctions.psm1",
-    "wmi/psws/PSODataUtils/Microsoft.PowerShell.ODataUtils/Microsoft.PowerShell.ODataAdapter.ps1": "Shared/Microsoft.PowerShell.ODataUtils/Microsoft.PowerShell.ODataAdapter.ps1",
-    "wmi/psws/PSODataUtils/Microsoft.PowerShell.ODataUtils/Microsoft.PowerShell.ODataUtils.psd1": "Shared/Microsoft.PowerShell.ODataUtils/Microsoft.PowerShell.ODataUtils.psd1",
-    "wmi/psws/PSODataUtils/Microsoft.PowerShell.ODataUtils/Microsoft.PowerShell.ODataUtils.psm1": "Shared/Microsoft.PowerShell.ODataUtils/Microsoft.PowerShell.ODataUtils.psm1",
-    "wmi/psws/PSODataUtils/Microsoft.PowerShell.ODataUtils/Microsoft.PowerShell.ODataUtilsHelper.ps1": "Shared/Microsoft.PowerShell.ODataUtils/Microsoft.PowerShell.ODataUtilsHelper.ps1",
-    "wmi/psws/PSODataUtils/Microsoft.PowerShell.ODataUtils/Microsoft.PowerShell.ODataV4Adapter.ps1": "Shared/Microsoft.PowerShell.ODataUtils/Microsoft.PowerShell.ODataV4Adapter.ps1",
-    "wmi/psws/PSODataUtils/Microsoft.PowerShell.ODataUtils/Microsoft.PowerShell.ODataUtilsStrings.psd1": "Shared/Microsoft.PowerShell.ODataUtils/en-US/Microsoft.PowerShell.ODataUtilsStrings.psd1",
+    "wmi/psws/PSODataUtils/Microsoft.PowerShell.ODataUtils/Microsoft.PowerShell.ODataAdapter.ps1": "Windows-Full/Microsoft.PowerShell.ODataUtils/Microsoft.PowerShell.ODataAdapter.ps1",
+    "wmi/psws/PSODataUtils/Microsoft.PowerShell.ODataUtils/Microsoft.PowerShell.ODataUtils.psd1": "Windows-Full/Microsoft.PowerShell.ODataUtils/Microsoft.PowerShell.ODataUtils.psd1",
+    "wmi/psws/PSODataUtils/Microsoft.PowerShell.ODataUtils/Microsoft.PowerShell.ODataUtils.psm1": "Windows-Full/Microsoft.PowerShell.ODataUtils/Microsoft.PowerShell.ODataUtils.psm1",
+    "wmi/psws/PSODataUtils/Microsoft.PowerShell.ODataUtils/Microsoft.PowerShell.ODataUtilsHelper.ps1": "Windows-Full/Microsoft.PowerShell.ODataUtils/Microsoft.PowerShell.ODataUtilsHelper.ps1",
+    "wmi/psws/PSODataUtils/Microsoft.PowerShell.ODataUtils/Microsoft.PowerShell.ODataV4Adapter.ps1": "Windows-Full/Microsoft.PowerShell.ODataUtils/Microsoft.PowerShell.ODataV4Adapter.ps1",
+    "wmi/psws/PSODataUtils/Microsoft.PowerShell.ODataUtils/Microsoft.PowerShell.ODataUtilsStrings.psd1": "Windows-Full/Microsoft.PowerShell.ODataUtils/en-US/Microsoft.PowerShell.ODataUtilsStrings.psd1",
     
     "wmi/WMIv2/Client/CIMCmdlets/CimCmdlets.psd1": "Windows-Core+Full/CimCmdlets/CimCmdlets.psd1",
     "monad/miscfiles/modules/Microsoft.WSMan.Management/Microsoft.WSMan.Management.psd1": "Windows-Core+Full/Microsoft.WSMan.Management/Microsoft.WSMan.Management.psd1",
@@ -44,6 +44,6 @@
     
     "monad/miscfiles/modules/Microsoft.PowerShell.Diagnostics/CoreClr/Microsoft.PowerShell.Diagnostics.psd1":  "Windows-Core/Microsoft.PowerShell.Diagnostics/Microsoft.PowerShell.Diagnostics.psd1",
 
-    "monad/miscfiles/modules/Microsoft.PowerShell.Security/CoreClr/Microsoft.PowerShell.Security.psd1": "Windows+Unix-Core/Microsoft.PowerShell.Security/Microsoft.PowerShell.Security.psd1",
+    "monad/miscfiles/modules/Microsoft.PowerShell.Security/CoreClr/Microsoft.PowerShell.Security.psd1": "Windows-Core/Microsoft.PowerShell.Security/Microsoft.PowerShell.Security.psd1",
     "monad/miscfiles/modules/Microsoft.PowerShell.Utility/CoreClr/Microsoft.PowerShell.Utility.psd1":  "Windows+Unix-Core/Microsoft.PowerShell.Utility/Microsoft.PowerShell.Utility.psd1"
 }

From 845bc34f5aad6dea32853de83465e35d9348fd8a Mon Sep 17 00:00:00 2001
From: Sergei Vorobev <sevoroby@microsoft.com>
Date: Thu, 28 Jul 2016 12:38:24 -0700
Subject: [PATCH 5/5] Update src/Modules/README.md

---
 src/Modules/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Modules/README.md b/src/Modules/README.md
index 07f8433816..ccc66161d0 100644
--- a/src/Modules/README.md
+++ b/src/Modules/README.md
@@ -16,6 +16,7 @@ These files are copied as-is by `dotnet`
 - Windows-Core
 - Windows-Core+Full
 - Windows-Full
+- Unix
 
 Notes
 -----------