Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump to xamarin/monodroid@1a9ee373 #9303

Merged
merged 4 commits into from
Sep 16, 2024
Merged

Bump to xamarin/monodroid@1a9ee373 #9303

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d0a262a
Bump to xamarin/monodroid@5d89b0b
pjcollins Sep 12, 2024
429ce03
Remove Xamarin.Android.Tools.Versions.props
pjcollins Sep 12, 2024
240b272
Fix merge
pjcollins Sep 12, 2024
36bba6f
Bump to xamarin/monodroid@1a9ee373
pjcollins Sep 13, 2024
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
2 changes: 1 addition & 1 deletion .external
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
xamarin/monodroid:release/8.0.4xx@e6a7cf474abe406f85aac55531fc46ead8f3f7d8
xamarin/monodroid:release/8.0.4xx@1a9ee3733285238e0630f230c383cf3df1a6736d
mono/mono:2020-02@6dd9def57ce969ca04a0ecd9ef72c0a8f069112d
3 changes: 0 additions & 3 deletions build-tools/installers/create-installers.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,8 +126,6 @@
<_MSBuildFiles Include="$(MicrosoftAndroidSdkOutDir)cil-strip.pdb" ExcludeFromAndroidNETSdk="true" />
<_MSBuildFiles Include="$(MicrosoftAndroidSdkOutDir)HtmlAgilityPack.dll" />
<_MSBuildFiles Include="$(MicrosoftAndroidSdkOutDir)HtmlAgilityPack.pdb" />
<_MSBuildFiles Include="$(MicrosoftAndroidSdkOutDir)ICSharpCode.SharpZipLib.dll" />
<_MSBuildFiles Include="$(MicrosoftAndroidSdkOutDir)ICSharpCode.SharpZipLib.pdb" />
<_MSBuildFiles Include="$(MicrosoftAndroidSdkOutDir)illinkanalyzer.exe" ExcludeFromAndroidNETSdk="true" />
<_MSBuildFiles Include="$(MicrosoftAndroidSdkOutDir)illinkanalyzer.pdb" ExcludeFromAndroidNETSdk="true" />
<_MSBuildFiles Include="$(MicrosoftAndroidSdkOutDir)Irony.dll" />
Expand Down Expand Up @@ -242,7 +240,6 @@
<_MSBuildFiles Include="$(MicrosoftAndroidSdkOutDir)Xamarin.Android.Tools.Aidl.pdb" />
<_MSBuildFiles Include="$(MicrosoftAndroidSdkOutDir)Xamarin.Android.Tools.AndroidSdk.dll" />
<_MSBuildFiles Include="$(MicrosoftAndroidSdkOutDir)Xamarin.Android.Tools.AndroidSdk.pdb" />
<_MSBuildFiles Include="$(MicrosoftAndroidSdkOutDir)Xamarin.Android.Tools.Versions.props" />
<_MSBuildFiles Include="$(MicrosoftAndroidSdkOutDir)Xamarin.Android.VisualBasic.targets" ExcludeFromAndroidNETSdk="true" />
<_MSBuildFiles Include="$(MicrosoftAndroidSdkOutDir)Xamarin.Build.AsyncTask.dll" />
<_MSBuildFiles Include="$(MicrosoftAndroidSdkOutDir)Xamarin.Build.AsyncTask.pdb" />
Expand Down
2 changes: 1 addition & 1 deletion ...Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/AndroidDependenciesTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public void InstallAndroidDependenciesTest ([Values ("GoogleV2", "Xamarin")] str
"AcceptAndroidSDKLicenses=true",
$"AndroidManifestType={manifestType}",
};
// When using the default Xamarin manifest, this test should fail if we can't install any of the defaults in Xamarin.Android.Tools.Versions.props
// When using the default Xamarin manifest, this test should fail if we can't install any of the defaults in Xamarin.Installer.Common.props
// When using the Google manifest, override the platform tools version to the one in their manifest as it only ever contains one version
if (manifestType == "GoogleV2") {
buildArgs.Add ($"AndroidSdkPlatformToolsVersion={GetCurrentPlatformToolsVersion ()}");
Expand Down
Loading