admin/PowerShell-PowerShell
1
0
Fork 0
mirror of https://github.com/PowerShell/PowerShell synced 2026-06-08 12:12:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Set default culture to en-US

Browse Source 
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`.
This commit is contained in:
Andrew Schwartzmeyer
2016-03-26 18:49:13 -07:00
parent 6433650edf
commit 2f29f43e42
6 changed files with 37 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Microsoft.PowerShell.Commands.Management/AssemblyInfo.cs
+5 -1
View File
@@ -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
#endif
src/Microsoft.PowerShell.Commands.Utility/AssemblyInfo.cs
+5 -1
View File
@@ -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
#endif
src/Microsoft.PowerShell.ConsoleHost/AssemblyInfo.cs
+10 -8
View File
@@ -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")]
src/Microsoft.PowerShell.Linux.Host/AssemblyInfo.cs
+6
View File
@@ -1,2 +1,8 @@
using System.Runtime.CompilerServices;
using System.Reflection;
using System.Resources;
[assembly:InternalsVisibleTo("powershell-tests")]
[assembly:AssemblyCulture("")]
[assembly:NeutralResourcesLanguage("en-US")]
src/Microsoft.PowerShell.Security/AssemblyInfo.cs
+4
View File
@@ -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)]
src/System.Management.Automation/AssemblyInfo.cs
+7 -5
View File
@@ -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 @@ using System.Reflection;
[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 @@ using System.Reflection;
[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)]