Skip to content

Commit 4ebbeb4

Browse files
committed
Merge branch 'main' into native-profiling-and-debugging
* main: [Mono.Android] Android.Telecom.InCallService.SetAudioRoute() + enum (dotnet#7711) [Mono.Android] Fix some incorrect enums. (dotnet#7670) [Xamarin.Android.Build.Tasks] _Microsoft.Android.Resource.Designer namespace (dotnet#7681) LEGO: Merge pull request 7713 [Xamarin.Android.Build.Tasks] lazily populate Resource lookup (dotnet#7686)
2 parents e146d06 + 639b216 commit 4ebbeb4

File tree

26 files changed

+437
-64
lines changed

26 files changed

+437
-64
lines changed

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

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -666,6 +666,30 @@
666666
</Str>
667667
<Disp Icon="Str" />
668668
</Item>
669+
<Item ItemId=";XA1031" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
670+
<Str Cat="Text">
671+
<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+
</Str>
673+
<Disp Icon="Str" />
674+
</Item>
675+
<Item ItemId=";XA1032" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
676+
<Str Cat="Text">
677+
<Val><![CDATA[Failed to resolve '{0}' from '{1}'. Please check your `AndroidHttpClientHandlerType` setting.]]></Val>
678+
</Str>
679+
<Disp Icon="Str" />
680+
</Item>
681+
<Item ItemId=";XA1033" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
682+
<Str Cat="Text">
683+
<Val><![CDATA[Could not resolve '{0}'. Please check your `AndroidHttpClientHandlerType` setting.]]></Val>
684+
</Str>
685+
<Disp Icon="Str" />
686+
</Item>
687+
<Item ItemId=";XA1034" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
688+
<Str Cat="Text">
689+
<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>
690+
</Str>
691+
<Disp Icon="Str" />
692+
</Item>
669693
<Item ItemId=";XA2000" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
670694
<Str Cat="Text">
671695
<Val><![CDATA[Use of AppDomain.CreateDomain() detected in assembly: {0}. .NET 6 and higher will only support a single AppDomain, so this API will no longer be available in Xamarin.Android once .NET 6 is released.]]></Val>

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

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -666,6 +666,30 @@
666666
</Str>
667667
<Disp Icon="Str" />
668668
</Item>
669+
<Item ItemId=";XA1031" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
670+
<Str Cat="Text">
671+
<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+
</Str>
673+
<Disp Icon="Str" />
674+
</Item>
675+
<Item ItemId=";XA1032" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
676+
<Str Cat="Text">
677+
<Val><![CDATA[Failed to resolve '{0}' from '{1}'. Please check your `AndroidHttpClientHandlerType` setting.]]></Val>
678+
</Str>
679+
<Disp Icon="Str" />
680+
</Item>
681+
<Item ItemId=";XA1033" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
682+
<Str Cat="Text">
683+
<Val><![CDATA[Could not resolve '{0}'. Please check your `AndroidHttpClientHandlerType` setting.]]></Val>
684+
</Str>
685+
<Disp Icon="Str" />
686+
</Item>
687+
<Item ItemId=";XA1034" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
688+
<Str Cat="Text">
689+
<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>
690+
</Str>
691+
<Disp Icon="Str" />
692+
</Item>
669693
<Item ItemId=";XA2000" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
670694
<Str Cat="Text">
671695
<Val><![CDATA[Use of AppDomain.CreateDomain() detected in assembly: {0}. .NET 6 and higher will only support a single AppDomain, so this API will no longer be available in Xamarin.Android once .NET 6 is released.]]></Val>

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

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -666,6 +666,30 @@
666666
</Str>
667667
<Disp Icon="Str" />
668668
</Item>
669+
<Item ItemId=";XA1031" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
670+
<Str Cat="Text">
671+
<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+
</Str>
673+
<Disp Icon="Str" />
674+
</Item>
675+
<Item ItemId=";XA1032" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
676+
<Str Cat="Text">
677+
<Val><![CDATA[Failed to resolve '{0}' from '{1}'. Please check your `AndroidHttpClientHandlerType` setting.]]></Val>
678+
</Str>
679+
<Disp Icon="Str" />
680+
</Item>
681+
<Item ItemId=";XA1033" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
682+
<Str Cat="Text">
683+
<Val><![CDATA[Could not resolve '{0}'. Please check your `AndroidHttpClientHandlerType` setting.]]></Val>
684+
</Str>
685+
<Disp Icon="Str" />
686+
</Item>
687+
<Item ItemId=";XA1034" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
688+
<Str Cat="Text">
689+
<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>
690+
</Str>
691+
<Disp Icon="Str" />
692+
</Item>
669693
<Item ItemId=";XA2000" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
670694
<Str Cat="Text">
671695
<Val><![CDATA[Use of AppDomain.CreateDomain() detected in assembly: {0}. .NET 6 and higher will only support a single AppDomain, so this API will no longer be available in Xamarin.Android once .NET 6 is released.]]></Val>

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

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -666,6 +666,30 @@
666666
</Str>
667667
<Disp Icon="Str" />
668668
</Item>
669+
<Item ItemId=";XA1031" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
670+
<Str Cat="Text">
671+
<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+
</Str>
673+
<Disp Icon="Str" />
674+
</Item>
675+
<Item ItemId=";XA1032" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
676+
<Str Cat="Text">
677+
<Val><![CDATA[Failed to resolve '{0}' from '{1}'. Please check your `AndroidHttpClientHandlerType` setting.]]></Val>
678+
</Str>
679+
<Disp Icon="Str" />
680+
</Item>
681+
<Item ItemId=";XA1033" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
682+
<Str Cat="Text">
683+
<Val><![CDATA[Could not resolve '{0}'. Please check your `AndroidHttpClientHandlerType` setting.]]></Val>
684+
</Str>
685+
<Disp Icon="Str" />
686+
</Item>
687+
<Item ItemId=";XA1034" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
688+
<Str Cat="Text">
689+
<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>
690+
</Str>
691+
<Disp Icon="Str" />
692+
</Item>
669693
<Item ItemId=";XA2000" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
670694
<Str Cat="Text">
671695
<Val><![CDATA[Use of AppDomain.CreateDomain() detected in assembly: {0}. .NET 6 and higher will only support a single AppDomain, so this API will no longer be available in Xamarin.Android once .NET 6 is released.]]></Val>

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

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -666,6 +666,30 @@
666666
</Str>
667667
<Disp Icon="Str" />
668668
</Item>
669+
<Item ItemId=";XA1031" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
670+
<Str Cat="Text">
671+
<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+
</Str>
673+
<Disp Icon="Str" />
674+
</Item>
675+
<Item ItemId=";XA1032" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
676+
<Str Cat="Text">
677+
<Val><![CDATA[Failed to resolve '{0}' from '{1}'. Please check your `AndroidHttpClientHandlerType` setting.]]></Val>
678+
</Str>
679+
<Disp Icon="Str" />
680+
</Item>
681+
<Item ItemId=";XA1033" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
682+
<Str Cat="Text">
683+
<Val><![CDATA[Could not resolve '{0}'. Please check your `AndroidHttpClientHandlerType` setting.]]></Val>
684+
</Str>
685+
<Disp Icon="Str" />
686+
</Item>
687+
<Item ItemId=";XA1034" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
688+
<Str Cat="Text">
689+
<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>
690+
</Str>
691+
<Disp Icon="Str" />
692+
</Item>
669693
<Item ItemId=";XA2000" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
670694
<Str Cat="Text">
671695
<Val><![CDATA[Use of AppDomain.CreateDomain() detected in assembly: {0}. .NET 6 and higher will only support a single AppDomain, so this API will no longer be available in Xamarin.Android once .NET 6 is released.]]></Val>

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

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -666,6 +666,30 @@
666666
</Str>
667667
<Disp Icon="Str" />
668668
</Item>
669+
<Item ItemId=";XA1031" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
670+
<Str Cat="Text">
671+
<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+
</Str>
673+
<Disp Icon="Str" />
674+
</Item>
675+
<Item ItemId=";XA1032" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
676+
<Str Cat="Text">
677+
<Val><![CDATA[Failed to resolve '{0}' from '{1}'. Please check your `AndroidHttpClientHandlerType` setting.]]></Val>
678+
</Str>
679+
<Disp Icon="Str" />
680+
</Item>
681+
<Item ItemId=";XA1033" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
682+
<Str Cat="Text">
683+
<Val><![CDATA[Could not resolve '{0}'. Please check your `AndroidHttpClientHandlerType` setting.]]></Val>
684+
</Str>
685+
<Disp Icon="Str" />
686+
</Item>
687+
<Item ItemId=";XA1034" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
688+
<Str Cat="Text">
689+
<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>
690+
</Str>
691+
<Disp Icon="Str" />
692+
</Item>
669693
<Item ItemId=";XA2000" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
670694
<Str Cat="Text">
671695
<Val><![CDATA[Use of AppDomain.CreateDomain() detected in assembly: {0}. .NET 6 and higher will only support a single AppDomain, so this API will no longer be available in Xamarin.Android once .NET 6 is released.]]></Val>

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

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -666,6 +666,30 @@
666666
</Str>
667667
<Disp Icon="Str" />
668668
</Item>
669+
<Item ItemId=";XA1031" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
670+
<Str Cat="Text">
671+
<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+
</Str>
673+
<Disp Icon="Str" />
674+
</Item>
675+
<Item ItemId=";XA1032" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
676+
<Str Cat="Text">
677+
<Val><![CDATA[Failed to resolve '{0}' from '{1}'. Please check your `AndroidHttpClientHandlerType` setting.]]></Val>
678+
</Str>
679+
<Disp Icon="Str" />
680+
</Item>
681+
<Item ItemId=";XA1033" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
682+
<Str Cat="Text">
683+
<Val><![CDATA[Could not resolve '{0}'. Please check your `AndroidHttpClientHandlerType` setting.]]></Val>
684+
</Str>
685+
<Disp Icon="Str" />
686+
</Item>
687+
<Item ItemId=";XA1034" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
688+
<Str Cat="Text">
689+
<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>
690+
</Str>
691+
<Disp Icon="Str" />
692+
</Item>
669693
<Item ItemId=";XA2000" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
670694
<Str Cat="Text">
671695
<Val><![CDATA[Use of AppDomain.CreateDomain() detected in assembly: {0}. .NET 6 and higher will only support a single AppDomain, so this API will no longer be available in Xamarin.Android once .NET 6 is released.]]></Val>

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

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -666,6 +666,30 @@
666666
</Str>
667667
<Disp Icon="Str" />
668668
</Item>
669+
<Item ItemId=";XA1031" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
670+
<Str Cat="Text">
671+
<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+
</Str>
673+
<Disp Icon="Str" />
674+
</Item>
675+
<Item ItemId=";XA1032" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
676+
<Str Cat="Text">
677+
<Val><![CDATA[Failed to resolve '{0}' from '{1}'. Please check your `AndroidHttpClientHandlerType` setting.]]></Val>
678+
</Str>
679+
<Disp Icon="Str" />
680+
</Item>
681+
<Item ItemId=";XA1033" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
682+
<Str Cat="Text">
683+
<Val><![CDATA[Could not resolve '{0}'. Please check your `AndroidHttpClientHandlerType` setting.]]></Val>
684+
</Str>
685+
<Disp Icon="Str" />
686+
</Item>
687+
<Item ItemId=";XA1034" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
688+
<Str Cat="Text">
689+
<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>
690+
</Str>
691+
<Disp Icon="Str" />
692+
</Item>
669693
<Item ItemId=";XA2000" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
670694
<Str Cat="Text">
671695
<Val><![CDATA[Use of AppDomain.CreateDomain() detected in assembly: {0}. .NET 6 and higher will only support a single AppDomain, so this API will no longer be available in Xamarin.Android once .NET 6 is released.]]></Val>

Localize/loc/pt-BR/src/Xamarin.Android.Build.Tasks/Properties/Resources.resx.lcl

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -666,6 +666,30 @@
666666
</Str>
667667
<Disp Icon="Str" />
668668
</Item>
669+
<Item ItemId=";XA1031" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
670+
<Str Cat="Text">
671+
<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+
</Str>
673+
<Disp Icon="Str" />
674+
</Item>
675+
<Item ItemId=";XA1032" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
676+
<Str Cat="Text">
677+
<Val><![CDATA[Failed to resolve '{0}' from '{1}'. Please check your `AndroidHttpClientHandlerType` setting.]]></Val>
678+
</Str>
679+
<Disp Icon="Str" />
680+
</Item>
681+
<Item ItemId=";XA1033" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
682+
<Str Cat="Text">
683+
<Val><![CDATA[Could not resolve '{0}'. Please check your `AndroidHttpClientHandlerType` setting.]]></Val>
684+
</Str>
685+
<Disp Icon="Str" />
686+
</Item>
687+
<Item ItemId=";XA1034" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
688+
<Str Cat="Text">
689+
<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>
690+
</Str>
691+
<Disp Icon="Str" />
692+
</Item>
669693
<Item ItemId=";XA2000" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
670694
<Str Cat="Text">
671695
<Val><![CDATA[Use of AppDomain.CreateDomain() detected in assembly: {0}. .NET 6 and higher will only support a single AppDomain, so this API will no longer be available in Xamarin.Android once .NET 6 is released.]]></Val>

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

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -666,6 +666,30 @@
666666
</Str>
667667
<Disp Icon="Str" />
668668
</Item>
669+
<Item ItemId=";XA1031" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
670+
<Str Cat="Text">
671+
<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+
</Str>
673+
<Disp Icon="Str" />
674+
</Item>
675+
<Item ItemId=";XA1032" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
676+
<Str Cat="Text">
677+
<Val><![CDATA[Failed to resolve '{0}' from '{1}'. Please check your `AndroidHttpClientHandlerType` setting.]]></Val>
678+
</Str>
679+
<Disp Icon="Str" />
680+
</Item>
681+
<Item ItemId=";XA1033" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
682+
<Str Cat="Text">
683+
<Val><![CDATA[Could not resolve '{0}'. Please check your `AndroidHttpClientHandlerType` setting.]]></Val>
684+
</Str>
685+
<Disp Icon="Str" />
686+
</Item>
687+
<Item ItemId=";XA1034" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
688+
<Str Cat="Text">
689+
<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>
690+
</Str>
691+
<Disp Icon="Str" />
692+
</Item>
669693
<Item ItemId=";XA2000" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
670694
<Str Cat="Text">
671695
<Val><![CDATA[Use of AppDomain.CreateDomain() detected in assembly: {0}. .NET 6 and higher will only support a single AppDomain, so this API will no longer be available in Xamarin.Android once .NET 6 is released.]]></Val>

0 commit comments

Comments
 (0)