Skip to content

Commit

Permalink
initial changes to Change languageSet and Dependencies (#11512)
Browse files Browse the repository at this point in the history 
Co-authored-by: tj_devel709 <antlambe@microsoft.com>
  • Loading branch information
@tj-devel709
tj-devel709 and tj_devel709 committed May 13, 2021
1 parent d1904ec commit 4fb1707
Show file tree
Hide file tree
Showing 16 changed files with 7 additions and 10,953 deletions.
1,017 changes: 0 additions & 1,017 deletions msbuild/Xamarin.Localization.MSBuild/TranslatedAssemblies/MSBStrings.hu.resx
View file

This file was deleted.

1,017 changes: 0 additions & 1,017 deletions msbuild/Xamarin.Localization.MSBuild/TranslatedAssemblies/MSBStrings.nl.resx
View file

This file was deleted.

1,017 changes: 0 additions & 1,017 deletions msbuild/Xamarin.Localization.MSBuild/TranslatedAssemblies/MSBStrings.pt-PT.resx
View file

This file was deleted.

1,017 changes: 0 additions & 1,017 deletions msbuild/Xamarin.Localization.MSBuild/TranslatedAssemblies/MSBStrings.sv.resx
View file

This file was deleted.

12 changes: 0 additions & 12 deletions msbuild/Xamarin.Localization.MSBuild/Xamarin.Localization.MSBuild.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,6 @@
<EmbeddedResource Include="TranslatedAssemblies/MSBStrings.fr.resx">
<Link>MSBStrings.fr.resx</Link>
</EmbeddedResource>
<EmbeddedResource Include="TranslatedAssemblies/MSBStrings.hu.resx">
<Link>MSBStrings.hu.resx</Link>
</EmbeddedResource>
<EmbeddedResource Include="TranslatedAssemblies/MSBStrings.it.resx">
<Link>MSBStrings.it.resx</Link>
</EmbeddedResource>
Expand All @@ -44,24 +41,15 @@
<EmbeddedResource Include="TranslatedAssemblies/MSBStrings.ko.resx">
<Link>MSBStrings.ko.resx</Link>
</EmbeddedResource>
<EmbeddedResource Include="TranslatedAssemblies/MSBStrings.nl.resx">
<Link>MSBStrings.nl.resx</Link>
</EmbeddedResource>
<EmbeddedResource Include="TranslatedAssemblies/MSBStrings.pl.resx">
<Link>MSBStrings.pl.resx</Link>
</EmbeddedResource>
<EmbeddedResource Include="TranslatedAssemblies/MSBStrings.pt-BR.resx">
<Link>MSBStrings.pt-BR.resx</Link>
</EmbeddedResource>
<EmbeddedResource Include="TranslatedAssemblies/MSBStrings.pt-PT.resx">
<Link>MSBStrings.pt-PT.resx</Link>
</EmbeddedResource>
<EmbeddedResource Include="TranslatedAssemblies/MSBStrings.ru.resx">
<Link>MSBStrings.ru.resx</Link>
</EmbeddedResource>
<EmbeddedResource Include="TranslatedAssemblies/MSBStrings.sv.resx">
<Link>MSBStrings.sv.resx</Link>
</EmbeddedResource>
<EmbeddedResource Include="TranslatedAssemblies/MSBStrings.tr.resx">
<Link>MSBStrings.tr.resx</Link>
</EmbeddedResource>
Expand Down
5 changes: 4 additions & 1 deletion ...sbuild/Xamarin.MacDev.Tasks.Tests/TaskTests/LocalizationIgnore/common-Translations.ignore
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# Insert Error codes that are waiting on translations below (one per line)
E0067
E0174
E0175
E0177
E0178
E0179
Expand All @@ -8,6 +9,7 @@ E0181
E0182
E0183
E0184
E0185
E0186
E0187
E7069
Expand All @@ -16,3 +18,4 @@ E7071
InvalidFramework
InvalidPlatform
E7072
W0176
13 changes: 0 additions & 13 deletions tests/msbuild/Xamarin.MacDev.Tasks.Tests/TaskTests/LocalizationStringTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,12 @@ public class LocalizationStringTest : TestBase {
[TestCase ("en-US", "Unknown image format.")]
[TestCase ("es-ES", "formato de imagen desconocido.")]
[TestCase ("fr-FR", "format d'image inconnu.")]
[TestCase ("hu", "hu")]
[TestCase ("it-IT", "Formato immagine sconosciuto.")]
[TestCase ("ja-JP", "の読み込みでエラーが発生しました: 画像の形式が不明です。")]
[TestCase ("ko-KR", "을(를) 로드하는 동안 오류 발생: 알 수 없는 이미지 형식입니다.")]
[TestCase ("nl", "nl")]
[TestCase ("pl-PL", "nieznany format obrazu.")]
[TestCase ("pt-BR", "formato de imagem desconhecido.")]
[TestCase ("pt-PT", "pt-PT")]
[TestCase ("ru-RU", "неизвестный формат изображения.")]
[TestCase ("sv", "sv")]
[TestCase ("tr-TR", "yüklenirken hata oluştu: Görüntü biçimi bilinmiyor.")]
[TestCase ("zh-CN", "时出错: 未知图像格式")]
[TestCase ("zh-TW", "時發生錯誤: 未知的映像格式。")]
Expand Down Expand Up @@ -57,16 +53,12 @@ public void AllSupportedTranslations (string culture, string errorMessage)
[TestCase ("de-DE")]
[TestCase ("es-ES")]
[TestCase ("fr-FR")]
[TestCase ("hu")]
[TestCase ("it-IT")]
[TestCase ("ja-JP")]
[TestCase ("ko-KR")]
[TestCase ("nl")]
[TestCase ("pl-PL")]
[TestCase ("pt-BR")]
[TestCase ("pt-PT")]
[TestCase ("ru-RU")]
[TestCase ("sv")]
[TestCase ("tr-TR")]
[TestCase ("zh-CN")]
[TestCase ("zh-TW")]
Expand Down Expand Up @@ -112,20 +104,15 @@ public void SetUp ()
[TestCase ("de-DE")]
[TestCase ("es-ES")]
[TestCase ("fr-FR")]
[TestCase ("hu")]
[TestCase ("it-IT")]
[TestCase ("ja-JP")]
[TestCase ("ko-KR")]
[TestCase ("nl")]
[TestCase ("pl-PL")]
[TestCase ("pt-PT")]
[TestCase ("pt-BR")]
[TestCase ("ru-RU")]
[TestCase ("sv")]
[TestCase ("tr-TR")]
[TestCase ("zh-CN")]
[TestCase ("zh-TW")]
[Ignore ("OneLocBuild will return proper translated resx files.")]
public void AllErrorTranslation (string culture)
{
StringBuilder errorList = new StringBuilder (string.Empty);
Expand Down
12 changes: 2 additions & 10 deletions tests/mtouch/LocalizationTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,12 @@ public class LocalizationTests
[TestCase ("de-DE")]
[TestCase ("es-ES")]
[TestCase ("fr-FR")]
[TestCase ("hu")]
[TestCase ("it-IT")]
[TestCase ("ja-JP")]
[TestCase ("ko-KR")]
[TestCase ("nl")]
[TestCase ("pl")]
[TestCase ("pl-PL")]
[TestCase ("pt-BR")]
[TestCase ("pt-PT")]
[TestCase ("ru-RU")]
[TestCase ("sv")]
[TestCase ("tr-TR")]
[TestCase ("zh-CN")]
[TestCase ("zh-TW")]
Expand Down Expand Up @@ -72,16 +68,12 @@ private string TranslateError (string culture, string errorCode)
[TestCase ("de-DE")]
[TestCase ("es-ES")]
[TestCase ("fr-FR")]
[TestCase ("hu")]
[TestCase ("it-IT")]
[TestCase ("ja-JP")]
[TestCase ("ko-KR")]
[TestCase ("nl")]
[TestCase ("pl")]
[TestCase ("pl-PL")]
[TestCase ("pt-BR")]
[TestCase ("pt-PT")]
[TestCase ("ru-RU")]
[TestCase ("sv")]
[TestCase ("tr-TR")]
[TestCase ("zh-CN")]
[TestCase ("zh-TW")]
Expand Down
2 changes: 1 addition & 1 deletion tools/devops/LocProject.json.in
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"Projects": [
{
"LanguageSet": "Azure_Languages",
"LanguageSet": "VS_Main_Languages",
"LocItems": [
{
"SourceFile": "@WORKING_DIRECTORY@/../../msbuild/Xamarin.Localization.MSBuild/MSBStrings.resx",
Expand Down
16 changes: 0 additions & 16 deletions tools/dotnet-linker/dotnet-linker.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -224,10 +224,6 @@
<Link>tools\mtouch\Errors.fr.resx</Link>
<ManifestResourceName>Errors.mtouch.fr</ManifestResourceName>
</EmbeddedResource>
<EmbeddedResource Include="..\mtouch\TranslatedAssemblies\Errors.hu.resx">
<Link>tools\mtouch\Errors.hu.resx</Link>
<ManifestResourceName>Errors.mtouch.hu</ManifestResourceName>
</EmbeddedResource>
<EmbeddedResource Include="..\mtouch\TranslatedAssemblies\Errors.it.resx">
<Link>tools\mtouch\Errors.it.resx</Link>
<ManifestResourceName>Errors.mtouch.it</ManifestResourceName>
Expand All @@ -240,10 +236,6 @@
<Link>tools\mtouch\Errors.ko.resx</Link>
<ManifestResourceName>Errors.mtouch.ko</ManifestResourceName>
</EmbeddedResource>
<EmbeddedResource Include="..\mtouch\TranslatedAssemblies\Errors.nl.resx">
<Link>tools\mtouch\Errors.nl.resx</Link>
<ManifestResourceName>Errors.mtouch.nl</ManifestResourceName>
</EmbeddedResource>
<EmbeddedResource Include="..\mtouch\TranslatedAssemblies\Errors.pl.resx">
<Link>tools\mtouch\Errors.pl.resx</Link>
<ManifestResourceName>Errors.mtouch.pl</ManifestResourceName>
Expand All @@ -252,18 +244,10 @@
<Link>tools\mtouch\Errors.pt-BR.resx</Link>
<ManifestResourceName>Errors.mtouch.pt-BR</ManifestResourceName>
</EmbeddedResource>
<EmbeddedResource Include="..\mtouch\TranslatedAssemblies\Errors.pt-PT.resx">
<Link>tools\mtouch\Errors.pt-PT.resx</Link>
<ManifestResourceName>Errors.mtouch.pt-PT</ManifestResourceName>
</EmbeddedResource>
<EmbeddedResource Include="..\mtouch\TranslatedAssemblies\Errors.ru.resx">
<Link>tools\mtouch\Errors.ru.resx</Link>
<ManifestResourceName>Errors.mtouch.ru</ManifestResourceName>
</EmbeddedResource>
<EmbeddedResource Include="..\mtouch\TranslatedAssemblies\Errors.sv.resx">
<Link>tools\mtouch\Errors.sv.resx</Link>
<ManifestResourceName>Errors.mtouch.sv</ManifestResourceName>
</EmbeddedResource>
<EmbeddedResource Include="..\mtouch\TranslatedAssemblies\Errors.tr.resx">
<Link>tools\mtouch\Errors.tr.resx</Link>
<ManifestResourceName>Errors.mtouch.tr</ManifestResourceName>
Expand Down
16 changes: 0 additions & 16 deletions tools/mmp/mmp.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -510,10 +510,6 @@
<Link>tools\mtouch\Errors.fr.resx</Link>
<ManifestResourceName>Errors.mtouch.fr</ManifestResourceName>
</EmbeddedResource>
<EmbeddedResource Include="..\mtouch\TranslatedAssemblies\Errors.hu.resx">
<Link>tools\mtouch\Errors.hu.resx</Link>
<ManifestResourceName>Errors.mtouch.hu</ManifestResourceName>
</EmbeddedResource>
<EmbeddedResource Include="..\mtouch\TranslatedAssemblies\Errors.it.resx">
<Link>tools\mtouch\Errors.it.resx</Link>
<ManifestResourceName>Errors.mtouch.it</ManifestResourceName>
Expand All @@ -526,10 +522,6 @@
<Link>tools\mtouch\Errors.ko.resx</Link>
<ManifestResourceName>Errors.mtouch.ko</ManifestResourceName>
</EmbeddedResource>
<EmbeddedResource Include="..\mtouch\TranslatedAssemblies\Errors.nl.resx">
<Link>tools\mtouch\Errors.nl.resx</Link>
<ManifestResourceName>Errors.mtouch.nl</ManifestResourceName>
</EmbeddedResource>
<EmbeddedResource Include="..\mtouch\TranslatedAssemblies\Errors.pl.resx">
<Link>tools\mtouch\Errors.pl.resx</Link>
<ManifestResourceName>Errors.mtouch.pl</ManifestResourceName>
Expand All @@ -538,18 +530,10 @@
<Link>tools\mtouch\Errors.pt-BR.resx</Link>
<ManifestResourceName>Errors.mtouch.pt-BR</ManifestResourceName>
</EmbeddedResource>
<EmbeddedResource Include="..\mtouch\TranslatedAssemblies\Errors.pt-PT.resx">
<Link>tools\mtouch\Errors.pt-PT.resx</Link>
<ManifestResourceName>Errors.mtouch.pt-PT</ManifestResourceName>
</EmbeddedResource>
<EmbeddedResource Include="..\mtouch\TranslatedAssemblies\Errors.ru.resx">
<Link>tools\mtouch\Errors.ru.resx</Link>
<ManifestResourceName>Errors.mtouch.ru</ManifestResourceName>
</EmbeddedResource>
<EmbeddedResource Include="..\mtouch\TranslatedAssemblies\Errors.sv.resx">
<Link>tools\mtouch\Errors.sv.resx</Link>
<ManifestResourceName>Errors.mtouch.sv</ManifestResourceName>
</EmbeddedResource>
<EmbeddedResource Include="..\mtouch\TranslatedAssemblies\Errors.tr.resx">
<Link>tools\mtouch\Errors.tr.resx</Link>
<ManifestResourceName>Errors.mtouch.tr</ManifestResourceName>
Expand Down
Loading

8 comments on commit 4fb1707

@vs-mobiletools-engineering-service2
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Tests were not ran (Build). ⚠️

Results were skipped for this run Azure Devops.

Pipeline on Agent
initial changes to Change languageSet and Dependencies (#11512)

Co-authored-by: tj_devel709 antlambe@microsoft.com

@vs-mobiletools-engineering-service2
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

❌ [CI Build] Tests failed on Build ❌

Tests failed on Build.

API diff

✅ API Diff from stable

View API diff

API & Generator diff

✅ API Diff (from PR only) (no change)
✅ Generator Diff (no change)

Packages generated

View packages

Test results

3 tests failed, 190 tests passed.

Failed tests

  • introspection/Mac Modern/Debug: Failed (Test run failed.
    Tests run: 35 Passed: 33 Inconclusive: 0 Failed: 1 Ignored: 1)
  • introspection/watchOS 32-bits - simulator/Debug (watchOS 5.0): Failed
  • monotouch-test/iOS Unified 64-bits - simulator/Debug (all optimizations) [dotnet]: Failed

Pipeline on Agent XAMBOT-1038.BigSur
initial changes to Change languageSet and Dependencies (#11512)

@vs-mobiletools-engineering-service2
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Tests were not ran (VSTS: device tests tvOS). ⚠️

Results were skipped for this run due to provisioning problems Azure Devops. Please contact the bot administrator.

Pipeline on Agent
initial changes to Change languageSet and Dependencies (#11512)

@vs-mobiletools-engineering-service2
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

❌ Tests failed on macOS Mac Catalina (10.15) ❌

Tests failed on Mac Catalina (10.15).

Failed tests are:

  • introspection

Pipeline on Agent
initial changes to Change languageSet and Dependencies (#11512)

@vs-mobiletools-engineering-service2
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Tests were not ran (VSTS: device tests iOS). ⚠️

Results were skipped for this run due to provisioning problems Azure Devops. Please contact the bot administrator.

Pipeline on Agent
initial changes to Change languageSet and Dependencies (#11512)

@vs-mobiletools-engineering-service2
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

❌ Tests failed on macOS Mac Mojave (10.14) ❌

Tests failed on Mac Mojave (10.14).

Failed tests are:

  • introspection
  • xammac_tests

Pipeline on Agent
initial changes to Change languageSet and Dependencies (#11512)

@vs-mobiletools-engineering-service2
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

❌ Tests failed on macOS Mac High Sierra (10.13) ❌

Tests failed on Mac High Sierra (10.13).

Failed tests are:

  • introspection
  • xammac_tests

Pipeline on Agent
initial changes to Change languageSet and Dependencies (#11512)

@vs-mobiletools-engineering-service2
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Tests were not ran (VSTS: device tests iOS32b). ⚠️

Results were skipped for this run due to provisioning problems Azure Devops. Please contact the bot administrator.

Pipeline on Agent
initial changes to Change languageSet and Dependencies (#11512)

Please sign in to comment.