Skip to content

Commit d1e01ef

Browse files
grendellogrendello
committed
Merge branch 'main' into lgtm
* main: [Xamarin.Android.Build.Tasks] Fix issue where app will not install (dotnet#7719) Bump to dotnet/installer@779a644 8.0.100-alpha.1.23070.23 (dotnet#7728) LEGO: Merge pull request 7751 [Mono.Android] Wrap connection exceptions in HttpRequestException (dotnet#7661) [Mono.Android] Fix View.SystemUiVisibility enumification (dotnet#7730)
2 parents cf9f9a0 + 1d7092d commit d1e01ef

File tree

24 files changed

+379
-93
lines changed

24 files changed

+379
-93
lines changed

‎Localize/loc/cs/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -669,24 +669,36 @@
669669
<Item ItemId=";XA1031" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
670670
<Str Cat="Text">
671671
<Val><![CDATA[The 'AndroidHttpClientHandlerType' property value '{0}' must derive from '{1}'.]D;]A;Please change the value to an assembly-qualifed type name which inherits from '{1}' or remove the property completely.]]></Val>
672+
<Tgt Cat="Text" Stat="Loc" Orig="New">
673+
<Val><![CDATA[Hodnota vlastnosti AndroidHttpClientHandlerType {0} musí být odvozena od {1}.]D;]A;Změňte hodnotu na název typu kvalifikovaného sestavení, který dědí z: {1}, případně vlastnost úplně odeberte.]]></Val>
674+
</Tgt>
672675
</Str>
673676
<Disp Icon="Str" />
674677
</Item>
675678
<Item ItemId=";XA1032" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
676679
<Str Cat="Text">
677680
<Val><![CDATA[Failed to resolve '{0}' from '{1}'. Please check your `AndroidHttpClientHandlerType` setting.]]></Val>
681+
<Tgt Cat="Text" Stat="Loc" Orig="New">
682+
<Val><![CDATA[Nepovedlo se přeložit {0} z(e) {1}. Zkontrolujte nastavení AndroidHttpClientHandlerType.]]></Val>
683+
</Tgt>
678684
</Str>
679685
<Disp Icon="Str" />
680686
</Item>
681687
<Item ItemId=";XA1033" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
682688
<Str Cat="Text">
683689
<Val><![CDATA[Could not resolve '{0}'. Please check your `AndroidHttpClientHandlerType` setting.]]></Val>
690+
<Tgt Cat="Text" Stat="Loc" Orig="New">
691+
<Val><![CDATA[Nepovedlo se přeložit {0}. Zkontrolujte nastavení AndroidHttpClientHandlerType.]]></Val>
692+
</Tgt>
684693
</Str>
685694
<Disp Icon="Str" />
686695
</Item>
687696
<Item ItemId=";XA1034" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
688697
<Str Cat="Text">
689698
<Val><![CDATA[Your project references '{0}' which uses the `_Microsoft.Android.Resource.Designer` assembly, but you do not have this feature enabled. Please set the `AndroidUseDesignerAssembly` MSBuild property to `true` in your project file.]]></Val>
699+
<Tgt Cat="Text" Stat="Loc" Orig="New">
700+
<Val><![CDATA[Váš projekt odkazuje na literál {0}, který používá sestavení _Microsoft.Android.Resource.Designer, ale tuto funkci nemáte povolenou. Nastavte vlastnost MSBuild AndroidUseDesignerAssembly v souboru projektu na hodnotu true.]]></Val>
701+
</Tgt>
690702
</Str>
691703
<Disp Icon="Str" />
692704
</Item>

‎Localize/loc/es/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -669,24 +669,36 @@
669669
<Item ItemId=";XA1031" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
670670
<Str Cat="Text">
671671
<Val><![CDATA[The 'AndroidHttpClientHandlerType' property value '{0}' must derive from '{1}'.]D;]A;Please change the value to an assembly-qualifed type name which inherits from '{1}' or remove the property completely.]]></Val>
672+
<Tgt Cat="Text" Stat="Loc" Orig="New">
673+
<Val><![CDATA[El valor de la propiedad "AndroidHttpClientHandlerType" "{0}" debe derivar de "{1}".]D;]A;Cambie el valor a un nombre de tipo de ensamblado que herede de "{1}" o quite la propiedad por completo.]]></Val>
674+
</Tgt>
672675
</Str>
673676
<Disp Icon="Str" />
674677
</Item>
675678
<Item ItemId=";XA1032" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
676679
<Str Cat="Text">
677680
<Val><![CDATA[Failed to resolve '{0}' from '{1}'. Please check your `AndroidHttpClientHandlerType` setting.]]></Val>
681+
<Tgt Cat="Text" Stat="Loc" Orig="New">
682+
<Val><![CDATA[No se pudo resolver "{0}" desde "{1}". Compruebe la configuración de "AndroidHttpClientHandlerType".]]></Val>
683+
</Tgt>
678684
</Str>
679685
<Disp Icon="Str" />
680686
</Item>
681687
<Item ItemId=";XA1033" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
682688
<Str Cat="Text">
683689
<Val><![CDATA[Could not resolve '{0}'. Please check your `AndroidHttpClientHandlerType` setting.]]></Val>
690+
<Tgt Cat="Text" Stat="Loc" Orig="New">
691+
<Val><![CDATA[No se pudo resolver "{0}". Compruebe la configuración de "AndroidHttpClientHandlerType".]]></Val>
692+
</Tgt>
684693
</Str>
685694
<Disp Icon="Str" />
686695
</Item>
687696
<Item ItemId=";XA1034" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
688697
<Str Cat="Text">
689698
<Val><![CDATA[Your project references '{0}' which uses the `_Microsoft.Android.Resource.Designer` assembly, but you do not have this feature enabled. Please set the `AndroidUseDesignerAssembly` MSBuild property to `true` in your project file.]]></Val>
699+
<Tgt Cat="Text" Stat="Loc" Orig="New">
700+
<Val><![CDATA[El proyecto hace referencia a "{0}", que usa el ensamblado "_Microsoft.Android.Resource.Designer", pero no tiene esta característica habilitada. Establezca la propiedad "AndroidUseDesignerAssembly" de MSBuild en "true" en el archivo del proyecto.]]></Val>
701+
</Tgt>
690702
</Str>
691703
<Disp Icon="Str" />
692704
</Item>

‎Localize/loc/fr/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -669,24 +669,36 @@
669669
<Item ItemId=";XA1031" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
670670
<Str Cat="Text">
671671
<Val><![CDATA[The 'AndroidHttpClientHandlerType' property value '{0}' must derive from '{1}'.]D;]A;Please change the value to an assembly-qualifed type name which inherits from '{1}' or remove the property completely.]]></Val>
672+
<Tgt Cat="Text" Stat="Loc" Orig="New">
673+
<Val><![CDATA[La valeur de la propriété « AndroidHttpClientHandlerType » « {0} » doit dériver de « {1} ».]D;]A;Veuillez remplacer la valeur par un nom de type qualifié par l’assembly qui hérite de « {1} » ou supprimez complètement la propriété.]]></Val>
674+
</Tgt>
672675
</Str>
673676
<Disp Icon="Str" />
674677
</Item>
675678
<Item ItemId=";XA1032" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
676679
<Str Cat="Text">
677680
<Val><![CDATA[Failed to resolve '{0}' from '{1}'. Please check your `AndroidHttpClientHandlerType` setting.]]></Val>
681+
<Tgt Cat="Text" Stat="Loc" Orig="New">
682+
<Val><![CDATA[Échec de la résolution de « {0} » à partir de « {1} ». Vérifiez votre paramètre `AndroidHttpClientHandlerType`.]]></Val>
683+
</Tgt>
678684
</Str>
679685
<Disp Icon="Str" />
680686
</Item>
681687
<Item ItemId=";XA1033" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
682688
<Str Cat="Text">
683689
<Val><![CDATA[Could not resolve '{0}'. Please check your `AndroidHttpClientHandlerType` setting.]]></Val>
690+
<Tgt Cat="Text" Stat="Loc" Orig="New">
691+
<Val><![CDATA[Impossible de résoudre « {0} ». Veuillez vérifier votre paramètre `AndroidHttpClientHandlerType`.]]></Val>
692+
</Tgt>
684693
</Str>
685694
<Disp Icon="Str" />
686695
</Item>
687696
<Item ItemId=";XA1034" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
688697
<Str Cat="Text">
689698
<Val><![CDATA[Your project references '{0}' which uses the `_Microsoft.Android.Resource.Designer` assembly, but you do not have this feature enabled. Please set the `AndroidUseDesignerAssembly` MSBuild property to `true` in your project file.]]></Val>
699+
<Tgt Cat="Text" Stat="Loc" Orig="New">
700+
<Val><![CDATA[Vos références de projet « {0} » qui utilise l’assembly `_Microsoft.Android.Resource.Designer`, mais cette fonctionnalité n’est pas activée. Veuillez définir la propriété MSBuild `AndroidUseDesignerAssembly` sur `true` dans votre Fichier projet.]]></Val>
701+
</Tgt>
690702
</Str>
691703
<Disp Icon="Str" />
692704
</Item>

‎Localize/loc/pl/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -669,24 +669,36 @@
669669
<Item ItemId=";XA1031" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
670670
<Str Cat="Text">
671671
<Val><![CDATA[The 'AndroidHttpClientHandlerType' property value '{0}' must derive from '{1}'.]D;]A;Please change the value to an assembly-qualifed type name which inherits from '{1}' or remove the property completely.]]></Val>
672+
<Tgt Cat="Text" Stat="Loc" Orig="New">
673+
<Val><![CDATA[Wartość właściwości „AndroidHttpClientHandlerType” „{0}” musi pochodzić od „{1}”.]D;]A;Zmień wartość na nazwę typu kwalifikowalnego zestawu, która dziedziczy po „{1}” lub całkowicie usuń właściwość.]]></Val>
674+
</Tgt>
672675
</Str>
673676
<Disp Icon="Str" />
674677
</Item>
675678
<Item ItemId=";XA1032" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
676679
<Str Cat="Text">
677680
<Val><![CDATA[Failed to resolve '{0}' from '{1}'. Please check your `AndroidHttpClientHandlerType` setting.]]></Val>
681+
<Tgt Cat="Text" Stat="Loc" Orig="New">
682+
<Val><![CDATA[Nie można rozpoznać elementu „{0}” z „{1}”. Sprawdź ustawienie „AndroidHttpClientHandlerType”.]]></Val>
683+
</Tgt>
678684
</Str>
679685
<Disp Icon="Str" />
680686
</Item>
681687
<Item ItemId=";XA1033" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
682688
<Str Cat="Text">
683689
<Val><![CDATA[Could not resolve '{0}'. Please check your `AndroidHttpClientHandlerType` setting.]]></Val>
690+
<Tgt Cat="Text" Stat="Loc" Orig="New">
691+
<Val><![CDATA[Nie można rozpoznać elementu „{0}”. Sprawdź ustawienie „AndroidHttpClientHandlerType”.]]></Val>
692+
</Tgt>
684693
</Str>
685694
<Disp Icon="Str" />
686695
</Item>
687696
<Item ItemId=";XA1034" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
688697
<Str Cat="Text">
689698
<Val><![CDATA[Your project references '{0}' which uses the `_Microsoft.Android.Resource.Designer` assembly, but you do not have this feature enabled. Please set the `AndroidUseDesignerAssembly` MSBuild property to `true` in your project file.]]></Val>
699+
<Tgt Cat="Text" Stat="Loc" Orig="New">
700+
<Val><![CDATA[Projekt odwołuje się do elementu „{0}”, który używa zestawu „_Microsoft.Android.Resource.Designer”, ale ta funkcja nie jest włączona. Ustaw właściwość MSBuild „AndroidUseDesignerAssembly” na wartość „true” w pliku projektu.]]></Val>
701+
</Tgt>
690702
</Str>
691703
<Disp Icon="Str" />
692704
</Item>

‎Localize/loc/zh-Hant/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -669,24 +669,36 @@
669669
<Item ItemId=";XA1031" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
670670
<Str Cat="Text">
671671
<Val><![CDATA[The 'AndroidHttpClientHandlerType' property value '{0}' must derive from '{1}'.]D;]A;Please change the value to an assembly-qualifed type name which inherits from '{1}' or remove the property completely.]]></Val>
672+
<Tgt Cat="Text" Stat="Loc" Orig="New">
673+
<Val><![CDATA['AndroidHttpClientHandlerType' 屬性值 '{0}' 必須衍生自 '{1}'。]D;]A;請將值變更為繼承自 '{1}' 或完全移除屬性的 assembly-qualifed 類型名稱。]]></Val>
674+
</Tgt>
672675
</Str>
673676
<Disp Icon="Str" />
674677
</Item>
675678
<Item ItemId=";XA1032" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
676679
<Str Cat="Text">
677680
<Val><![CDATA[Failed to resolve '{0}' from '{1}'. Please check your `AndroidHttpClientHandlerType` setting.]]></Val>
681+
<Tgt Cat="Text" Stat="Loc" Orig="New">
682+
<Val><![CDATA[無法從 '{0}' 解析 '{1}'。請檢查您的 'AndroidHttpClientHandlerType' 設定。]]></Val>
683+
</Tgt>
678684
</Str>
679685
<Disp Icon="Str" />
680686
</Item>
681687
<Item ItemId=";XA1033" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
682688
<Str Cat="Text">
683689
<Val><![CDATA[Could not resolve '{0}'. Please check your `AndroidHttpClientHandlerType` setting.]]></Val>
690+
<Tgt Cat="Text" Stat="Loc" Orig="New">
691+
<Val><![CDATA[無法解析 '{0}'。請檢查您的 'AndroidHttpClientHandlerType' 設定。]]></Val>
692+
</Tgt>
684693
</Str>
685694
<Disp Icon="Str" />
686695
</Item>
687696
<Item ItemId=";XA1034" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
688697
<Str Cat="Text">
689698
<Val><![CDATA[Your project references '{0}' which uses the `_Microsoft.Android.Resource.Designer` assembly, but you do not have this feature enabled. Please set the `AndroidUseDesignerAssembly` MSBuild property to `true` in your project file.]]></Val>
699+
<Tgt Cat="Text" Stat="Loc" Orig="New">
700+
<Val><![CDATA[您的專案參考 '{0}' 使用 '_Microsoft.Android.Resource.Designer' 組件，但您未啟用此功能。請將專案檔案中的 'AndroidUseDesignerAssembly' MSBuild 屬性設定為 'true'。]]></Val>
701+
</Tgt>
690702
</Str>
691703
<Disp Icon="Str" />
692704
</Item>

‎eng/Version.Details.xml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
<Dependencies>
22
<ProductDependencies>
3-
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="8.0.100-alpha.1.23063.11">
3+
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="8.0.100-alpha.1.23070.23">
44
<Uri>https://github.com/dotnet/installer</Uri>
5-
<Sha>9962c6a686a31ba1e7c20983a810ba7989c3fc0c</Sha>
5+
<Sha>779a6442daf6b95c5662d2f0c20801de5e179a05</Sha>
66
</Dependency>
7-
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.100-1.23055.2" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
7+
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.100-1.23067.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
88
<Uri>https://github.com/dotnet/linker</Uri>
9-
<Sha>4b3f78cbc7284b4198652a695e9fe0267133728e</Sha>
9+
<Sha>c790896f128957acd2999208f44f09ae1e826c8c</Sha>
1010
</Dependency>
11-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-alpha.1.23058.2" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
11+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-alpha.1.23070.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
1212
<Uri>https://github.com/dotnet/runtime</Uri>
13-
<Sha>5da4a9e919dcee35f831ab69b6e475baaf798875</Sha>
13+
<Sha>ddb69889684da95dc8d83a51b987774de5e47598</Sha>
1414
</Dependency>
15-
<Dependency Name="Microsoft.NET.Workload.Emscripten.net7.Manifest-8.0.100" Version="8.0.0-alpha.1.22620.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
15+
<Dependency Name="Microsoft.NET.Workload.Emscripten.net7.Manifest-8.0.100" Version="8.0.0-alpha.1.23066.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
1616
<Uri>https://github.com/dotnet/emsdk</Uri>
17-
<Sha>66b984594a008151bdb14dc60589373e3d44be83</Sha>
17+
<Sha>5b46122b31036064483ce2e55b5e2240e5548204</Sha>
1818
</Dependency>
1919
</ProductDependencies>
2020
<ToolsetDependencies>

‎eng/Versions.props‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<Project>
22
<!--Package versions-->
33
<PropertyGroup>
4-
<MicrosoftDotnetSdkInternalPackageVersion>8.0.100-alpha.1.23063.11</MicrosoftDotnetSdkInternalPackageVersion>
5-
<MicrosoftNETILLinkTasksPackageVersion>8.0.100-1.23055.2</MicrosoftNETILLinkTasksPackageVersion>
6-
<MicrosoftNETCoreAppRefPackageVersion>8.0.0-alpha.1.23058.2</MicrosoftNETCoreAppRefPackageVersion>
4+
<MicrosoftDotnetSdkInternalPackageVersion>8.0.100-alpha.1.23070.23</MicrosoftDotnetSdkInternalPackageVersion>
5+
<MicrosoftNETILLinkTasksPackageVersion>8.0.100-1.23067.1</MicrosoftNETILLinkTasksPackageVersion>
6+
<MicrosoftNETCoreAppRefPackageVersion>8.0.0-alpha.1.23070.1</MicrosoftNETCoreAppRefPackageVersion>
77
<MicrosoftDotNetApiCompatPackageVersion>7.0.0-beta.22103.1</MicrosoftDotNetApiCompatPackageVersion>
88
<MicrosoftDotNetBuildTasksFeedPackageVersion>7.0.0-beta.22103.1</MicrosoftDotNetBuildTasksFeedPackageVersion>
9-
<MicrosoftNETWorkloadEmscriptennet7Manifest80100Version>8.0.0-alpha.1.22620.1</MicrosoftNETWorkloadEmscriptennet7Manifest80100Version>
9+
<MicrosoftNETWorkloadEmscriptennet7Manifest80100Version>8.0.0-alpha.1.23066.1</MicrosoftNETWorkloadEmscriptennet7Manifest80100Version>
1010
<MicrosoftNETWorkloadEmscriptenPackageVersion>$(MicrosoftNETWorkloadEmscriptennet7Manifest80100Version)</MicrosoftNETWorkloadEmscriptenPackageVersion>
1111
<MicrosoftTemplateEngineTasksPackageVersion>7.0.100-rc.1.22410.7</MicrosoftTemplateEngineTasksPackageVersion>
1212
</PropertyGroup>

‎src/Mono.Android/Android.Telecom/InCallService.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ namespace Android.Telecom
66
public abstract partial class InCallService : Android.App.Service
77
{
88
#if ANDROID_23
9-
[Obsolete ("Incorrect enum parameter, use the overload that takes a CallAudioRoute paramter instead.")]
9+
[Obsolete ("Incorrect enum parameter, use the overload that takes a CallAudioRoute parameter instead.")]
1010
[global::System.Runtime.Versioning.SupportedOSPlatformAttribute ("android23.0")]
1111
public void SetAudioRoute ([global::Android.Runtime.GeneratedEnum] Android.Telecom.VideoQuality route)
1212
{

‎src/Mono.Android/Android.Views/View.cs‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,5 +90,13 @@ public bool FitsSystemWindows ()
9090
return InvokeFitsSystemWindows ();
9191
}
9292
#endif
93+
94+
#if NET && ANDROID_34
95+
[global::System.Runtime.Versioning.ObsoletedOSPlatform ("android30.0", "These flags are deprecated. Use WindowInsetsController instead.")]
96+
public SystemUiFlags SystemUiFlags {
97+
get => (SystemUiFlags) SystemUiVisibility;
98+
set => SystemUiVisibility = (Android.Views.StatusBarVisibility) value;
99+
}
100+
#endif
93101
}
94102
}

‎src/Mono.Android/Android.Views/WindowManagerLayoutParams.cs‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
using System;
2+
3+
namespace Android.Views
4+
{
5+
partial class WindowManagerLayoutParams
6+
{
7+
#if NET && ANDROID_34
8+
[global::System.Runtime.Versioning.ObsoletedOSPlatform ("android30.0", "These flags are deprecated. Use WindowInsetsController instead.")]
9+
public SystemUiFlags SystemUiFlags {
10+
get => (SystemUiFlags) SystemUiVisibility;
11+
set => SystemUiVisibility = (Android.Views.StatusBarVisibility) value;
12+
}
13+
#endif
14+
}
15+
}

0 commit comments

Comments
 (0)