Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -40,5 +40,5 @@
branch = 3.35.2
[submodule "external/xamarin-android-tools"]
path = external/xamarin-android-tools
url = https://github.com/xamarin/xamarin-android-tools
branch = main
url = https://github.com/grendello/xamarin-android-tools
branch = update-mono.unix
2 changes: 1 addition & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@

<!-- Common <PackageReference/> versions -->
<PropertyGroup>
<LibZipSharpVersion>2.0.4</LibZipSharpVersion>
<LibZipSharpVersion>2.0.5</LibZipSharpVersion>
<MicroBuildCoreVersion>0.4.1</MicroBuildCoreVersion>
<MonoCecilVersion>0.11.4</MonoCecilVersion>
<NewtonsoftJsonPackageVersion>13.0.1</NewtonsoftJsonPackageVersion>
Expand Down
2 changes: 1 addition & 1 deletion build-tools/xaprepare/xaprepare/xaprepare.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
<PackageReference Include="7-Zip.CommandLine" Version="18.1.0" GeneratePathProperty="true" />
<PackageReference Include="Kajabity.Tools.Java" Version="0.2.6862.30334" />
<PackageReference Include="Mono.Options" Version="$(MonoOptionsVersion)" />
<PackageReference Include="Mono.Unix" Version="7.0.0-final.1.21369.2" />
<PackageReference Include="Mono.Unix" Version="7.1.0-final.1.21458.1" />
<PackageReference Include="System.Net.Http" Version="4.3.4" />
<PackageReference Include="System.Private.Uri" Version="4.3.2" />
<PackageReference Include="Xamarin.LibZipSharp" Version="$(LibZipSharpVersion)" GeneratePathProperty="true" />
Expand Down
2 changes: 1 addition & 1 deletion external/xamarin-android-tools
Submodule xamarin-android-tools updated 32 files
+19 −0 Localize/LocProject.json
+23 −0 Localize/loc/cs/src/Microsoft.Android.Build.BaseTasks/Properties/Resources.resx.lcl
+41 −0 Localize/loc/cs/src/Xamarin.Android.Tools.AndroidSdk/Properties/Resources.resx.lcl
+23 −0 Localize/loc/de/src/Microsoft.Android.Build.BaseTasks/Properties/Resources.resx.lcl
+41 −0 Localize/loc/de/src/Xamarin.Android.Tools.AndroidSdk/Properties/Resources.resx.lcl
+23 −0 Localize/loc/es/src/Microsoft.Android.Build.BaseTasks/Properties/Resources.resx.lcl
+41 −0 Localize/loc/es/src/Xamarin.Android.Tools.AndroidSdk/Properties/Resources.resx.lcl
+23 −0 Localize/loc/fr/src/Microsoft.Android.Build.BaseTasks/Properties/Resources.resx.lcl
+41 −0 Localize/loc/fr/src/Xamarin.Android.Tools.AndroidSdk/Properties/Resources.resx.lcl
+23 −0 Localize/loc/it/src/Microsoft.Android.Build.BaseTasks/Properties/Resources.resx.lcl
+41 −0 Localize/loc/it/src/Xamarin.Android.Tools.AndroidSdk/Properties/Resources.resx.lcl
+23 −0 Localize/loc/ja/src/Microsoft.Android.Build.BaseTasks/Properties/Resources.resx.lcl
+41 −0 Localize/loc/ja/src/Xamarin.Android.Tools.AndroidSdk/Properties/Resources.resx.lcl
+23 −0 Localize/loc/ko/src/Microsoft.Android.Build.BaseTasks/Properties/Resources.resx.lcl
+41 −0 Localize/loc/ko/src/Xamarin.Android.Tools.AndroidSdk/Properties/Resources.resx.lcl
+23 −0 Localize/loc/pl/src/Microsoft.Android.Build.BaseTasks/Properties/Resources.resx.lcl
+41 −0 Localize/loc/pl/src/Xamarin.Android.Tools.AndroidSdk/Properties/Resources.resx.lcl
+23 −0 Localize/loc/pt-BR/src/Microsoft.Android.Build.BaseTasks/Properties/Resources.resx.lcl
+41 −0 Localize/loc/pt-BR/src/Xamarin.Android.Tools.AndroidSdk/Properties/Resources.resx.lcl
+23 −0 Localize/loc/ru/src/Microsoft.Android.Build.BaseTasks/Properties/Resources.resx.lcl
+41 −0 Localize/loc/ru/src/Xamarin.Android.Tools.AndroidSdk/Properties/Resources.resx.lcl
+23 −0 Localize/loc/tr/src/Microsoft.Android.Build.BaseTasks/Properties/Resources.resx.lcl
+41 −0 Localize/loc/tr/src/Xamarin.Android.Tools.AndroidSdk/Properties/Resources.resx.lcl
+23 −0 Localize/loc/zh-Hans/src/Microsoft.Android.Build.BaseTasks/Properties/Resources.resx.lcl
+41 −0 Localize/loc/zh-Hans/src/Xamarin.Android.Tools.AndroidSdk/Properties/Resources.resx.lcl
+23 −0 Localize/loc/zh-Hant/src/Microsoft.Android.Build.BaseTasks/Properties/Resources.resx.lcl
+41 −0 Localize/loc/zh-Hant/src/Xamarin.Android.Tools.AndroidSdk/Properties/Resources.resx.lcl
+52 −0 Localize/onelocbuild.yaml
+3 −3 azure-pipelines.yaml
+2 −2 src/Microsoft.Android.Build.BaseTasks/MSBuildReferences.projitems
+6 −0 src/Xamarin.Android.Tools.AndroidSdk/AndroidVersions.cs
+1 −1 src/Xamarin.Android.Tools.AndroidSdk/Xamarin.Android.Tools.Versions.props