Skip to content

Commit 7c03882

Browse files
committed
Merge branch 'main' into dev/grendel/xxhash3
* main: [runtime] Remove the last vestiges of desktop builds (#8810) [ci] Don't auto-retry APK test suites. (#8811) [Microsoft.Android.Templates] Update EN l10n template strings (#8808) Bump to xamarin/Java.Interop/main@651de42 (#8809)
2 parents fae658b + 6fde0f6 commit 7c03882

File tree

5 files changed

+105
-357
lines changed

5 files changed

+105
-357
lines changed

build-tools/automation/yaml-templates/apk-instrumentation.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ parameters:
1010
artifactSource: ""
1111
artifactFolder: ""
1212
condition: succeeded()
13-
retryCountOnTaskFailure: 1
1413

1514
steps:
1615
- template: /build-tools/automation/yaml-templates/run-dotnet-preview.yaml
@@ -25,7 +24,6 @@ steps:
2524
-v:n -c ${{ parameters.configuration }} ${{ parameters.extraBuildArgs }}
2625
condition: ${{ parameters.condition }}
2726
continueOnError: true
28-
retryCountOnTaskFailure: ${{ parameters.retryCountOnTaskFailure }}
2927

3028
- script: >
3129
DEST="$(Build.StagingDirectory)/Test${{ parameters.configuration }}/${{ parameters.artifactFolder }}/" &&

external/Java.Interop

src/Microsoft.Android.Templates/android-activity/.template.config/localize/templatestrings.en.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"author": "Microsoft",
3-
"name": "Android Activity template",
3+
"name": "Android Activity",
44
"description": "An Android Activity class",
55
"symbols/namespace/description": "namespace for the generated code",
66
"postActions/openInEditor/description": "Opens Activity1.cs in the editor"
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"author": "Microsoft",
3-
"name": "Android Layout template",
3+
"name": "Android Layout",
44
"description": "An Android layout (XML) file",
55
"postActions/openInEditor/description": "Opens Layout1.xml in the editor"
66
}

0 commit comments

Comments
 (0)