Skip to content

Commit c158adf

Browse files
pjcollinspjcollins
authored
Changes: xamarin/monodroid@e6a7cf4...1a9ee37 * xamarin/monodroid@1a9ee37: Remove jar2xml and xamarin-analysis submodules * xamarin/monodroid@5d89b0b: Add Xamarin.Installer.Common.props * xamarin/monodroid@b632d51: Fix xamarin.sync stdin hang Replaces Xamarin.Android.Tools.Versions.props with Xamarin.Installer.Common.props.
1 parent 2e37202 commit c158adf

3 files changed

Lines changed: 2 additions & 5 deletions

File tree

‎.external‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
xamarin/monodroid:release/8.0.4xx@e6a7cf474abe406f85aac55531fc46ead8f3f7d8
1+
xamarin/monodroid:release/8.0.4xx@1a9ee3733285238e0630f230c383cf3df1a6736d
22
mono/mono:2020-02@6dd9def57ce969ca04a0ecd9ef72c0a8f069112d

‎build-tools/installers/create-installers.targets‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -126,8 +126,6 @@
126126
<_MSBuildFiles Include="$(MicrosoftAndroidSdkOutDir)cil-strip.pdb" ExcludeFromAndroidNETSdk="true" />
127127
<_MSBuildFiles Include="$(MicrosoftAndroidSdkOutDir)HtmlAgilityPack.dll" />
128128
<_MSBuildFiles Include="$(MicrosoftAndroidSdkOutDir)HtmlAgilityPack.pdb" />
129-
<_MSBuildFiles Include="$(MicrosoftAndroidSdkOutDir)ICSharpCode.SharpZipLib.dll" />
130-
<_MSBuildFiles Include="$(MicrosoftAndroidSdkOutDir)ICSharpCode.SharpZipLib.pdb" />
131129
<_MSBuildFiles Include="$(MicrosoftAndroidSdkOutDir)illinkanalyzer.exe" ExcludeFromAndroidNETSdk="true" />
132130
<_MSBuildFiles Include="$(MicrosoftAndroidSdkOutDir)illinkanalyzer.pdb" ExcludeFromAndroidNETSdk="true" />
133131
<_MSBuildFiles Include="$(MicrosoftAndroidSdkOutDir)Irony.dll" />
@@ -242,7 +240,6 @@
242240
<_MSBuildFiles Include="$(MicrosoftAndroidSdkOutDir)Xamarin.Android.Tools.Aidl.pdb" />
243241
<_MSBuildFiles Include="$(MicrosoftAndroidSdkOutDir)Xamarin.Android.Tools.AndroidSdk.dll" />
244242
<_MSBuildFiles Include="$(MicrosoftAndroidSdkOutDir)Xamarin.Android.Tools.AndroidSdk.pdb" />
245-
<_MSBuildFiles Include="$(MicrosoftAndroidSdkOutDir)Xamarin.Android.Tools.Versions.props" />
246243
<_MSBuildFiles Include="$(MicrosoftAndroidSdkOutDir)Xamarin.Android.VisualBasic.targets" ExcludeFromAndroidNETSdk="true" />
247244
<_MSBuildFiles Include="$(MicrosoftAndroidSdkOutDir)Xamarin.Build.AsyncTask.dll" />
248245
<_MSBuildFiles Include="$(MicrosoftAndroidSdkOutDir)Xamarin.Build.AsyncTask.pdb" />

‎src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/AndroidDependenciesTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public void InstallAndroidDependenciesTest ([Values ("GoogleV2", "Xamarin")] str
3838
"AcceptAndroidSDKLicenses=true",
3939
$"AndroidManifestType={manifestType}",
4040
};
41-
// 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
41+
// When using the default Xamarin manifest, this test should fail if we can't install any of the defaults in Xamarin.Installer.Common.props
4242
// When using the Google manifest, override the platform tools version to the one in their manifest as it only ever contains one version
4343
if (manifestType == "GoogleV2") {
4444
buildArgs.Add ($"AndroidSdkPlatformToolsVersion={GetCurrentPlatformToolsVersion ()}");

0 commit comments

Comments
 (0)