Skip to content

Commit

Permalink
Merge branch 'main' into lego/hb_dca0a672-370a-4b3c-b55f-cd146e93faf9…
Browse files Browse the repository at this point in the history 
…_20210702221506997
  • Loading branch information
@mandel-macaque
mandel-macaque authored Jul 8, 2021
2 parents 5696ace + 9d31e45 commit c38e1a9
Show file tree
Hide file tree
Showing 39 changed files with 1,101 additions and 576 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/label-checker.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- run: exit 0
name: 'Monojenkins PR'
# always happy if monojenkins
if: github.actor == 'vs-mobiletools-engineering-service2'
if: github.actor == 'vs-mobiletools-engineering-service2' || github.actor == 'github-actions[bot]'

- run: exit 1
name: 'User PR with no labels'
Expand Down
72 changes: 72 additions & 0 deletions Localize/loc/cs/msbuild/Xamarin.Localization.MSBuild/MSBStrings.resx.lcl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1603,6 +1603,78 @@
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";E7073" ItemType="0;.resx" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[At least one app bundle must be specified.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Musí se zadat nejméně jedna sada prostředků aplikace.]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";E7074" ItemType="0;.resx" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[The app bundle {0} does not exist.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Sada prostředků aplikace {0} neexistuje.]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";E7075" ItemType="0;.resx" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[No 'SpecificSubDirectory' metadata was provided for the app bundle {0}.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Pro sadu prostředků aplikace {0} se neposkytla žádná metadata SpecificSubDirectory.]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";E7076" ItemType="0;.resx" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Can't merge the symlink '{0}', it has different targets.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Symbolický odkaz {0} se nedá sloučit, protože má rozdílné cíle.]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";E7077" ItemType="0;.resx" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Unable to merge the file '{0}', it's different between the input app bundles.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Nedá se sloučit soubor {0}, protože se liší mezi vstupními sadami prostředků aplikace.]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";E7078" ItemType="0;.resx" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Invalid app bundle: the Mach-O file {0} has dependent files.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Neplatná sada prostředků aplikace: soubor Mach-O {0} má závislé soubory.]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";E7079" ItemType="0;.resx" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Invalid app bundle: the file {0} has different types between the input app bundles.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Neplatná sada prostředků aplikace: soubor {0} má mezi vstupními sadami prostředků aplikace rozdílné typy.]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";E7080" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[App bundle file #{0}: {1}]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Soubor sady prostředků aplikace č. {0}: {1}]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";InvalidFramework" ItemType="0;.resx" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Invalid framework: {0}]]></Val>
Expand Down
72 changes: 72 additions & 0 deletions Localize/loc/de/msbuild/Xamarin.Localization.MSBuild/MSBStrings.resx.lcl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1603,6 +1603,78 @@
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";E7073" ItemType="0;.resx" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[At least one app bundle must be specified.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Es muss mindestens ein App Bundle angegeben werden.]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";E7074" ItemType="0;.resx" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[The app bundle {0} does not exist.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Das App Bundle "{0}" ist nicht vorhanden.]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";E7075" ItemType="0;.resx" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[No 'SpecificSubDirectory' metadata was provided for the app bundle {0}.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Es wurden keine SpecificSubDirectory-Metadaten für das App Bundle "{0}" bereitgestellt.]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";E7076" ItemType="0;.resx" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Can't merge the symlink '{0}', it has different targets.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Der Symlink "{0}" kann nicht zusammengeführt werden. Er weist unterschiedliche Ziele auf.]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";E7077" ItemType="0;.resx" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Unable to merge the file '{0}', it's different between the input app bundles.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Die Datei "{0}" kann nicht zusammengeführt werden. Sie unterscheidet sich von den Eingabe-App-Bundles.]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";E7078" ItemType="0;.resx" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Invalid app bundle: the Mach-O file {0} has dependent files.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Ungültiges App Bundle: die Mach-O-Datei "{0}" hat abhängige Dateien.]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";E7079" ItemType="0;.resx" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Invalid app bundle: the file {0} has different types between the input app bundles.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Ungültiges App Bundle: die Datei "{0}" hat unterschiedliche Typen zwischen den Eingabe-App-Bundles.]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";E7080" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[App bundle file #{0}: {1}]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[App Bundle-Datei #{0}: {1}]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";InvalidFramework" ItemType="0;.resx" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Invalid framework: {0}]]></Val>
Expand Down
72 changes: 72 additions & 0 deletions Localize/loc/es/msbuild/Xamarin.Localization.MSBuild/MSBStrings.resx.lcl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1603,6 +1603,78 @@
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";E7073" ItemType="0;.resx" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[At least one app bundle must be specified.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Debe especificarse al menos un lote de aplicaciones.]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";E7074" ItemType="0;.resx" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[The app bundle {0} does not exist.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[El lote de aplicaciones {0} no existe.]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";E7075" ItemType="0;.resx" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[No 'SpecificSubDirectory' metadata was provided for the app bundle {0}.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[No se proporcionó ningún metadato "SpecificSubDirectory" para el lote de aplicaciones {0}.]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";E7076" ItemType="0;.resx" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Can't merge the symlink '{0}', it has different targets.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[No se puede combinar el symlink "{0}", tiene destinos diferentes.]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";E7077" ItemType="0;.resx" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Unable to merge the file '{0}', it's different between the input app bundles.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[No se puede combinar el archivo "{0}", es diferente entre los lotes de aplicaciones de entrada.]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";E7078" ItemType="0;.resx" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Invalid app bundle: the Mach-O file {0} has dependent files.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Lote de aplicaciones no válido: el archivo Mach-O {0} tiene archivos dependientes.]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";E7079" ItemType="0;.resx" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Invalid app bundle: the file {0} has different types between the input app bundles.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Lote de aplicaciones no válido: el archivo {0} tiene tipos diferentes entre los lotes de aplicaciones de entrada.]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";E7080" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[App bundle file #{0}: {1}]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Archivo de lote de aplicaciones n.º {0}: {1}]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";InvalidFramework" ItemType="0;.resx" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Invalid framework: {0}]]></Val>
Expand Down
72 changes: 72 additions & 0 deletions Localize/loc/ja/msbuild/Xamarin.Localization.MSBuild/MSBStrings.resx.lcl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1603,6 +1603,78 @@
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";E7073" ItemType="0;.resx" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[At least one app bundle must be specified.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[少なくとも 1 つのアプリ バンドルを指定する必要があります。]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";E7074" ItemType="0;.resx" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[The app bundle {0} does not exist.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[アプリ バンドル {0} が存在しません。]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";E7075" ItemType="0;.resx" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[No 'SpecificSubDirectory' metadata was provided for the app bundle {0}.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[アプリ バンドル {0} に対して、'SpecificSubDirectory' メタデータが指定されていません。]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";E7076" ItemType="0;.resx" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Can't merge the symlink '{0}', it has different targets.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[シンボリックリンク '{0}' をマージできません。ターゲットが異なります。]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";E7077" ItemType="0;.resx" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Unable to merge the file '{0}', it's different between the input app bundles.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[ファイル '{0}' をマージできません。入力アプリ バンドル間で異なります。]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";E7078" ItemType="0;.resx" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Invalid app bundle: the Mach-O file {0} has dependent files.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[無効なアプリ バンドル: Mach-O ファイル {0} に依存ファイルがあります。]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";E7079" ItemType="0;.resx" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Invalid app bundle: the file {0} has different types between the input app bundles.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[無効なアプリ バンドル: ファイル {0} の入力アプリ バンドル間の種類が異なります。]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";E7080" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[App bundle file #{0}: {1}]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[アプリ バンドル ファイル #{0}: {1}]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";InvalidFramework" ItemType="0;.resx" PsrId="211" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Invalid framework: {0}]]></Val>
Expand Down
Loading

8 comments on commit c38e1a9

@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) (please review changes)
ℹ️ Generator Diff (please review changes)

Packages generated

View packages

Test results

1 tests failed, 220 tests passed.

Failed tests

  • DotNet tests: Failed (Execution failed with exit code 1)

Pipeline on Agent XAMBOT-1038.BigSur'
Merge branch 'main' into lego/hb_dca0a672-370a-4b3c-b55f-cd146e93faf9_20210702221506997

@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 catastrophically on VSTS: device tests tvOS 🔥

Not enough free space in the host.

Pipeline on Agent
Merge branch 'main' into lego/hb_dca0a672-370a-4b3c-b55f-cd146e93faf9_20210702221506997

@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
Merge branch 'main' into lego/hb_dca0a672-370a-4b3c-b55f-cd146e93faf9_20210702221506997

@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
Merge branch 'main' into lego/hb_dca0a672-370a-4b3c-b55f-cd146e93faf9_20210702221506997

@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 passed on macOS Mac Catalina (10.15) ✅

Tests passed

All tests on macOS X Mac Catalina (10.15) passed.

Pipeline on Agent
Merge branch 'main' into lego/hb_dca0a672-370a-4b3c-b55f-cd146e93faf9_20210702221506997

@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 passed on macOS Mac Mojave (10.14) ✅

Tests passed

All tests on macOS X Mac Mojave (10.14) passed.

Pipeline on Agent
Merge branch 'main' into lego/hb_dca0a672-370a-4b3c-b55f-cd146e93faf9_20210702221506997

@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 passed on macOS Mac High Sierra (10.13) ✅

Tests passed

All tests on macOS X Mac High Sierra (10.13) passed.

Pipeline on Agent
Merge branch 'main' into lego/hb_dca0a672-370a-4b3c-b55f-cd146e93faf9_20210702221506997

@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
Merge branch 'main' into lego/hb_dca0a672-370a-4b3c-b55f-cd146e93faf9_20210702221506997

Please sign in to comment.