From ffbdb41fe5f56c2268346a65d96107ee4a5abb52 Mon Sep 17 00:00:00 2001 From: Sergei Vorobev Date: Thu, 30 Jun 2016 16:02:07 -0700 Subject: [PATCH 01/23] Add Convert-TxtResourceToXml function to build.psm1 --- build.psm1 | 156 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 156 insertions(+) diff --git a/build.psm1 b/build.psm1 index 3207df83a..9c359fb1d 100644 --- a/build.psm1 +++ b/build.psm1 @@ -986,6 +986,37 @@ function Find-Dotnet() { } } +<# + This is one-time convertion. We use it for to turn GetEventResources.txt into GetEventResources.resx + + .EXAMPLE Convert-TxtResourceToXml -Path Microsoft.PowerShell.Commands.Diagnostics\resources +#> +function Convert-TxtResourceToXml +{ + param( + [string[]]$Path + ) + + process + { + $Path | % { + Get-ChildItem $_ -Filter "*.txt" | % { + $txtFile = $_.FullName + $resxFile = Join-Path (Split-Path $txtFile) "$($_.BaseName).resx" + $resourceHashtable = ConvertFrom-StringData (Get-Content -Raw $txtFile) + $resxContent = $resourceHashtable.GetEnumerator() | % { +@' + + {1} + +'@ -f $_.Key, $_.Value + } | Out-String + Set-Content -Path $resxFile -Value ($script:RESX_TEMPLATE -f $resxContent) + } + } + } +} + function Start-XamlGen { [CmdletBinding()] @@ -1557,3 +1588,128 @@ function New-AppxPackage return $appxPackagePath } + + +$script:RESX_TEMPLATE = @' + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + +{0} + +'@ \ No newline at end of file From 8d22c75fe899e46e8e2a2c6aa72fc1bf3769d8ea Mon Sep 17 00:00:00 2001 From: Sergei Vorobev Date: Thu, 30 Jun 2016 16:02:42 -0700 Subject: [PATCH 02/23] GetEventResources.txt into GetEventResources.resx for Microsoft.PowerShell.Commands.Diagnostics resources --- .../resources/GetEventResources.resx | 289 ++++++++++++++++++ 1 file changed, 289 insertions(+) create mode 100644 src/Microsoft.PowerShell.Commands.Diagnostics/resources/GetEventResources.resx diff --git a/src/Microsoft.PowerShell.Commands.Diagnostics/resources/GetEventResources.resx b/src/Microsoft.PowerShell.Commands.Diagnostics/resources/GetEventResources.resx new file mode 100644 index 000000000..350312484 --- /dev/null +++ b/src/Microsoft.PowerShell.Commands.Diagnostics/resources/GetEventResources.resx @@ -0,0 +1,289 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + The {0} file does not have the expected file name extension. Specify only .blg, .csv, or .tsv files when you use the Path parameter. + + + Internal performance counter API call failed. Error: {0:x8}. + + + You must specify at least one Log, Provider or Path key-value pair. + + + There is not an event provider on the {0} computer that matches "{1}". + + + A null value was encountered in the {0} hash table key. Null values are not permitted. + + + Constructed structured query: +{0}. + + + The {0} provider writes events to the {1} log. + + + The value of the StartTime parameter must be less than the value of the EndTime parameter. + + + There is not an event log on the {0} computer that matches "{1}". + + + Microsoft + + + The Circular parameter will be ignored unless the MaxSize parameter is also specified. + + + Unable to open the {0} file for writing. + + + Invalid value '{0}' specified for keyword. + + + The {0} performance counter cannot be exported to the {1} file because it was not part of the first sample set. + + + No events were found that match the specified selection criteria. + + + The default values for this command failed. Error: {0:x8}. + + + You cannot import different types of performance log files in the same command. Specify only one type of file in the Path parameter. + + + The {0} path does not appear to be a valid log file path. Specify a valid file system path. + + + A valid Event Id must be specified. + + + Could not retrieve information about the {0} provider. Error: {1}. + + + The {0} event log can be read only in the forward chronological order because it is an analytical or a debug log. To see events from the {0} event log, use the Oldest parameter in the command. + + + The following export destination path is ambiguous: {0}. + + + The {0} performance counter path is not valid. + + + The data in one of the performance counter samples is not valid. View the Status property for each PerformanceCounterSample object to make sure it contains valid data. + + + Provided payload does not match with the template that was defined for event id {0}. +The defined template is following: +{1} + + + Cannot find any performance counter sets on the {0} computer that match the following: {1}. + + + No valid counter paths were found in the files. + + + Unable to create the {0} file. Verify that the path is valid. + + + Could not find any performance counter sets on the {0} computer: error {1:x8}. Verify that the {0} computer exists, that it is discoverable, and that you have sufficient privileges to view performance counter data on that computer. + + + Event cannot be written because there are no events defined with id {0} for the provider {1}. Please correct the event id and try again. + + + The {0} Context key-value is not a valid SID or NT account name. + + + Event cannot be written because the specified version {0} for event {1} is not defined for the provider {2}. Please correct the version and try again. + + + The {0} format type is not a valid format for a counter file. Possible values for the Format parameter are .blg, .csv, or .tsv. + + + You cannot import more than 32 .blg counter log files in each command. + + + The specified providers do not write events to the {0} log. This log will be ignored. + + + The following value is not in a valid security identifier (SID) format: {0}. Enter a valid SID, such as S-1-5-32-544. + + + No provider found with name {0}. + + + Cannot retrieve information about the {0} performance counter set because access was denied. + + + Event cannot be written because multiple events with id {0} have beend defined for provider {1}. Please provide a version for the event and try again. + + + The {0} event log file can be read only in the forward chronological order because it is an .etl or an .evt file. To see events from the {0} event log, use the Oldest parameter in the command. + + + Provider name must be specified. + + + The {0} file does not appear to be a valid log file. Specify only .evtx, .etl, or .evt files as values of the Path parameter. + + + The {0} performance counter path is either not valid or it is not present in the following files: {1}. + + + Timestamp + + + The following value is not in a valid DateTime format: {0}. + + + Could not retrieve information about the {0} log. Error: {1}. + + + Cannot retrieve event message text. + + + The {0} file already exists. To overwrite this file, use the Force parameter in the Export-Counter command. + + + The Continuous parameter and the MaxSamples parameter cannot be used in the same command. + + + This cmdlet can be run only on Microsoft Windows 7 and above. + + + This Windows PowerShell snap-in contains Windows Eventing and Performance Counter cmdlets. + + + Cannot find any performance counter sets in the {0} files that match the following: {1}. + + + The specified providers do not write events to any of the specified logs. + + + Cooked Values + + + You cannot import more than one comma-separated (.csv) or tab-separated (.tsv) performance counter file in each command. + + + From b755212f5dd4da128d096a99abe7711b762953cc Mon Sep 17 00:00:00 2001 From: Sergei Vorobev Date: Thu, 30 Jun 2016 16:07:53 -0700 Subject: [PATCH 03/23] Fix GetEventResources problem in Microsoft.PowerShell.Commands.Diagnostics -Move logic about instantiating ResourceManager in one place -Add CommonUtils.cs to CoreCLR build -Update resources generation with dotnet cli naming pattern --- .../CommonUtils.cs | 17 +++++++++-------- .../CounterSample.cs | 2 +- .../ExportCounterCommand.cs | 2 +- .../GetCounterCommand.cs | 2 +- .../GetEventCommand.cs | 2 +- .../ImportCounterCommand.cs | 2 +- .../NewWinEventCommand.cs | 4 ++-- .../project.json | 3 +-- 8 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/Microsoft.PowerShell.Commands.Diagnostics/CommonUtils.cs b/src/Microsoft.PowerShell.Commands.Diagnostics/CommonUtils.cs index cd2050f3d..e51685365 100644 --- a/src/Microsoft.PowerShell.Commands.Diagnostics/CommonUtils.cs +++ b/src/Microsoft.PowerShell.Commands.Diagnostics/CommonUtils.cs @@ -3,19 +3,14 @@ using System.Collections; using System.Diagnostics; using System.Runtime.InteropServices; using System.Text; - +using System.Resources; +using System.Reflection; namespace Microsoft.PowerShell.Commands.Diagnostics.Common { - internal class CommonUtilities + internal static class CommonUtilities { - // - // No-op private ctor to prevent the default ctor from getting generated. - // This class is intended to only have static members. - // - private CommonUtilities() { } - // // StringArrayToString helper converts a string array into a comma-separated string. // Note this has only limited use, individual strings cannot have commas. @@ -117,6 +112,12 @@ namespace Microsoft.PowerShell.Commands.Diagnostics.Common return formatError; } + public static ResourceManager GetResourceManager() + { + // this naming pattern is dictated by the dotnet cli + return new ResourceManager("Microsoft.PowerShell.Commands.Diagnostics.resources.GetEventResources", typeof(CommonUtilities).GetTypeInfo().Assembly); + } + } } diff --git a/src/Microsoft.PowerShell.Commands.Diagnostics/CounterSample.cs b/src/Microsoft.PowerShell.Commands.Diagnostics/CounterSample.cs index 29bdd7845..a7cdd86d1 100644 --- a/src/Microsoft.PowerShell.Commands.Diagnostics/CounterSample.cs +++ b/src/Microsoft.PowerShell.Commands.Diagnostics/CounterSample.cs @@ -145,7 +145,7 @@ namespace Microsoft.PowerShell.Commands.GetCounter { internal PerformanceCounterSampleSet() { - _resourceMgr = new ResourceManager("GetEventResources", Assembly.GetExecutingAssembly()); + _resourceMgr = Microsoft.PowerShell.Commands.Diagnostics.Common.CommonUtilities.GetResourceManager(); } internal PerformanceCounterSampleSet (DateTime timeStamp, diff --git a/src/Microsoft.PowerShell.Commands.Diagnostics/ExportCounterCommand.cs b/src/Microsoft.PowerShell.Commands.Diagnostics/ExportCounterCommand.cs index 9104fc838..49246e66f 100644 --- a/src/Microsoft.PowerShell.Commands.Diagnostics/ExportCounterCommand.cs +++ b/src/Microsoft.PowerShell.Commands.Diagnostics/ExportCounterCommand.cs @@ -152,7 +152,7 @@ namespace Microsoft.PowerShell.Commands protected override void BeginProcessing() { - _resourceMgr = new ResourceManager("GetEventResources", Assembly.GetExecutingAssembly()); + _resourceMgr = Microsoft.PowerShell.Commands.Diagnostics.Common.CommonUtilities.GetResourceManager(); // // Determine the OS version: this cmdlet requires Windows 7 diff --git a/src/Microsoft.PowerShell.Commands.Diagnostics/GetCounterCommand.cs b/src/Microsoft.PowerShell.Commands.Diagnostics/GetCounterCommand.cs index b0eac6410..815f10705 100644 --- a/src/Microsoft.PowerShell.Commands.Diagnostics/GetCounterCommand.cs +++ b/src/Microsoft.PowerShell.Commands.Diagnostics/GetCounterCommand.cs @@ -203,7 +203,7 @@ namespace Microsoft.PowerShell.Commands // protected override void BeginProcessing() { - _resourceMgr = new ResourceManager("GetEventResources", Assembly.GetExecutingAssembly()); + _resourceMgr = Microsoft.PowerShell.Commands.Diagnostics.Common.CommonUtilities.GetResourceManager(); _pdhHelper = new PdhHelper(System.Environment.OSVersion.Version.Major < 6); uint res = _pdhHelper.ConnectToDataSource(); diff --git a/src/Microsoft.PowerShell.Commands.Diagnostics/GetEventCommand.cs b/src/Microsoft.PowerShell.Commands.Diagnostics/GetEventCommand.cs index 019c0b014..f8dfa499a 100644 --- a/src/Microsoft.PowerShell.Commands.Diagnostics/GetEventCommand.cs +++ b/src/Microsoft.PowerShell.Commands.Diagnostics/GetEventCommand.cs @@ -396,7 +396,7 @@ namespace Microsoft.PowerShell.Commands // protected override void BeginProcessing() { - _resourceMgr = new ResourceManager("GetEventResources", typeof(GetWinEventCommand).GetTypeInfo().Assembly); + _resourceMgr = Microsoft.PowerShell.Commands.Diagnostics.Common.CommonUtilities.GetResourceManager(); } diff --git a/src/Microsoft.PowerShell.Commands.Diagnostics/ImportCounterCommand.cs b/src/Microsoft.PowerShell.Commands.Diagnostics/ImportCounterCommand.cs index a54c5e7b5..ffa460119 100644 --- a/src/Microsoft.PowerShell.Commands.Diagnostics/ImportCounterCommand.cs +++ b/src/Microsoft.PowerShell.Commands.Diagnostics/ImportCounterCommand.cs @@ -189,7 +189,7 @@ namespace Microsoft.PowerShell.Commands // protected override void BeginProcessing() { - _resourceMgr = new ResourceManager("GetEventResources", Assembly.GetExecutingAssembly()); + _resourceMgr = Microsoft.PowerShell.Commands.Diagnostics.Common.CommonUtilities.GetResourceManager(); _pdhHelper = new PdhHelper(System.Environment.OSVersion.Version.Major < 6); } diff --git a/src/Microsoft.PowerShell.Commands.Diagnostics/NewWinEventCommand.cs b/src/Microsoft.PowerShell.Commands.Diagnostics/NewWinEventCommand.cs index 7c4326540..0f80fa729 100644 --- a/src/Microsoft.PowerShell.Commands.Diagnostics/NewWinEventCommand.cs +++ b/src/Microsoft.PowerShell.Commands.Diagnostics/NewWinEventCommand.cs @@ -13,7 +13,7 @@ using System.Diagnostics.CodeAnalysis; using System.Collections.Generic; using System.Xml; using System.IO; - + namespace Microsoft.PowerShell.Commands { /// @@ -28,7 +28,7 @@ namespace Microsoft.PowerShell.Commands private const string TemplateTag = "template"; private const string DataTag = "data"; - private ResourceManager _resourceMgr = new ResourceManager("GetEventResources", typeof(NewWinEventCommand).GetTypeInfo().Assembly); + private ResourceManager _resourceMgr = Microsoft.PowerShell.Commands.Diagnostics.Common.CommonUtilities.GetResourceManager(); /// diff --git a/src/Microsoft.PowerShell.Commands.Diagnostics/project.json b/src/Microsoft.PowerShell.Commands.Diagnostics/project.json index 9796030c2..231795604 100644 --- a/src/Microsoft.PowerShell.Commands.Diagnostics/project.json +++ b/src/Microsoft.PowerShell.Commands.Diagnostics/project.json @@ -29,8 +29,7 @@ "ExportCounterCommand.cs", "GetCounterCommand.cs", "ImportCounterCommand.cs", - "CounterFileInfo.cs", - "CommonUtils.cs" + "CounterFileInfo.cs" ] } } From c1d1b52869877ab3b7f0d01a78dc2e62bfc4fcea Mon Sep 17 00:00:00 2001 From: Sergei Vorobev Date: Thu, 30 Jun 2016 16:19:03 -0700 Subject: [PATCH 04/23] Exclude map.json files from copyToOutput and publishOptions --- src/Microsoft.PowerShell.ConsoleHost/project.json | 9 ++++++++- src/powershell/project.json | 9 ++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/Microsoft.PowerShell.ConsoleHost/project.json b/src/Microsoft.PowerShell.ConsoleHost/project.json index f79fb421f..52fe110c9 100644 --- a/src/Microsoft.PowerShell.ConsoleHost/project.json +++ b/src/Microsoft.PowerShell.ConsoleHost/project.json @@ -15,6 +15,11 @@ "../Modules", "powershell.exe", "../../powershell.version" + ], + "exclude": [ + "../Modules/Pester/.git", + "../Modules/map.json", + "Modules/map.json" ] } }, @@ -27,7 +32,9 @@ "../../powershell.version" ], "exclude": [ - "../Modules/Pester/.git" + "../Modules/Pester/.git", + "../Modules/map.json", + "Modules/map.json" ] }, diff --git a/src/powershell/project.json b/src/powershell/project.json index d2c95ad0d..45d9c7407 100644 --- a/src/powershell/project.json +++ b/src/powershell/project.json @@ -14,6 +14,11 @@ "*.so", "*.dylib", "../../powershell.version" + ], + "exclude": [ + "../Modules/Pester/.git", + "../Modules/map.json", + "Modules/map.json" ] } }, @@ -27,7 +32,9 @@ "../../powershell.version" ], "exclude": [ - "../Modules/Pester/.git" + "../Modules/Pester/.git", + "../Modules/map.json", + "Modules/map.json" ] }, From 777ba09bce5885d5ea6ee4a488d2ca79dd936b7e Mon Sep 17 00:00:00 2001 From: Sergei Vorobev Date: Thu, 30 Jun 2016 16:32:59 -0700 Subject: [PATCH 05/23] Add a simple test for Get-WinEvent on windows (Core + Full) --- test/fullclr/PowerShellGithubDev.Tests.ps1 | 14 ++++++++++++++ .../Get-WinEvent.Tests.ps1 | 7 +++++++ 2 files changed, 21 insertions(+) create mode 100644 test/powershell/Modules/Microsoft.PowerShell.Diagnostics/Get-WinEvent.Tests.ps1 diff --git a/test/fullclr/PowerShellGithubDev.Tests.ps1 b/test/fullclr/PowerShellGithubDev.Tests.ps1 index 9e3601735..944ee69bc 100644 --- a/test/fullclr/PowerShellGithubDev.Tests.ps1 +++ b/test/fullclr/PowerShellGithubDev.Tests.ps1 @@ -122,6 +122,20 @@ try Remove-Module -ErrorAction SilentlyContinue CimCmdlets } } + + It 'loads Microsoft.PowerShell.Diagnostics' { + try + { + Import-Module Microsoft.PowerShell.Diagnostics -ErrorAction Stop + Get-WinEvent -LogName System -MaxEvents 1 | Should Not Be $null + [Microsoft.PowerShell.Commands.GetWinEventCommand].Assembly.Location | Should Be ( + Join-Path $env:DEVPATH Microsoft.PowerShell.Commands.Diagnostics.dll) + } + finally + { + Remove-Module -ErrorAction SilentlyContinue Microsoft.PowerShell.Diagnostics + } + } } } diff --git a/test/powershell/Modules/Microsoft.PowerShell.Diagnostics/Get-WinEvent.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Diagnostics/Get-WinEvent.Tests.ps1 new file mode 100644 index 000000000..fc438e94b --- /dev/null +++ b/test/powershell/Modules/Microsoft.PowerShell.Diagnostics/Get-WinEvent.Tests.ps1 @@ -0,0 +1,7 @@ +Describe 'Get-WinEvent' { + + # Get-WinEvent works only on windows + It 'can query a System log' -Skip:(-not $IsWindows) { + Get-WinEvent -LogName System -MaxEvents 1 | Should Not Be $null + } +} From 916d17e95832dd7d3a97ce2bb345262d1d8beaa7 Mon Sep 17 00:00:00 2001 From: Sergei Vorobev Date: Thu, 30 Jun 2016 16:42:58 -0700 Subject: [PATCH 06/23] Fix Microsoft.PowerShell.ConsoleHost/map.json --- build.psm1 | 11 ++++++++++- src/Microsoft.PowerShell.ConsoleHost/map.json | 2 +- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/build.psm1 b/build.psm1 index 9c359fb1d..6120e7309 100644 --- a/build.psm1 +++ b/build.psm1 @@ -841,7 +841,16 @@ function Get-Mappings { $map = @{} $mapFiles | % { - $rawHashtable = $_ | Get-Content -Raw | ConvertFrom-Json | Convert-PSObjectToHashtable + $file = $_ + try + { + $rawHashtable = $_ | Get-Content -Raw | ConvertFrom-Json | Convert-PSObjectToHashtable + } + catch + { + Write-Error "Exception, when processing $($file.FullName): $_" + } + $mapRoot = Split-Path $_.FullName if ($KeepRelativePaths) { diff --git a/src/Microsoft.PowerShell.ConsoleHost/map.json b/src/Microsoft.PowerShell.ConsoleHost/map.json index 293e288db..472b2f6e6 100644 --- a/src/Microsoft.PowerShell.ConsoleHost/map.json +++ b/src/Microsoft.PowerShell.ConsoleHost/map.json @@ -30,5 +30,5 @@ "monad/src/host/msh/resources/ManagedEntranceStrings.resx": "resources/ManagedEntranceStrings.resx", "monad/src/singleshell/installer/EngineInstaller.cs": "singleshell/installer/EngineInstaller.cs", "monad/src/host/msh/ConsoleHostRawUserInterface.cs": "host/msh/ConsoleHostRawUserInterface.cs", - "monad/src/host/msh/ConsoleHost.cs": "host/msh/ConsoleHost.cs", + "monad/src/host/msh/ConsoleHost.cs": "host/msh/ConsoleHost.cs" } From 12111b0e6f90d72744c643fa39475edc0e59c370 Mon Sep 17 00:00:00 2001 From: Sergei Vorobev Date: Thu, 30 Jun 2016 18:06:43 -0700 Subject: [PATCH 07/23] 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 From e4e3206621206655440d342d43a742d033d6d22c Mon Sep 17 00:00:00 2001 From: Sergei Vorobev Date: Thu, 30 Jun 2016 18:15:10 -0700 Subject: [PATCH 08/23] Move modules for Full in Module/Full --- .../Microsoft.PowerShell.Diagnostics.psd1 | 0 .../Microsoft.PowerShell.Utility.psd1 | 0 .../PSScheduledJob/PSScheduledJob.Format.ps1xml | Bin .../Full}/PSScheduledJob/PSScheduledJob.psd1 | 0 .../PSScheduledJob/PSScheduledJob.types.ps1xml | Bin .../Full}/PSWorkflow/PSWorkflow.psd1 | Bin .../Full}/PSWorkflow/PSWorkflow.psm1 | Bin .../Full}/PSWorkflow/PSWorkflow.types.ps1xml | Bin .../Full}/PSWorkflowUtility/PSWorkflowUtility.psd1 | Bin .../Full}/PSWorkflowUtility/PSWorkflowUtility.psm1 | Bin .../Modules => Modules/Full}/map.json | 0 11 files changed, 0 insertions(+), 0 deletions(-) rename src/{Microsoft.PowerShell.ConsoleHost/Modules => Modules/Full}/Microsoft.PowerShell.Diagnostics/Microsoft.PowerShell.Diagnostics.psd1 (100%) rename src/{Microsoft.PowerShell.ConsoleHost/Modules => Modules/Full}/Microsoft.PowerShell.Utility/Microsoft.PowerShell.Utility.psd1 (100%) rename src/{Microsoft.PowerShell.ConsoleHost/Modules => Modules/Full}/PSScheduledJob/PSScheduledJob.Format.ps1xml (100%) rename src/{Microsoft.PowerShell.ConsoleHost/Modules => Modules/Full}/PSScheduledJob/PSScheduledJob.psd1 (100%) rename src/{Microsoft.PowerShell.ConsoleHost/Modules => Modules/Full}/PSScheduledJob/PSScheduledJob.types.ps1xml (100%) rename src/{Microsoft.PowerShell.ConsoleHost/Modules => Modules/Full}/PSWorkflow/PSWorkflow.psd1 (100%) rename src/{Microsoft.PowerShell.ConsoleHost/Modules => Modules/Full}/PSWorkflow/PSWorkflow.psm1 (100%) rename src/{Microsoft.PowerShell.ConsoleHost/Modules => Modules/Full}/PSWorkflow/PSWorkflow.types.ps1xml (100%) rename src/{Microsoft.PowerShell.ConsoleHost/Modules => Modules/Full}/PSWorkflowUtility/PSWorkflowUtility.psd1 (100%) rename src/{Microsoft.PowerShell.ConsoleHost/Modules => Modules/Full}/PSWorkflowUtility/PSWorkflowUtility.psm1 (100%) rename src/{Microsoft.PowerShell.ConsoleHost/Modules => Modules/Full}/map.json (100%) diff --git a/src/Microsoft.PowerShell.ConsoleHost/Modules/Microsoft.PowerShell.Diagnostics/Microsoft.PowerShell.Diagnostics.psd1 b/src/Modules/Full/Microsoft.PowerShell.Diagnostics/Microsoft.PowerShell.Diagnostics.psd1 similarity index 100% rename from src/Microsoft.PowerShell.ConsoleHost/Modules/Microsoft.PowerShell.Diagnostics/Microsoft.PowerShell.Diagnostics.psd1 rename to src/Modules/Full/Microsoft.PowerShell.Diagnostics/Microsoft.PowerShell.Diagnostics.psd1 diff --git a/src/Microsoft.PowerShell.ConsoleHost/Modules/Microsoft.PowerShell.Utility/Microsoft.PowerShell.Utility.psd1 b/src/Modules/Full/Microsoft.PowerShell.Utility/Microsoft.PowerShell.Utility.psd1 similarity index 100% rename from src/Microsoft.PowerShell.ConsoleHost/Modules/Microsoft.PowerShell.Utility/Microsoft.PowerShell.Utility.psd1 rename to src/Modules/Full/Microsoft.PowerShell.Utility/Microsoft.PowerShell.Utility.psd1 diff --git a/src/Microsoft.PowerShell.ConsoleHost/Modules/PSScheduledJob/PSScheduledJob.Format.ps1xml b/src/Modules/Full/PSScheduledJob/PSScheduledJob.Format.ps1xml similarity index 100% rename from src/Microsoft.PowerShell.ConsoleHost/Modules/PSScheduledJob/PSScheduledJob.Format.ps1xml rename to src/Modules/Full/PSScheduledJob/PSScheduledJob.Format.ps1xml diff --git a/src/Microsoft.PowerShell.ConsoleHost/Modules/PSScheduledJob/PSScheduledJob.psd1 b/src/Modules/Full/PSScheduledJob/PSScheduledJob.psd1 similarity index 100% rename from src/Microsoft.PowerShell.ConsoleHost/Modules/PSScheduledJob/PSScheduledJob.psd1 rename to src/Modules/Full/PSScheduledJob/PSScheduledJob.psd1 diff --git a/src/Microsoft.PowerShell.ConsoleHost/Modules/PSScheduledJob/PSScheduledJob.types.ps1xml b/src/Modules/Full/PSScheduledJob/PSScheduledJob.types.ps1xml similarity index 100% rename from src/Microsoft.PowerShell.ConsoleHost/Modules/PSScheduledJob/PSScheduledJob.types.ps1xml rename to src/Modules/Full/PSScheduledJob/PSScheduledJob.types.ps1xml diff --git a/src/Microsoft.PowerShell.ConsoleHost/Modules/PSWorkflow/PSWorkflow.psd1 b/src/Modules/Full/PSWorkflow/PSWorkflow.psd1 similarity index 100% rename from src/Microsoft.PowerShell.ConsoleHost/Modules/PSWorkflow/PSWorkflow.psd1 rename to src/Modules/Full/PSWorkflow/PSWorkflow.psd1 diff --git a/src/Microsoft.PowerShell.ConsoleHost/Modules/PSWorkflow/PSWorkflow.psm1 b/src/Modules/Full/PSWorkflow/PSWorkflow.psm1 similarity index 100% rename from src/Microsoft.PowerShell.ConsoleHost/Modules/PSWorkflow/PSWorkflow.psm1 rename to src/Modules/Full/PSWorkflow/PSWorkflow.psm1 diff --git a/src/Microsoft.PowerShell.ConsoleHost/Modules/PSWorkflow/PSWorkflow.types.ps1xml b/src/Modules/Full/PSWorkflow/PSWorkflow.types.ps1xml similarity index 100% rename from src/Microsoft.PowerShell.ConsoleHost/Modules/PSWorkflow/PSWorkflow.types.ps1xml rename to src/Modules/Full/PSWorkflow/PSWorkflow.types.ps1xml diff --git a/src/Microsoft.PowerShell.ConsoleHost/Modules/PSWorkflowUtility/PSWorkflowUtility.psd1 b/src/Modules/Full/PSWorkflowUtility/PSWorkflowUtility.psd1 similarity index 100% rename from src/Microsoft.PowerShell.ConsoleHost/Modules/PSWorkflowUtility/PSWorkflowUtility.psd1 rename to src/Modules/Full/PSWorkflowUtility/PSWorkflowUtility.psd1 diff --git a/src/Microsoft.PowerShell.ConsoleHost/Modules/PSWorkflowUtility/PSWorkflowUtility.psm1 b/src/Modules/Full/PSWorkflowUtility/PSWorkflowUtility.psm1 similarity index 100% rename from src/Microsoft.PowerShell.ConsoleHost/Modules/PSWorkflowUtility/PSWorkflowUtility.psm1 rename to src/Modules/Full/PSWorkflowUtility/PSWorkflowUtility.psm1 diff --git a/src/Microsoft.PowerShell.ConsoleHost/Modules/map.json b/src/Modules/Full/map.json similarity index 100% rename from src/Microsoft.PowerShell.ConsoleHost/Modules/map.json rename to src/Modules/Full/map.json From 7e9fcaef29044033dc0de2221609461e8530540c Mon Sep 17 00:00:00 2001 From: Sergei Vorobev Date: Thu, 30 Jun 2016 18:16:30 -0700 Subject: [PATCH 09/23] Move modules for Core in Module/Core --- .../Microsoft.PowerShell.Diagnostics.psd1 | 0 .../Microsoft.PowerShell.Management.psd1 | 0 .../Microsoft.PowerShell.Security.psd1 | 0 .../Microsoft.PowerShell.Utility.psd1 | 0 .../Microsoft.PowerShell.Utility.psm1 | 0 .../Core}/PSDiagnostics/PSDiagnostics.psd1 | Bin .../Core}/PSDiagnostics/PSDiagnostics.psm1 | Bin 7 files changed, 0 insertions(+), 0 deletions(-) rename src/{powershell/Modules => Modules/Core}/Microsoft.PowerShell.Diagnostics/Microsoft.PowerShell.Diagnostics.psd1 (100%) rename src/{powershell/Modules => Modules/Core}/Microsoft.PowerShell.Management/Microsoft.PowerShell.Management.psd1 (100%) rename src/{powershell/Modules => Modules/Core}/Microsoft.PowerShell.Security/Microsoft.PowerShell.Security.psd1 (100%) rename src/{powershell/Modules => Modules/Core}/Microsoft.PowerShell.Utility/Microsoft.PowerShell.Utility.psd1 (100%) rename src/{powershell/Modules => Modules/Core}/Microsoft.PowerShell.Utility/Microsoft.PowerShell.Utility.psm1 (100%) rename src/{powershell/Modules => Modules/Core}/PSDiagnostics/PSDiagnostics.psd1 (100%) rename src/{powershell/Modules => Modules/Core}/PSDiagnostics/PSDiagnostics.psm1 (100%) diff --git a/src/powershell/Modules/Microsoft.PowerShell.Diagnostics/Microsoft.PowerShell.Diagnostics.psd1 b/src/Modules/Core/Microsoft.PowerShell.Diagnostics/Microsoft.PowerShell.Diagnostics.psd1 similarity index 100% rename from src/powershell/Modules/Microsoft.PowerShell.Diagnostics/Microsoft.PowerShell.Diagnostics.psd1 rename to src/Modules/Core/Microsoft.PowerShell.Diagnostics/Microsoft.PowerShell.Diagnostics.psd1 diff --git a/src/powershell/Modules/Microsoft.PowerShell.Management/Microsoft.PowerShell.Management.psd1 b/src/Modules/Core/Microsoft.PowerShell.Management/Microsoft.PowerShell.Management.psd1 similarity index 100% rename from src/powershell/Modules/Microsoft.PowerShell.Management/Microsoft.PowerShell.Management.psd1 rename to src/Modules/Core/Microsoft.PowerShell.Management/Microsoft.PowerShell.Management.psd1 diff --git a/src/powershell/Modules/Microsoft.PowerShell.Security/Microsoft.PowerShell.Security.psd1 b/src/Modules/Core/Microsoft.PowerShell.Security/Microsoft.PowerShell.Security.psd1 similarity index 100% rename from src/powershell/Modules/Microsoft.PowerShell.Security/Microsoft.PowerShell.Security.psd1 rename to src/Modules/Core/Microsoft.PowerShell.Security/Microsoft.PowerShell.Security.psd1 diff --git a/src/powershell/Modules/Microsoft.PowerShell.Utility/Microsoft.PowerShell.Utility.psd1 b/src/Modules/Core/Microsoft.PowerShell.Utility/Microsoft.PowerShell.Utility.psd1 similarity index 100% rename from src/powershell/Modules/Microsoft.PowerShell.Utility/Microsoft.PowerShell.Utility.psd1 rename to src/Modules/Core/Microsoft.PowerShell.Utility/Microsoft.PowerShell.Utility.psd1 diff --git a/src/powershell/Modules/Microsoft.PowerShell.Utility/Microsoft.PowerShell.Utility.psm1 b/src/Modules/Core/Microsoft.PowerShell.Utility/Microsoft.PowerShell.Utility.psm1 similarity index 100% rename from src/powershell/Modules/Microsoft.PowerShell.Utility/Microsoft.PowerShell.Utility.psm1 rename to src/Modules/Core/Microsoft.PowerShell.Utility/Microsoft.PowerShell.Utility.psm1 diff --git a/src/powershell/Modules/PSDiagnostics/PSDiagnostics.psd1 b/src/Modules/Core/PSDiagnostics/PSDiagnostics.psd1 similarity index 100% rename from src/powershell/Modules/PSDiagnostics/PSDiagnostics.psd1 rename to src/Modules/Core/PSDiagnostics/PSDiagnostics.psd1 diff --git a/src/powershell/Modules/PSDiagnostics/PSDiagnostics.psm1 b/src/Modules/Core/PSDiagnostics/PSDiagnostics.psm1 similarity index 100% rename from src/powershell/Modules/PSDiagnostics/PSDiagnostics.psm1 rename to src/Modules/Core/PSDiagnostics/PSDiagnostics.psm1 From 0c2ed6f1241840da32c854096511379caef2df0e Mon Sep 17 00:00:00 2001 From: Sergei Vorobev Date: Thu, 30 Jun 2016 18:23:40 -0700 Subject: [PATCH 10/23] Update Modules map.json files --- src/Modules/Full/map.json | 12 ------- src/Modules/map.json | 70 +++++++++++++++++++++++---------------- src/powershell/map.json | 4 --- 3 files changed, 41 insertions(+), 45 deletions(-) delete mode 100644 src/Modules/Full/map.json delete mode 100644 src/powershell/map.json diff --git a/src/Modules/Full/map.json b/src/Modules/Full/map.json deleted file mode 100644 index d060b10a2..000000000 --- a/src/Modules/Full/map.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "monad/miscfiles/modules/Microsoft.PowerShell.Diagnostics/Microsoft.PowerShell.Diagnostics.psd1": "Microsoft.PowerShell.Diagnostics/Microsoft.PowerShell.Diagnostics.psd1", - "monad/miscfiles/modules/Microsoft.PowerShell.Utility/Microsoft.PowerShell.Utility.psd1": "Microsoft.PowerShell.Utility/Microsoft.PowerShell.Utility.psd1", - "monad/src/ScheduledJob/PSScheduledJob.Format.ps1xml": "PSScheduledJob/PSScheduledJob.Format.ps1xml", - "monad/src/ScheduledJob/PSScheduledJob.psd1": "PSScheduledJob/PSScheduledJob.psd1", - "monad/src/ScheduledJob/PSScheduledJob.types.ps1xml": "PSScheduledJob/PSScheduledJob.types.ps1xml", - "monad/src/m3p/product/PSWorkflow.psd1" : "PSWorkflow/PSWorkflow.psd1", - "monad/src/m3p/product/PSWorkflow.psm1" : "PSWorkflow/PSWorkflow.psm1", - "monad/src/m3p/product/PSWorkflow.types.ps1xml" : "PSWorkflow/PSWorkflow.types.ps1xml", - "monad/src/m3p/product/PSWorkflowUtility.psd1" : "PSWorkflowUtility/PSWorkflowUtility.psd1", - "monad/src/m3p/product/PSWorkflowUtility.psm1" : "PSWorkflowUtility/PSWorkflowUtility.psm1" -} diff --git a/src/Modules/map.json b/src/Modules/map.json index d2f5fe1de..462efd4ab 100644 --- a/src/Modules/map.json +++ b/src/Modules/map.json @@ -1,31 +1,43 @@ { - "monad/miscfiles/modules/PSDiagnostics/PSDiagnostics.psd1": "PSDiagnostics/PSDiagnostics.psd1", - "monad/miscfiles/modules/Microsoft.PowerShell.Archive/Microsoft.PowerShell.Archive.psm1": "Microsoft.PowerShell.Archive/Microsoft.PowerShell.Archive.psm1", - "monad/miscfiles/modules/Microsoft.PowerShell.Management/Microsoft.PowerShell.Management.psd1": "Microsoft.PowerShell.Management/Microsoft.PowerShell.Management.psd1", - "monad/miscfiles/modules/Microsoft.WSMan.Management/Microsoft.WSMan.Management.psd1": "Microsoft.WSMan.Management/Microsoft.WSMan.Management.psd1", - "monad/miscfiles/modules/PSDiagnostics/PSDiagnostics.psm1": "PSDiagnostics/PSDiagnostics.psm1", - "monad/miscfiles/modules/AppxProvider/AppxProvider.psm1": "AppxProvider/AppxProvider.psm1", - "monad/miscfiles/modules/Microsoft.PowerShell.Archive/Microsoft.PowerShell.Archive.psd1": "Microsoft.PowerShell.Archive/Microsoft.PowerShell.Archive.psd1", - "monad/miscfiles/modules/Microsoft.PowerShell.Utility/Microsoft.PowerShell.Utility.psm1": "Microsoft.PowerShell.Utility/Microsoft.PowerShell.Utility.psm1", - "monad/miscfiles/modules/Microsoft.PowerShell.Security/Microsoft.PowerShell.Security.psd1": "Microsoft.PowerShell.Security/Microsoft.PowerShell.Security.psd1", - "monad/miscfiles/modules/Microsoft.PowerShell.Archive/ArchiveResources.psd1": "Microsoft.PowerShell.Archive/ArchiveResources.psd1", - "monad/miscfiles/modules/PSGet/PSGet.psd1": "PowerShellGet/PowerShellGet.psd1", - "monad/miscfiles/modules/PSGet/PSModule.psm1": "PowerShellGet/PSModule.psm1", - "monad/miscfiles/modules/PSGet/PSGet.Format.ps1xml": "PowerShellGet/PSGet.Format.ps1xml", - "monad/miscfiles/modules/PSGet/PSGet.Resource.psd1": "PowerShellGet/PSGet.Resource.psd1", - "monad/miscfiles/modules/Microsoft.PowerShell.Host/Microsoft.PowerShell.Host.psd1": "Microsoft.PowerShell.Host/Microsoft.PowerShell.Host.psd1", - "monad/miscfiles/modules/AppxProvider/AppxProvider.Resource.psd1": "AppxProvider/AppxProvider.Resource.psd1", - "monad/miscfiles/modules/AppxProvider/AppxProvider.psd1": "AppxProvider/AppxProvider.psd1", - "monad/src/LocalAccounts/Microsoft.PowerShell.LocalAccounts.psd1": "Microsoft.PowerShell.LocalAccounts/Microsoft.PowerShell.LocalAccounts.psd1", - "monad/src/LocalAccounts/LocalAccounts.format.ps1xml": "Microsoft.PowerShell.LocalAccounts/LocalAccounts.format.ps1xml", - "monad/src/oneget/PowerShell.Module/PackageManagement.psd1": "PackageManagement/PackageManagement.psd1", - "monad/src/oneget/PowerShell.Module/PackageManagement.format.ps1xml": "PackageManagement/PackageManagement.format.ps1xml", - "monad/src/oneget/providers/inbox/powershell.metaprovider/PackageProviderFunctions.psm1": "PackageManagement/PackageProviderFunctions.psm1", - "wmi/psws/PSODataUtils/Microsoft.PowerShell.ODataUtils/Microsoft.PowerShell.ODataAdapter.ps1": "Microsoft.PowerShell.ODataUtils/Microsoft.PowerShell.ODataAdapter.ps1", - "wmi/psws/PSODataUtils/Microsoft.PowerShell.ODataUtils/Microsoft.PowerShell.ODataUtils.psd1": "Microsoft.PowerShell.ODataUtils/Microsoft.PowerShell.ODataUtils.psd1", - "wmi/psws/PSODataUtils/Microsoft.PowerShell.ODataUtils/Microsoft.PowerShell.ODataUtils.psm1": "Microsoft.PowerShell.ODataUtils/Microsoft.PowerShell.ODataUtils.psm1", - "wmi/psws/PSODataUtils/Microsoft.PowerShell.ODataUtils/Microsoft.PowerShell.ODataUtilsHelper.ps1": "Microsoft.PowerShell.ODataUtils/Microsoft.PowerShell.ODataUtilsHelper.ps1", - "wmi/psws/PSODataUtils/Microsoft.PowerShell.ODataUtils/Microsoft.PowerShell.ODataV4Adapter.ps1": "Microsoft.PowerShell.ODataUtils/Microsoft.PowerShell.ODataV4Adapter.ps1", - "wmi/psws/PSODataUtils/Microsoft.PowerShell.ODataUtils/Microsoft.PowerShell.ODataUtilsStrings.psd1": "Microsoft.PowerShell.ODataUtils/en-US/Microsoft.PowerShell.ODataUtilsStrings.psd1", - "wmi/WMIv2/Client/CIMCmdlets/CimCmdlets.psd1" : "CimCmdlets/CimCmdlets.psd1" + "monad/miscfiles/modules/PSDiagnostics/PSDiagnostics.psd1": "Shared/PSDiagnostics/PSDiagnostics.psd1", + "monad/miscfiles/modules/Microsoft.PowerShell.Archive/Microsoft.PowerShell.Archive.psm1": "Shared/Microsoft.PowerShell.Archive/Microsoft.PowerShell.Archive.psm1", + "monad/miscfiles/modules/Microsoft.PowerShell.Management/Microsoft.PowerShell.Management.psd1": "Shared/Microsoft.PowerShell.Management/Microsoft.PowerShell.Management.psd1", + "monad/miscfiles/modules/Microsoft.WSMan.Management/Microsoft.WSMan.Management.psd1": "Shared/Microsoft.WSMan.Management/Microsoft.WSMan.Management.psd1", + "monad/miscfiles/modules/PSDiagnostics/PSDiagnostics.psm1": "Shared/PSDiagnostics/PSDiagnostics.psm1", + "monad/miscfiles/modules/AppxProvider/AppxProvider.psm1": "Shared/AppxProvider/AppxProvider.psm1", + "monad/miscfiles/modules/Microsoft.PowerShell.Archive/Microsoft.PowerShell.Archive.psd1": "Shared/Microsoft.PowerShell.Archive/Microsoft.PowerShell.Archive.psd1", + "monad/miscfiles/modules/Microsoft.PowerShell.Utility/Microsoft.PowerShell.Utility.psm1": "Shared/Microsoft.PowerShell.Utility/Microsoft.PowerShell.Utility.psm1", + "monad/miscfiles/modules/Microsoft.PowerShell.Security/Microsoft.PowerShell.Security.psd1": "Shared/Microsoft.PowerShell.Security/Microsoft.PowerShell.Security.psd1", + "monad/miscfiles/modules/Microsoft.PowerShell.Archive/ArchiveResources.psd1": "Shared/Microsoft.PowerShell.Archive/ArchiveResources.psd1", + "monad/miscfiles/modules/PSGet/PSGet.psd1": "Shared/PowerShellGet/PowerShellGet.psd1", + "monad/miscfiles/modules/PSGet/PSModule.psm1": "Shared/PowerShellGet/PSModule.psm1", + "monad/miscfiles/modules/PSGet/PSGet.Format.ps1xml": "Shared/PowerShellGet/PSGet.Format.ps1xml", + "monad/miscfiles/modules/PSGet/PSGet.Resource.psd1": "Shared/PowerShellGet/PSGet.Resource.psd1", + "monad/miscfiles/modules/Microsoft.PowerShell.Host/Microsoft.PowerShell.Host.psd1": "Shared/Microsoft.PowerShell.Host/Microsoft.PowerShell.Host.psd1", + "monad/miscfiles/modules/AppxProvider/AppxProvider.Resource.psd1": "Shared/AppxProvider/AppxProvider.Resource.psd1", + "monad/miscfiles/modules/AppxProvider/AppxProvider.psd1": "Shared/AppxProvider/AppxProvider.psd1", + "monad/src/LocalAccounts/Microsoft.PowerShell.LocalAccounts.psd1": "Shared/Microsoft.PowerShell.LocalAccounts/Microsoft.PowerShell.LocalAccounts.psd1", + "monad/src/LocalAccounts/LocalAccounts.format.ps1xml": "Shared/Microsoft.PowerShell.LocalAccounts/LocalAccounts.format.ps1xml", + "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/WMIv2/Client/CIMCmdlets/CimCmdlets.psd1": "Shared/CimCmdlets/CimCmdlets.psd1", + "monad/miscfiles/modules/Microsoft.PowerShell.Diagnostics/Microsoft.PowerShell.Diagnostics.psd1": "Full/Microsoft.PowerShell.Diagnostics/Microsoft.PowerShell.Diagnostics.psd1", + "monad/miscfiles/modules/Microsoft.PowerShell.Utility/Microsoft.PowerShell.Utility.psd1": "Full/Microsoft.PowerShell.Utility/Microsoft.PowerShell.Utility.psd1", + "monad/src/ScheduledJob/PSScheduledJob.Format.ps1xml": "Full/PSScheduledJob/PSScheduledJob.Format.ps1xml", + "monad/src/ScheduledJob/PSScheduledJob.psd1": "Full/PSScheduledJob/PSScheduledJob.psd1", + "monad/src/ScheduledJob/PSScheduledJob.types.ps1xml": "Full/PSScheduledJob/PSScheduledJob.types.ps1xml", + "monad/src/m3p/product/PSWorkflow.psd1": "Full/PSWorkflow/PSWorkflow.psd1", + "monad/src/m3p/product/PSWorkflow.psm1": "Full/PSWorkflow/PSWorkflow.psm1", + "monad/src/m3p/product/PSWorkflow.types.ps1xml": "Full/PSWorkflow/PSWorkflow.types.ps1xml", + "monad/src/m3p/product/PSWorkflowUtility.psd1": "Full/PSWorkflowUtility/PSWorkflowUtility.psd1", + "monad/src/m3p/product/PSWorkflowUtility.psm1": "Full/PSWorkflowUtility/PSWorkflowUtility.psm1", + "monad/miscfiles/modules/Microsoft.PowerShell.Diagnostics/CoreClr/Microsoft.PowerShell.Diagnostics.psd1": "Core/Microsoft.PowerShell.Diagnostics/Microsoft.PowerShell.Diagnostics.psd1", + "monad/miscfiles/modules/Microsoft.PowerShell.Utility/CoreClr/Microsoft.PowerShell.Utility.psd1": "Core/Microsoft.PowerShell.Utility/Microsoft.PowerShell.Utility.psd1" } diff --git a/src/powershell/map.json b/src/powershell/map.json deleted file mode 100644 index bde38359e..000000000 --- a/src/powershell/map.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "monad/miscfiles/modules/Microsoft.PowerShell.Diagnostics/CoreClr/Microsoft.PowerShell.Diagnostics.psd1": "Modules/Microsoft.PowerShell.Diagnostics/Microsoft.PowerShell.Diagnostics.psd1", - "monad/miscfiles/modules/Microsoft.PowerShell.Utility/CoreClr/Microsoft.PowerShell.Utility.psd1": "Modules/Microsoft.PowerShell.Utility/Microsoft.PowerShell.Utility.psd1" -} From afbf9dd2e146d387e5c13c2b90f967c8e619301e Mon Sep 17 00:00:00 2001 From: Sergei Vorobev Date: Thu, 30 Jun 2016 18:29:24 -0700 Subject: [PATCH 11/23] Update project.json files to take Modules only from src/Modules --- .../project.json | 40 +++++++++++-------- src/powershell/project.json | 36 ++++++++++------- 2 files changed, 46 insertions(+), 30 deletions(-) diff --git a/src/Microsoft.PowerShell.ConsoleHost/project.json b/src/Microsoft.PowerShell.ConsoleHost/project.json index 52fe110c9..45486d007 100644 --- a/src/Microsoft.PowerShell.ConsoleHost/project.json +++ b/src/Microsoft.PowerShell.ConsoleHost/project.json @@ -10,31 +10,39 @@ "warningsAsErrors": true, "allowUnsafe": true, "copyToOutput": { - "include": [ - "Modules", - "../Modules", + "mappings": { + "Modules/" : { + "include": [ + "../Modules/Full", + "../Modules/Shared" + ], + "exclude": [ + "../Modules/Shared/Pester/.git" + ] + } + }, + "include" : [ "powershell.exe", "../../powershell.version" - ], - "exclude": [ - "../Modules/Pester/.git", - "../Modules/map.json", - "Modules/map.json" ] } }, "publishOptions": { - "include": [ - "Modules", - "../Modules", + "mappings": { + "Modules/" : { + "include": [ + "../Modules/Full", + "../Modules/Shared" + ], + "exclude": [ + "../Modules/Shared/Pester/.git" + ] + } + }, + "include" : [ "powershell.exe", "../../powershell.version" - ], - "exclude": [ - "../Modules/Pester/.git", - "../Modules/map.json", - "Modules/map.json" ] }, diff --git a/src/powershell/project.json b/src/powershell/project.json index 45d9c7407..da0f261c7 100644 --- a/src/powershell/project.json +++ b/src/powershell/project.json @@ -8,34 +8,42 @@ "allowUnsafe": true, "emitEntryPoint": true, "copyToOutput": { + "mappings": { + "Modules/" : { + "include": [ + "../Modules/Core", + "../Modules/Shared" + ], + "exclude": [ + "../Modules/Shared/Pester/.git" + ] + } + }, "include": [ - "Modules", - "../Modules", "*.so", "*.dylib", "../../powershell.version" ], - "exclude": [ - "../Modules/Pester/.git", - "../Modules/map.json", - "Modules/map.json" - ] } }, "publishOptions": { + "mappings": { + "Modules/" : { + "include": [ + "../Modules/Core", + "../Modules/Shared" + ], + "exclude": [ + "../Modules/Shared/Pester/.git" + ] + } + }, "include": [ - "Modules", - "../Modules", "*.so", "*.dylib", "../../powershell.version" ], - "exclude": [ - "../Modules/Pester/.git", - "../Modules/map.json", - "Modules/map.json" - ] }, "dependencies": { From 1035ed30ecd7e07e6d6d6858bc3016414d650282 Mon Sep 17 00:00:00 2001 From: Sergei Vorobev Date: Thu, 30 Jun 2016 18:41:55 -0700 Subject: [PATCH 12/23] Move Modules related notes from internals.md into src/Modules/README.md --- docs/building/internals.md | 11 ----------- src/Modules/README.md | 25 +++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 11 deletions(-) create mode 100644 src/Modules/README.md diff --git a/docs/building/internals.md b/docs/building/internals.md index ca22828a8..f9bc60729 100644 --- a/docs/building/internals.md +++ b/docs/building/internals.md @@ -32,14 +32,3 @@ it should be listed as a dependency for FullCLR $Top folder (src\Microsoft.Power * If assembly is part of CoreCLR build, it should be listed as a dependency for CoreCLR $Top folder (src\powershell) - - -Modules ----------- - -There are 3 modules directories with the same purpose: they have **content** files (i.e. `*.psm1`, `*.psd1`) -which would be binplaced by `dotnet` - -- `src\Modules` shared between all flavours -- `src\Microsoft.PowerShell.ConsoleHost\Modules` FullCLR (Windows) -- `src\powershell\Modules` CoreCLR (all platforms) diff --git a/src/Modules/README.md b/src/Modules/README.md new file mode 100644 index 000000000..d651071fb --- /dev/null +++ b/src/Modules/README.md @@ -0,0 +1,25 @@ +Modules +========== + +There are 3 directories with **content** files. +Content files includes: + +- ps1xml +- psm1 +- psd1 +- ps1 + +These files are copyied as-is by `dotnet` + +- **Shared** is shared between all flavours +- **Full** for FullCLR (Windows) +- **Core** for CoreCLR (all platforms) + +Notes +----------- + +* We have files with the same names in "Full" and "Core" folders. +That means that the contents of these two files are different. +I.e. if it's .psd1 file, it could be because `CmdletsToExport` are different for different platforms. + +* Also, we should never have files with the same names under "Full" and "Shared" (or "Core" and "Shared"). From c01ee38d5e7c2d43692ed800ea171819c3e44e1c Mon Sep 17 00:00:00 2001 From: Sergei Vorobev Date: Thu, 30 Jun 2016 18:45:20 -0700 Subject: [PATCH 13/23] Speed-up CimCmdlets FullCLR test --- test/fullclr/PowerShellGithubDev.Tests.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/fullclr/PowerShellGithubDev.Tests.ps1 b/test/fullclr/PowerShellGithubDev.Tests.ps1 index 944ee69bc..2868d2b44 100644 --- a/test/fullclr/PowerShellGithubDev.Tests.ps1 +++ b/test/fullclr/PowerShellGithubDev.Tests.ps1 @@ -115,7 +115,7 @@ try try { Import-Module CimCmdlets -ErrorAction Stop - Get-CimClass | Should Not Be $null + Get-CimClass -ClassName CIM_Error | Should Not Be $null } finally { From 4af28157400a5a536942d59b4c8c87ef1a522196 Mon Sep 17 00:00:00 2001 From: Sergei Vorobev Date: Thu, 30 Jun 2016 23:44:21 -0700 Subject: [PATCH 14/23] don't call specific submodules init in CI: get them all --- .travis.yml | 2 +- appveyor.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0c65a78a8..e0709ce23 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,7 @@ git: submodules: false before_install: - git config --global url.git@github.com:.insteadOf https://github.com/ - - git submodule update --init -- src/Modules/Pester src/libpsl-native/test/googletest + - git submodule update --init - ./tools/download.sh script: - ulimit -n 4096; powershell -c "Import-Module ./build.psm1; Start-PSBootstrap; Start-PSBuild -Publish; Start-PSPester; Start-PSxUnit" diff --git a/appveyor.yml b/appveyor.yml index 5f469df7d..e9d50fd4a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -18,7 +18,7 @@ install: - ps: $fileContent += "`n-----END RSA PRIVATE KEY-----`n" - ps: Set-Content c:\users\appveyor\.ssh\id_rsa $fileContent - git config --global url.git@github.com:.insteadOf https://github.com/ - - git submodule update --init -- src/Modules/Pester + - git submodule update --init - ps: Import-Module .\build.psm1; Start-PSBootstrap build_script: From 1a98407ee241bdefc90a1288ffaca3c737f2070b Mon Sep 17 00:00:00 2001 From: Sergei Vorobev Date: Fri, 1 Jul 2016 10:18:51 -0700 Subject: [PATCH 15/23] Fix Pester call for FullCLR from appveyor.yml --- appveyor.yml | 2 +- src/Microsoft.PowerShell.ConsoleHost/project.json | 4 ++-- src/powershell/project.json | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index e9d50fd4a..4583381fa 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -43,7 +43,7 @@ test_script: $env:FullOutput = Split-Path -Parent (Get-PSOutput -Options (New-PSOptions -FullCLR)) Write-Host -Foreground Green 'Run FullCLR tests' $testResultsFileFullCLR = "$pwd\TestsResults.FullCLR.xml" - Start-DevPSGitHub -binDir $env:FullOutput -NoNewWindow -ArgumentList '-noprofile', '-noninteractive', '-command', "Import-Module .\src\Modules\Pester; Invoke-Pester test/fullCLR -OutputFormat NUnitXml -OutputFile $testResultsFileFullCLR" + Start-DevPSGitHub -NoNewWindow -ArgumentList '-noprofile', '-noninteractive', '-command', "`$env:PSModulePath = Join-Path `$env:DEVPATH Modules; Invoke-Pester test/fullCLR -OutputFormat NUnitXml -OutputFile $testResultsFileFullCLR" (New-Object 'System.Net.WebClient').UploadFile("https://ci.appveyor.com/api/testresults/nunit/$($env:APPVEYOR_JOB_ID)", (Resolve-Path $testResultsFileFullCLR)) # # Fail the build, if tests failed diff --git a/src/Microsoft.PowerShell.ConsoleHost/project.json b/src/Microsoft.PowerShell.ConsoleHost/project.json index 45486d007..054135941 100644 --- a/src/Microsoft.PowerShell.ConsoleHost/project.json +++ b/src/Microsoft.PowerShell.ConsoleHost/project.json @@ -17,7 +17,7 @@ "../Modules/Shared" ], "exclude": [ - "../Modules/Shared/Pester/.git" + "../Modules/Shared/Pester/.git*" ] } }, @@ -36,7 +36,7 @@ "../Modules/Shared" ], "exclude": [ - "../Modules/Shared/Pester/.git" + "../Modules/Shared/Pester/.git*" ] } }, diff --git a/src/powershell/project.json b/src/powershell/project.json index da0f261c7..83953f93c 100644 --- a/src/powershell/project.json +++ b/src/powershell/project.json @@ -15,7 +15,7 @@ "../Modules/Shared" ], "exclude": [ - "../Modules/Shared/Pester/.git" + "../Modules/Shared/Pester/.git*" ] } }, @@ -35,7 +35,7 @@ "../Modules/Shared" ], "exclude": [ - "../Modules/Shared/Pester/.git" + "../Modules/Shared/Pester/.git*" ] } }, From ca321b93222886a7996045b85898d5014ec8031d Mon Sep 17 00:00:00 2001 From: Sergei Vorobev Date: Fri, 1 Jul 2016 12:09:50 -0700 Subject: [PATCH 16/23] Improve Start-DevPowerShell - Rename Start-DevPSGithub to Start-DevPowerShell - Add Configuration parameter to Start-PSBuild - Add -Command parameter to Start-DevPowerShell --- build.psm1 | 64 ++++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 50 insertions(+), 14 deletions(-) diff --git a/build.psm1 b/build.psm1 index 6120e7309..f1e9310e4 100644 --- a/build.psm1 +++ b/build.psm1 @@ -59,12 +59,11 @@ function Start-PSBuild { [switch]$XamlGen, [Parameter(ParameterSetName='FullCLR')] - [string]$cmakeGenerator = "Visual Studio 14 2015 Win64", + [ValidateSet('x86', 'x64')] + [string]$NativeHostArch = "x64", - [Parameter(ParameterSetName='FullCLR')] - [ValidateSet("Debug", - "Release")] - [string]$msbuildConfiguration = "Release" + [ValidateSet('Linux', 'Debug', 'Release', '')] + [string]$Configuration ) if ($Clean) @@ -104,6 +103,26 @@ function Start-PSBuild { throw 'mc.exe not found. Install Microsoft Windows SDK.' } + # setup msbuild configuration + if ($Configuration -eq 'Debug' -or $Configuration -eq 'Release') + { + $msbuildConfiguration = $Configuration + } + else + { + $msbuildConfiguration = 'Release' + } + + # setup cmakeGenerator + if ($NativeHostArch -eq 'x86') + { + $cmakeGenerator = 'Visual Studio 14 2015' + } + else + { + $cmakeGenerator = 'Visual Studio 14 2015 Win64' + } + } elseif ($IsLinux -or $IsOSX) { foreach ($Dependency in 'cmake', 'make', 'g++') { $precheck = $precheck -and (precheck $Dependency "Build dependency '$Dependency' not found. Run Start-PSBootstrap.") @@ -116,7 +135,7 @@ function Start-PSBuild { } # set output options - $OptionsArguments = @{Publish=$Publish; Output=$Output; FullCLR=$FullCLR; Runtime=$Runtime} + $OptionsArguments = @{Publish=$Publish; Output=$Output; FullCLR=$FullCLR; Runtime=$Runtime; Configuration=$Configuration; Verbose=$true} $script:Options = New-PSOptions @OptionsArguments # setup arguments @@ -239,7 +258,7 @@ function Start-PSBuild { function New-PSOptions { [CmdletBinding()] param( - [ValidateSet("Linux", "Debug", "Release")] + [ValidateSet("Linux", "Debug", "Release", "")] [string]$Configuration, [ValidateSet("netcoreapp1.0", "net451")] @@ -279,7 +298,7 @@ function New-PSOptions { } elseif ($IsWindows) { "Debug" } - log "Using configuration '$Configuration'" + Write-Verbose "Using configuration '$Configuration'" } if (-not $Framework) { @@ -288,7 +307,7 @@ function New-PSOptions { } else { "netcoreapp1.0" } - log "Using framework '$Framework'" + Write-Verbose "Using framework '$Framework'" } if (-not $Runtime) { @@ -301,7 +320,7 @@ function New-PSOptions { if (-not $Runtime) { Throw "Could not determine Runtime Identifier, please update dotnet" } else { - log "Using runtime '$Runtime'" + Write-Verbose "Using runtime '$Runtime'" } } @@ -649,20 +668,37 @@ function Publish-NuGetFeed } -function Start-DevPSGitHub { +function Start-DevPowerShell { param( [switch]$ZapDisable, [string[]]$ArgumentList = '', [switch]$LoadProfile, - [string]$binDir = "$PSScriptRoot\src\Microsoft.PowerShell.ConsoleHost\bin\Debug\net451", - [switch]$NoNewWindow + [string]$binDir = (Split-Path (New-PSOptions -FullCLR).Output), + [switch]$NoNewWindow, + [string]$Command, + [switch]$KeepPSModulePath ) try { - if ($LoadProfile -eq $false) { + if (-not $LoadProfile) { $ArgumentList = @('-noprofile') + $ArgumentList } + if (-not $KeepPSModulePath) + { + if (-not $Command) + { + $ArgumentList = @('-NoExit') + $ArgumentList + } + + $Command = '$env:PSModulePath = Join-Path $env:DEVPATH Modules; ' + $Command + } + + if ($Command) + { + $ArgumentList = $ArgumentList + @("-command $Command") + } + $env:DEVPATH = $binDir if ($ZapDisable) { $env:COMPLUS_ZapDisable = 1 From df38b7c7608dd0242e69abc33d4c60332051910e Mon Sep 17 00:00:00 2001 From: Sergei Vorobev Date: Fri, 1 Jul 2016 12:15:26 -0700 Subject: [PATCH 17/23] Fix Start-DevPowerShell call from appveyor --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 4583381fa..f743073eb 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -43,7 +43,7 @@ test_script: $env:FullOutput = Split-Path -Parent (Get-PSOutput -Options (New-PSOptions -FullCLR)) Write-Host -Foreground Green 'Run FullCLR tests' $testResultsFileFullCLR = "$pwd\TestsResults.FullCLR.xml" - Start-DevPSGitHub -NoNewWindow -ArgumentList '-noprofile', '-noninteractive', '-command', "`$env:PSModulePath = Join-Path `$env:DEVPATH Modules; Invoke-Pester test/fullCLR -OutputFormat NUnitXml -OutputFile $testResultsFileFullCLR" + Start-DevPowerShell -NoNewWindow -ArgumentList '-noprofile', '-noninteractive' -Command "Invoke-Pester test/fullCLR -OutputFormat NUnitXml -OutputFile $testResultsFileFullCLR" (New-Object 'System.Net.WebClient').UploadFile("https://ci.appveyor.com/api/testresults/nunit/$($env:APPVEYOR_JOB_ID)", (Resolve-Path $testResultsFileFullCLR)) # # Fail the build, if tests failed From afa9aba8f1329b859701e9e8c9e7d9288a26072a Mon Sep 17 00:00:00 2001 From: Sergei Vorobev Date: Fri, 1 Jul 2016 12:31:05 -0700 Subject: [PATCH 18/23] Add missed types and format files into src/Modules/map.json --- src/Modules/map.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Modules/map.json b/src/Modules/map.json index 462efd4ab..c44e16ff8 100644 --- a/src/Modules/map.json +++ b/src/Modules/map.json @@ -3,6 +3,7 @@ "monad/miscfiles/modules/Microsoft.PowerShell.Archive/Microsoft.PowerShell.Archive.psm1": "Shared/Microsoft.PowerShell.Archive/Microsoft.PowerShell.Archive.psm1", "monad/miscfiles/modules/Microsoft.PowerShell.Management/Microsoft.PowerShell.Management.psd1": "Shared/Microsoft.PowerShell.Management/Microsoft.PowerShell.Management.psd1", "monad/miscfiles/modules/Microsoft.WSMan.Management/Microsoft.WSMan.Management.psd1": "Shared/Microsoft.WSMan.Management/Microsoft.WSMan.Management.psd1", + "monad/miscfiles/display/WSMan.format.ps1xml": "Shared/Microsoft.WSMan.Management/WSMan.format.ps1xml", "monad/miscfiles/modules/PSDiagnostics/PSDiagnostics.psm1": "Shared/PSDiagnostics/PSDiagnostics.psm1", "monad/miscfiles/modules/AppxProvider/AppxProvider.psm1": "Shared/AppxProvider/AppxProvider.psm1", "monad/miscfiles/modules/Microsoft.PowerShell.Archive/Microsoft.PowerShell.Archive.psd1": "Shared/Microsoft.PowerShell.Archive/Microsoft.PowerShell.Archive.psd1", @@ -29,6 +30,9 @@ "wmi/psws/PSODataUtils/Microsoft.PowerShell.ODataUtils/Microsoft.PowerShell.ODataUtilsStrings.psd1": "Shared/Microsoft.PowerShell.ODataUtils/en-US/Microsoft.PowerShell.ODataUtilsStrings.psd1", "wmi/WMIv2/Client/CIMCmdlets/CimCmdlets.psd1": "Shared/CimCmdlets/CimCmdlets.psd1", "monad/miscfiles/modules/Microsoft.PowerShell.Diagnostics/Microsoft.PowerShell.Diagnostics.psd1": "Full/Microsoft.PowerShell.Diagnostics/Microsoft.PowerShell.Diagnostics.psd1", + "monad/miscfiles/types/getevent.types.ps1xml": "Full/Microsoft.PowerShell.Diagnostics/GetEvent.types.ps1xml", + "monad/miscfiles/display/Event.format.ps1xml": "Full/Microsoft.PowerShell.Diagnostics/Event.format.ps1xml", + "monad/miscfiles/display/Diagnostics.format.ps1xml": "Full/Microsoft.PowerShell.Diagnostics/Diagnostics.format.ps1xml", "monad/miscfiles/modules/Microsoft.PowerShell.Utility/Microsoft.PowerShell.Utility.psd1": "Full/Microsoft.PowerShell.Utility/Microsoft.PowerShell.Utility.psd1", "monad/src/ScheduledJob/PSScheduledJob.Format.ps1xml": "Full/PSScheduledJob/PSScheduledJob.Format.ps1xml", "monad/src/ScheduledJob/PSScheduledJob.psd1": "Full/PSScheduledJob/PSScheduledJob.psd1", From 1c1442f4afda315d4ca4d2376c5c739552f3de6b Mon Sep 17 00:00:00 2001 From: PowerShell Team Date: Fri, 1 Jul 2016 12:31:31 -0700 Subject: [PATCH 19/23] Copy missed format and types files from [SD:717473] commit 559488db3 --- .../Diagnostics.format.ps1xml | Bin 0 -> 5074 bytes .../Event.format.ps1xml | Bin 0 -> 10144 bytes .../GetEvent.types.ps1xml | Bin 0 -> 9164 bytes .../WSMan.format.ps1xml | Bin 0 -> 16598 bytes 4 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/Modules/Full/Microsoft.PowerShell.Diagnostics/Diagnostics.format.ps1xml create mode 100644 src/Modules/Full/Microsoft.PowerShell.Diagnostics/Event.format.ps1xml create mode 100644 src/Modules/Full/Microsoft.PowerShell.Diagnostics/GetEvent.types.ps1xml create mode 100644 src/Modules/Shared/Microsoft.WSMan.Management/WSMan.format.ps1xml diff --git a/src/Modules/Full/Microsoft.PowerShell.Diagnostics/Diagnostics.format.ps1xml b/src/Modules/Full/Microsoft.PowerShell.Diagnostics/Diagnostics.format.ps1xml new file mode 100644 index 0000000000000000000000000000000000000000..6c6fc81f1ba54d9c10c3239bd0cf1f8136169590 GIT binary patch literal 5074 zcmeHL+fExX5S`~r{fAV2F7%?lts?aTZKM_uLGZlI1tKLO+AKo+eA{zujO|^IS*lb; zp<1o>HZwkR=6LMn*Uv&e$)zl1Dl<8kE2*TE8uxtHm*?_KdgkDrdn)9Gyu#6wm-ie! zIhBFz$r)@vv1{#*Q4}?%H4&%7uwO$6MBGfujV%F|2pw3%=D2)bu9$DXgno>k;12+vhek zIj;kR&5_+B8^TX}DI4&UXyKL7*g z=h9%HGW&)->V!B_-?fOekNJNXH=AZwSLE8{)}7-N3!IUE!cx0xZ{#%&ve%_%n#qmNFYqKD%)3NC!d#0yVP!e^lt6%rjI+{aYfE%tLE3l-;x7?;RIDn!jPICioN4GqA5M+qs^<>C%59!GQCIf`;4|iwr}qe zuL=85BK!CNdgOk_^4Z)$HFXklnckzcJ>q`Cb(TA_$F?sC*PnL}Sd;9$-{dOUR<`R# z;R@AOtefLnFYD%Q^ZCz)W0O1U?O-F;Rj3B7pNC3{JGs`C9c#L$wg!05?b_`eqSNu0 z6@TM!4=_UStMG=^_`Bjbva;XXU=2imNTM~r>69uoTyrM73FrQg|ERXWv&-?aa;XiGaghW>BeZ@a&( AL;wH) literal 0 HcmV?d00001 diff --git a/src/Modules/Full/Microsoft.PowerShell.Diagnostics/Event.format.ps1xml b/src/Modules/Full/Microsoft.PowerShell.Diagnostics/Event.format.ps1xml new file mode 100644 index 0000000000000000000000000000000000000000..1b8f45b06976f28223d21cc15786ebb6c3a7a247 GIT binary patch literal 10144 zcmeHNZEw>s5Wdey{D+F~Y!nGJq_7EA1d}#E+XSCW*L4$VHZ9#7KOXj+-NP?QT&HP= zN~5W`jqS&GkI(nw@aK0zJ9I~5N~uFPG^8ua>6|Voqqp>oy0k$r(00(1(E!g+(3{an z^Qu7TLcIE|@Cbb!Zy34O!!A>C3B|MK_@9~qlZ z@rt8e6zP{Xq0d-x48-jzZXZ&lz)fh=>SI}Dj^7%|j)0TmGr;^Iw0}?co?QN1`JK=) z#$IBUk>?0ca)mSovps0r2S*wB;-}|WCCBp*Y9})Fgt^|JL!k7rI`5C&zmJ(C)ysQx zg%PY{aow=4n}7GAzP1T{#JU$?__7u^U)3yT=L&k>TO8@08?d4E74}%O>RBNT&5rDY z#UEHR#U6&%vB!mwS*AMrvrVuBY*G4@OcW0+PiP&Zftmja7-AFtS&{KotuIH4{Tss$ zZOk}{{1p=Vu6AxhXVB>-y;2rwKa0^*P_;GNj5U|^v2@>Rq`6_>9jt{tX{LM{dxdS- z3_m%;cV?(;#JaHDrPqykUJVOdq?9g}ed1%ih<$<%;rnk9vDhxzDu;+*^*l#4T5P11 zvm&jH$X-@_#vWuG;uO`DP;jN4gP&YZm$)m3j8!PH_gyDuwCYsb8Kvam87J2KmtVM`JuzfH)lgY{j*0rDxX%b7pB zH^h{WE5F@Z@y#0K@uE53ec9|Cz_;J2oQ~`8BYgV>j`xsN^L-O%cli<+@8af;_i^6p zT(n6_E6{bWQT_ep`?~>74&Tu68NF8Z(&Eoh7dN);j+*;5sr+nTxEWcWGLOc?+X%7Q zitXXu93>{dkkch?HCk-OBS_NPh<4=of9m97%v!C?Id-S!i|>LiZMX)Bi%>1U!e+4z z@mn1sT1JaZ%99YI`s^?6?UAhMw{Dy$^P}^f&e^!JaY!U~5#5LsA45VYF>%eE&wS~- zW4@;?XNqT-x>>a8l)f=*t7myjto??0kIJ`56Vw?e_;9QDVevJy*&qKK*F5K_WF~XI z`;^(u-ZuCs@s{uEW3*XZz9g~0Ob&yJ*>}W`OI=e93mjcM^POr#)~p4^xITPc|abh)0k0#rFC#H#YZ> gHS1>{)pwkB56dRmN)Iu&>i@OzI4wijjkfk^56$|pssI20 literal 0 HcmV?d00001 diff --git a/src/Modules/Full/Microsoft.PowerShell.Diagnostics/GetEvent.types.ps1xml b/src/Modules/Full/Microsoft.PowerShell.Diagnostics/GetEvent.types.ps1xml new file mode 100644 index 0000000000000000000000000000000000000000..5a5731b8b31df09a385a4dc2350118253b80cd73 GIT binary patch literal 9164 zcmeHNZEqS!5T38C)cQ2-+#N&BtDV8;rW2+nEJs(-!h^UQd% zd&ix9;6`yJgnTc%vop`U?CjjG|M|NvPvnElWGacgmx(N7Dd#em3;9`gEqU|xpJh&4-Vj9XDXt2azg6jzSzJtbm zJB2=cTH=}dT|lRi>d3x1>@mZ8il6D7=soT+YbA22{Kw$)T0Y{Ms?0=Q>4-6S{jO4o zr>AeU_CTqoYJb}JOsOZZdm;y*O3*e3FM5Es=Mzy8?HeHD2Ro)zWSpT`c zyT*xni#!+La02Qna8qtiEizJlXs<~|LSCO@U8wH~Y%;@Gvnee|`#Sy<(%va&TI3m? zQbf%W?o+fU@&ebf+J1ue;T3fXtI!`KP?#4I$e=}N1^Q^!H#OCiQuaal4xARCJcIpc z&HKRl9qt{pouFq9jcGIXk$!;@yi%%ZKpQ2}1WwMHz>6_N9JJU%XVVz=q+I?Dp<4_7 zPVm=+w4Su(5O4c(44wGYlrEkUP<7=gTKk}CVq6Q)U2W&+9@>xPC0aR(^gEzp54rE) z{t8c&b_^R1^}UHPedRxtU(rH5$Bn|$v5Znh>5{ZrS zOpBJbKGK#h^l3xxf%1EXw!JG9T}ULFwvHo0Lq9~jAu^eHzSJkiPifTF@OSXmhs>iZ z?V6C+QW>VH*>o4wMEn$eL+EL`@ZH**=r?~j=EDV}H0@&I{ag#5zH%~s}>CE5=)Comh@T2h1UCZHT^zKHwV7@Jp3MGHm|#1tK%WBm`?{XOu2MUlu`*EWXFw zsXMC-MgSx95`5EJ@H4GD;KX@Q9TzEY?+0?pdhYsIBYigRSED#jQxv;-nmAV2=b0#Q z|8jXK_BgS5ga&LDfj8SFrYN$C$6Oq5+sxxu;Vi#>#5=dx#zV~(6U^rY<{&FwX0&o& zJCFDt^RpTC9$am0^N87;W9wFU79{ zr-(g%!RB*&HfMdF_${8Laqjc^(D;-~>5rnhT|6qT_}rW8=$y6THWT}rUp+q+`#2kI zo78|F8P$=P|9xBoU#|RiXe0hF4pPzY}qKM7Y z#C+JdSw*$FD^!Da+{?@E-qo}go}uQpFC>2N*`8LYkvYQXtY$V2%zMNaJQ&aJ>`aYy zGQY1g>w`6etSq{696r{hR?k#D*n@kM_Qg?sTxcvq&6qs~LHlQHu5`%k3Lm z(_-oKWEB6Jx17MU&gz&9muHa1ryXkBvCi)s<~54n^YIe*5zp;)Czovg-By~RvSgjg z3Zi;_v3`EY`?!vMdY+-4Bj(Z--;~w=RiiC0&0^K6>{#v|)+?Sqzb!e};JACbVlIHu z>(d1P)4;RT9X%b5qt&0ylH4ET**i~;@8KzhzIO6VuB>%=*05UVhdOSF^X4L5DCf`8 z9!F7x{GnnGc<6i6E0Kq)RU$v>*|5F+hDu=vD8BlSq!rf-HLR3#JvCxP@IMvq>q&dS z;5b}2I|mML;ps1EQRP==*9GQ6iYjIS97WzQ8pr&yUUYFp9Etht)X3-%%jC#-J&nKg M*q5z2;ufd;7m=X(8vp}GE6&fJBYy5HR`ci-)~A92m_ zWa^GFKf=?gJC&#J-NK!?d+t|(c;p_sZ{0Vp;l9J%J>cBgh(F3SaBrc(9RC?UhtT&O zH0Iq2^x}9 z(C24zZyIOfEz+EU!ZDyHkehtFVv(WfLwk)Q4tagbb)mk;u*o@a)uyx{?Q8Nc!0nw- zrbV7%v_RB6$901F%)P?rNNhjG{8Q0deepzQhk#K(WZ*)Z&<^xc(K~yhEBPD%@*OzO z0C@@v(w^T#(jRbriMeAuxq!~J8lMq<1`K{O4pawPDRWIo%5~#uF^VV$Z8nqjG=fFR zSFJsOel7Ss!+#U}y6(sw;_kq8;BAhYu8mO!s5W%&xE`RIh~E~*ZJ8%_7xNwW2WE*y z_*;PD6H>p0>uZe2tphs_*2E_ z+SB_jv7Gnkx*mK9TC@+Pp$%v`wKuKZ#<&HJv_uc1K73=^z7iSKd(?+eeUWy6Du@}>+aKE35?*o?|>2a>WLM?QqzJ|J%_Fg}Ns-r#fc z@p_0c=QWq!mb|qN@|ehue2Sft$4_G`*U%c~`&IfIf2F_^gOPaSAv(-o#3$ig-g<^jF0qZ)lRt0a z^{|WD+seJV_78BHM(pd>KDJ!w?Nqdcw(22LF0rHII;ztFdLPA@sjTn)>oLRVtW#y` z(x{GZPbHlrEauJo9qg=%Sv`%Pif+$473F4!)jEXUE3@Qk3Y4Z%ktt1kM%K;g8pm~+ zrm6T={X$FEi`AH8j8oOA#F4ElskrYV_08#3Xiq(>c_&hdvpDm z+N(S#*SD5ZNo!#}2Uk%V>bm_Jui>(|NUh~!RK+VgwJu|hG0wL2o=0*bQMR)(?-y6@ zCU%@@J$8NO>B>%n5x+Y(W4_>SJUk`ZotrT>LW`vGeVjGJJRSC3#cZNhr`^lzSv_p^ zT-Z(bRa*Rt?66y|dVzhHukpxQ}#; zar*jd9qQ+L(_Pj1gxy{-j^nN;)Y97_t^grSReg_lZa?kb`OAJ*?HzX4>sB)J*eV*; zzV=ko6+MjqG*nd#kV{-e%d}lB>GkUx$N0@@yV_b+yPz0**X8h=ii|k>ErX61ID066 zw|`rp`MWs&s*msfd6LOr1WqK5ZABC#b`wuwKULdZ7xeX>)iQR%bzqTy^00?9J_qD5sq&RQ;-wa9Z8dztQ|3_A>zu literal 0 HcmV?d00001 From cef3a9a3c9575ffdebcb3425a4be4341a166b4f8 Mon Sep 17 00:00:00 2001 From: Sergei Vorobev Date: Thu, 30 Jun 2016 18:58:31 -0700 Subject: [PATCH 20/23] Add missed export into Microsoft.WSMan.Management.psd1 --- .../Microsoft.WSMan.Management/Microsoft.WSMan.Management.psd1 | 1 + src/Modules/map.json | 2 ++ 2 files changed, 3 insertions(+) diff --git a/src/Modules/Shared/Microsoft.WSMan.Management/Microsoft.WSMan.Management.psd1 b/src/Modules/Shared/Microsoft.WSMan.Management/Microsoft.WSMan.Management.psd1 index b66b28217..972d36886 100644 --- a/src/Modules/Shared/Microsoft.WSMan.Management/Microsoft.WSMan.Management.psd1 +++ b/src/Modules/Shared/Microsoft.WSMan.Management/Microsoft.WSMan.Management.psd1 @@ -10,5 +10,6 @@ AliasesToExport = @() FunctionsToExport = @() CmdletsToExport="Disable-WSManCredSSP", "Enable-WSManCredSSP", "Get-WSManCredSSP", "Set-WSManQuickConfig", "Test-WSMan", "Invoke-WSManAction", "Connect-WSMan", "Disconnect-WSMan", "Get-WSManInstance", "Set-WSManInstance", "Remove-WSManInstance", "New-WSManInstance", "New-WSManSessionOption" NestedModules="Microsoft.WSMan.Management.dll" +FormatsToProcess="WSMan.format.ps1xml" HelpInfoURI = 'http://go.microsoft.com/fwlink/?linkid=390788' } diff --git a/src/Modules/map.json b/src/Modules/map.json index c44e16ff8..1186cdb40 100644 --- a/src/Modules/map.json +++ b/src/Modules/map.json @@ -29,6 +29,7 @@ "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/WMIv2/Client/CIMCmdlets/CimCmdlets.psd1": "Shared/CimCmdlets/CimCmdlets.psd1", + "monad/miscfiles/modules/Microsoft.PowerShell.Diagnostics/Microsoft.PowerShell.Diagnostics.psd1": "Full/Microsoft.PowerShell.Diagnostics/Microsoft.PowerShell.Diagnostics.psd1", "monad/miscfiles/types/getevent.types.ps1xml": "Full/Microsoft.PowerShell.Diagnostics/GetEvent.types.ps1xml", "monad/miscfiles/display/Event.format.ps1xml": "Full/Microsoft.PowerShell.Diagnostics/Event.format.ps1xml", @@ -42,6 +43,7 @@ "monad/src/m3p/product/PSWorkflow.types.ps1xml": "Full/PSWorkflow/PSWorkflow.types.ps1xml", "monad/src/m3p/product/PSWorkflowUtility.psd1": "Full/PSWorkflowUtility/PSWorkflowUtility.psd1", "monad/src/m3p/product/PSWorkflowUtility.psm1": "Full/PSWorkflowUtility/PSWorkflowUtility.psm1", + "monad/miscfiles/modules/Microsoft.PowerShell.Diagnostics/CoreClr/Microsoft.PowerShell.Diagnostics.psd1": "Core/Microsoft.PowerShell.Diagnostics/Microsoft.PowerShell.Diagnostics.psd1", "monad/miscfiles/modules/Microsoft.PowerShell.Utility/CoreClr/Microsoft.PowerShell.Utility.psd1": "Core/Microsoft.PowerShell.Utility/Microsoft.PowerShell.Utility.psd1" } From b7186b51f1ae10e768085bae6520ba2adebcbc43 Mon Sep 17 00:00:00 2001 From: Sergei Vorobev Date: Fri, 1 Jul 2016 13:20:04 -0700 Subject: [PATCH 21/23] Fix typo in README.md --- src/Modules/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/README.md b/src/Modules/README.md index d651071fb..500a406e2 100644 --- a/src/Modules/README.md +++ b/src/Modules/README.md @@ -9,7 +9,7 @@ Content files includes: - psd1 - ps1 -These files are copyied as-is by `dotnet` +These files are copied as-is by `dotnet` - **Shared** is shared between all flavours - **Full** for FullCLR (Windows) From b29948afbea85bee4b89242e8db4ec263db5a110 Mon Sep 17 00:00:00 2001 From: Sergei Vorobev Date: Fri, 1 Jul 2016 13:51:14 -0700 Subject: [PATCH 22/23] Update docs\building\windows-full.md + typo fixes --- build.psm1 | 2 +- docs/building/windows-full.md | 24 +++++++----------------- 2 files changed, 8 insertions(+), 18 deletions(-) diff --git a/build.psm1 b/build.psm1 index f1e9310e4..0a6015f5b 100644 --- a/build.psm1 +++ b/build.psm1 @@ -1032,7 +1032,7 @@ function Find-Dotnet() { } <# - This is one-time convertion. We use it for to turn GetEventResources.txt into GetEventResources.resx + This is one-time conversion. We use it for to turn GetEventResources.txt into GetEventResources.resx .EXAMPLE Convert-TxtResourceToXml -Path Microsoft.PowerShell.Commands.Diagnostics\resources #> diff --git a/docs/building/windows-full.md b/docs/building/windows-full.md index 8e51cde4c..5ec0910fe 100644 --- a/docs/building/windows-full.md +++ b/docs/building/windows-full.md @@ -51,7 +51,7 @@ module. Because the `ConsoleHost` project (*not* the `Host` project) is a library and not an application (in the sense that .NET CLI does not emit a native executable using .NET Core's `corehost`), it targets the -framework `netstandard1.5`, *not* `netcoreapp1.0`, and the build +framework `netstandard1.6`, *not* `netcoreapp1.0`, and the build output will *not* have a runtime identifier in the path. Thus the output location of `powershell.exe` will be @@ -69,34 +69,24 @@ Assembly Cache (GAC), not your output directory. and run side-by-side. ```powershell -Start-DevPSGithub +Start-DevPowerShell ``` This command has a reasonable default to run `powershell.exe` from the build output folder. If you are building an unusual configuration (i.e. not `Debug`), you can explicitly specify path to the bin directory ```powershell -Start-DevPSGithub -binDir .\src\Microsoft.PowerShell.ConsoleHost\bin\Debug\net451 +Start-DevPowerShell -binDir .\src\Microsoft.PowerShell.ConsoleHost\bin\Debug\net451 ``` Or more programmatically: ```powershell -Start-DevPSGithub -binDir (Split-Path -Parent (Get-PSOutput)) +Start-DevPowerShell -binDir (Split-Path -Parent (Get-PSOutput)) ``` -The default for `powershell.exe` that **we build** is x86. See -[issue #683][]. - -There is a separate execution policy registry key for x86, and it's -likely that you didn't ~~bypass~~ enable it. From **powershell.exe -(x86)** run: - -``` -Set-ExecutionPolicy Bypass -``` - -[issue #683]: https://github.com/PowerShell/PowerShell/issues/683 +The default for produced `powershell.exe` is x64. +You can contorl it with `Start-PSBuild -FullCLR -NativeHostArch x86` Build manually ============== @@ -104,7 +94,7 @@ Build manually The build logic is relatively simple and contains the following steps: - building managed DLLs: `dotnet publish --runtime net451` -- generating Visual Studio project: `cmake -G "$cmakeGenerator"` +- generating Visual Studio project: `cmake` - building `powershell.exe` from generated solution: `msbuild powershell.sln` From 44c98fa946d9d3408ad0636c7b59e8a75d26fad9 Mon Sep 17 00:00:00 2001 From: Sergei Vorobev Date: Fri, 1 Jul 2016 14:04:55 -0700 Subject: [PATCH 23/23] Remove extra comma in powershell/project.json --- src/powershell/project.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/powershell/project.json b/src/powershell/project.json index 83953f93c..603f316c7 100644 --- a/src/powershell/project.json +++ b/src/powershell/project.json @@ -23,7 +23,7 @@ "*.so", "*.dylib", "../../powershell.version" - ], + ] } },