From 18ba3f3365a33867374dbedd498c16e0e07cc69f Mon Sep 17 00:00:00 2001 From: Andrew Schwartzmeyer Date: Sat, 26 Mar 2016 14:41:30 -0700 Subject: [PATCH 01/11] Fix VS Code attach debugging configuration Needs to be `processName`, not `program`. Go figure. --- .vscode/launch.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index 850d235c3c8..3954855c646 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -17,7 +17,7 @@ "type": "coreclr", "request": "attach", "justMyCode": false, - "program": "powershell" + "processName": "powershell" } ] } From 9a52f1eaa7a26a48089e640c8d017cc9338fb1dc Mon Sep 17 00:00:00 2001 From: Andrew Schwartzmeyer Date: Sat, 26 Mar 2016 14:30:47 -0700 Subject: [PATCH 02/11] Replace SMA's namedResource section with resource Specifically this enables us to leverage `dotnet-resgen` to auto-generate the `resx` files into `resources` files for the default culture, which are then compiled into the SMA assembly. This requires a change to the C# bindings. The Windows build system takes `file.resx` and compiles `file.resources`, but CLI prepends the assembly name, thus compiling `SMA.file.resources`. So the resource manager in the generated bindings must be adjusted to look for `SMA.file` instead of `file`. Note that C# bindings cannot yet be auto-generated. Given localized resources of the form `file.en-US.resx`, `dotnet-resgen` will create a satellite assembly and publish it to `en-US/SMA.resources.dll`, so #666 will not be a technical problem. --- src/System.Management.Automation/project.json | 70 +------------------ 1 file changed, 1 insertion(+), 69 deletions(-) diff --git a/src/System.Management.Automation/project.json b/src/System.Management.Automation/project.json index adc6fb72e9f..68806d77a17 100644 --- a/src/System.Management.Automation/project.json +++ b/src/System.Management.Automation/project.json @@ -778,73 +778,5 @@ "../monad/monad/src/utils/WindowsErrorReporting.cs" ], - "namedResource": { - "Authenticode": "../windows-build/gen/SYS_AUTO/Authenticode.resources", - "AuthorizationManagerBase": "../windows-build/gen/SYS_AUTO/AuthorizationManagerBase.resources", - "AutomationExceptions": "../windows-build/gen/SYS_AUTO/AutomationExceptions.resources", - "CimInstanceTypeAdapterResources": "../windows-build/gen/SYS_AUTO/CimInstanceTypeAdapterResources.resources", - "CmdletizationCoreResources": "../windows-build/gen/SYS_AUTO/CmdletizationCoreResources.resources", - "CommandBaseStrings": "../windows-build/gen/SYS_AUTO/CommandBaseStrings.resources", - "ConsoleInfoErrorStrings": "../windows-build/gen/SYS_AUTO/ConsoleInfoErrorStrings.resources", - "CoreClrStubResources": "../windows-build/gen/SYS_AUTO/CoreClrStubResources.resources", - "Credential": "../windows-build/gen/SYS_AUTO/Credential.resources", - "CredentialAttributeStrings": "../windows-build/gen/SYS_AUTO/CredentialAttributeStrings.resources", - "CredUI": "../windows-build/gen/SYS_AUTO/CredUI.resources", - "DebuggerStrings": "../windows-build/gen/SYS_AUTO/DebuggerStrings.resources", - "DescriptionsStrings": "../windows-build/gen/SYS_AUTO/DescriptionsStrings.resources", - "DiscoveryExceptions": "../windows-build/gen/SYS_AUTO/DiscoveryExceptions.resources", - "EnumExpressionEvaluatorStrings": "../windows-build/gen/SYS_AUTO/EnumExpressionEvaluatorStrings.resources", - "ErrorCategoryStrings": "../windows-build/gen/SYS_AUTO/ErrorCategoryStrings.resources", - "ErrorPackage": "../windows-build/gen/SYS_AUTO/ErrorPackage.resources", - "EtwLoggingStrings": "../windows-build/gen/SYS_AUTO/EtwLoggingStrings.resources", - "EventingResources": "../windows-build/gen/SYS_AUTO/EventingResources.resources", - "ExtendedTypeSystem": "../windows-build/gen/SYS_AUTO/ExtendedTypeSystem.resources", - "FileSystemProviderStrings": "../windows-build/gen/SYS_AUTO/FileSystemProviderStrings.resources", - "FormatAndOut_format_xxx": "../windows-build/gen/SYS_AUTO/FormatAndOut_format_xxx.resources", - "FormatAndOut_MshParameter": "../windows-build/gen/SYS_AUTO/FormatAndOut_MshParameter.resources", - "FormatAndOut_out_xxx": "../windows-build/gen/SYS_AUTO/FormatAndOut_out_xxx.resources", - "FormatAndOutXmlLoadingStrings": "../windows-build/gen/SYS_AUTO/FormatAndOutXmlLoadingStrings.resources", - "GetErrorText": "../windows-build/gen/SYS_AUTO/GetErrorText.resources", - "HelpDisplayStrings": "../windows-build/gen/SYS_AUTO/HelpDisplayStrings.resources", - "HelpErrors": "../windows-build/gen/SYS_AUTO/HelpErrors.resources", - "HistoryStrings": "../windows-build/gen/SYS_AUTO/HistoryStrings.resources", - "HostInterfaceExceptionsStrings": "../windows-build/gen/SYS_AUTO/HostInterfaceExceptionsStrings.resources", - "InternalCommandStrings": "../windows-build/gen/SYS_AUTO/InternalCommandStrings.resources", - "InternalHostStrings": "../windows-build/gen/SYS_AUTO/InternalHostStrings.resources", - "InternalHostUserInterfaceStrings": "../windows-build/gen/SYS_AUTO/InternalHostUserInterfaceStrings.resources", - "Logging": "../windows-build/gen/SYS_AUTO/Logging.resources", - "Metadata": "../windows-build/gen/SYS_AUTO/Metadata.resources", - "MiniShellErrors": "../windows-build/gen/SYS_AUTO/MiniShellErrors.resources", - "Modules": "../windows-build/gen/SYS_AUTO/Modules.resources", - "MshHostRawUserInterfaceStrings": "../windows-build/gen/SYS_AUTO/MshHostRawUserInterfaceStrings.resources", - "MshSignature": "../windows-build/gen/SYS_AUTO/MshSignature.resources", - "MshSnapInCmdletResources": "../windows-build/gen/SYS_AUTO/MshSnapInCmdletResources.resources", - "MshSnapinInfo": "../windows-build/gen/SYS_AUTO/MshSnapinInfo.resources", - "NativeCP": "../windows-build/gen/SYS_AUTO/NativeCP.resources", - "ParameterBinderStrings": "../windows-build/gen/SYS_AUTO/ParameterBinderStrings.resources", - "ParserStrings": "../windows-build/gen/SYS_AUTO/ParserStrings.resources", - "PathUtilsStrings": "../windows-build/gen/SYS_AUTO/PathUtilsStrings.resources", - "PipelineStrings": "../windows-build/gen/SYS_AUTO/PipelineStrings.resources", - "PowerShellStrings": "../windows-build/gen/SYS_AUTO/PowerShellStrings.resources", - "ProgressRecordStrings": "../windows-build/gen/SYS_AUTO/ProgressRecordStrings.resources", - "ProviderBaseSecurity": "../windows-build/gen/SYS_AUTO/ProviderBaseSecurity.resources", - "ProxyCommandStrings": "../windows-build/gen/SYS_AUTO/ProxyCommandStrings.resources", - "PSCommandStrings": "../windows-build/gen/SYS_AUTO/PSCommandStrings.resources", - "PSDataBufferStrings": "../windows-build/gen/SYS_AUTO/PSDataBufferStrings.resources", - "PSListModifierStrings": "../windows-build/gen/SYS_AUTO/PSListModifierStrings.resources", - "RegistryProviderStrings": "../windows-build/gen/SYS_AUTO/RegistryProviderStrings.resources", - "RemotingErrorIdStrings": "../windows-build/gen/SYS_AUTO/RemotingErrorIdStrings.resources", - "RunspaceInit": "../windows-build/gen/SYS_AUTO/RunspaceInit.resources", - "RunspacePoolStrings": "../windows-build/gen/SYS_AUTO/RunspacePoolStrings.resources", - "RunspaceStrings": "../windows-build/gen/SYS_AUTO/RunspaceStrings.resources", - "SecuritySupportStrings": "../windows-build/gen/SYS_AUTO/SecuritySupportStrings.resources", - "Serialization": "../windows-build/gen/SYS_AUTO/Serialization.resources", - "SessionStateProviderBaseStrings": "../windows-build/gen/SYS_AUTO/SessionStateProviderBaseStrings.resources", - "SessionStateStrings": "../windows-build/gen/SYS_AUTO/SessionStateStrings.resources", - "SuggestionStrings": "../windows-build/gen/SYS_AUTO/SuggestionStrings.resources", - "TabCompletionStrings": "../windows-build/gen/SYS_AUTO/TabCompletionStrings.resources", - "TransactionStrings": "../windows-build/gen/SYS_AUTO/TransactionStrings.resources", - "TypesXmlStrings": "../windows-build/gen/SYS_AUTO/TypesXmlStrings.resources", - "WildcardPatternStrings": "../windows-build/gen/SYS_AUTO/WildcardPatternStrings.resources" - } + "resource": [ "../monad/monad/src/engine/resources/*.resx" ] } From 3979d4c2064e6359e657fa901157c6646332302c Mon Sep 17 00:00:00 2001 From: Andrew Schwartzmeyer Date: Sat, 26 Mar 2016 14:51:31 -0700 Subject: [PATCH 03/11] Replace Utility's namedResource section with resource --- .../project.json | 34 +------------------ 1 file changed, 1 insertion(+), 33 deletions(-) diff --git a/src/Microsoft.PowerShell.Commands.Utility/project.json b/src/Microsoft.PowerShell.Commands.Utility/project.json index 0eb79e2ddda..5347ceaf0cd 100644 --- a/src/Microsoft.PowerShell.Commands.Utility/project.json +++ b/src/Microsoft.PowerShell.Commands.Utility/project.json @@ -170,37 +170,5 @@ "../monad/monad/src/singleshell/installer/MshUtilityMshSnapin.cs" ], - "namedResource": { - "FormatAndOut_out_gridview": "../windows-build/gen/COMMANDS_UTILITY/FormatAndOut_out_gridview.resources", - "SendMailMessageStrings": "../windows-build/gen/COMMANDS_UTILITY/SendMailMessageStrings.resources", - "OutPrinterDisplayStrings": "../windows-build/gen/COMMANDS_UTILITY/OutPrinterDisplayStrings.resources", - "TraceCommandStrings": "../windows-build/gen/COMMANDS_UTILITY/TraceCommandStrings.resources", - "ConvertFromStringResources": "../windows-build/gen/COMMANDS_UTILITY/ConvertFromStringResources.resources", - "ConvertStringResources": "../windows-build/gen/COMMANDS_UTILITY/ConvertStringResources.resources", - "FlashExtractStrings": "../windows-build/gen/COMMANDS_UTILITY/FlashExtractStrings.resources", - "ImplicitRemotingStrings": "../windows-build/gen/COMMANDS_UTILITY/ImplicitRemotingStrings.resources", - "ImmutableStrings": "../windows-build/gen/COMMANDS_UTILITY/ImmutableStrings.resources", - "AddMember": "../windows-build/gen/COMMANDS_UTILITY/AddMember.resources", - "AddTypeStrings": "../windows-build/gen/COMMANDS_UTILITY/AddTypeStrings.resources", - "AliasCommandStrings": "../windows-build/gen/COMMANDS_UTILITY/AliasCommandStrings.resources", - "ConvertFromStringData": "../windows-build/gen/COMMANDS_UTILITY/ConvertFromStringData.resources", - "CsvCommandStrings": "../windows-build/gen/COMMANDS_UTILITY/CsvCommandStrings.resources", - "Debugger": "../windows-build/gen/COMMANDS_UTILITY/Debugger.resources", - "EventingStrings": "../windows-build/gen/COMMANDS_UTILITY/EventingStrings.resources", - "GetMember": "../windows-build/gen/COMMANDS_UTILITY/GetMember.resources", - "GetRandomCommandStrings": "../windows-build/gen/COMMANDS_UTILITY/GetRandomCommandStrings.resources", - "HostStrings": "../windows-build/gen/COMMANDS_UTILITY/HostStrings.resources", - "ImportLocalizedDataStrings": "../windows-build/gen/COMMANDS_UTILITY/ImportLocalizedDataStrings.resources", - "MatchStringStrings": "../windows-build/gen/COMMANDS_UTILITY/MatchStringStrings.resources", - "MeasureObjectStrings": "../windows-build/gen/COMMANDS_UTILITY/MeasureObjectStrings.resources", - "NewObjectStrings": "../windows-build/gen/COMMANDS_UTILITY/NewObjectStrings.resources", - "SelectObjectStrings": "../windows-build/gen/COMMANDS_UTILITY/SelectObjectStrings.resources", - "SortObjectStrings": "../windows-build/gen/COMMANDS_UTILITY/SortObjectStrings.resources", - "UpdateDataStrings": "../windows-build/gen/COMMANDS_UTILITY/UpdateDataStrings.resources", - "UtilityCommonStrings": "../windows-build/gen/COMMANDS_UTILITY/UtilityCommonStrings.resources", - "VariableCommandStrings": "../windows-build/gen/COMMANDS_UTILITY/VariableCommandStrings.resources", - "WebCmdletStrings": "../windows-build/gen/COMMANDS_UTILITY/WebCmdletStrings.resources", - "WriteErrorStrings": "../windows-build/gen/COMMANDS_UTILITY/WriteErrorStrings.resources", - "WriteProgressResourceStrings": "../windows-build/gen/COMMANDS_UTILITY/WriteProgressResourceStrings.resources" - } + "resource": [ "../monad/monad/src/commands/utility/resources/*.resx" ] } From 76fd8bd436e6133eb4188ed588b928d9bcea0463 Mon Sep 17 00:00:00 2001 From: Andrew Schwartzmeyer Date: Sat, 26 Mar 2016 15:04:10 -0700 Subject: [PATCH 04/11] Replace Management's namedResource section with resource --- .../project.json | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/src/Microsoft.PowerShell.Commands.Management/project.json b/src/Microsoft.PowerShell.Commands.Management/project.json index 6dded2746c1..4f61364ac76 100644 --- a/src/Microsoft.PowerShell.Commands.Management/project.json +++ b/src/Microsoft.PowerShell.Commands.Management/project.json @@ -111,21 +111,5 @@ "../monad/monad/src/singleshell/installer/MshManagementMshSnapin.cs" ], - "namedResource": { - "ClearRecycleBinResources": "../windows-build/gen/COMMANDS_MANAGEMENT/ClearRecycleBinResources.resources", - "ClipboardResources": "../windows-build/gen/COMMANDS_MANAGEMENT/ClipboardResources.resources", - "CmdletizationResources": "../windows-build/gen/COMMANDS_MANAGEMENT/CmdletizationResources.resources", - "ComputerResources": "../windows-build/gen/COMMANDS_MANAGEMENT/ComputerResources.resources", - "ControlPanelResources": "../windows-build/gen/COMMANDS_MANAGEMENT/ControlPanelResources.resources", - "EventlogResources": "../windows-build/gen/COMMANDS_MANAGEMENT/EventlogResources.resources", - "HotFixResources": "../windows-build/gen/COMMANDS_MANAGEMENT/HotFixResources.resources", - "ManagementMshSnapInResources": "../windows-build/gen/COMMANDS_MANAGEMENT/ManagementMshSnapInResources.resources", - "NavigationResources": "../windows-build/gen/COMMANDS_MANAGEMENT/NavigationResources.resources", - "ProcessCommandHelpResources": "../windows-build/gen/COMMANDS_MANAGEMENT/ProcessCommandHelpResources.resources", - "ProcessResources": "../windows-build/gen/COMMANDS_MANAGEMENT/ProcessResources.resources", - "ServiceResources": "../windows-build/gen/COMMANDS_MANAGEMENT/ServiceResources.resources", - "TransactionResources": "../windows-build/gen/COMMANDS_MANAGEMENT/TransactionResources.resources", - "WebServiceResources": "../windows-build/gen/COMMANDS_MANAGEMENT/WebServiceResources.resources", - "WmiResources": "../windows-build/gen/COMMANDS_MANAGEMENT/WmiResources.resources" - } + "resource": [ "../monad/monad/src/commands/management/resources/*.resx" ] } From b363fc909ec68d76227b8c95131eb8919e654180 Mon Sep 17 00:00:00 2001 From: Andrew Schwartzmeyer Date: Sat, 26 Mar 2016 15:04:29 -0700 Subject: [PATCH 05/11] Replace Security's namedResource section with resource --- src/Microsoft.PowerShell.Security/project.json | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/src/Microsoft.PowerShell.Security/project.json b/src/Microsoft.PowerShell.Security/project.json index 0b9e6a68257..2b046e41661 100644 --- a/src/Microsoft.PowerShell.Security/project.json +++ b/src/Microsoft.PowerShell.Security/project.json @@ -39,14 +39,5 @@ "../monad/monad/src/singleshell/installer/MshSecurityMshSnapin.cs" ], - "namedResource": { - "CertificateCommands": "../windows-build/gen/SECURITY/CertificateCommands.resources", - "CertificateProviderStrings": "../windows-build/gen/SECURITY/CertificateProviderStrings.resources", - "CmsCommands": "../windows-build/gen/SECURITY/CmsCommands.resources", - "ExecutionPolicyCommands": "../windows-build/gen/SECURITY/ExecutionPolicyCommands.resources", - "SecureStringCommands": "../windows-build/gen/SECURITY/SecureStringCommands.resources", - "SecurityMshSnapinResources": "../windows-build/gen/SECURITY/SecurityMshSnapinResources.resources", - "SignatureCommands": "../windows-build/gen/SECURITY/SignatureCommands.resources", - "UtilsStrings": "../windows-build/gen/SECURITY/UtilsStrings.resources" - } + "resource": [ "../monad/monad/src/security/resources/*.resx" ] } From af9296035c0576f1ab61baa61f23203c026e7576 Mon Sep 17 00:00:00 2001 From: Andrew Schwartzmeyer Date: Sat, 26 Mar 2016 15:15:13 -0700 Subject: [PATCH 06/11] Replace ConsoleHost's namedResource section with resource --- src/Microsoft.PowerShell.ConsoleHost/project.json | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/src/Microsoft.PowerShell.ConsoleHost/project.json b/src/Microsoft.PowerShell.ConsoleHost/project.json index bae6dd43a3c..669d6c8ae2e 100644 --- a/src/Microsoft.PowerShell.ConsoleHost/project.json +++ b/src/Microsoft.PowerShell.ConsoleHost/project.json @@ -48,16 +48,5 @@ "../monad/monad/src/host/msh/ManagedEntrance.cs" ], - "namedResource": { - "TranscriptStrings": "../windows-build/gen/CONSOLE_HOST/TranscriptStrings.resources", - "ProgressNodeStrings": "../windows-build/gen/CONSOLE_HOST/ProgressNodeStrings.resources", - "ManagedEntranceStrings": "../windows-build/gen/CONSOLE_HOST/ManagedEntranceStrings.resources", - "HostMshSnapInResources": "../windows-build/gen/CONSOLE_HOST/HostMshSnapInResources.resources", - "ConsoleHostUserInterfaceStrings": "../windows-build/gen/CONSOLE_HOST/ConsoleHostUserInterfaceStrings.resources", - "ConsoleHostUserInterfaceSecurityResources": "../windows-build/gen/CONSOLE_HOST/ConsoleHostUserInterfaceSecurityResources.resources", - "ConsoleHostStrings": "../windows-build/gen/CONSOLE_HOST/ConsoleHostStrings.resources", - "ConsoleHostRawUserInterfaceStrings": "../windows-build/gen/CONSOLE_HOST/ConsoleHostRawUserInterfaceStrings.resources", - "ConsoleControlStrings": "../windows-build/gen/CONSOLE_HOST/ConsoleControlStrings.resources", - "CommandLineParameterParserStrings": "../windows-build/gen/CONSOLE_HOST/CommandLineParameterParserStrings.resources" - } + "resource": [ "../monad/monad/src/host/msh/resources/*.resx" ] } From 3d8a3b9d45f468726a15623726a5223544f00acb Mon Sep 17 00:00:00 2001 From: Andrew Schwartzmeyer Date: Sat, 26 Mar 2016 15:16:48 -0700 Subject: [PATCH 07/11] Replace Eventing's namedResource section with resource --- src/Microsoft.PowerShell.CoreCLR.Eventing/project.json | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/Microsoft.PowerShell.CoreCLR.Eventing/project.json b/src/Microsoft.PowerShell.CoreCLR.Eventing/project.json index c852f2611a3..5bb1be3bd84 100644 --- a/src/Microsoft.PowerShell.CoreCLR.Eventing/project.json +++ b/src/Microsoft.PowerShell.CoreCLR.Eventing/project.json @@ -66,7 +66,5 @@ "../monad/monad/src/DotNetCode/Eventing/Reader/Winmeta.cs" ], - "namedResource": { - "DotNetEventingStrings": "../windows-build/gen/CORECLR_EVENTING/DotNetEventingStrings.resources" - } + "resource": [ "../monad/monad/src/DotNetCode/Eventing/resources/*.resx" ] } From aedaf53813f9b9d6523b6bc9da3fce963b1a7d6c Mon Sep 17 00:00:00 2001 From: Andrew Schwartzmeyer Date: Sat, 26 Mar 2016 15:31:45 -0700 Subject: [PATCH 08/11] Bump windows-build submodule with resources fixes --- src/windows-build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/windows-build b/src/windows-build index 03767adae4b..bdbfc8b5757 160000 --- a/src/windows-build +++ b/src/windows-build @@ -1 +1 @@ -Subproject commit 03767adae4b0d42b48f6fcd5f97f3b673d176356 +Subproject commit bdbfc8b5757f4f3fa15cc0a069b0e6182032de06 From 6433650edf56fecf44a9c8b27059d7413dcff4f3 Mon Sep 17 00:00:00 2001 From: Andrew Schwartzmeyer Date: Sat, 26 Mar 2016 16:11:57 -0700 Subject: [PATCH 09/11] Add System.IO.MemoryMappedFiles dependency This is a runtime dependency that causes an internal exception to be thrown and caught when not available. --- src/Microsoft.PowerShell.Linux.Host/project.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Microsoft.PowerShell.Linux.Host/project.json b/src/Microsoft.PowerShell.Linux.Host/project.json index be3adce5970..c24629b4ba9 100644 --- a/src/Microsoft.PowerShell.Linux.Host/project.json +++ b/src/Microsoft.PowerShell.Linux.Host/project.json @@ -12,6 +12,7 @@ "dependencies": { "Newtonsoft.Json": "8.0.2", "System.Xml.XDocument": "4.0.11-rc3-23922", + "System.IO.MemoryMappedFiles": "4.0.0-rc3-23922", "Microsoft.PowerShell.Commands.Management": "1.0.0-*", "Microsoft.PowerShell.Commands.Utility": "1.0.0-*" }, From 2f29f43e42f466e124ea71f370d76cca847f2602 Mon Sep 17 00:00:00 2001 From: Andrew Schwartzmeyer Date: Sat, 26 Mar 2016 16:00:34 -0700 Subject: [PATCH 10/11] Set default culture to en-US So that the resource manager doesn't try to load a non-existent satellite assembly (and thus throw). The culture `en-US` is the default `CurrentCulture` on all platforms I tested, specifically not `en`. Note that there is a problem with the FullCLR build where some other assembly is still attempting to reference `Logging.resources` instead of `System.Management.Automation.Logging.resources`. --- .../AssemblyInfo.cs | 6 +++++- .../AssemblyInfo.cs | 6 +++++- .../AssemblyInfo.cs | 18 ++++++++++-------- .../AssemblyInfo.cs | 6 ++++++ .../AssemblyInfo.cs | 4 ++++ .../AssemblyInfo.cs | 12 +++++++----- 6 files changed, 37 insertions(+), 15 deletions(-) diff --git a/src/Microsoft.PowerShell.Commands.Management/AssemblyInfo.cs b/src/Microsoft.PowerShell.Commands.Management/AssemblyInfo.cs index e95166b4783..13d5df3951b 100644 --- a/src/Microsoft.PowerShell.Commands.Management/AssemblyInfo.cs +++ b/src/Microsoft.PowerShell.Commands.Management/AssemblyInfo.cs @@ -1,9 +1,13 @@ using System.Reflection; +using System.Resources; [assembly:AssemblyFileVersionAttribute("3.0.0.0")] [assembly:AssemblyVersion("3.0.0.0")] +[assembly:AssemblyCulture("")] +[assembly:NeutralResourcesLanguage("en-US")] + #if !CORECLR [assembly:AssemblyKeyFileAttribute(@"..\..\src\monad\monad\src\graphicalhost\visualstudiopublic.snk")] [assembly:AssemblyDelaySignAttribute(true)] -#endif \ No newline at end of file +#endif diff --git a/src/Microsoft.PowerShell.Commands.Utility/AssemblyInfo.cs b/src/Microsoft.PowerShell.Commands.Utility/AssemblyInfo.cs index e95166b4783..13d5df3951b 100644 --- a/src/Microsoft.PowerShell.Commands.Utility/AssemblyInfo.cs +++ b/src/Microsoft.PowerShell.Commands.Utility/AssemblyInfo.cs @@ -1,9 +1,13 @@ using System.Reflection; +using System.Resources; [assembly:AssemblyFileVersionAttribute("3.0.0.0")] [assembly:AssemblyVersion("3.0.0.0")] +[assembly:AssemblyCulture("")] +[assembly:NeutralResourcesLanguage("en-US")] + #if !CORECLR [assembly:AssemblyKeyFileAttribute(@"..\..\src\monad\monad\src\graphicalhost\visualstudiopublic.snk")] [assembly:AssemblyDelaySignAttribute(true)] -#endif \ No newline at end of file +#endif diff --git a/src/Microsoft.PowerShell.ConsoleHost/AssemblyInfo.cs b/src/Microsoft.PowerShell.ConsoleHost/AssemblyInfo.cs index 6e175a5d3f0..eb8fb85ce44 100644 --- a/src/Microsoft.PowerShell.ConsoleHost/AssemblyInfo.cs +++ b/src/Microsoft.PowerShell.ConsoleHost/AssemblyInfo.cs @@ -1,18 +1,20 @@ +using System.Diagnostics.CodeAnalysis; using System.Reflection; -using System.Security.Permissions; +using System.Resources; using System.Runtime.CompilerServices; using System.Runtime.ConstrainedExecution; -using System.Diagnostics.CodeAnalysis; +using System.Security.Permissions; +[assembly:AssemblyCulture("")] +[assembly:NeutralResourcesLanguage("en-US")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyInformationalVersionAttribute (@"10.0.10011.16384")] +[assembly:AssemblyConfiguration("")] +[assembly:AssemblyInformationalVersionAttribute (@"10.0.10011.16384")] [assembly:ReliabilityContractAttribute(Consistency.MayCorruptAppDomain, Cer.MayFail)] -[assembly: AssemblyTitle("Microsoft.PowerShell.ConsoleHost")] -[assembly: AssemblyDescription("Microsoft Windows PowerShell Console Host")] +[assembly:AssemblyTitle("Microsoft.PowerShell.ConsoleHost")] +[assembly:AssemblyDescription("Microsoft Windows PowerShell Console Host")] -[assembly: System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.5")] -[assembly:System.Resources.NeutralResourcesLanguage("en")] +[assembly:System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.5")] [assembly:System.Runtime.InteropServices.ComVisible(false)] [assembly:System.Reflection.AssemblyVersion("3.0.0.0")] [assembly:System.Reflection.AssemblyProduct("Microsoft (R) Windows (R) Operating System")] diff --git a/src/Microsoft.PowerShell.Linux.Host/AssemblyInfo.cs b/src/Microsoft.PowerShell.Linux.Host/AssemblyInfo.cs index dd02d483418..3e4b06af932 100644 --- a/src/Microsoft.PowerShell.Linux.Host/AssemblyInfo.cs +++ b/src/Microsoft.PowerShell.Linux.Host/AssemblyInfo.cs @@ -1,2 +1,8 @@ using System.Runtime.CompilerServices; +using System.Reflection; +using System.Resources; + [assembly:InternalsVisibleTo("powershell-tests")] + +[assembly:AssemblyCulture("")] +[assembly:NeutralResourcesLanguage("en-US")] diff --git a/src/Microsoft.PowerShell.Security/AssemblyInfo.cs b/src/Microsoft.PowerShell.Security/AssemblyInfo.cs index 2ccb30e4987..13d5df3951b 100644 --- a/src/Microsoft.PowerShell.Security/AssemblyInfo.cs +++ b/src/Microsoft.PowerShell.Security/AssemblyInfo.cs @@ -1,8 +1,12 @@ using System.Reflection; +using System.Resources; [assembly:AssemblyFileVersionAttribute("3.0.0.0")] [assembly:AssemblyVersion("3.0.0.0")] +[assembly:AssemblyCulture("")] +[assembly:NeutralResourcesLanguage("en-US")] + #if !CORECLR [assembly:AssemblyKeyFileAttribute(@"..\..\src\monad\monad\src\graphicalhost\visualstudiopublic.snk")] [assembly:AssemblyDelaySignAttribute(true)] diff --git a/src/System.Management.Automation/AssemblyInfo.cs b/src/System.Management.Automation/AssemblyInfo.cs index 34137476a52..a69cca0715e 100644 --- a/src/System.Management.Automation/AssemblyInfo.cs +++ b/src/System.Management.Automation/AssemblyInfo.cs @@ -1,5 +1,12 @@ using System.Runtime.CompilerServices; using System.Reflection; +using System.Resources; + +[assembly:AssemblyFileVersionAttribute("3.0.0.0")] +[assembly:AssemblyVersion("3.0.0.0")] + +[assembly:AssemblyCulture("")] +[assembly:NeutralResourcesLanguage("en-US")] #if CORECLR @@ -9,8 +16,6 @@ [assembly:InternalsVisibleTo("Microsoft.PowerShell.CoreCLR.AssemblyLoadContext")] [assembly:InternalsVisibleTo("powershell")] [assembly:InternalsVisibleTo("powershell-tests")] -[assembly:AssemblyFileVersionAttribute("3.0.0.0")] -[assembly:AssemblyVersion("3.0.0.0")] #else @@ -30,9 +35,6 @@ [assembly: InternalsVisibleTo(@"Microsoft.PowerShell.Editor"+@",PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")] [assembly: InternalsVisibleTo(@"powershell_ise"+@",PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")] -[assembly:AssemblyFileVersionAttribute("3.0.0.0")] -[assembly:AssemblyVersion("3.0.0.0")] - [assembly:AssemblyKeyFileAttribute(@"..\..\src\monad\monad\src\graphicalhost\visualstudiopublic.snk")] [assembly:AssemblyDelaySignAttribute(true)] From eb938415bc19c7ce8d8f6da1ed412243f8b7f1ec Mon Sep 17 00:00:00 2001 From: Andrew Schwartzmeyer Date: Mon, 28 Mar 2016 10:49:08 -0700 Subject: [PATCH 11/11] Fix use of ResourceManager in monad --- src/monad | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/monad b/src/monad index 5b0cc1d0973..569bde91d43 160000 --- a/src/monad +++ b/src/monad @@ -1 +1 @@ -Subproject commit 5b0cc1d0973cd6eddc348177e2f306c727b4d4d9 +Subproject commit 569bde91d43a30435a60a33343196217547d81a5