Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into introspection-skip-ms…
Browse files Browse the repository at this point in the history
…gsend-everywhere
  • Loading branch information
rolfbjarne committed Oct 7, 2021
2 parents 4bd6a6c + 694ec2d commit 3ccbdc0
Show file tree
Hide file tree
Showing 45 changed files with 275 additions and 129 deletions.
2 changes: 1 addition & 1 deletion Make.config
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,7 @@ DEVICETV_OBJC_CFLAGS = $(DEVICETV_CFLAGS) $(DEVICE_OBJC_CFLAGS)

XAMARIN_MACOS_SDK = $(MAC_FRAMEWORK_CURRENT_DIR)/SDKs/Xamarin.macOS.sdk

MAC_OBJC_CFLAGS= -DMONOMAC -DMIN_XM_MONO_VERSION=\"$(MIN_XM_MONO_VERSION)\" $(CFLAGS) $(OBJC_CFLAGS)
MAC_OBJC_CFLAGS= -mmacosx-version-min=$(MIN_OSX_SDK_VERSION) -DMONOMAC -DMIN_XM_MONO_VERSION=\"$(MIN_XM_MONO_VERSION)\" $(CFLAGS) $(OBJC_CFLAGS)
MAC_CFLAGS = -mmacosx-version-min=$(MIN_OSX_SDK_VERSION) -DMONOMAC -g -DMIN_XM_MONO_VERSION=\"$(MIN_XM_MONO_VERSION)\" $(CFLAGS)
MAC_LDFLAGS = -mmacosx-version-min=$(MIN_OSX_SDK_VERSION) -framework AppKit

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1054,21 +1054,32 @@
</comment>
</data>
<data name="E7082" xml:space="preserve">
<value>The {0} value in the Info.plist ({1}) does not match the SupportedOSPlatformVersion value ({2}) in the project file (if there is no SupportedOSPlatformVersion value in the project file, then a default value has been assumed). Either change the value in the Info.plist to match the SupportedOSPlatformVersion value, or remove the value in the Info.plist (and add a SupportedOSPlatformVersion value to the project file if it doesn't already exist).</value>
<value>Hodnota {0} v Info.plist ({1}) se neshoduje s hodnotou SupportedOSPlatformVersion ({2}) v souboru projektu (pokud v souboru projektu není žádná SupportedOSPlatformVersion, předpokládá se výchozí hodnota). Buď změňte hodnotu v Info.plist tak, aby se shodovala s hodnotou SupportedOSPlatformVersion, nebo odeberte hodnotu v Info.plist (a přidejte hodnotu SupportedOSPlatformVersion do souboru projektu, pokud ještě neexistuje).</value>
<comment>
{0}: the name of a value from the Info.plist file the message talks about (either 'MinimumOSVersion' or 'LSMinimumSystemVersion').
{1}: the value from the Info.plist.
{2}: the value from the project file.
</comment>
</data>
<data name="E7083" xml:space="preserve">
<value>All font files must be located in the same directory in the app bundle. The following font files have different target directories in the app bundle:</value>
<value>Všechny soubory písem se musí nacházet ve stejném adresáři v sadě prostředků aplikace. Následující soubory písem mají v sadě prostředků aplikace různé cílové adresáře:</value>
<comment>This error message will be followed by E7084 error messages listing the target directory for each font file</comment>
</data>
<data name="E7084" xml:space="preserve">
<value>The target directory is {0}</value>
<value>Cílový adresář je {0}.</value>
<comment>See E7082 as well.
{0}: the target directory (in the app bundle) for the font file
</comment>
</data>
<data name="W7085" xml:space="preserve">
<value>Creating a compressed binding resource package because there are symlinks in the input.</value>
</data>
<data name="E7086" xml:space="preserve">
<value>The value '{0}' is invalid for the Compress property. Valid values: 'true', 'false' or 'auto'.</value>
<comment>The following are literal names and should not be translated: Compress, true, false, auto.</comment>
</data>
<data name="W7087" xml:space="preserve">
<value>Expected a 'manifest' file in the directory {0}.</value>
<comment>The following are literal names and should not be translated: manifest</comment>
</data>
</root>
Original file line number Diff line number Diff line change
Expand Up @@ -1054,21 +1054,32 @@
</comment>
</data>
<data name="E7082" xml:space="preserve">
<value>The {0} value in the Info.plist ({1}) does not match the SupportedOSPlatformVersion value ({2}) in the project file (if there is no SupportedOSPlatformVersion value in the project file, then a default value has been assumed). Either change the value in the Info.plist to match the SupportedOSPlatformVersion value, or remove the value in the Info.plist (and add a SupportedOSPlatformVersion value to the project file if it doesn't already exist).</value>
<value>Der {0}-Wert in der Datei „Info.plist ({1}) stimmt nicht mit dem SupportedOSPlatformVersion-Wert ({2}) in der Projektdatei überein (wenn kein SupportedOSPlatformVersion-Wert in der Projektdatei vorhanden ist, wurde ein Standardwert angenommen). Ändern Sie entweder den Wert in der Datei „Info. plist“, damit er mit dem SupportedOSPlatformVersion-Wert übereinstimmt, oder entfernen Sie den Wert in Info. plist“ (und fügen Sie der Projektdatei einen SupportedOSPlatformVersion-Wert hinzu, wenn keiner vorhanden ist).</value>
<comment>
{0}: the name of a value from the Info.plist file the message talks about (either 'MinimumOSVersion' or 'LSMinimumSystemVersion').
{1}: the value from the Info.plist.
{2}: the value from the project file.
</comment>
</data>
<data name="E7083" xml:space="preserve">
<value>All font files must be located in the same directory in the app bundle. The following font files have different target directories in the app bundle:</value>
<value>Alle Schriftartdateien müssen sich im gleichen Verzeichnis im App-Bundle befinden. Die folgenden Schriftartdateien weisen unterschiedliche Zielverzeichnisse im App-Bundle auf:</value>
<comment>This error message will be followed by E7084 error messages listing the target directory for each font file</comment>
</data>
<data name="E7084" xml:space="preserve">
<value>The target directory is {0}</value>
<value>Das Zielverzeichnis ist {0}</value>
<comment>See E7082 as well.
{0}: the target directory (in the app bundle) for the font file
</comment>
</data>
<data name="W7085" xml:space="preserve">
<value>Creating a compressed binding resource package because there are symlinks in the input.</value>
</data>
<data name="E7086" xml:space="preserve">
<value>The value '{0}' is invalid for the Compress property. Valid values: 'true', 'false' or 'auto'.</value>
<comment>The following are literal names and should not be translated: Compress, true, false, auto.</comment>
</data>
<data name="W7087" xml:space="preserve">
<value>Expected a 'manifest' file in the directory {0}.</value>
<comment>The following are literal names and should not be translated: manifest</comment>
</data>
</root>
Original file line number Diff line number Diff line change
Expand Up @@ -1054,21 +1054,32 @@
</comment>
</data>
<data name="E7082" xml:space="preserve">
<value>The {0} value in the Info.plist ({1}) does not match the SupportedOSPlatformVersion value ({2}) in the project file (if there is no SupportedOSPlatformVersion value in the project file, then a default value has been assumed). Either change the value in the Info.plist to match the SupportedOSPlatformVersion value, or remove the value in the Info.plist (and add a SupportedOSPlatformVersion value to the project file if it doesn't already exist).</value>
<value>El valor de {0} del archivo info. plist ({1}) no coincide con el valor SupportedOSPlatformVersion ({2}) del archivo de proyecto (si no hay ningún valor SupportedOSPlatformVersion en el archivo de proyecto, se ha asumido un valor predeterminado). Cambie el valor en el archivo info. plist para que coincida con el valor SupportedOSPlatformVersion, o bien quite el valor del archivo info.plist (y agregue un valor SupportedOSPlatformVersion al archivo de proyecto si aún no existe).</value>
<comment>
{0}: the name of a value from the Info.plist file the message talks about (either 'MinimumOSVersion' or 'LSMinimumSystemVersion').
{1}: the value from the Info.plist.
{2}: the value from the project file.
</comment>
</data>
<data name="E7083" xml:space="preserve">
<value>All font files must be located in the same directory in the app bundle. The following font files have different target directories in the app bundle:</value>
<value>Todos los archivos de fuente deben encontrarse en el mismo directorio del lote de aplicaciones. Los siguientes archivos de fuente tienen directorios de destino diferentes en el lote de aplicaciones:</value>
<comment>This error message will be followed by E7084 error messages listing the target directory for each font file</comment>
</data>
<data name="E7084" xml:space="preserve">
<value>The target directory is {0}</value>
<value>El directorio de destino es {0}</value>
<comment>See E7082 as well.
{0}: the target directory (in the app bundle) for the font file
</comment>
</data>
<data name="W7085" xml:space="preserve">
<value>Creating a compressed binding resource package because there are symlinks in the input.</value>
</data>
<data name="E7086" xml:space="preserve">
<value>The value '{0}' is invalid for the Compress property. Valid values: 'true', 'false' or 'auto'.</value>
<comment>The following are literal names and should not be translated: Compress, true, false, auto.</comment>
</data>
<data name="W7087" xml:space="preserve">
<value>Expected a 'manifest' file in the directory {0}.</value>
<comment>The following are literal names and should not be translated: manifest</comment>
</data>
</root>
Original file line number Diff line number Diff line change
Expand Up @@ -711,10 +711,10 @@
<value>Le chemin d'archive fourni ne provient pas d'un fichier d'archive valide (.xcarchive). Chemin d'archive : « {0} »</value>
</data>
<data name="E0187" xml:space="preserve">
<value>Could not map the macOS version {0} to a corresponding Mac Catalyst version. Valid macOS versions are: {1}</value>
<value>Impossible de mapper la version de macOS {0} à une version Mac Catalyst correspondante. Les versions de macOS valides sont : {1}.</value>
</data>
<data name="E0188" xml:space="preserve">
<value>Could not map the Mac Catalyst version {0} to a corresponding macOS version. Valid Mac Catalyst versions are: {1}</value>
<value>Impossible de faire correspondre la version {0} de Mac Catalyst à une version correspondante de macOS. Les versions valides de Mac Catalyst sont : {1}.</value>
</data>
<data name="E7001" xml:space="preserve">
<value>Impossible de résoudre les adresses IP des hôtes pour les paramètres du débogueur Wi-Fi.
Expand Down Expand Up @@ -1054,21 +1054,32 @@
</comment>
</data>
<data name="E7082" xml:space="preserve">
<value>The {0} value in the Info.plist ({1}) does not match the SupportedOSPlatformVersion value ({2}) in the project file (if there is no SupportedOSPlatformVersion value in the project file, then a default value has been assumed). Either change the value in the Info.plist to match the SupportedOSPlatformVersion value, or remove the value in the Info.plist (and add a SupportedOSPlatformVersion value to the project file if it doesn't already exist).</value>
<value>La {0} valeur dans info. plist ({1}) ne correspond pas à la valeur SupportedOSPlatformVersion ({2}) dans le fichier projet (s’il n’existe aucune valeur SupportedOSPlatformVersion dans le fichier projet, une valeur par défaut est utilisée). Modifiez la valeur dans info. plist pour qu’elle corresponde à la valeur SupportedOSPlatformVersion ou supprimez la valeur dans info.plist (et ajoutez une valeur SupportedOSPlatformVersion au fichier projet s’il n’existe pas déjà).</value>
<comment>
{0}: the name of a value from the Info.plist file the message talks about (either 'MinimumOSVersion' or 'LSMinimumSystemVersion').
{1}: the value from the Info.plist.
{2}: the value from the project file.
</comment>
</data>
<data name="E7083" xml:space="preserve">
<value>All font files must be located in the same directory in the app bundle. The following font files have different target directories in the app bundle:</value>
<value>Tous les fichiers de police doivent se trouver dans le même répertoire de l’ensemble d’applications. Les fichiers de police suivants ont des répertoires cibles différents dans l’ensemble d’applications :</value>
<comment>This error message will be followed by E7084 error messages listing the target directory for each font file</comment>
</data>
<data name="E7084" xml:space="preserve">
<value>The target directory is {0}</value>
<value>Le répertoire cible est {0}.</value>
<comment>See E7082 as well.
{0}: the target directory (in the app bundle) for the font file
</comment>
</data>
<data name="W7085" xml:space="preserve">
<value>Creating a compressed binding resource package because there are symlinks in the input.</value>
</data>
<data name="E7086" xml:space="preserve">
<value>The value '{0}' is invalid for the Compress property. Valid values: 'true', 'false' or 'auto'.</value>
<comment>The following are literal names and should not be translated: Compress, true, false, auto.</comment>
</data>
<data name="W7087" xml:space="preserve">
<value>Expected a 'manifest' file in the directory {0}.</value>
<comment>The following are literal names and should not be translated: manifest</comment>
</data>
</root>
Original file line number Diff line number Diff line change
Expand Up @@ -1054,21 +1054,32 @@
</comment>
</data>
<data name="E7082" xml:space="preserve">
<value>The {0} value in the Info.plist ({1}) does not match the SupportedOSPlatformVersion value ({2}) in the project file (if there is no SupportedOSPlatformVersion value in the project file, then a default value has been assumed). Either change the value in the Info.plist to match the SupportedOSPlatformVersion value, or remove the value in the Info.plist (and add a SupportedOSPlatformVersion value to the project file if it doesn't already exist).</value>
<value>Il valore di {0} nel file INFO. plist ({1}) non corrisponde al valore SupportedOSPlatformVersion ({2}) nel file di progetto (se non è presente alcun valore SupportedOSPlatformVersion nel file di progetto, è stato assunto un valore predefinito). Modificare il valore nel file INFO. plist in modo che corrisponda al valore SupportedOSPlatformVersion o rimuovere il valore nell'info. plist (e aggiungere un valore SupportedOSPlatformVersion al file di progetto se non esiste già).</value>
<comment>
{0}: the name of a value from the Info.plist file the message talks about (either 'MinimumOSVersion' or 'LSMinimumSystemVersion').
{1}: the value from the Info.plist.
{2}: the value from the project file.
</comment>
</data>
<data name="E7083" xml:space="preserve">
<value>All font files must be located in the same directory in the app bundle. The following font files have different target directories in the app bundle:</value>
<value>Tutti i file dei tipi di carattere devono trovarsi nella stessa directory nel bundle dell'app. I file dei tipi di carattere seguenti hanno directory di destinazione diverse nel bundle dell'app:</value>
<comment>This error message will be followed by E7084 error messages listing the target directory for each font file</comment>
</data>
<data name="E7084" xml:space="preserve">
<value>The target directory is {0}</value>
<value>La directory di destinazione è {0}</value>
<comment>See E7082 as well.
{0}: the target directory (in the app bundle) for the font file
</comment>
</data>
<data name="W7085" xml:space="preserve">
<value>Creating a compressed binding resource package because there are symlinks in the input.</value>
</data>
<data name="E7086" xml:space="preserve">
<value>The value '{0}' is invalid for the Compress property. Valid values: 'true', 'false' or 'auto'.</value>
<comment>The following are literal names and should not be translated: Compress, true, false, auto.</comment>
</data>
<data name="W7087" xml:space="preserve">
<value>Expected a 'manifest' file in the directory {0}.</value>
<comment>The following are literal names and should not be translated: manifest</comment>
</data>
</root>
Loading

5 comments on commit 3ccbdc0

@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 (only version changes)

Packages generated

View packages

Test results

1 tests failed, 217 tests passed.

Failed tests

  • monotouch-test/Mac Catalyst [dotnet]/Debug [dotnet]: Failed (Tests run: 2694 Passed: 2491 Inconclusive: 35 Failed: 3 Ignored: 200)

Pipeline on Agent XAMBOT-1037.BigSur'
Merge remote-tracking branch 'origin/main' into introspection-skip-msgsend-everywhere

@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 remote-tracking branch 'origin/main' into introspection-skip-msgsend-everywhere

@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 remote-tracking branch 'origin/main' into introspection-skip-msgsend-everywhere

@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
  • linksdk

Pipeline on Agent
Merge remote-tracking branch 'origin/main' into introspection-skip-msgsend-everywhere

@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 M1 - Mac Big Sur (11.5) ✅

Tests passed

All tests on macOS X M1 - Mac Big Sur (11.5) passed.

Pipeline on Agent
Merge remote-tracking branch 'origin/main' into introspection-skip-msgsend-everywhere

Please sign in to comment.