Skip to content

Commit

Permalink
Merge branch 'main' into dev/grendel/blazor-hang
Browse files Browse the repository at this point in the history
* main:
  Bump to dotnet/installer@dc43d363d2 9.0.100-preview.4.24175.5 (#8828)
  [Xamarin.Android.Build.Tasks] Update to newer ILRepack which supports debug files. (#8839)
  Bump 'NuGet.*' and 'Newtonsoft.Json' NuGet versions. (#8825)
  Localized file check-in by OneLocBuild Task (#8844)
  [LayoutBindings] Fix '[Preserve]' is obsolete warnings (#8529)
  LEGO: Merge pull request 8837
  • Loading branch information
grendello committed Apr 2, 2024
2 parents 8efc08b + 378b492 commit b45cbfb
Show file tree
Hide file tree
Showing 45 changed files with 1,361 additions and 412 deletions.
2 changes: 1 addition & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
<LibZipSharpVersion>3.1.1</LibZipSharpVersion>
<MicroBuildCoreVersion>1.0.0</MicroBuildCoreVersion>
<MonoCecilVersion>0.11.4</MonoCecilVersion>
<NewtonsoftJsonPackageVersion>13.0.1</NewtonsoftJsonPackageVersion>
<NewtonsoftJsonPackageVersion>13.0.3</NewtonsoftJsonPackageVersion>
<NuGetApiPackageVersion>5.4.0</NuGetApiPackageVersion>
<LZ4PackageVersion>1.1.11</LZ4PackageVersion>
<MonoOptionsVersion>6.12.0.148</MonoOptionsVersion>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1190,10 +1190,13 @@
</Item>
<Item ItemId=";XA4234" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA['<{0}>' item '{1}' is missing required metadata '{2}']]></Val>
<Val><![CDATA['<{0}>' item '{1}' is missing required attribute '{2}'.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Položce <{0}> {1} chybí požadovaná metadata {2}]]></Val>
<Val><![CDATA[V položce <{0}> {1} chybí požadovaný atribut {2}.]]></Val>
</Tgt>
<Prev Cat="Text">
<Val><![CDATA['<{0}>' item '{1}' is missing required metadata '{2}']]></Val>
</Prev>
</Str>
<Disp Icon="Str" />
</Item>
Expand All @@ -1217,27 +1220,93 @@
</Item>
<Item ItemId=";XA4237" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Cannot download POM file for Maven artifact '{0}:{1}'.]D;]A;- {2}: {3}]]></Val>
<Val><![CDATA[Cannot download POM file for Maven artifact '{0}'.]D;]A;- {1}]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Nelze stáhnout soubor POM pro artefakt Maven {0}:{1}.]D;]A;- {2}: {3}]]></Val>
<Val><![CDATA[Nelze stáhnout soubor POM pro artefakt Maven {0}.]D;]A;- {1}]]></Val>
</Tgt>
<Prev Cat="Text">
<Val><![CDATA[Cannot download POM file for Maven artifact '{0}:{1}'.]D;]A;- {2}: {3}]]></Val>
</Prev>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";XA4238" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Item ItemId=";XA4239" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Cannot download parent POM file for Maven artifact '{0}:{1}'.]D;]A;- {2}: {3}]]></Val>
<Val><![CDATA[Unknown Maven repository: '{0}'.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Nelze stáhnout nadřazený soubor POM pro artefakt Maven {0}:{1}.]D;]A;- {2}: {3}]]></Val>
<Val><![CDATA[Neznámé úložiště Maven: {0}]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";XA4239" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Item ItemId=";XA4241" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Unknown Maven repository: '{0}'.]]></Val>
<Val><![CDATA[Java dependency '{0}' is not satisfied.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Neznámé úložiště Maven: {0}]]></Val>
<Val><![CDATA[Závislosti Java {0} není vyhověno.]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";XA4242" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Java dependency '{0}' is not satisfied. Microsoft maintains the NuGet package '{1}' that could fulfill this dependency.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Závislosti Java {0} není vyhověno. Microsoft spravuje balíček NuGet {1}, který by mohl této závislosti vyhovět.]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";XA4243" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Attribute '{0}' is required when using '{1}' for '{2}' item '{3}'.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Atribut {0} je vyžadován při použití {1} pro položku {2} {3}.]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";XA4244" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Attribute '{0}' cannot be empty for '{1}' item '{2}'.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Atribut {0} nemůže být pro položku {1} {2} prázdný.]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";XA4245" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Specified POM file '{0}' does not exist.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Zadaný soubor POM {0} neexistuje.]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";XA4246" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Could not parse POM file '{0}'.]D;]A;- {1}]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Nepovedlo se parsovat soubor POM {0}.]D;]A;- {1}]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";XA4247" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Could not resolve POM file for artifact '{0}'.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Nepovedlo se přeložit soubor POM pro artefakt {0}.]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";XA4248" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Could not find NuGet package '{0}' version '{1}' in lock file. Ensure NuGet Restore has run since this <PackageReference> was added.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[V souboru zámku se nepovedlo najít balíček NuGet {0} verze {1}. Ujistěte se, že se od přidání tohoto <PackageReference> spustilo obnovení NuGet.]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1190,10 +1190,13 @@
</Item>
<Item ItemId=";XA4234" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA['<{0}>' item '{1}' is missing required metadata '{2}']]></Val>
<Val><![CDATA['<{0}>' item '{1}' is missing required attribute '{2}'.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Für das "<{0}>"-Element "{1}" fehlen die erforderlichen Metadaten "{2}"]]></Val>
<Val><![CDATA[Für das <{0}>-Element {1}“ fehlt das erforderliche Attribut „{2}“.]]></Val>
</Tgt>
<Prev Cat="Text">
<Val><![CDATA['<{0}>' item '{1}' is missing required metadata '{2}']]></Val>
</Prev>
</Str>
<Disp Icon="Str" />
</Item>
Expand All @@ -1217,27 +1220,93 @@
</Item>
<Item ItemId=";XA4237" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Cannot download POM file for Maven artifact '{0}:{1}'.]D;]A;- {2}: {3}]]></Val>
<Val><![CDATA[Cannot download POM file for Maven artifact '{0}'.]D;]A;- {1}]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Der POM-Datei für das Maven-Artefakt "{0}:{1}" kann nicht heruntergeladen werden.]D;]A;– {2}: {3}]]></Val>
<Val><![CDATA[Die POM-Datei für das Maven-Artefakt {0} kann nicht heruntergeladen werden.]D;]A;– {1}]]></Val>
</Tgt>
<Prev Cat="Text">
<Val><![CDATA[Cannot download POM file for Maven artifact '{0}:{1}'.]D;]A;- {2}: {3}]]></Val>
</Prev>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";XA4238" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Item ItemId=";XA4239" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Cannot download parent POM file for Maven artifact '{0}:{1}'.]D;]A;- {2}: {3}]]></Val>
<Val><![CDATA[Unknown Maven repository: '{0}'.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Die übergeordnete POM-Datei für das Maven-Artefakt "{0}:{1}" kann nicht heruntergeladen werden.]D;]A;– {2}: {3}]]></Val>
<Val><![CDATA[Unbekanntes Maven-Repository: "{0}".]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";XA4239" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Item ItemId=";XA4241" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Unknown Maven repository: '{0}'.]]></Val>
<Val><![CDATA[Java dependency '{0}' is not satisfied.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Unbekanntes Maven-Repository: "{0}".]]></Val>
<Val><![CDATA[Java-Abhängigkeit „{0}“ wurde nicht erfüllt.]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";XA4242" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Java dependency '{0}' is not satisfied. Microsoft maintains the NuGet package '{1}' that could fulfill this dependency.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Java-Abhängigkeit „{0}“ wurde nicht erfüllt. Microsoft verwaltet das NuGet-Paket „{1}“, das diese Abhängigkeit erfüllen könnte.]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";XA4243" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Attribute '{0}' is required when using '{1}' for '{2}' item '{3}'.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Das Attribut „{0}“ ist erforderlich, wenn „{1}“ für das „{2}“-Element „{3}“ verwendet wird.]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";XA4244" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Attribute '{0}' cannot be empty for '{1}' item '{2}'.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Das Attribut „{0}“ darf für das „{1}“-Element „{2}“ nicht leer sein.]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";XA4245" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Specified POM file '{0}' does not exist.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Die angegebene POM-Datei „{0}“ ist nicht vorhanden.]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";XA4246" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Could not parse POM file '{0}'.]D;]A;- {1}]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Die POM-Datei „{0}“ konnte nicht analysiert werden.]D;]A;– {1}]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";XA4247" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Could not resolve POM file for artifact '{0}'.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Die POM-Datei für das Artefakt „{0}“ konnte nicht aufgelöst werden.]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";XA4248" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Could not find NuGet package '{0}' version '{1}' in lock file. Ensure NuGet Restore has run since this <PackageReference> was added.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Das NuGet-Paket „{0}“ der Version „{1}“ wurde in der Sperrdatei nicht gefunden. Stellen Sie sicher, dass die NuGet-Wiederherstellung seit dem Hinzufügen dieser <PackageReference> ausgeführt wurde.]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1190,10 +1190,13 @@
</Item>
<Item ItemId=";XA4234" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA['<{0}>' item '{1}' is missing required metadata '{2}']]></Val>
<Val><![CDATA['<{0}>' item '{1}' is missing required attribute '{2}'.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA["<{0}>" el elemento "{1}" en los metadatos necesarios "{2}"]]></Val>
<Val><![CDATA[El elemento "{0}" "{1}" no tiene el atributo "{2}" requerido]]></Val>
</Tgt>
<Prev Cat="Text">
<Val><![CDATA['<{0}>' item '{1}' is missing required metadata '{2}']]></Val>
</Prev>
</Str>
<Disp Icon="Str" />
</Item>
Expand All @@ -1217,27 +1220,93 @@
</Item>
<Item ItemId=";XA4237" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Cannot download POM file for Maven artifact '{0}:{1}'.]D;]A;- {2}: {3}]]></Val>
<Val><![CDATA[Cannot download POM file for Maven artifact '{0}'.]D;]A;- {1}]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[No se puede descargar archivo POM para el artefacto de Maven "{0}:{1}".]D;]A;- {2}: {3}]]></Val>
<Val><![CDATA[No se puede descargar el archivo POM para el artefacto de Maven "{0}".]D;]A;- {1}]]></Val>
</Tgt>
<Prev Cat="Text">
<Val><![CDATA[Cannot download POM file for Maven artifact '{0}:{1}'.]D;]A;- {2}: {3}]]></Val>
</Prev>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";XA4238" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Item ItemId=";XA4239" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Cannot download parent POM file for Maven artifact '{0}:{1}'.]D;]A;- {2}: {3}]]></Val>
<Val><![CDATA[Unknown Maven repository: '{0}'.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[No se puede descargar el archivo POM primario para el artefacto de Maven "{0}:{1}".]D;]A;- {2}: {3}]]></Val>
<Val><![CDATA[Repositorio de Maven desconocido: "{0}".]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";XA4239" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Item ItemId=";XA4241" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Unknown Maven repository: '{0}'.]]></Val>
<Val><![CDATA[Java dependency '{0}' is not satisfied.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Repositorio de Maven desconocido: "{0}".]]></Val>
<Val><![CDATA[No se cumple la dependencia de Java "{0}".]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";XA4242" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Java dependency '{0}' is not satisfied. Microsoft maintains the NuGet package '{1}' that could fulfill this dependency.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[No se cumple la dependencia de Java "{0}". Microsoft mantiene el paquete NuGet "{1}" que podría satisfacer esta dependencia.]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";XA4243" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Attribute '{0}' is required when using '{1}' for '{2}' item '{3}'.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[Se requiere el atributo "{0}" cuando se usa "{1}" para el elemento "{2}" "{3}".]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";XA4244" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Attribute '{0}' cannot be empty for '{1}' item '{2}'.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[El atributo "{0}" no puede estar vacío para el elemento "{1}" "{2}".]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";XA4245" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Specified POM file '{0}' does not exist.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[El archivo POM especificado "{0}" no existe.]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";XA4246" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Could not parse POM file '{0}'.]D;]A;- {1}]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[No se pudo analizar el archivo POM "{0}".]D;]A;- {1}]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";XA4247" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Could not resolve POM file for artifact '{0}'.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[No se pudo resolver el archivo POM para el artefacto "{0}".]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
</Item>
<Item ItemId=";XA4248" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
<Str Cat="Text">
<Val><![CDATA[Could not find NuGet package '{0}' version '{1}' in lock file. Ensure NuGet Restore has run since this <PackageReference> was added.]]></Val>
<Tgt Cat="Text" Stat="Loc" Orig="New">
<Val><![CDATA[No se encontró el paquete NuGet "{0}" versión "{1}" en el archivo de bloqueo. Asegúrese de que la restauración de NuGet se ha ejecutado desde que se agregó esta <PackageReference>.]]></Val>
</Tgt>
</Str>
<Disp Icon="Str" />
Expand Down
Loading

0 comments on commit b45cbfb

Please sign in to comment.