Skip to content

Commit a3d3376

Browse files
Merge branch 'main' into dependabot/gradle/src/manifestmerger/com.android.tools.build-manifest-merger-31.13.0
2 parents c546566 + bb2c376 commit a3d3376

File tree

180 files changed

+8944
-1837
lines changed

Some content is hidden

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

180 files changed

+8944
-1837
lines changed

.github/ISSUE_TEMPLATE/01-building-an-application.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ body:
1515
options:
1616
- net8.0-android
1717
- net9.0-android
18-
- net10.0-android (Preview)
18+
- net10.0-android
19+
- net11.0-android (Preview)
1920
- Other
2021
validations:
2122
required: true

.github/ISSUE_TEMPLATE/02-running-an-application.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ body:
1515
options:
1616
- net8.0-android
1717
- net9.0-android
18-
- net10.0-android (Preview)
18+
- net10.0-android
19+
- net11.0-android (Preview)
1920
- Other
2021
validations:
2122
required: true

.github/ISSUE_TEMPLATE/03-mono-android-api.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ body:
2020
options:
2121
- net8.0-android
2222
- net9.0-android
23-
- net10.0-android (Preview)
23+
- net10.0-android
24+
- net11.0-android (Preview)
2425
- Other
2526
validations:
2627
required: true

.github/ISSUE_TEMPLATE/04-binding-a-java-library.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ body:
1717
options:
1818
- net8.0-android
1919
- net9.0-android
20-
- net10.0-android (Preview)
20+
- net10.0-android
21+
- net11.0-android (Preview)
2122
- Other
2223
validations:
2324
required: true

.github/ISSUE_TEMPLATE/05-other.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ body:
1515
options:
1616
- net8.0-android
1717
- net9.0-android
18-
- net10.0-android (Preview)
18+
- net10.0-android
19+
- net11.0-android (Preview)
1920
- Other
2021
validations:
2122
required: true

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
----
2+
3+
Pull Request
4+
[title](https://github.com/xamarin/xamarin-android/blob/main/Documentation/workflow/commit-messages.md#commit-summary) and
5+
[description](https://github.com/xamarin/xamarin-android/blob/main/Documentation/workflow/commit-messages.md#commit-body)
6+
should follow the
7+
[`commit-messages.md` workflow documentation](https://github.com/xamarin/xamarin-android/blob/main/Documentation/workflow/commit-messages.md), and in particular should include:
8+
9+
- [ ] Useful description of *why the change is necessary*.
10+
- [ ] Links to issues fixed
11+
- [ ] Unit tests

.github/dependabot.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
# https://docs.github.com/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/
22
version: 2
33
updates:
4+
- package-ecosystem: "nuget"
5+
directory: "/"
6+
schedule:
7+
interval: "weekly"
48
- package-ecosystem: "gradle"
59
directory: "/src/r8/"
610
schedule:

.github/workflows/copilot-setup-steps.yml

Lines changed: 28 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,22 @@ jobs:
99
env:
1010
AndroidToolchainCacheDirectory: /mnt/android-archives
1111
AndroidToolchainDirectory: /mnt/android-toolchain
12+
NUGET_PACKAGES: /mnt/nuget/packages
13+
NUGET_HTTP_CACHE_PATH: /mnt/nuget/v3-cache
14+
NUGET_PLUGINS_CACHE_PATH: /mnt/nuget/plugins-cache
15+
NUGET_SCRATCH: /mnt/nuget/scratch
1216

1317
steps:
18+
- name: Free up disk space
19+
run: |
20+
# Remove pre-installed Android SDK/NDK (~10GB) since we download our own specific versions
21+
sudo rm -rf /usr/local/lib/android
22+
1423
- name: Checkout repository
1524
uses: actions/checkout@v4
1625
with:
1726
submodules: recursive
27+
fetch-depth: 1
1828

1929
- name: Log disk space (after checkout)
2030
uses: ./.github/workflows/log-disk-space
@@ -27,15 +37,30 @@ jobs:
2737
sudo mkdir -p /mnt/android-archives
2838
sudo mkdir -p /mnt/android-toolchain
2939
sudo mkdir -p /mnt/bin
30-
sudo chown $USER:$USER /mnt/android-archives /mnt/android-toolchain /mnt/bin
40+
sudo mkdir -p /mnt/gradle
41+
sudo mkdir -p /mnt/nuget/packages
42+
sudo mkdir -p /mnt/nuget/v3-cache
43+
sudo mkdir -p /mnt/nuget/plugins-cache
44+
sudo mkdir -p /mnt/nuget/scratch
45+
sudo chown -R $USER:$USER /mnt/android-archives /mnt/android-toolchain /mnt/bin /mnt/gradle /mnt/nuget
3146
3247
# Remove bin directory if it exists and create symlink to use the secondary disk
3348
rm -rf ./bin
3449
ln -s /mnt/bin ./bin
3550
36-
echo "Android toolchain directories configured:"
51+
# Move Gradle cache to secondary disk to prevent "No space left on device" during Gradle operations
52+
mkdir -p /mnt/gradle
53+
ln -s /mnt/gradle $HOME/.gradle
54+
55+
echo "Build cache directories configured on /mnt (secondary disk):"
56+
echo " - Android toolchain: /mnt/android-toolchain"
57+
echo " - Build output: /mnt/bin"
58+
echo " - Gradle cache: /mnt/gradle"
59+
echo " - NuGet packages: /mnt/nuget/packages"
60+
echo " - NuGet HTTP cache: /mnt/nuget/v3-cache"
61+
echo " - NuGet plugins cache: /mnt/nuget/plugins-cache"
62+
echo " - NuGet scratch: /mnt/nuget/scratch"
3763
ls -la /mnt
38-
ls -lah bin
3964
df -h /mnt
4065
4166
- name: Setup .NET

Directory.Build.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
<PropertyGroup>
44
<DirectoryBuildPropsImported>true</DirectoryBuildPropsImported>
5-
<DotNetTargetFrameworkVersion>10.0</DotNetTargetFrameworkVersion>
5+
<DotNetTargetFrameworkVersion>11.0</DotNetTargetFrameworkVersion>
66
<DotNetTargetFramework>net$(DotNetTargetFrameworkVersion)</DotNetTargetFramework>
77
<DotNetAndroidTargetFramework>$(DotNetTargetFramework)-android</DotNetAndroidTargetFramework>
88
<!-- Used for bootstrap, command-line tooling, and desktop NUnit projects -->
9-
<DotNetStableTargetFramework>net9.0</DotNetStableTargetFramework>
9+
<DotNetStableTargetFramework>net10.0</DotNetStableTargetFramework>
1010
<TargetFrameworkNETStandard>netstandard2.0</TargetFrameworkNETStandard>
1111
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
1212
<BuildOutputDirectory>$(MSBuildThisFileDirectory)bin\$(Configuration)\</BuildOutputDirectory>

Directory.Build.targets

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
<!-- NuGet Package Versions -->
44
<ItemGroup>
5+
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="8.0.0" />
56
<PackageReference Update="Microsoft.Win32.Registry" Version="5.0.0" />
67
<PackageReference Update="System.CodeDom" Version="9.0.8" />
78
<PackageReference Update="Irony" Version="1.1.0" />

0 commit comments

Comments
 (0)