Skip to content

[Xamarin.Android.Build.Tests] Fix up an Error in the Designer Tests #807

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 2 commits into from
Sep 1, 2017
Merged

[Xamarin.Android.Build.Tests] Fix up an Error in the Designer Tests #807

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eb6790f
[Xamarin.Android.Build.Tests] Fix up an Error in the Designer Tests
dellis1972 Sep 1, 2017
febb52f
Updated based on feedback
dellis1972 Sep 1, 2017
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
8 changes: 4 additions & 4 deletions ...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
Expand Up @@ -435,9 +435,9 @@ public void CheckOldResourceDesignerIsNotUsed (bool isRelease, ProjectLanguage l
if (File.Exists (designer))
File.Delete (Path.Combine (Root, b.ProjectDirectory, designer));
Assert.IsTrue (b.Build (proj), "Build should have succeeded.");
Assert.IsFalse (File.Exists (Path.Combine (b.ProjectDirectory, "Resources",
"Resource.designer" + proj.Language.DefaultDesignerExtension)),
"{0} should not exists", designer);
var fi = new FileInfo (Path.Combine (Root, b.ProjectDirectory, designer));
Assert.IsFalse (fi.Length > new [] { 0xef, 0xbb, 0xbf, 0x0d, 0x0a }.Length,
"{0} should not contain anything.", designer);
var outputFile = Path.Combine (Root, b.ProjectDirectory, proj.IntermediateOutputPath,
"Resource.Designer" + proj.Language.DefaultDesignerExtension);
Assert.IsTrue (File.Exists (outputFile), "Resource.Designer{1} should have been created in {0}",
Expand Down Expand Up @@ -467,7 +467,7 @@ public void CheckOldResourceDesignerWithWrongCasingIsRemoved (bool isRelease, Pr
Assert.IsNotNull (designer, $"Failed to retrieve the Resource.designer.{proj.Language.DefaultDesignerExtension}");
designer.Deleted = true;
Assert.IsTrue (b.Build (proj), "Build should have succeeded.");
Assert.IsFalse (File.Exists (Path.Combine (b.ProjectDirectory, "Resources",
Assert.IsFalse (File.Exists (Path.Combine (Root, b.ProjectDirectory, "Resources",
"Resource.designer" + proj.Language.DefaultDesignerExtension)),
"{0} should not exists", designer.Include ());
var outputFile = Path.Combine (Root, b.ProjectDirectory, proj.IntermediateOutputPath,
Expand Down
4 changes: 2 additions & 2 deletions ...ndroid.Build.Tasks/Tests/Xamarin.ProjectTools/Android/XamarinAndroidApplicationProject.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ public XamarinAndroidApplicationProject (string debugConfigurationName = "Debug"
SetProperty ("AndroidManifest", "Properties\\AndroidManifest.xml");
SetProperty (DebugProperties, "AndroidLinkMode", "None");
SetProperty (ReleaseProperties, "AndroidLinkMode", "SdkOnly");
SetProperty (DebugProperties, "EmbedAssembliesIntoApk", "False");
SetProperty (ReleaseProperties, "EmbedAssembliesIntoApk", "True");
SetProperty (DebugProperties, "EmbedAssembliesIntoApk", "False", "'$(EmbedAssembliesIntoApk)' == ''");
SetProperty (ReleaseProperties, "EmbedAssembliesIntoApk", "True", "'$(EmbedAssembliesIntoApk)' == ''");

AndroidManifest = default_android_manifest;
LayoutMain = default_layout_main;
Expand Down