Skip to content

[Xamarin.Android.Build.Tasks] [Smoke][VS 2017] Exception on deploying CheeseSquare sample #744

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

Merged
merged 1 commit into from
Aug 14, 2017
Merged

[Xamarin.Android.Build.Tasks] [Smoke][VS 2017] Exception on deploying CheeseSquare sample #744

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 24 additions & 1 deletion ...marin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/AndroidUpdateResourcesTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System;
using System;
using Xamarin.ProjectTools;
using NUnit.Framework;
using System.Linq;
Expand Down Expand Up @@ -110,6 +110,29 @@ public void DesignTimeBuild ([Values(false, true)] bool isRelease)
}
}

[Test]
public void CheckEmbeddedSupportLibraryResources ()
{
var proj = new XamarinAndroidApplicationProject () {
IsRelease = true,
Packages = {
KnownPackages.SupportMediaCompat_25_4_0_1,
KnownPackages.SupportFragment_25_4_0_1,
KnownPackages.SupportCoreUtils_25_4_0_1,
KnownPackages.SupportCoreUI_25_4_0_1,
KnownPackages.SupportCompat_25_4_0_1,
KnownPackages.AndroidSupportV4_25_4_0_1,
KnownPackages.SupportV7AppCompat_25_4_0_1,
},
TargetFrameworkVersion = "v7.1",
};
using (var b = CreateApkBuilder ("temp/CheckEmbeddedSupportLibraryResources")) {
Assert.IsTrue (b.Build (proj), "First build should have succeeded.");
var Rdrawable = b.Output.GetIntermediaryPath (Path.Combine ("android", "bin", "classes", "android", "support", "v7", "appcompat", "R$drawable.class"));
Assert.IsTrue (File.Exists (Rdrawable), $"{Rdrawable} should exist");
}
}

[Test]
public void MoveResource ()
{
Expand Down
63 changes: 63 additions & 0 deletions src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Android/KnownPackages.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,15 @@ public static class KnownPackages
MetadataValues = "HintPath=..\\packages\\Xamarin.Android.Support.v4.23.1.1.0\\lib\\MonoAndroid403\\Xamarin.Android.Support.v4.dll" }
}
};
public static Package AndroidSupportV4_25_4_0_1 = new Package () {
Id = "Xamarin.Android.Support.v4",
Version = "25.4.0.1",
TargetFramework = "MonoAndroid70",
References = {
new BuildItem.Reference ("Xamarin.Android.Support.v4") {
MetadataValues = "HintPath=..\\packages\\Xamarin.Android.Support.v4.25.4.0.1\\lib\\MonoAndroid70\\Xamarin.Android.Support.v4.dll" }
}
};
public static Package AndroidSupportV4Beta = new Package () {
Id = "Xamarin.Android.Support.v4",
Version = "21.0.0.0-beta1",
Expand Down Expand Up @@ -139,6 +148,60 @@ public static class KnownPackages
MetadataValues = "HintPath=..\\packages\\Xamarin.Android.Support.v7.AppCompat.23.1.1.0\\lib\\MonoAndroid403\\Xamarin.Android.Support.v7.AppCompat.dll" }
}
};
public static Package SupportV7AppCompat_25_4_0_1 = new Package {
Id = "Xamarin.Android.Support.v7.AppCompat",
Version = "25.4.0.1",
TargetFramework = "MonoAndroid70",
References = {
new BuildItem.Reference ("Xamarin.Android.Support.v7.AppCompat") {
MetadataValues = "HintPath=..\\packages\\Xamarin.Android.Support.v7.AppCompat.25.4.0.1\\lib\\MonoAndroid70\\Xamarin.Android.Support.v7.AppCompat.dll" }
}
};
public static Package SupportCompat_25_4_0_1 = new Package {
Id = "Xamarin.Android.Support.Compat",
Version = "25.4.0.1",
TargetFramework = "MonoAndroid70",
References = {
new BuildItem.Reference ("Xamarin.Android.Support.Compat") {
MetadataValues = "HintPath=..\\packages\\Xamarin.Android.Support.Compat.25.4.0.1\\lib\\MonoAndroid70\\Xamarin.Android.Support.Compat.dll" }
}
};
public static Package SupportCoreUI_25_4_0_1 = new Package {
Id = "Xamarin.Android.Support.Core.UI",
Version = "25.4.0.1",
TargetFramework = "MonoAndroid70",
References = {
new BuildItem.Reference ("Xamarin.Android.Support.Core.UI") {
MetadataValues = "HintPath=..\\packages\\Xamarin.Android.Support.Core.UI.25.4.0.1\\lib\\MonoAndroid70\\Xamarin.Android.Support.Core.UI.dll" }
}
};
public static Package SupportCoreUtils_25_4_0_1 = new Package {
Id = "Xamarin.Android.Support.Core.Utils",
Version = "25.4.0.1",
TargetFramework = "MonoAndroid70",
References = {
new BuildItem.Reference ("Xamarin.Android.Support.Core.Utils") {
MetadataValues = "HintPath=..\\packages\\Xamarin.Android.Support.Core.Utils.25.4.0.1\\lib\\MonoAndroid70\\Xamarin.Android.Support.Core.Utils.dll" }
}
};
public static Package SupportFragment_25_4_0_1 = new Package {
Id = "Xamarin.Android.Support.Fragment",
Version = "25.4.0.1",
TargetFramework = "MonoAndroid70",
References = {
new BuildItem.Reference ("Xamarin.Android.Support.Fragment") {
MetadataValues = "HintPath=..\\packages\\Xamarin.Android.Support.Fragment.25.4.0.1\\lib\\MonoAndroid70\\Xamarin.Android.Support.Fragment.dll" }
}
};
public static Package SupportMediaCompat_25_4_0_1 = new Package {
Id = "Xamarin.Android.Support.Media.Compat",
Version = "25.4.0.1",
TargetFramework = "MonoAndroid70",
References = {
new BuildItem.Reference ("Xamarin.Android.Support.Media.Compat") {
MetadataValues = "HintPath=..\\packages\\Xamarin.Android.Support.Media.Compat.25.4.0.1\\lib\\MonoAndroid70\\Xamarin.Android.Support.Media.Compat.dll" }
}
};
public static Package SupportV7MediaRouter_21_0_3_0 = new Package {
Id = "Xamarin.Android.Support.v7.MediaRouter",
Version = "21.0.3.0",
Expand Down
5 changes: 2 additions & 3 deletions src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1198,8 +1198,7 @@ because xbuild doesn't support framework reference assemblies.
</PropertyGroup>

<Target Name="_GenerateJavaDesignerForComponent"
Condition="'@(_AdditonalAndroidResourceCachePaths)' != ''"
Inputs="@(_AdditonalAndroidResourceCacheFiles)"
Inputs="@(_AdditonalAndroidResourceCacheFiles);@(_LibraryResourceDirectoryStamps)"
Outputs="$(_AndroidComponentResgenFlagFile)"
DependsOnTargets="$(_GenerateJavaDesignerForComponentDependsOnTargets)">

Expand All @@ -1208,7 +1207,7 @@ because xbuild doesn't support framework reference assemblies.
ImportsDirectory="$(_LibraryProjectImportsDirectoryName)"
OutputImportDirectory="$(_AndroidLibrayProjectIntermediatePath)"
UseShortFileNames="$(UseShortFileNames)"
ManifestFiles="@(_AdditonalAndroidResourceCachePaths->'%(Identity)\AndroidManifest.xml')"
ManifestFiles="@(_AdditonalAndroidResourceCachePaths->'%(Identity)\AndroidManifest.xml');@(LibraryResourceDirectories->'%(Identity)\..\AndroidManifest.xml')"
ApplicationName="$(_AndroidPackage)"
JavaPlatformJarPath="$(JavaPlatformJarPath)"
NonConstantId="true"
Expand Down