Skip to content

Commit 76cf49e

Browse files
authored
[msbuild] Rename the localization resources, so they don't match localization resources from other assemblies. (#24899)
1 parent 095d77f commit 76cf49e

2 files changed

Lines changed: 18 additions & 16 deletions

File tree

msbuild/Xamarin.MacDev.Tasks/DotNetGlobals.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,5 @@
44
global using System;
55
global using System.Collections.Generic;
66
global using System.Runtime.InteropServices;
7+
8+
global using Xamarin.Localization.MSBuild;

msbuild/Xamarin.MacDev.Tasks/Xamarin.MacDev.Tasks.csproj

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -140,66 +140,66 @@
140140
<Type>Resx</Type>
141141
<Generator>ResXFileCodeGenerator</Generator>
142142
<LastGenOutput>Errors.designer.cs</LastGenOutput>
143-
<CustomToolNamespace>Xamarin.Bundler</CustomToolNamespace>
144-
<ManifestResourceName>Xamarin.Bundler.Errors</ManifestResourceName>
143+
<CustomToolNamespace>Xamarin.Localization.MSBuild</CustomToolNamespace>
144+
<ManifestResourceName>Xamarin.Localization.MSBuild.Errors</ManifestResourceName>
145145
<StronglyTypedFileName>Errors.designer.cs</StronglyTypedFileName>
146146
<StronglyTypedLanguage>CSharp</StronglyTypedLanguage>
147-
<StronglyTypedNamespace>Xamarin.Bundler</StronglyTypedNamespace>
147+
<StronglyTypedNamespace>Xamarin.Localization.MSBuild</StronglyTypedNamespace>
148148
<StronglyTypedClassName>Errors</StronglyTypedClassName>
149149
<GenerateResource>true</GenerateResource>
150150
<PublicClass>true</PublicClass>
151151
</EmbeddedResource>
152152
<EmbeddedResource Include="../../tools/mtouch/TranslatedAssemblies\Errors.cs.resx">
153153
<Link>Errors.cs.resx</Link>
154-
<ManifestResourceName>Xamarin.Bundler.Errors.cs</ManifestResourceName>
154+
<ManifestResourceName>Xamarin.Localization.MSBuild.Errors.cs</ManifestResourceName>
155155
</EmbeddedResource>
156156
<EmbeddedResource Include="../../tools/mtouch/TranslatedAssemblies\Errors.de.resx">
157157
<Link>Errors.de.resx</Link>
158-
<ManifestResourceName>Xamarin.Bundler.Errors.de</ManifestResourceName>
158+
<ManifestResourceName>Xamarin.Localization.MSBuild.Errors.de</ManifestResourceName>
159159
</EmbeddedResource>
160160
<EmbeddedResource Include="../../tools/mtouch/TranslatedAssemblies\Errors.es.resx">
161161
<Link>Errors.es.resx</Link>
162-
<ManifestResourceName>Xamarin.Bundler.Errors.es</ManifestResourceName>
162+
<ManifestResourceName>Xamarin.Localization.MSBuild.Errors.es</ManifestResourceName>
163163
</EmbeddedResource>
164164
<EmbeddedResource Include="../../tools/mtouch/TranslatedAssemblies\Errors.fr.resx">
165165
<Link>Errors.fr.resx</Link>
166-
<ManifestResourceName>Xamarin.Bundler.Errors.fr</ManifestResourceName>
166+
<ManifestResourceName>Xamarin.Localization.MSBuild.Errors.fr</ManifestResourceName>
167167
</EmbeddedResource>
168168
<EmbeddedResource Include="../../tools/mtouch/TranslatedAssemblies\Errors.it.resx">
169169
<Link>Errors.it.resx</Link>
170-
<ManifestResourceName>Xamarin.Bundler.Errors.it</ManifestResourceName>
170+
<ManifestResourceName>Xamarin.Localization.MSBuild.Errors.it</ManifestResourceName>
171171
</EmbeddedResource>
172172
<EmbeddedResource Include="../../tools/mtouch/TranslatedAssemblies\Errors.ja.resx">
173173
<Link>Errors.ja.resx</Link>
174-
<ManifestResourceName>Xamarin.Bundler.Errors.ja</ManifestResourceName>
174+
<ManifestResourceName>Xamarin.Localization.MSBuild.Errors.ja</ManifestResourceName>
175175
</EmbeddedResource>
176176
<EmbeddedResource Include="../../tools/mtouch/TranslatedAssemblies\Errors.ko.resx">
177177
<Link>Errors.ko.resx</Link>
178-
<ManifestResourceName>Xamarin.Bundler.Errors.ko</ManifestResourceName>
178+
<ManifestResourceName>Xamarin.Localization.MSBuild.Errors.ko</ManifestResourceName>
179179
</EmbeddedResource>
180180
<EmbeddedResource Include="../../tools/mtouch/TranslatedAssemblies\Errors.pl.resx">
181181
<Link>Errors.pl.resx</Link>
182-
<ManifestResourceName>Xamarin.Bundler.Errors.pl</ManifestResourceName>
182+
<ManifestResourceName>Xamarin.Localization.MSBuild.Errors.pl</ManifestResourceName>
183183
</EmbeddedResource>
184184
<EmbeddedResource Include="../../tools/mtouch/TranslatedAssemblies\Errors.pt-BR.resx">
185185
<Link>Errors.pt-BR.resx</Link>
186-
<ManifestResourceName>Xamarin.Bundler.Errors.pt-BR</ManifestResourceName>
186+
<ManifestResourceName>Xamarin.Localization.MSBuild.Errors.pt-BR</ManifestResourceName>
187187
</EmbeddedResource>
188188
<EmbeddedResource Include="../../tools/mtouch/TranslatedAssemblies\Errors.ru.resx">
189189
<Link>Errors.ru.resx</Link>
190-
<ManifestResourceName>Xamarin.Bundler.Errors.ru</ManifestResourceName>
190+
<ManifestResourceName>Xamarin.Localization.MSBuild.Errors.ru</ManifestResourceName>
191191
</EmbeddedResource>
192192
<EmbeddedResource Include="../../tools/mtouch/TranslatedAssemblies\Errors.tr.resx">
193193
<Link>Errors.tr.resx</Link>
194-
<ManifestResourceName>Xamarin.Bundler.Errors.tr</ManifestResourceName>
194+
<ManifestResourceName>Xamarin.Localization.MSBuild.Errors.tr</ManifestResourceName>
195195
</EmbeddedResource>
196196
<EmbeddedResource Include="../../tools/mtouch/TranslatedAssemblies\Errors.zh-Hans.resx">
197197
<Link>Errors.zh-Hans.resx</Link>
198-
<ManifestResourceName>Xamarin.Bundler.Errors.zh-Hans</ManifestResourceName>
198+
<ManifestResourceName>Xamarin.Localization.MSBuild.Errors.zh-Hans</ManifestResourceName>
199199
</EmbeddedResource>
200200
<EmbeddedResource Include="../../tools/mtouch/TranslatedAssemblies\Errors.zh-Hant.resx">
201201
<Link>Errors.zh-Hant.resx</Link>
202-
<ManifestResourceName>Xamarin.Bundler.Errors.zh-Hant</ManifestResourceName>
202+
<ManifestResourceName>Xamarin.Localization.MSBuild.Errors.zh-Hant</ManifestResourceName>
203203
</EmbeddedResource>
204204
</ItemGroup>
205205
</Project>

0 commit comments

Comments
 (0)