Skip to content

Commit

Permalink
Merge branch 'main' into xamarin-app-utils
Browse files Browse the repository at this point in the history 
* main:
  Bump r8 from 4.0.48 to 4.0.52 (dotnet#7858)
  [tests] Fix recently added AndroidMessageHandler test (dotnet#7859)
  [build] remove darc dependency for System.IO.Hashing (dotnet#7855)
  Localized file check-in by OneLocBuild Task (dotnet#7851)
  • Loading branch information
@grendello
grendello committed Mar 7, 2023
2 parents db58742 + 0ea65a0 commit 23de8c5
Show file tree
Hide file tree
Showing 17 changed files with 37 additions and 28 deletions.
4 changes: 0 additions & 4 deletions eng/Version.Details.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,6 @@
<Uri>https://github.com/dotnet/cecil</Uri>
<Sha>68e0c35d0b4b6651b9a062a52e7dd694d7a43927</Sha>
</Dependency>
<Dependency Name="System.IO.Hashing" Version="8.0.0-alpha.1.23080.2" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>9529803ae29c2804880c6bd8ca710b8c037cb498</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="7.0.0-beta.22103.1">
Expand Down
2 changes: 1 addition & 1 deletion eng/Versions.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<MicrosoftNETWorkloadEmscriptenPackageVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest80100preview2Version)</MicrosoftNETWorkloadEmscriptenPackageVersion>
<MicrosoftTemplateEngineTasksPackageVersion>7.0.100-rc.1.22410.7</MicrosoftTemplateEngineTasksPackageVersion>
<MicrosoftDotNetCecilPackageVersion>0.11.4-alpha.23113.1</MicrosoftDotNetCecilPackageVersion>
<SystemIOHashingPackageVersion>8.0.0-alpha.1.23080.2</SystemIOHashingPackageVersion>
<SystemIOHashingPackageVersion>$(MicrosoftNETCoreAppRefPackageVersion)</SystemIOHashingPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Match the first three version numbers and append 00 -->
Expand Down
2 changes: 1 addition & 1 deletion src/Xamarin.Android.Build.Tasks/Properties/Resources.cs.resx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -494,7 +494,7 @@ Změňte hodnotu na název typu kvalifikovaného sestavení, který dědí z: {1
{0} - The name of the assembly</comment>
</data>
<data name="XA1035" xml:space="preserve">
<value>The 'BundleAssemblies' property is deprecated and it has no effect on the application build. Equivalent functionality is implemented by the 'AndroidUseAssemblyStore' and 'AndroidEnableAssemblyCompression' properties.</value>
<value>Vlastnost BundleAssemblies je zastaralá a nemá žádný vliv na sestavení aplikace. Ekvivalentní funkce jsou implementovány vlastnostmi AndroidUseAssemblyStore a AndroidEnableAssemblyCompression.</value>
<comment>The following are literal names and should not be translated: 'BundleAssemblies', 'AndroidUseAssemblyStore', 'AndroidEnableAssemblyCompression'</comment>
</data>
<data name="XA2000" xml:space="preserve">
Expand Down
2 changes: 1 addition & 1 deletion src/Xamarin.Android.Build.Tasks/Properties/Resources.de.resx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -494,7 +494,7 @@ Bitte ändern Sie den Wert in einen Assembly-basierten Typnamen, der von „{1}
{0} - The name of the assembly</comment>
</data>
<data name="XA1035" xml:space="preserve">
<value>The 'BundleAssemblies' property is deprecated and it has no effect on the application build. Equivalent functionality is implemented by the 'AndroidUseAssemblyStore' and 'AndroidEnableAssemblyCompression' properties.</value>
<value>Die Eigenschaft „BundleAssemblies“ ist veraltet und hat keine Auswirkungen auf den Anwendungs-Build. Die entsprechende Funktionalität wird durch die Eigenschaften „AndroidUseAssemblyStore“ und „AndroidEnableAssemblyCompression“ implementiert.</value>
<comment>The following are literal names and should not be translated: 'BundleAssemblies', 'AndroidUseAssemblyStore', 'AndroidEnableAssemblyCompression'</comment>
</data>
<data name="XA2000" xml:space="preserve">
Expand Down
2 changes: 1 addition & 1 deletion src/Xamarin.Android.Build.Tasks/Properties/Resources.es.resx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -494,7 +494,7 @@ Cambie el valor a un nombre de tipo de ensamblado que herede de "{1}" o quite la
{0} - The name of the assembly</comment>
</data>
<data name="XA1035" xml:space="preserve">
<value>The 'BundleAssemblies' property is deprecated and it has no effect on the application build. Equivalent functionality is implemented by the 'AndroidUseAssemblyStore' and 'AndroidEnableAssemblyCompression' properties.</value>
<value>La propiedad "BundleAssemblies" está en desuso y no tiene ningún efecto en la compilación de la aplicación. Las propiedades "AndroidUseAssemblyStore" y "AndroidEnableAssemblyCompression" implementan una funcionalidad equivalente.</value>
<comment>The following are literal names and should not be translated: 'BundleAssemblies', 'AndroidUseAssemblyStore', 'AndroidEnableAssemblyCompression'</comment>
</data>
<data name="XA2000" xml:space="preserve">
Expand Down
2 changes: 1 addition & 1 deletion src/Xamarin.Android.Build.Tasks/Properties/Resources.fr.resx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -494,7 +494,7 @@ Veuillez remplacer la valeur par un nom de type qualifié par l’assembly qui h
{0} - The name of the assembly</comment>
</data>
<data name="XA1035" xml:space="preserve">
<value>The 'BundleAssemblies' property is deprecated and it has no effect on the application build. Equivalent functionality is implemented by the 'AndroidUseAssemblyStore' and 'AndroidEnableAssemblyCompression' properties.</value>
<value>La propriété « BundleAssemblies » est déconseillée et n’a aucun effet sur la build de l’application. La fonctionnalité équivalente est implémentée par les propriétés « AndroidUseAssemblyStore » et « AndroidEnableAssemblyCompression ».</value>
<comment>The following are literal names and should not be translated: 'BundleAssemblies', 'AndroidUseAssemblyStore', 'AndroidEnableAssemblyCompression'</comment>
</data>
<data name="XA2000" xml:space="preserve">
Expand Down
2 changes: 1 addition & 1 deletion src/Xamarin.Android.Build.Tasks/Properties/Resources.it.resx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -494,7 +494,7 @@ Modificare il valore in un nome di tipo con qualifica assembly che eredita da '{
{0} - The name of the assembly</comment>
</data>
<data name="XA1035" xml:space="preserve">
<value>The 'BundleAssemblies' property is deprecated and it has no effect on the application build. Equivalent functionality is implemented by the 'AndroidUseAssemblyStore' and 'AndroidEnableAssemblyCompression' properties.</value>
<value>La proprietà 'BundleAssemblies' è deprecata e non ha alcun effetto sul build dell'applicazione. La funzione equivalente è implementata dalle proprietà 'AndroidUseAssemblyStore' e 'AndroidEnableAssemblyCompression'.</value>
<comment>The following are literal names and should not be translated: 'BundleAssemblies', 'AndroidUseAssemblyStore', 'AndroidEnableAssemblyCompression'</comment>
</data>
<data name="XA2000" xml:space="preserve">
Expand Down
2 changes: 1 addition & 1 deletion src/Xamarin.Android.Build.Tasks/Properties/Resources.ja.resx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -494,7 +494,7 @@ In this message, the term "binding" means a piece of generated code that makes i
{0} - The name of the assembly</comment>
</data>
<data name="XA1035" xml:space="preserve">
<value>The 'BundleAssemblies' property is deprecated and it has no effect on the application build. Equivalent functionality is implemented by the 'AndroidUseAssemblyStore' and 'AndroidEnableAssemblyCompression' properties.</value>
<value>'BundleAssemblies' プロパティは非推奨であり、アプリケーションのビルドには影響しません。同等の機能は、'AndroidUseAssemblyStore' プロパティと 'AndroidEnableAssemblyCompression' プロパティによって実装されます。</value>
<comment>The following are literal names and should not be translated: 'BundleAssemblies', 'AndroidUseAssemblyStore', 'AndroidEnableAssemblyCompression'</comment>
</data>
<data name="XA2000" xml:space="preserve">
Expand Down
2 changes: 1 addition & 1 deletion src/Xamarin.Android.Build.Tasks/Properties/Resources.ko.resx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -494,7 +494,7 @@ In this message, the term "binding" means a piece of generated code that makes i
{0} - The name of the assembly</comment>
</data>
<data name="XA1035" xml:space="preserve">
<value>The 'BundleAssemblies' property is deprecated and it has no effect on the application build. Equivalent functionality is implemented by the 'AndroidUseAssemblyStore' and 'AndroidEnableAssemblyCompression' properties.</value>
<value>'BundleAssemblies' 속성은 사용되지 않으며 애플리케이션 빌드에 영향을 주지 않습니다. 동일한 기능이 'AndroidUseAssemblyStore' 및 'AndroidEnableAssemblyCompression' 속성에 의해 구현됩니다.</value>
<comment>The following are literal names and should not be translated: 'BundleAssemblies', 'AndroidUseAssemblyStore', 'AndroidEnableAssemblyCompression'</comment>
</data>
<data name="XA2000" xml:space="preserve">
Expand Down
2 changes: 1 addition & 1 deletion src/Xamarin.Android.Build.Tasks/Properties/Resources.pl.resx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -494,7 +494,7 @@ Zmień wartość na nazwę typu kwalifikowalnego zestawu, która dziedziczy po
{0} - The name of the assembly</comment>
</data>
<data name="XA1035" xml:space="preserve">
<value>The 'BundleAssemblies' property is deprecated and it has no effect on the application build. Equivalent functionality is implemented by the 'AndroidUseAssemblyStore' and 'AndroidEnableAssemblyCompression' properties.</value>
<value>Właściwość „BundleAssemblies” jest przestarzała i nie ma wpływu na kompilację aplikacji. Równoważna funkcjonalność jest implementowana przez właściwości „AndroidUseAssemblyStore” i „AndroidEnableAssemblyCompression”.</value>
<comment>The following are literal names and should not be translated: 'BundleAssemblies', 'AndroidUseAssemblyStore', 'AndroidEnableAssemblyCompression'</comment>
</data>
<data name="XA2000" xml:space="preserve">
Expand Down
2 changes: 1 addition & 1 deletion src/Xamarin.Android.Build.Tasks/Properties/Resources.pt-BR.resx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -494,7 +494,7 @@ Altere o valor para um nome de tipo qualificado por assembly que herda de "{1}"
{0} - The name of the assembly</comment>
</data>
<data name="XA1035" xml:space="preserve">
<value>The 'BundleAssemblies' property is deprecated and it has no effect on the application build. Equivalent functionality is implemented by the 'AndroidUseAssemblyStore' and 'AndroidEnableAssemblyCompression' properties.</value>
<value>A propriedade "BundleAssemblies" foi preterida e não tem efeito sobre a compilação do aplicativo. A funcionalidade equivalente é implementada pelas propriedades "AndroidUseAssemblyStore" e "AndroidEnableAssemblyCompression".</value>
<comment>The following are literal names and should not be translated: 'BundleAssemblies', 'AndroidUseAssemblyStore', 'AndroidEnableAssemblyCompression'</comment>
</data>
<data name="XA2000" xml:space="preserve">
Expand Down
2 changes: 1 addition & 1 deletion src/Xamarin.Android.Build.Tasks/Properties/Resources.ru.resx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -494,7 +494,7 @@ In this message, the term "binding" means a piece of generated code that makes i
{0} - The name of the assembly</comment>
</data>
<data name="XA1035" xml:space="preserve">
<value>The 'BundleAssemblies' property is deprecated and it has no effect on the application build. Equivalent functionality is implemented by the 'AndroidUseAssemblyStore' and 'AndroidEnableAssemblyCompression' properties.</value>
<value>Свойство "BundleAssemblies" устарело и не взаимодействует со сборкой приложения. Эквивалентная функциональность реализована свойствами "AndroidUseAssemblyStore" и "AndroidEnableAssemblyCompression".</value>
<comment>The following are literal names and should not be translated: 'BundleAssemblies', 'AndroidUseAssemblyStore', 'AndroidEnableAssemblyCompression'</comment>
</data>
<data name="XA2000" xml:space="preserve">
Expand Down
2 changes: 1 addition & 1 deletion src/Xamarin.Android.Build.Tasks/Properties/Resources.tr.resx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -494,7 +494,7 @@ Lütfen değeri '{1}' türünden devralan derlemeye uygun bir tür adına dönü
{0} - The name of the assembly</comment>
</data>
<data name="XA1035" xml:space="preserve">
<value>The 'BundleAssemblies' property is deprecated and it has no effect on the application build. Equivalent functionality is implemented by the 'AndroidUseAssemblyStore' and 'AndroidEnableAssemblyCompression' properties.</value>
<value>'BundleAssemblies' özelliği kullanım dışıdır ve uygulama derlemesi üzerinde etkisi yoktur. Eşdeğer işlev 'AndroidUseAssemblyStore' ve 'AndroidEnableAssemblyCompression' özellikleri ile uygulanmalıdır.</value>
<comment>The following are literal names and should not be translated: 'BundleAssemblies', 'AndroidUseAssemblyStore', 'AndroidEnableAssemblyCompression'</comment>
</data>
<data name="XA2000" xml:space="preserve">
Expand Down
2 changes: 1 addition & 1 deletion src/Xamarin.Android.Build.Tasks/Properties/Resources.zh-Hans.resx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -494,7 +494,7 @@ In this message, the term "binding" means a piece of generated code that makes i
{0} - The name of the assembly</comment>
</data>
<data name="XA1035" xml:space="preserve">
<value>The 'BundleAssemblies' property is deprecated and it has no effect on the application build. Equivalent functionality is implemented by the 'AndroidUseAssemblyStore' and 'AndroidEnableAssemblyCompression' properties.</value>
<value>“BundleAssemblies” 属性已弃用，它对应用程序生成没有影响。将由 “AndroidUseAssemblyStore” 和 “AndroidEnableAssemblyCompression” 属性实现等效功能。</value>
<comment>The following are literal names and should not be translated: 'BundleAssemblies', 'AndroidUseAssemblyStore', 'AndroidEnableAssemblyCompression'</comment>
</data>
<data name="XA2000" xml:space="preserve">
Expand Down
2 changes: 1 addition & 1 deletion src/Xamarin.Android.Build.Tasks/Properties/Resources.zh-Hant.resx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -494,7 +494,7 @@ In this message, the term "binding" means a piece of generated code that makes i
{0} - The name of the assembly</comment>
</data>
<data name="XA1035" xml:space="preserve">
<value>The 'BundleAssemblies' property is deprecated and it has no effect on the application build. Equivalent functionality is implemented by the 'AndroidUseAssemblyStore' and 'AndroidEnableAssemblyCompression' properties.</value>
<value>'BundleAssemblies' 屬性已過時，對應用程式組建沒有任何作用。將由 'AndroidUseAssemblyStore' 和 'AndroidEnableAssemblyCompression' 屬性實作同等功能。</value>
<comment>The following are literal names and should not be translated: 'BundleAssemblies', 'AndroidUseAssemblyStore', 'AndroidEnableAssemblyCompression'</comment>
</data>
<data name="XA2000" xml:space="preserve">
Expand Down
2 changes: 1 addition & 1 deletion src/r8/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ repositories {
}

dependencies {
compile group: 'com.android.tools', name: 'r8', version: '4.0.48'
compile group: 'com.android.tools', name: 'r8', version: '4.0.52'
}

jar {
Expand Down
31 changes: 22 additions & 9 deletions tests/Mono.Android-Tests/Xamarin.Android.Net/AndroidMessageHandlerTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,20 +39,29 @@ protected override HttpMessageHandler CreateHandler ()
#if NET
[Test]
[TestCaseSource (nameof (DecompressionSource))]
[Retry (5)]
// Disabled because it doesn't exist in NUnitLite, uncomment when/if we switch to full NUnit
// When we can use it, replace all the Console.WriteLine calls with Assert.Warn
// [Retry (5)]
public async Task Decompression (string urlPath, string encoding, string jsonFieldName)
{
// Catch all the exceptions and warn about them or otherwise [Retry] above won't work
try {
DoDecompression (urlPath, encoding, jsonFieldName);
int count = 0;
// Remove the loop when [Retry] can be used
while (count < 5) {
if (await DoDecompression (urlPath, encoding, jsonFieldName)) {
return;
}
count++;
}
} catch (Exception ex) {
Assert.Warn ("Unexpected exception thrown");
Assert.Warn (ex.ToString ());
Console.WriteLine ("Unexpected exception thrown");
Console.WriteLine (ex.ToString ());
Assert.Fail ("Exception should have not been thrown");
}
}

void DoDecompression (string urlPath, string encoding, string jsonFieldName)
async Task<bool> DoDecompression (string urlPath, string encoding, string jsonFieldName)
{
var handler = new AndroidMessageHandler {
AutomaticDecompression = DecompressionMethods.All
Expand All @@ -66,7 +75,9 @@ void DoDecompression (string urlPath, string encoding, string jsonFieldName)
// we will sleep a short while before failing the test
if (!response.IsSuccessStatusCode) {
System.Threading.Thread.Sleep (1000);
Assert.Fail ($"Request ended with a failure error code: {response.StatusCode}");
// Uncomment when we can use [Retry]
//Assert.Fail ($"Request ended with a failure error code: {response.StatusCode}");
return false;
}

foreach (string enc in response.Content.Headers.ContentEncoding) {
Expand All @@ -77,13 +88,15 @@ void DoDecompression (string urlPath, string encoding, string jsonFieldName)

string responseBody = await response.Content.ReadAsStringAsync ();

Assert.Warn ("-- Retrieved JSON start");
Assert.Warn (responseBody);
Assert.Warn ("-- Retrieved JSON end");
Console.WriteLine ("-- Retrieved JSON start");
Console.WriteLine (responseBody);
Console.WriteLine ("-- Retrieved JSON end");

Assert.IsTrue (responseBody.Length > 0, "Response was empty");
Assert.AreEqual (response.Content.Headers.ContentLength, responseBody.Length, "Retrieved data length is different than the one specified in the Content-Length header");
Assert.IsTrue (responseBody.Contains ($"\"{jsonFieldName}\"", StringComparison.OrdinalIgnoreCase), $"\"{jsonFieldName}\" should have been in the response JSON");

return true;
}
#endif

Expand Down

0 comments on commit 23de8c5

Please # to comment.