Skip to content

Commit 4f4da57

Browse files
grendellogrendello
committed
Merge branch 'main' into issue7629
* main: (32 commits) [monodroid] Replace `exit()` with `abort()` in native code (dotnet#7734) Bump to xamarin/Java.Interop/main@8a1ae57 (dotnet#7738) [build] bump `$(AndroidNet7Version)` (dotnet#7737) Bump to xamarin/Java.Interop/main@1366d99 (dotnet#7718) [Xamarin.Android.Build.Tasks] fix AndroidGenerateResourceDesigner (dotnet#7721) Bump to xamarin/monodroid@50faac94 (dotnet#7725) Revert "[Xamarin.Android.Build.Tasks] fix cases of missing `@(Reference)` (dotnet#7642)" (dotnet#7726) [marshal methods] Properly support arrays of arrays (dotnet#7707) Bump to dotnet/installer@9962c6a 8.0.100-alpha.1.23063.11 (dotnet#7677) [Actions] Add action to bump the hash used for the unified pipeline (dotnet#7712) Bump to xamarin/xamarin-android-tools/main@099fd95 (dotnet#7709) [ci] Move build stages into yaml templates (dotnet#7553) [Xamarin.Android.Build.Tasks] fix NRE in `<GenerateResourceCaseMap/>` (dotnet#7716) [ci] Pass token when building Designer tests (dotnet#7715) [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) [Xamarin.Android.Build.Tasks] skip XA1034 logic in some cases (dotnet#7680) ...
2 parents 2c0a82b + c990148 commit 4f4da57

File tree

181 files changed

+4626
-956
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

181 files changed

+4626
-956
lines changed

‎.external‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
xamarin/monodroid:main@c0c933b7a5286c0babecb165c0676c32f5e44092
1+
xamarin/monodroid:main@50faac94c6a0c27864564829ac83f3988c82f8ef
22
mono/mono:2020-02@6dd9def57ce969ca04a0ecd9ef72c0a8f069112d

‎.github/workflows/sdk-insertion-bump.yml‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
name: Notify release branch change
2+
3+
on:
4+
# trigger for main and release branches.
5+
push:
6+
branches:
7+
- main
8+
- 'release/**'
9+
10+
jobs:
11+
pingRemote:
12+
runs-on: ubuntu-latest
13+
14+
steps:
15+
- uses: actions/checkout@v3
16+
17+
- name: Parse commit
18+
shell: pwsh
19+
id: commit_title
20+
run: |
21+
Write-Host "Commit message is $Env:COMMIT_MESSAGE"
22+
$title = ($Env:COMMIT_MESSAGE -split '\n')[0]
23+
"COMMIT_TITLE=$title" >> $env:GITHUB_OUTPUT
24+
env:
25+
COMMIT_MESSAGE: "${{ github.event.head_commit.message }}"
26+
27+
- name: 'Update remote repository'
28+
uses: peter-evans/repository-dispatch@v2
29+
with:
30+
token: ${{ secrets.SERVICEACCOUNT_PAT }}
31+
event-type: 'sdk_insertion'
32+
repository: 'xamarin/sdk-insertions'
33+
client-payload: '{"repository": "xamarin/xamarin-android", "branch": "${{ github.ref_name }}", "commit": "${{ github.sha }}", "commit_message": "${{ steps.commit_title.outputs.COMMIT_TITLE }}"}'
34+
35+

‎Configuration.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
<DebugType Condition=" '$(DebugType)' == '' ">portable</DebugType>
4848
<Deterministic Condition=" '$(Deterministic)' == '' ">True</Deterministic>
4949
<LangVersion Condition=" '$(LangVersion)' == '' ">latest</LangVersion>
50-
<AndroidNet7Version Condition=" '$(AndroidNet7Version)' == '' ">33.0.1</AndroidNet7Version>
50+
<AndroidNet7Version Condition=" '$(AndroidNet7Version)' == '' ">33.0.26</AndroidNet7Version>
5151
<AndroidNet6Version Condition=" '$(AndroidNet6Version)' == '' ">32.0.485</AndroidNet6Version>
5252
</PropertyGroup>
5353
<PropertyGroup Condition=" '$(HostOS)' == '' ">

‎Documentation/guides/building-apps/build-properties.md‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1110,6 +1110,14 @@ or use `-p:AndroidCreateProguardMappingFile=False` on the command line.
11101110

11111111
This property was added in Xamarin.Android 11.2.
11121112

1113+
## AndroidD8IgnoreWarnings
1114+
1115+
Specifies `--map-diagnostics warning info` to be passed to `d8`. The
1116+
default value is `True`, but can be set to `False` to enforce more
1117+
strict behavior. See the [D8 and R8 source code][r8-source] for details.
1118+
1119+
Added in .NET 8.
1120+
11131121
## AndroidR8IgnoreWarnings
11141122

11151123
Specifies
@@ -1118,8 +1126,13 @@ to continue with dex compilation even if certain warnings are
11181126
encountered. The default value is `True`, but can be set to `False` to
11191127
enforce more strict behavior. See the [ProGuard manual](https://www.guardsquare.com/manual/configuration/usage) for details.
11201128

1129+
Starting in .NET 8, specifies `--map-diagnostics warning info`. See
1130+
the [D8 and R8 source code][r8-source] for details.
1131+
11211132
Added in Xamarin.Android 10.3.
11221133

1134+
[r8-source]: https://r8.googlesource.com/r8/+/refs/tags/3.3.75/src/main/java/com/android/tools/r8/BaseCompilerCommandParser.java#246
1135+
11231136
## AndroidR8JarPath
11241137

11251138
The path to `r8.jar` for use with the
@@ -1351,6 +1364,35 @@ To suppress the default AOT profiles, set the property to `false`.
13511364

13521365
Added in Xamarin.Android 10.1.
13531366

1367+
## AndroidUseDesignerAssembly
1368+
1369+
A bool property which controls if the build system will generate an
1370+
`_Microsoft.Android.Resource.Designer.dll` as apposed to a `Resource.Designer.cs` file. The benefits of this are smaller applications and
1371+
faster startup time.
1372+
1373+
The default value is `true` in .NET 8.
1374+
1375+
This setting is not backward compatible with Classic Xamarin.Android.
1376+
As a Nuget Author it is recommended that you ship three versions of
1377+
the assembly if you want to maintain backward compatibility.
1378+
One for MonoAndroid, one for net6.0-android and
1379+
one for net8.0-android. You can do this by using [Xamarin.Legacy.Sdk](https://www.nuget.org/packages/Xamarin.Legacy.Sdk). This is only required if your Nuget Library
1380+
project makes use of `AndroidResource` items in the project or via a dependency.
1381+
1382+
```
1383+
<TargetFrameworks>monoandroid90;net6.0-android;net8.0-android</TargetFrameworks>
1384+
```
1385+
1386+
Alternatively turn this setting off until such time as both Classic and
1387+
net7.0-android have been deprecated.
1388+
1389+
.NET 8 Projects which choose to turn this setting off will not be able to
1390+
consume references which do use it. If you try to use an assembly
1391+
which does have this feature enabled in a project that does not, you will
1392+
get a `XA1034` build error.
1393+
1394+
Added in .NET 8. Unsupported in Classic Xamarin.Android.
1395+
13541396
## AndroidUseInterpreter
13551397

13561398
A boolean property that causes the `.apk` to contain the mono

‎Documentation/guides/messages/xa1034.md‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
---
2+
title: Xamarin.Android error XA1034
3+
description: XA1034 error code
4+
ms.date: 13/12/2022
5+
---
6+
# Xamarin.Android error XA1034
7+
8+
## Example messages
9+
10+
```
11+
Your project references 'Foo.dll' 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.
12+
```
13+
14+
## Solution
15+
16+
Edit your csproj directly and change the 'AndroidUseDesignerAssembly' to `True`.

‎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>

0 commit comments

Comments
 (0)