Skip to content

Commit d8f380a

Browse files
mkaringmkaring
authored
Merge 2e62f2e into 7b02fc9 
2 parents 7b02fc9 + 2e62f2e commit d8f380a

File tree

11 files changed

+750
-5
lines changed

11 files changed

+750
-5
lines changed

‎Confuser.Renamer/Analyzers/ResourceAnalyzer.cs‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,25 +19,27 @@ public void Analyze(ConfuserContext context, INameService service, ProtectionPar
1919
if (!string.IsNullOrEmpty(module.Assembly.Culture) &&
2020
asmName.EndsWith(".resources")) {
2121
// Satellite assembly
22-
var satellitePattern = new Regex(string.Format("^(.*)\\.{0}\\.resources$", module.Assembly.Culture));
22+
string satellitePattern = $"^(.*)\\.(?i:({module.Assembly.Culture}))\\.resources$";
2323
string nameAsmName = asmName.Substring(0, asmName.Length - ".resources".Length);
2424
ModuleDef mainModule = context.Modules.SingleOrDefault(mod => mod.Assembly.Name == nameAsmName);
2525
if (mainModule == null) {
2626
context.Logger.ErrorFormat("Could not find main assembly of satellite assembly '{0}'.", module.Assembly.FullName);
2727
throw new ConfuserException(null);
2828
}
2929

30-
string format = "{0}." + module.Assembly.Culture + ".resources";
3130
foreach (Resource res in module.Resources) {
32-
Match match = satellitePattern.Match(res.Name);
33-
if (!match.Success)
34-
continue;
31+
Match match = Regex.Match(res.Name, satellitePattern);
32+
if (!match.Success) continue;
3533
string typeName = match.Groups[1].Value;
34+
string culture = match.Groups[2].Value;
35+
3636
TypeDef type = mainModule.FindReflection(typeName);
3737
if (type == null) {
3838
context.Logger.WarnFormat(Resources.ResourceAnalyzer_Analyze_CouldNotFindResourceType, typeName);
3939
continue;
4040
}
41+
string format = $"{{0}}.{culture}.resources";
42+
4143
service.ReduceRenameMode(type, RenameMode.Reflection);
4244
service.AddReference(type, new ResourceReference(res, type, format));
4345
}

‎Tests/389_MixedCultureCasing.Test/389_MixedCultureCasing.Test.csproj‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<TargetFramework>net461</TargetFramework>
5+
<RootNamespace>MixedCultureCasing.Test</RootNamespace>
6+
<IsPackable>false</IsPackable>
7+
</PropertyGroup>
8+
9+
<ItemGroup>
10+
<ProjectReference Include="..\Confuser.UnitTest\Confuser.UnitTest.csproj" />
11+
<ProjectReference Include="..\389_MixedCultureCasing\389_MixedCultureCasing.csproj" />
12+
</ItemGroup>
13+
14+
</Project>

‎Tests/389_MixedCultureCasing.Test/MixedCultureCasingTest.cs‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
using System;
2+
using System.Threading.Tasks;
3+
using Confuser.Core;
4+
using Confuser.Core.Project;
5+
using Confuser.UnitTest;
6+
using Xunit;
7+
using Xunit.Abstractions;
8+
9+
namespace MixedCultureCasing.Test
10+
{
11+
public class MixedCultureCasingTest : TestBase {
12+
public MixedCultureCasingTest(ITestOutputHelper outputHelper) : base(outputHelper) { }
13+
14+
[Fact]
15+
[Trait("Category", "Protection")]
16+
[Trait("Protection", "rename")]
17+
[Trait("Issue", "https://github.com/mkaring/ConfuserEx/issues/389")]
18+
public async Task MixedCultureCasing() =>
19+
await Run(
20+
new [] {
21+
"389_MixedCultureCasing.exe",
22+
@"de-DE\389_MixedCultureCasing.resources.dll"
23+
},
24+
new [] {
25+
"Test 1 (neutral)",
26+
"Test 1 (deutsch)",
27+
"Test 2 (neutral)",
28+
"Test 2 (deutsch)"
29+
},
30+
new SettingItem<Protection>("rename")
31+
);
32+
}
33+
}

‎Tests/389_MixedCultureCasing/389_MixedCultureCasing.csproj‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<OutputType>Exe</OutputType>
5+
<TargetFramework>net461</TargetFramework>
6+
<RootNamespace>MixedCultureCasing</RootNamespace>
7+
<LangVersion>7.3</LangVersion>
8+
</PropertyGroup>
9+
10+
<ItemGroup>
11+
<Compile Update="Resource1.Designer.cs">
12+
<DesignTime>True</DesignTime>
13+
<AutoGen>True</AutoGen>
14+
<DependentUpon>Resource1.resx</DependentUpon>
15+
</Compile>
16+
<Compile Update="Resource2.Designer.cs">
17+
<DesignTime>True</DesignTime>
18+
<AutoGen>True</AutoGen>
19+
<DependentUpon>Resource2.resx</DependentUpon>
20+
</Compile>
21+
</ItemGroup>
22+
23+
<ItemGroup>
24+
<EmbeddedResource Update="Resource1.resx">
25+
<Generator>ResXFileCodeGenerator</Generator>
26+
<LastGenOutput>Resource1.Designer.cs</LastGenOutput>
27+
</EmbeddedResource>
28+
<EmbeddedResource Update="Resource2.resx">
29+
<Generator>ResXFileCodeGenerator</Generator>
30+
<LastGenOutput>Resource2.Designer.cs</LastGenOutput>
31+
</EmbeddedResource>
32+
</ItemGroup>
33+
34+
</Project>

‎Tests/389_MixedCultureCasing/Program.cs‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
using System;
2+
using System.Globalization;
3+
4+
namespace MixedCultureCasing {
5+
public class Program {
6+
internal static int Main(string[] args) {
7+
Console.WriteLine("START");
8+
9+
Resource1.Culture = CultureInfo.GetCultureInfo("en-US");
10+
Console.WriteLine(Resource1.Test1);
11+
12+
Resource1.Culture = CultureInfo.GetCultureInfo("de-DE");
13+
Console.WriteLine(Resource1.Test1);
14+
15+
Resource2.Culture = CultureInfo.GetCultureInfo("en-US");
16+
Console.WriteLine(Resource2.Test2);
17+
18+
Resource2.Culture = CultureInfo.GetCultureInfo("de-DE");
19+
Console.WriteLine(Resource2.Test2);
20+
21+
Console.WriteLine("END");
22+
23+
return 42;
24+
}
25+
}
26+
}

‎Tests/389_MixedCultureCasing/Resource1.Designer.cs‎

Lines changed: 72 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Tests/389_MixedCultureCasing/Resource1.de-DE.resx‎

Lines changed: 123 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,123 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<root>
3+
<!--
4+
Microsoft ResX Schema
5+
6+
Version 2.0
7+
8+
The primary goals of this format is to allow a simple XML format
9+
that is mostly human readable. The generation and parsing of the
10+
various data types are done through the TypeConverter classes
11+
associated with the data types.
12+
13+
Example:
14+
15+
... ado.net/XML headers & schema ...
16+
<resheader name="resmimetype">text/microsoft-resx</resheader>
17+
<resheader name="version">2.0</resheader>
18+
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
19+
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
20+
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
21+
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
22+
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
23+
<value>[base64 mime encoded serialized .NET Framework object]</value>
24+
</data>
25+
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
26+
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
27+
<comment>This is a comment</comment>
28+
</data>
29+
30+
There are any number of "resheader" rows that contain simple
31+
name/value pairs.
32+
33+
Each data row contains a name, and value. The row also contains a
34+
type or mimetype. Type corresponds to a .NET class that support
35+
text/value conversion through the TypeConverter architecture.
36+
Classes that don't support this are serialized and stored with the
37+
mimetype set.
38+
39+
The mimetype is used for serialized objects, and tells the
40+
ResXResourceReader how to depersist the object. This is currently not
41+
extensible. For a given mimetype the value must be set accordingly:
42+
43+
Note - application/x-microsoft.net.object.binary.base64 is the format
44+
that the ResXResourceWriter will generate, however the reader can
45+
read any of the formats listed below.
46+
47+
mimetype: application/x-microsoft.net.object.binary.base64
48+
value : The object must be serialized with
49+
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
50+
: and then encoded with base64 encoding.
51+
52+
mimetype: application/x-microsoft.net.object.soap.base64
53+
value : The object must be serialized with
54+
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
55+
: and then encoded with base64 encoding.
56+
57+
mimetype: application/x-microsoft.net.object.bytearray.base64
58+
value : The object must be serialized into a byte array
59+
: using a System.ComponentModel.TypeConverter
60+
: and then encoded with base64 encoding.
61+
-->
62+
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
63+
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
64+
<xsd:element name="root" msdata:IsDataSet="true">
65+
<xsd:complexType>
66+
<xsd:choice maxOccurs="unbounded">
67+
<xsd:element name="metadata">
68+
<xsd:complexType>
69+
<xsd:sequence>
70+
<xsd:element name="value" type="xsd:string" minOccurs="0" />
71+
</xsd:sequence>
72+
<xsd:attribute name="name" use="required" type="xsd:string" />
73+
<xsd:attribute name="type" type="xsd:string" />
74+
<xsd:attribute name="mimetype" type="xsd:string" />
75+
<xsd:attribute ref="xml:space" />
76+
</xsd:complexType>
77+
</xsd:element>
78+
<xsd:element name="assembly">
79+
<xsd:complexType>
80+
<xsd:attribute name="alias" type="xsd:string" />
81+
<xsd:attribute name="name" type="xsd:string" />
82+
</xsd:complexType>
83+
</xsd:element>
84+
<xsd:element name="data">
85+
<xsd:complexType>
86+
<xsd:sequence>
87+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
88+
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
89+
</xsd:sequence>
90+
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
91+
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
92+
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
93+
<xsd:attribute ref="xml:space" />
94+
</xsd:complexType>
95+
</xsd:element>
96+
<xsd:element name="resheader">
97+
<xsd:complexType>
98+
<xsd:sequence>
99+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
100+
</xsd:sequence>
101+
<xsd:attribute name="name" type="xsd:string" use="required" />
102+
</xsd:complexType>
103+
</xsd:element>
104+
</xsd:choice>
105+
</xsd:complexType>
106+
</xsd:element>
107+
</xsd:schema>
108+
<resheader name="resmimetype">
109+
<value>text/microsoft-resx</value>
110+
</resheader>
111+
<resheader name="version">
112+
<value>2.0</value>
113+
</resheader>
114+
<resheader name="reader">
115+
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
116+
</resheader>
117+
<resheader name="writer">
118+
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119+
</resheader>
120+
<data name="Test1" xml:space="preserve">
121+
<value>Test 1 (deutsch)</value>
122+
</data>
123+
</root>

0 commit comments

Comments
 (0)