Skip to content

Commit cd4584b

Browse files
grendellogrendello
committed
Merge branch 'main' into blazor-hang
* main: LEGO: Merge pull request 8119 [build] Bump `$(XABuildToolsVersion)`=34 (dotnet#8118) [Xamarin.Android.Build.Tasks] missing resource error handling (dotnet#8066) [CI] Allow MSBuild test stages to run in the megapipeline (dotnet#8033) [ci] Fix nightly test environment provisioning (dotnet#8113)
2 parents 2990041 + 24e51cb commit cd4584b

File tree

40 files changed

+491
-203
lines changed

40 files changed

+491
-203
lines changed

‎Configuration.props‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -132,13 +132,13 @@
132132
For some reason, the URL for platform-tools/build-tools 32.0.0 is prefixed with what appears to be a GIT commit hash or some other checksum...
133133
Linux packages don't have any prefix, but this forces us to have *some* mechanism to handle this...
134134
-->
135-
<XABuildToolsPackagePrefixMacOS>5219cc671e844de73762e969ace287c29d2e14cd.</XABuildToolsPackagePrefixMacOS>
136-
<XABuildToolsPackagePrefixWindows>210b77e4bc623bd4cdda4dae790048f227972bd2.</XABuildToolsPackagePrefixWindows>
135+
<XABuildToolsPackagePrefixMacOS></XABuildToolsPackagePrefixMacOS>
136+
<XABuildToolsPackagePrefixWindows></XABuildToolsPackagePrefixWindows>
137137
<XABuildToolsPackagePrefixLinux></XABuildToolsPackagePrefixLinux>
138138
<XABuildToolsPackagePrefix Condition=" '$(HostOS)' == 'Darwin' ">$(XABuildToolsPackagePrefixMacOS)</XABuildToolsPackagePrefix>
139139
<XABuildToolsPackagePrefix Condition=" '$(HostOS)' == 'Windows' ">$(XABuildToolsPackagePrefixWindows)</XABuildToolsPackagePrefix>
140-
<XABuildToolsVersion>32</XABuildToolsVersion>
141-
<XABuildToolsFolder Condition="'$(XABuildToolsFolder)' == ''">32.0.0</XABuildToolsFolder>
140+
<XABuildToolsVersion>34</XABuildToolsVersion>
141+
<XABuildToolsFolder Condition="'$(XABuildToolsFolder)' == ''">34.0.0</XABuildToolsFolder>
142142
<!-- build-tools 30, for DX tests -->
143143
<XABuildTools30PackagePrefixMacOS>f6d24b187cc6bd534c6c37604205171784ac5621.</XABuildTools30PackagePrefixMacOS>
144144
<XABuildTools30PackagePrefixWindows>91936d4ee3ccc839f0addd53c9ebf087b1e39251.</XABuildTools30PackagePrefixWindows>

‎Documentation/guides/messages/README.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,10 @@ Exceptions that have not been gracefully handled yet. Ideally these will be fix
222222
These take the form of `XACCC7NNN`, where `CCC` is a 3 character code denoting the MSBuild Task that is throwing the exception,
223223
and `NNN` is a 3 digit number indicating the type of the unhandled `Exception`.
224224

225+
## XA8xxx: Linker Step Errors
226+
227+
+ [XA8000/IL8000](xa8000.md): Could not find Android Resource '@anim/enterfromright'. Please update @(AndroidResource) to add the missing resource.
228+
225229
**Tasks:**
226230
* `A2C` - `Aapt2Compile`
227231
* `A2L` - `Aapt2Link`

‎Documentation/guides/messages/xa8000.md‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
---
2+
title: Xamarin.Android warning XA8000/IL8000
3+
description: XA8000/IL8000 error code
4+
ms.date: 06/01/2023
5+
---
6+
# Xamarin.Android error XA8000/IL8000
7+
8+
## Issue
9+
10+
```
11+
Could not find Android Resource '@anim/enterfromright'. Please update @(AndroidResource) to add the missing resource.
12+
```
13+
14+
## Solution
15+
16+
When trying to upgrade older nuget package references to use the
17+
more recent Resource Designer Assembly, the system might encounter
18+
fields which cannot be upgraded because the resource is missing
19+
from either the dependency or the app.
20+
21+
To fix this issue the missing `AndroidResource` needs to be added to the application. Or the Nuget should be upgraded to use .net 8 or later.

‎Localize/loc/es/src/Microsoft.Android.Sdk.ILLink/Properties/Resources.resx.lcl‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,15 @@
1818
</Str>
1919
<Disp Icon="Str" />
2020
</Item>
21+
<Item ItemId=";XA8000" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
22+
<Str Cat="Text">
23+
<Val><![CDATA[Could not find Android Resource '{0}'. Please update @(AndroidResource) to add the missing resource.]]></Val>
24+
<Tgt Cat="Text" Stat="Loc" Orig="New">
25+
<Val><![CDATA[No se encontró el recurso de Android '{0}'. Actualice @(AndroidResource) para agregar el recurso que falta.]]></Val>
26+
</Tgt>
27+
</Str>
28+
<Disp Icon="Str" />
29+
</Item>
2130
</Item>
2231
</Item>
2332
</LCX>

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1464,6 +1464,15 @@
14641464
</Str>
14651465
<Disp Icon="Str" />
14661466
</Item>
1467+
<Item ItemId=";XA8000" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
1468+
<Str Cat="Text">
1469+
<Val><![CDATA[Could not find Android Resource '{0}'. Please update @(AndroidResource) to add the missing resource.]]></Val>
1470+
<Tgt Cat="Text" Stat="Loc" Orig="New">
1471+
<Val><![CDATA[No se encontró el recurso de Android '{0}'. Actualice @(AndroidResource) para agregar el recurso que falta.]]></Val>
1472+
</Tgt>
1473+
</Str>
1474+
<Disp Icon="Str" />
1475+
</Item>
14671476
<Item ItemId=";XA_Directory_Is_From" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
14681477
<Str Cat="Text">
14691478
<Val><![CDATA[Directory '{0}' is from '{1}'.]]></Val>

‎Localize/loc/ja/src/Microsoft.Android.Sdk.ILLink/Properties/Resources.resx.lcl‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,15 @@
1818
</Str>
1919
<Disp Icon="Str" />
2020
</Item>
21+
<Item ItemId=";XA8000" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
22+
<Str Cat="Text">
23+
<Val><![CDATA[Could not find Android Resource '{0}'. Please update @(AndroidResource) to add the missing resource.]]></Val>
24+
<Tgt Cat="Text" Stat="Loc" Orig="New">
25+
<Val><![CDATA[Android リソース '{0}' が見つかりませんでした。不足しているリソースを追加するには、@(AndroidResource) を更新してください。]]></Val>
26+
</Tgt>
27+
</Str>
28+
<Disp Icon="Str" />
29+
</Item>
2130
</Item>
2231
</Item>
2332
</LCX>

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1464,6 +1464,15 @@
14641464
</Str>
14651465
<Disp Icon="Str" />
14661466
</Item>
1467+
<Item ItemId=";XA8000" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
1468+
<Str Cat="Text">
1469+
<Val><![CDATA[Could not find Android Resource '{0}'. Please update @(AndroidResource) to add the missing resource.]]></Val>
1470+
<Tgt Cat="Text" Stat="Loc" Orig="New">
1471+
<Val><![CDATA[Android リソース '{0}' が見つかりませんでした。不足しているリソースを追加するには、@(AndroidResource) を更新してください。]]></Val>
1472+
</Tgt>
1473+
</Str>
1474+
<Disp Icon="Str" />
1475+
</Item>
14671476
<Item ItemId=";XA_Directory_Is_From" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
14681477
<Str Cat="Text">
14691478
<Val><![CDATA[Directory '{0}' is from '{1}'.]]></Val>

‎Localize/loc/pt-BR/src/Microsoft.Android.Sdk.ILLink/Properties/Resources.resx.lcl‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,15 @@
1818
</Str>
1919
<Disp Icon="Str" />
2020
</Item>
21+
<Item ItemId=";XA8000" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
22+
<Str Cat="Text">
23+
<Val><![CDATA[Could not find Android Resource '{0}'. Please update @(AndroidResource) to add the missing resource.]]></Val>
24+
<Tgt Cat="Text" Stat="Loc" Orig="New">
25+
<Val><![CDATA[Não foi possível encontrar o recurso Android '{0}'. Atualize @(AndroidResource) para adicionar o recurso ausente.]]></Val>
26+
</Tgt>
27+
</Str>
28+
<Disp Icon="Str" />
29+
</Item>
2130
</Item>
2231
</Item>
2332
</LCX>

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1464,6 +1464,15 @@
14641464
</Str>
14651465
<Disp Icon="Str" />
14661466
</Item>
1467+
<Item ItemId=";XA8000" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
1468+
<Str Cat="Text">
1469+
<Val><![CDATA[Could not find Android Resource '{0}'. Please update @(AndroidResource) to add the missing resource.]]></Val>
1470+
<Tgt Cat="Text" Stat="Loc" Orig="New">
1471+
<Val><![CDATA[Não foi possível encontrar o recurso Android '{0}'. Atualize @(AndroidResource) para adicionar o recurso ausente.]]></Val>
1472+
</Tgt>
1473+
</Str>
1474+
<Disp Icon="Str" />
1475+
</Item>
14671476
<Item ItemId=";XA_Directory_Is_From" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
14681477
<Str Cat="Text">
14691478
<Val><![CDATA[Directory '{0}' is from '{1}'.]]></Val>

‎Localize/loc/ru/src/Microsoft.Android.Sdk.ILLink/Properties/Resources.resx.lcl‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,15 @@
1818
</Str>
1919
<Disp Icon="Str" />
2020
</Item>
21+
<Item ItemId=";XA8000" ItemType="0;.resx" PsrId="211" InstFlg="true" Leaf="true">
22+
<Str Cat="Text">
23+
<Val><![CDATA[Could not find Android Resource '{0}'. Please update @(AndroidResource) to add the missing resource.]]></Val>
24+
<Tgt Cat="Text" Stat="Loc" Orig="New">
25+
<Val><![CDATA[Не удалось найти ресурс Android "{0}". Обновите @(AndroidResource), чтобы добавить отсутствующий ресурс.]]></Val>
26+
</Tgt>
27+
</Str>
28+
<Disp Icon="Str" />
29+
</Item>
2130
</Item>
2231
</Item>
2332
</LCX>

0 commit comments

Comments
 (0)