From 12111b0e6f90d72744c643fa39475edc0e59c370 Mon Sep 17 00:00:00 2001 From: Sergei Vorobev Date: Thu, 30 Jun 2016 18:06:43 -0700 Subject: [PATCH] Move modules shared between frameworks in Module/Shared folder --- .gitmodules | 2 +- .../AppxProvider/AppxProvider.Resource.psd1 | Bin .../{ => Shared}/AppxProvider/AppxProvider.psd1 | Bin .../{ => Shared}/AppxProvider/AppxProvider.psm1 | 0 src/Modules/{ => Shared}/CimCmdlets/CimCmdlets.psd1 | Bin .../ArchiveResources.psd1 | Bin .../Microsoft.PowerShell.Archive.psd1 | 0 .../Microsoft.PowerShell.Archive.psm1 | Bin .../Microsoft.PowerShell.Host.psd1 | 0 .../LocalAccounts.format.ps1xml | 0 .../Microsoft.PowerShell.LocalAccounts.psd1 | Bin .../Microsoft.PowerShell.Management.psd1 | 0 .../Microsoft.PowerShell.ODataAdapter.ps1 | Bin .../Microsoft.PowerShell.ODataUtils.psd1 | Bin .../Microsoft.PowerShell.ODataUtils.psm1 | Bin .../Microsoft.PowerShell.ODataUtilsHelper.ps1 | Bin .../Microsoft.PowerShell.ODataV4Adapter.ps1 | 0 .../Microsoft.PowerShell.ODataUtilsStrings.psd1 | Bin .../Microsoft.PowerShell.Security.psd1 | 0 .../Microsoft.PowerShell.Utility.psm1 | 0 .../Microsoft.WSMan.Management.psd1 | 0 .../{ => Shared}/PSDiagnostics/PSDiagnostics.psd1 | Bin .../{ => Shared}/PSDiagnostics/PSDiagnostics.psm1 | Bin src/Modules/{ => Shared}/PSReadLine/PSReadLine.psd1 | 0 src/Modules/{ => Shared}/PSReadLine/PSReadLine.psm1 | 0 .../PackageManagement.format.ps1xml | 0 .../PackageManagement/PackageManagement.psd1 | 0 .../PackageManagement/PackageProviderFunctions.psm1 | 0 src/Modules/{ => Shared}/Pester | 0 .../{ => Shared}/PowerShellGet/PSGet.Format.ps1xml | 0 .../{ => Shared}/PowerShellGet/PSGet.Resource.psd1 | Bin .../{ => Shared}/PowerShellGet/PSModule.psm1 | 0 .../{ => Shared}/PowerShellGet/PowerShellGet.psd1 | Bin 33 files changed, 1 insertion(+), 1 deletion(-) rename src/Modules/{ => Shared}/AppxProvider/AppxProvider.Resource.psd1 (100%) rename src/Modules/{ => Shared}/AppxProvider/AppxProvider.psd1 (100%) rename src/Modules/{ => Shared}/AppxProvider/AppxProvider.psm1 (100%) rename src/Modules/{ => Shared}/CimCmdlets/CimCmdlets.psd1 (100%) rename src/Modules/{ => Shared}/Microsoft.PowerShell.Archive/ArchiveResources.psd1 (100%) rename src/Modules/{ => Shared}/Microsoft.PowerShell.Archive/Microsoft.PowerShell.Archive.psd1 (100%) rename src/Modules/{ => Shared}/Microsoft.PowerShell.Archive/Microsoft.PowerShell.Archive.psm1 (100%) rename src/Modules/{ => Shared}/Microsoft.PowerShell.Host/Microsoft.PowerShell.Host.psd1 (100%) rename src/Modules/{ => Shared}/Microsoft.PowerShell.LocalAccounts/LocalAccounts.format.ps1xml (100%) rename src/Modules/{ => Shared}/Microsoft.PowerShell.LocalAccounts/Microsoft.PowerShell.LocalAccounts.psd1 (100%) rename src/Modules/{ => Shared}/Microsoft.PowerShell.Management/Microsoft.PowerShell.Management.psd1 (100%) rename src/Modules/{ => Shared}/Microsoft.PowerShell.ODataUtils/Microsoft.PowerShell.ODataAdapter.ps1 (100%) rename src/Modules/{ => Shared}/Microsoft.PowerShell.ODataUtils/Microsoft.PowerShell.ODataUtils.psd1 (100%) rename src/Modules/{ => Shared}/Microsoft.PowerShell.ODataUtils/Microsoft.PowerShell.ODataUtils.psm1 (100%) rename src/Modules/{ => Shared}/Microsoft.PowerShell.ODataUtils/Microsoft.PowerShell.ODataUtilsHelper.ps1 (100%) rename src/Modules/{ => Shared}/Microsoft.PowerShell.ODataUtils/Microsoft.PowerShell.ODataV4Adapter.ps1 (100%) rename src/Modules/{ => Shared}/Microsoft.PowerShell.ODataUtils/en-US/Microsoft.PowerShell.ODataUtilsStrings.psd1 (100%) rename src/Modules/{ => Shared}/Microsoft.PowerShell.Security/Microsoft.PowerShell.Security.psd1 (100%) rename src/Modules/{ => Shared}/Microsoft.PowerShell.Utility/Microsoft.PowerShell.Utility.psm1 (100%) rename src/Modules/{ => Shared}/Microsoft.WSMan.Management/Microsoft.WSMan.Management.psd1 (100%) rename src/Modules/{ => Shared}/PSDiagnostics/PSDiagnostics.psd1 (100%) rename src/Modules/{ => Shared}/PSDiagnostics/PSDiagnostics.psm1 (100%) rename src/Modules/{ => Shared}/PSReadLine/PSReadLine.psd1 (100%) rename src/Modules/{ => Shared}/PSReadLine/PSReadLine.psm1 (100%) rename src/Modules/{ => Shared}/PackageManagement/PackageManagement.format.ps1xml (100%) rename src/Modules/{ => Shared}/PackageManagement/PackageManagement.psd1 (100%) rename src/Modules/{ => Shared}/PackageManagement/PackageProviderFunctions.psm1 (100%) rename src/Modules/{ => Shared}/Pester (100%) rename src/Modules/{ => Shared}/PowerShellGet/PSGet.Format.ps1xml (100%) rename src/Modules/{ => Shared}/PowerShellGet/PSGet.Resource.psd1 (100%) rename src/Modules/{ => Shared}/PowerShellGet/PSModule.psm1 (100%) rename src/Modules/{ => Shared}/PowerShellGet/PowerShellGet.psd1 (100%) diff --git a/.gitmodules b/.gitmodules index c991d073e..17765f683 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,5 +1,5 @@ [submodule "src/Modules/Pester"] - path = src/Modules/Pester + path = src/Modules/Shared/Pester url = https://github.com/PowerShell/psl-pester.git branch = develop ignore = dirty diff --git a/src/Modules/AppxProvider/AppxProvider.Resource.psd1 b/src/Modules/Shared/AppxProvider/AppxProvider.Resource.psd1 similarity index 100% rename from src/Modules/AppxProvider/AppxProvider.Resource.psd1 rename to src/Modules/Shared/AppxProvider/AppxProvider.Resource.psd1 diff --git a/src/Modules/AppxProvider/AppxProvider.psd1 b/src/Modules/Shared/AppxProvider/AppxProvider.psd1 similarity index 100% rename from src/Modules/AppxProvider/AppxProvider.psd1 rename to src/Modules/Shared/AppxProvider/AppxProvider.psd1 diff --git a/src/Modules/AppxProvider/AppxProvider.psm1 b/src/Modules/Shared/AppxProvider/AppxProvider.psm1 similarity index 100% rename from src/Modules/AppxProvider/AppxProvider.psm1 rename to src/Modules/Shared/AppxProvider/AppxProvider.psm1 diff --git a/src/Modules/CimCmdlets/CimCmdlets.psd1 b/src/Modules/Shared/CimCmdlets/CimCmdlets.psd1 similarity index 100% rename from src/Modules/CimCmdlets/CimCmdlets.psd1 rename to src/Modules/Shared/CimCmdlets/CimCmdlets.psd1 diff --git a/src/Modules/Microsoft.PowerShell.Archive/ArchiveResources.psd1 b/src/Modules/Shared/Microsoft.PowerShell.Archive/ArchiveResources.psd1 similarity index 100% rename from src/Modules/Microsoft.PowerShell.Archive/ArchiveResources.psd1 rename to src/Modules/Shared/Microsoft.PowerShell.Archive/ArchiveResources.psd1 diff --git a/src/Modules/Microsoft.PowerShell.Archive/Microsoft.PowerShell.Archive.psd1 b/src/Modules/Shared/Microsoft.PowerShell.Archive/Microsoft.PowerShell.Archive.psd1 similarity index 100% rename from src/Modules/Microsoft.PowerShell.Archive/Microsoft.PowerShell.Archive.psd1 rename to src/Modules/Shared/Microsoft.PowerShell.Archive/Microsoft.PowerShell.Archive.psd1 diff --git a/src/Modules/Microsoft.PowerShell.Archive/Microsoft.PowerShell.Archive.psm1 b/src/Modules/Shared/Microsoft.PowerShell.Archive/Microsoft.PowerShell.Archive.psm1 similarity index 100% rename from src/Modules/Microsoft.PowerShell.Archive/Microsoft.PowerShell.Archive.psm1 rename to src/Modules/Shared/Microsoft.PowerShell.Archive/Microsoft.PowerShell.Archive.psm1 diff --git a/src/Modules/Microsoft.PowerShell.Host/Microsoft.PowerShell.Host.psd1 b/src/Modules/Shared/Microsoft.PowerShell.Host/Microsoft.PowerShell.Host.psd1 similarity index 100% rename from src/Modules/Microsoft.PowerShell.Host/Microsoft.PowerShell.Host.psd1 rename to src/Modules/Shared/Microsoft.PowerShell.Host/Microsoft.PowerShell.Host.psd1 diff --git a/src/Modules/Microsoft.PowerShell.LocalAccounts/LocalAccounts.format.ps1xml b/src/Modules/Shared/Microsoft.PowerShell.LocalAccounts/LocalAccounts.format.ps1xml similarity index 100% rename from src/Modules/Microsoft.PowerShell.LocalAccounts/LocalAccounts.format.ps1xml rename to src/Modules/Shared/Microsoft.PowerShell.LocalAccounts/LocalAccounts.format.ps1xml diff --git a/src/Modules/Microsoft.PowerShell.LocalAccounts/Microsoft.PowerShell.LocalAccounts.psd1 b/src/Modules/Shared/Microsoft.PowerShell.LocalAccounts/Microsoft.PowerShell.LocalAccounts.psd1 similarity index 100% rename from src/Modules/Microsoft.PowerShell.LocalAccounts/Microsoft.PowerShell.LocalAccounts.psd1 rename to src/Modules/Shared/Microsoft.PowerShell.LocalAccounts/Microsoft.PowerShell.LocalAccounts.psd1 diff --git a/src/Modules/Microsoft.PowerShell.Management/Microsoft.PowerShell.Management.psd1 b/src/Modules/Shared/Microsoft.PowerShell.Management/Microsoft.PowerShell.Management.psd1 similarity index 100% rename from src/Modules/Microsoft.PowerShell.Management/Microsoft.PowerShell.Management.psd1 rename to src/Modules/Shared/Microsoft.PowerShell.Management/Microsoft.PowerShell.Management.psd1 diff --git a/src/Modules/Microsoft.PowerShell.ODataUtils/Microsoft.PowerShell.ODataAdapter.ps1 b/src/Modules/Shared/Microsoft.PowerShell.ODataUtils/Microsoft.PowerShell.ODataAdapter.ps1 similarity index 100% rename from src/Modules/Microsoft.PowerShell.ODataUtils/Microsoft.PowerShell.ODataAdapter.ps1 rename to src/Modules/Shared/Microsoft.PowerShell.ODataUtils/Microsoft.PowerShell.ODataAdapter.ps1 diff --git a/src/Modules/Microsoft.PowerShell.ODataUtils/Microsoft.PowerShell.ODataUtils.psd1 b/src/Modules/Shared/Microsoft.PowerShell.ODataUtils/Microsoft.PowerShell.ODataUtils.psd1 similarity index 100% rename from src/Modules/Microsoft.PowerShell.ODataUtils/Microsoft.PowerShell.ODataUtils.psd1 rename to src/Modules/Shared/Microsoft.PowerShell.ODataUtils/Microsoft.PowerShell.ODataUtils.psd1 diff --git a/src/Modules/Microsoft.PowerShell.ODataUtils/Microsoft.PowerShell.ODataUtils.psm1 b/src/Modules/Shared/Microsoft.PowerShell.ODataUtils/Microsoft.PowerShell.ODataUtils.psm1 similarity index 100% rename from src/Modules/Microsoft.PowerShell.ODataUtils/Microsoft.PowerShell.ODataUtils.psm1 rename to src/Modules/Shared/Microsoft.PowerShell.ODataUtils/Microsoft.PowerShell.ODataUtils.psm1 diff --git a/src/Modules/Microsoft.PowerShell.ODataUtils/Microsoft.PowerShell.ODataUtilsHelper.ps1 b/src/Modules/Shared/Microsoft.PowerShell.ODataUtils/Microsoft.PowerShell.ODataUtilsHelper.ps1 similarity index 100% rename from src/Modules/Microsoft.PowerShell.ODataUtils/Microsoft.PowerShell.ODataUtilsHelper.ps1 rename to src/Modules/Shared/Microsoft.PowerShell.ODataUtils/Microsoft.PowerShell.ODataUtilsHelper.ps1 diff --git a/src/Modules/Microsoft.PowerShell.ODataUtils/Microsoft.PowerShell.ODataV4Adapter.ps1 b/src/Modules/Shared/Microsoft.PowerShell.ODataUtils/Microsoft.PowerShell.ODataV4Adapter.ps1 similarity index 100% rename from src/Modules/Microsoft.PowerShell.ODataUtils/Microsoft.PowerShell.ODataV4Adapter.ps1 rename to src/Modules/Shared/Microsoft.PowerShell.ODataUtils/Microsoft.PowerShell.ODataV4Adapter.ps1 diff --git a/src/Modules/Microsoft.PowerShell.ODataUtils/en-US/Microsoft.PowerShell.ODataUtilsStrings.psd1 b/src/Modules/Shared/Microsoft.PowerShell.ODataUtils/en-US/Microsoft.PowerShell.ODataUtilsStrings.psd1 similarity index 100% rename from src/Modules/Microsoft.PowerShell.ODataUtils/en-US/Microsoft.PowerShell.ODataUtilsStrings.psd1 rename to src/Modules/Shared/Microsoft.PowerShell.ODataUtils/en-US/Microsoft.PowerShell.ODataUtilsStrings.psd1 diff --git a/src/Modules/Microsoft.PowerShell.Security/Microsoft.PowerShell.Security.psd1 b/src/Modules/Shared/Microsoft.PowerShell.Security/Microsoft.PowerShell.Security.psd1 similarity index 100% rename from src/Modules/Microsoft.PowerShell.Security/Microsoft.PowerShell.Security.psd1 rename to src/Modules/Shared/Microsoft.PowerShell.Security/Microsoft.PowerShell.Security.psd1 diff --git a/src/Modules/Microsoft.PowerShell.Utility/Microsoft.PowerShell.Utility.psm1 b/src/Modules/Shared/Microsoft.PowerShell.Utility/Microsoft.PowerShell.Utility.psm1 similarity index 100% rename from src/Modules/Microsoft.PowerShell.Utility/Microsoft.PowerShell.Utility.psm1 rename to src/Modules/Shared/Microsoft.PowerShell.Utility/Microsoft.PowerShell.Utility.psm1 diff --git a/src/Modules/Microsoft.WSMan.Management/Microsoft.WSMan.Management.psd1 b/src/Modules/Shared/Microsoft.WSMan.Management/Microsoft.WSMan.Management.psd1 similarity index 100% rename from src/Modules/Microsoft.WSMan.Management/Microsoft.WSMan.Management.psd1 rename to src/Modules/Shared/Microsoft.WSMan.Management/Microsoft.WSMan.Management.psd1 diff --git a/src/Modules/PSDiagnostics/PSDiagnostics.psd1 b/src/Modules/Shared/PSDiagnostics/PSDiagnostics.psd1 similarity index 100% rename from src/Modules/PSDiagnostics/PSDiagnostics.psd1 rename to src/Modules/Shared/PSDiagnostics/PSDiagnostics.psd1 diff --git a/src/Modules/PSDiagnostics/PSDiagnostics.psm1 b/src/Modules/Shared/PSDiagnostics/PSDiagnostics.psm1 similarity index 100% rename from src/Modules/PSDiagnostics/PSDiagnostics.psm1 rename to src/Modules/Shared/PSDiagnostics/PSDiagnostics.psm1 diff --git a/src/Modules/PSReadLine/PSReadLine.psd1 b/src/Modules/Shared/PSReadLine/PSReadLine.psd1 similarity index 100% rename from src/Modules/PSReadLine/PSReadLine.psd1 rename to src/Modules/Shared/PSReadLine/PSReadLine.psd1 diff --git a/src/Modules/PSReadLine/PSReadLine.psm1 b/src/Modules/Shared/PSReadLine/PSReadLine.psm1 similarity index 100% rename from src/Modules/PSReadLine/PSReadLine.psm1 rename to src/Modules/Shared/PSReadLine/PSReadLine.psm1 diff --git a/src/Modules/PackageManagement/PackageManagement.format.ps1xml b/src/Modules/Shared/PackageManagement/PackageManagement.format.ps1xml similarity index 100% rename from src/Modules/PackageManagement/PackageManagement.format.ps1xml rename to src/Modules/Shared/PackageManagement/PackageManagement.format.ps1xml diff --git a/src/Modules/PackageManagement/PackageManagement.psd1 b/src/Modules/Shared/PackageManagement/PackageManagement.psd1 similarity index 100% rename from src/Modules/PackageManagement/PackageManagement.psd1 rename to src/Modules/Shared/PackageManagement/PackageManagement.psd1 diff --git a/src/Modules/PackageManagement/PackageProviderFunctions.psm1 b/src/Modules/Shared/PackageManagement/PackageProviderFunctions.psm1 similarity index 100% rename from src/Modules/PackageManagement/PackageProviderFunctions.psm1 rename to src/Modules/Shared/PackageManagement/PackageProviderFunctions.psm1 diff --git a/src/Modules/Pester b/src/Modules/Shared/Pester similarity index 100% rename from src/Modules/Pester rename to src/Modules/Shared/Pester diff --git a/src/Modules/PowerShellGet/PSGet.Format.ps1xml b/src/Modules/Shared/PowerShellGet/PSGet.Format.ps1xml similarity index 100% rename from src/Modules/PowerShellGet/PSGet.Format.ps1xml rename to src/Modules/Shared/PowerShellGet/PSGet.Format.ps1xml diff --git a/src/Modules/PowerShellGet/PSGet.Resource.psd1 b/src/Modules/Shared/PowerShellGet/PSGet.Resource.psd1 similarity index 100% rename from src/Modules/PowerShellGet/PSGet.Resource.psd1 rename to src/Modules/Shared/PowerShellGet/PSGet.Resource.psd1 diff --git a/src/Modules/PowerShellGet/PSModule.psm1 b/src/Modules/Shared/PowerShellGet/PSModule.psm1 similarity index 100% rename from src/Modules/PowerShellGet/PSModule.psm1 rename to src/Modules/Shared/PowerShellGet/PSModule.psm1 diff --git a/src/Modules/PowerShellGet/PowerShellGet.psd1 b/src/Modules/Shared/PowerShellGet/PowerShellGet.psd1 similarity index 100% rename from src/Modules/PowerShellGet/PowerShellGet.psd1 rename to src/Modules/Shared/PowerShellGet/PowerShellGet.psd1