Skip to content

Commit c912d17

Browse files
speblspebl
authored
Fix localization for Common.Dynamic and add vsixlangpacks (#65)
* fix path for loc files * fix path to lcl files * mark vsix proj at not component * add common dynamic projects to setversion * fix path * remove unnecessary swix res and add option to set isproductcomonent for setup * check if property is set to true in microbuild before setting it * rename microbuild variable for clarity * add vsixlangpacks and pass culture to CreateInstance * inculde lang packs in vsix * use resource manager from common.dynamic in common * fix project files * remove eula and link asw they're not localized * remove localized description until we have one * fix proj file * remove old references to strings.cs which we no longer use * use separate resources.cs to ensure loading the right asm * change Common.Dynamic.GTA use resx as well * change basename for common dynamic dll * change default namespace to not conflict with common * LoadFrom not LoadFile so we can get satellite asm * switch namespace back so it matches with translation files * remove empty localized descriptions
1 parent 42d11e0 commit c912d17

29 files changed

Lines changed: 465 additions & 94 deletions

‎GoogleTestAdapter/Common.Dynamic.GTA/Common.Dynamic.GTA.csproj‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,11 @@
4040
</ItemGroup>
4141
<ItemGroup>
4242
<Compile Include="Properties\AssemblyInfo.cs" />
43-
<Compile Include="Strings.cs" />
43+
<Compile Include="Resources.Designer.cs">
44+
<DependentUpon>Resources.resx</DependentUpon>
45+
<AutoGen>True</AutoGen>
46+
<DesignTime>True</DesignTime>
47+
</Compile>
4448
</ItemGroup>
4549
<ItemGroup>
4650
<None Include="Key.snk" />
@@ -51,6 +55,13 @@
5155
<Name>Common</Name>
5256
</ProjectReference>
5357
</ItemGroup>
58+
<ItemGroup>
59+
<EmbeddedResource Include="Resources.resx">
60+
<Generator>PublicResXFileCodeGenerator</Generator>
61+
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
62+
<SubType>Designer</SubType>
63+
</EmbeddedResource>
64+
</ItemGroup>
5465
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
5566
<Import Project="$(NuGetPackages)MicroBuild.Core.0.2.0\build\MicroBuild.Core.targets" Condition="Exists('$(NuGetPackages)MicroBuild.Core.0.2.0\build\MicroBuild.Core.targets')" />
5667
<PropertyGroup>

‎GoogleTestAdapter/Common.Dynamic.GTA/Resources.Designer.cs‎

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

‎GoogleTestAdapter/Common.Dynamic.GTA/Resources.resx‎

Lines changed: 133 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,133 @@
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="ExtensionName" xml:space="preserve">
121+
<value>Google Test Adapter</value>
122+
</data>
123+
<data name="TestDiscoveryStarting" xml:space="preserve">
124+
<value>Google Test Adapter: Test discovery starting...</value>
125+
</data>
126+
<data name="TestExecutionStarting" xml:space="preserve">
127+
<value>Google Test Adapter: Test execution starting...</value>
128+
</data>
129+
<data name="TroubleShootingLink" xml:space="preserve">
130+
<value>{0}Check out Google Test Adapter's trouble shooting section at https://github.com/csoltenborn/GoogleTestAdapter#trouble_shooting</value>
131+
<comment>{0} is empty or a name of a thread followed by space (e.g. "[T0] ")</comment>
132+
</data>
133+
</root>

‎GoogleTestAdapter/Common.Dynamic.GTA/Strings.cs‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎GoogleTestAdapter/Common.Dynamic.TAfGT/Common.Dynamic.TAfGT.csproj‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,15 @@
4040
</PropertyGroup>
4141
<ItemGroup>
4242
<FilesToLocalize Include="$(OutDir)\GoogleTestAdapter.Common.Dynamic.dll">
43-
<TranslationFile>$(MSBuildThisFileDirectory)..\..\loc\lcl\{Lang}\GoogleTestAdapter.Common.Dynamic.dll.lcl</TranslationFile>
43+
<TranslationFile>$(MSBuildThisFileDirectory)..\..\loc\lcl\{Lang}\GoogleTestAdapter.Common.Dynamic.dll.lcl</TranslationFile>
4444
</FilesToLocalize>
4545
<FilesToSign Include="$(OutDir)\GoogleTestAdapter.Common.Dynamic.dll" Condition="'$(RealSign)' == 'True'">
4646
<Authenticode>Microsoft</Authenticode>
4747
<StrongName>StrongName</StrongName>
4848
</FilesToSign>
49-
<SignFilesDependsOn Include="GatherLocalizedOutputsForSigning">
50-
<!-- Do not have this show up in Solution Explorer in VS -->
51-
<InProject>false</InProject>
49+
<SignFilesDependsOn Include="GatherLocalizedOutputsForSigning">
50+
<!-- Do not have this show up in Solution Explorer in VS -->
51+
<InProject>false</InProject>
5252
</SignFilesDependsOn>
5353
</ItemGroup>
5454
<ItemGroup>
@@ -62,7 +62,6 @@
6262
<DesignTime>True</DesignTime>
6363
<DependentUpon>Resources.resx</DependentUpon>
6464
</Compile>
65-
<Compile Include="Strings.cs" />
6665
</ItemGroup>
6766
<ItemGroup>
6867
<None Include="Key.snk" />
@@ -75,7 +74,7 @@
7574
</ItemGroup>
7675
<ItemGroup>
7776
<EmbeddedResource Include="Resources.resx">
78-
<Generator>ResXFileCodeGenerator</Generator>
77+
<Generator>PublicResXFileCodeGenerator</Generator>
7978
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
8079
<SubType>Designer</SubType>
8180
</EmbeddedResource>
@@ -91,12 +90,12 @@
9190
copy "$(SolutionDir)Keys\Key_Debug.snk" "$(ProjectDir)Key.snk"
9291
)</PreBuildEvent>
9392
</PropertyGroup>
94-
<Target Name="GatherLocalizedOutputsForSigning" Condition="'$(LocalizationEnabled)' == 'true' AND '$(RealSign)' == 'True'">
95-
<ItemGroup>
96-
<FilesToSign Include="$(OutDir)\localize\**\$(AssemblyName).resources.dll">
97-
<Authenticode>Microsoft</Authenticode>
98-
<StrongName>StrongName</StrongName>
99-
</FilesToSign>
100-
</ItemGroup>
101-
</Target>
93+
<Target Name="GatherLocalizedOutputsForSigning" Condition="'$(LocalizationEnabled)' == 'true' AND '$(RealSign)' == 'True'">
94+
<ItemGroup>
95+
<FilesToSign Include="$(OutDir)\localize\**\$(AssemblyName).resources.dll">
96+
<Authenticode>Microsoft</Authenticode>
97+
<StrongName>StrongName</StrongName>
98+
</FilesToSign>
99+
</ItemGroup>
100+
</Target>
102101
</Project>

‎GoogleTestAdapter/Common.Dynamic.TAfGT/Resources.Designer.cs‎

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

0 commit comments

Comments
 (0)