Skip to content
Merged
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
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ public void ReportAaptWarningsForBlankLevel ()
proj.AndroidResources.Add (new AndroidItem.AndroidResource ("Resources\\drawable\\Image (1).png") {
BinaryContent = () => XamarinAndroidCommonProject.icon_binary_mdpi
});
using (var b = CreateApkBuilder ($"temp/{TestName}")) {
using (var b = CreateApkBuilder ()) {
b.ThrowOnBuildFailure = false;
Assert.IsFalse (b.Build (proj), "Build should have failed.");
StringAssertEx.Contains ("APT0003", b.LastBuildOutput, "An error message with a blank \"level\", should be reported as an error!");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ public void CleanBasicBindingLibrary (string classParser)
WebContent = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/svg-android/svg-android.jar"
});
proj.AndroidClassParser = classParser;
using (var b = CreateDllBuilder (Path.Combine ("temp", TestName))) {
using (var b = CreateDllBuilder ()) {
Assert.IsTrue (b.Build (proj), "Build should have succeeded.");
b.BuildLogFile = "clean.log";
Assert.IsTrue (b.Clean (proj), "Clean should have succeeded");
Expand Down Expand Up @@ -243,7 +243,7 @@ public void BindByteArrayInMethodParameter ()
proj.Jars.Add (new AndroidItem.EmbeddedJar ("Jars\\svg-android.jar") {
WebContentFileNameFromAzure = "javaBindingIssue.jar"
});
using (var b = CreateDllBuilder ("temp/BindByteArrayInMethodParameter")) {
using (var b = CreateDllBuilder ()) {
Assert.IsTrue (b.Build (proj), "Build should have succeeded.");
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,7 @@ public void CheckWhichRuntimeIsIncluded (string supportedAbi, bool debugSymbols,
proj.SetProperty (proj.ActiveConfigurationProperties, KnownProperties.EmbedAssembliesIntoApk, embedAssemblies.Value);
else
proj.RemoveProperty (proj.ActiveConfigurationProperties, KnownProperties.EmbedAssembliesIntoApk);
using (var b = CreateApkBuilder (Path.Combine ("temp", TestName))) {
using (var b = CreateApkBuilder ()) {
var runtimeInfo = b.GetSupportedRuntimes ();
Assert.IsTrue (b.Build (proj), "Build should have succeeded.");
var apkPath = Path.Combine (Root, b.ProjectDirectory,
Expand Down Expand Up @@ -743,7 +743,7 @@ public void BuildAfterUpgradingNuget ()
Version = "1.6.1.5",
});

using (var b = CreateApkBuilder (Path.Combine ("temp", TestName))) {
using (var b = CreateApkBuilder ()) {
//[TearDown] will still delete if test outcome successful, I need logs if assertions fail but build passes
b.CleanupAfterSuccessfulBuild =
b.CleanupOnDispose = false;
Expand Down Expand Up @@ -875,7 +875,7 @@ public void Dispose ()
}
}
}" });
using (var builder = CreateApkBuilder (Path.Combine ("temp", TestName))) {
using (var builder = CreateApkBuilder ()) {
builder.ThrowOnBuildFailure = false;
Assert.IsFalse (builder.Build (proj), "Build should have failed with XA4212.");
StringAssertEx.Contains ($"error : XA4", builder.LastBuildOutput, "Error should be XA4212");
Expand Down Expand Up @@ -973,7 +973,7 @@ public void foo()
AAAAAAAAAAAAPQAAAE1FVEEtSU5GL01BTklGRVNULk1GUEsBAhQAFAAICAgAJZFnS7uHtAn+AQAA
0QMAAAwAAAAAAAAAAAAAAAAAwwAAAExhbWJkYS5jbGFzc1BLBQYAAAAAAwADALcAAAD7AgAAAAA=
") });
using (var builder = CreateApkBuilder (Path.Combine ("temp", TestName))) {
using (var builder = CreateApkBuilder ()) {
Assert.IsTrue (builder.Build (proj), "Build should have succeeded");
Assert.IsFalse (builder.LastBuildOutput.ContainsText ("Duplicate zip entry"), "Should not get warning about [META-INF/MANIFEST.MF]");

Expand Down Expand Up @@ -1021,7 +1021,7 @@ public void SystemDrawingCommon ()
KnownPackages.Acr_UserDialogs,
}
};
using (var b = CreateApkBuilder (Path.Combine ("temp", TestName))) {
using (var b = CreateApkBuilder ()) {
Assert.IsTrue (b.Build (proj), "Build should have succeeded.");
}
}
Expand Down Expand Up @@ -1050,7 +1050,7 @@ public void MicrosoftExtensionsHttp ()
</Target>
</Project>"
});
using (var b = CreateApkBuilder (Path.Combine ("temp", TestName))) {
using (var b = CreateApkBuilder ()) {
Assert.IsTrue (b.Build (proj), "Build should have succeeded.");
}
}
Expand All @@ -1064,7 +1064,7 @@ public void FastDeploymentDoesNotAddContentProvider ()
EmbedAssembliesIntoApk = false,
};
proj.SetProperty ("_XASupportsFastDev", "True");
using (var b = CreateApkBuilder (Path.Combine ("temp", TestName))) {
using (var b = CreateApkBuilder ()) {
//NOTE: build will fail, due to $(_XASupportsFastDev)
b.ThrowOnBuildFailure = false;
b.Build (proj);
Expand Down Expand Up @@ -1115,7 +1115,7 @@ public void BuildOutsideVisualStudio ()
public void RemoveOldMonoPackageManager ()
{
var proj = new XamarinAndroidApplicationProject ();
using (var b = CreateApkBuilder (Path.Combine ("temp", TestName))) {
using (var b = CreateApkBuilder ()) {
b.ThrowOnBuildFailure = false;
Assert.IsTrue (b.Build (proj), "Build should have succeeded.");
var targets = new [] {
Expand Down Expand Up @@ -1158,7 +1158,7 @@ public void CompilerErrorShouldNotRunLinkAssemblies ()
proj.Sources.Add (new BuildItem.Source ("SyntaxError.cs") {
TextContent = () => "class SyntaxError {"
});
using (var b = CreateApkBuilder (Path.Combine ("temp", TestName))) {
using (var b = CreateApkBuilder ()) {
b.ThrowOnBuildFailure = false;
Assert.IsFalse (b.Build (proj), "Build should have failed.");
Assert.IsFalse (StringAssertEx.ContainsText (b.LastBuildOutput, "The \"LinkAssemblies\" task failed unexpectedly"), "The LinkAssemblies MSBuild task should not run!");
Expand All @@ -1185,7 +1185,7 @@ public void AssemblyWithMissingTargetFramework ()
}
};
proj.PackageReferences.Add (KnownPackages.CircleImageView);
using (var b = CreateApkBuilder (Path.Combine ("temp", TestName))) {
using (var b = CreateApkBuilder ()) {
Assert.IsTrue (b.Build (proj), "build should have succeeded.");

// We should have a java stub
Expand Down Expand Up @@ -1215,7 +1215,7 @@ public MyWorker (Context c, WorkerParameters p) : base (c, p) { }
});
proj.PackageReferences.Add (KnownPackages.AndroidXWorkRuntime);
proj.PackageReferences.Add (KnownPackages.AndroidXLifecycleLiveData);
using (var b = CreateApkBuilder (Path.Combine ("temp", TestName))) {
using (var b = CreateApkBuilder ()) {
Assert.IsTrue (b.Build (proj), "Build should have succeeded.");
}
}
Expand Down Expand Up @@ -1264,7 +1264,7 @@ public CustomApp(IntPtr handle, JniHandleOwnership ownerShip) : base(handle, own
BinaryContent = () => Array.Empty<byte> (), // doesn't have to be real, just *exist*
});

using (var b = CreateApkBuilder (Path.Combine ("temp", TestName))) {
using (var b = CreateApkBuilder ()) {
Assert.IsTrue (b.Build (proj), "Build should have succeeded.");

var manifest = Path.Combine (Root, b.ProjectDirectory, proj.IntermediateOutputPath, "android", "AndroidManifest.xml");
Expand All @@ -1282,7 +1282,7 @@ public void AbiNameInIntermediateOutputPath ()
proj.OutputPath = Path.Combine ("bin", "x86", "Debug");
proj.IntermediateOutputPath = Path.Combine ("obj", "x86", "Debug");
proj.MainActivity = proj.DefaultMainActivity.Replace ("//${AFTER_ONCREATE}", "var task = Akavache.BlobCache.LocalMachine.GetAllKeys();");
using (var b = CreateApkBuilder (Path.Combine ("temp", TestName))) {
using (var b = CreateApkBuilder ()) {
Assert.IsTrue (b.Build (proj), "Build should have succeeded.");
Assert.IsFalse (StringAssertEx.ContainsText (b.LastBuildOutput, Path.Combine ("armeabi", "libe_sqlite3.so")), "Build should not use `armeabi`.");
}
Expand Down Expand Up @@ -1694,7 +1694,7 @@ public void CheckLintResourceFileReferencesAreFixed ()
</ConstraintLayout>";
}
});
using (var b = CreateApkBuilder (Path.Combine ("temp", TestName))) {
using (var b = CreateApkBuilder ()) {
Assert.IsTrue (b.Build (proj), "Project should have built.");
StringAssertEx.Contains ("XA0102", b.LastBuildOutput, "Output should contain XA0102 warnings");
var errorFilePath = Path.Combine (proj.IntermediateOutputPath, "android", proj.IntermediateOutputPath, "res", "layout", "test.xml");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -445,7 +445,7 @@ public void BuildHasNoWarnings (bool isRelease, bool xamarinForms, bool multidex
proj.SetProperty ("XamarinAndroidSupportSkipVerifyVersions", "True"); // Disables API 29 warning in Xamarin.Build.Download
proj.SetProperty ("AndroidPackageFormat", packageFormat);
proj.SetProperty ("TrimmerSingleWarn", "false");
using (var b = CreateApkBuilder (Path.Combine ("temp", TestName))) {
using (var b = CreateApkBuilder ()) {
Assert.IsTrue (b.Build (proj), "Build should have succeeded.");
b.AssertHasNoWarnings ();
Assert.IsFalse (StringAssertEx.ContainsText (b.LastBuildOutput, "Warning: end of file not at end of a line"),
Expand Down Expand Up @@ -483,7 +483,7 @@ public void BuildHasTrimmerWarnings (string properties, string [] codes, bool is
}
}

using var b = CreateApkBuilder (Path.Combine ("temp", TestName));
using var b = CreateApkBuilder ();
Assert.IsTrue (b.Build (proj), "Build should have succeeded.");

if (codes.Length == 0) {
Expand Down Expand Up @@ -529,7 +529,7 @@ public void XA1037PropertyDeprecatedWarning (string property, string value, bool
proj.IsRelease = isRelease;
proj.SetProperty (property, value);

using (ProjectBuilder b = isBindingProject ? CreateDllBuilder (Path.Combine ("temp", TestName)) : CreateApkBuilder (Path.Combine ("temp", TestName))) {
using (ProjectBuilder b = isBindingProject ? CreateDllBuilder () : CreateApkBuilder ()) {
Assert.IsTrue (b.Build (proj), "Build should have succeeded.");
Assert.IsTrue (StringAssertEx.ContainsText (b.LastBuildOutput, $"The '{property}' MSBuild property is deprecated and will be removed"),
$"Should not get a warning about the {property} property");
Expand Down Expand Up @@ -636,7 +636,7 @@ public void BuildBasicApplicationAppCompat ([Values (true, false)] bool publishA
var packages = proj.PackageReferences;
packages.Add (KnownPackages.AndroidXAppCompat);
proj.MainActivity = proj.DefaultMainActivity.Replace ("public class MainActivity : Activity", "public class MainActivity : AndroidX.AppCompat.App.AppCompatActivity");
using (var b = CreateApkBuilder (Path.Combine ("temp", TestName))) {
using (var b = CreateApkBuilder ()) {
Assert.IsTrue (b.Build (proj), "Build should have succeeded.");
}
}
Expand Down Expand Up @@ -704,7 +704,7 @@ public void SkipConvertResourcesCases ()
proj.OtherBuildItems.Add (new BuildItem ("AndroidAarLibrary", "Jars\\material-menu-1.1.0.aar") {
WebContent = "https://repo1.maven.org/maven2/com/balysv/material-menu/1.1.0/material-menu-1.1.0.aar"
});
using (var b = CreateApkBuilder (Path.Combine ("temp", TestName))) {
using (var b = CreateApkBuilder ()) {
b.Verbosity = LoggerVerbosity.Detailed;
Assert.IsTrue (b.Build (proj), "Build should have succeeded.");
Assert.IsFalse (b.Output.IsTargetSkipped (target), $"`{target}` should not be skipped.");
Expand Down Expand Up @@ -770,7 +770,7 @@ public void BuildInParallel ()
var proj = new XamarinFormsAndroidApplicationProject ();


using (var b = CreateApkBuilder (Path.Combine ("temp", TestName))) {
using (var b = CreateApkBuilder ()) {
//We don't want these things stepping on each other
b.BuildLogFile = null;
b.Save (proj, saveProject: true);
Expand Down Expand Up @@ -853,7 +853,7 @@ public void FooMethod () {{
}}
",
});
using (var b = CreateApkBuilder (Path.Combine ("temp", TestName))) {
using (var b = CreateApkBuilder ()) {
b.Target = "Compile";
Assert.IsTrue (b.Build (proj), "Build should have succeeded.");
}
Expand Down Expand Up @@ -896,7 +896,7 @@ public CustomTextView(Context context, IAttributeSet attributes) : base(context,
}"
});

using (var b = CreateApkBuilder (Path.Combine ("temp", TestName))) {
using (var b = CreateApkBuilder ()) {
Assert.IsTrue (b.Build (proj), "first *regular* build should have succeeded.");
var build_props = b.Output.GetIntermediaryPath ("build.props");
var designtime_build_props = b.Output.GetIntermediaryPath (Path.Combine ("designtime", "build.props"));
Expand Down Expand Up @@ -979,7 +979,7 @@ public void TargetFrameworkMonikerAssemblyAttributesPath ()
var proj = new XamarinAndroidApplicationProject {
};

using (var b = CreateApkBuilder (Path.Combine ("temp", TestName))) {
using (var b = CreateApkBuilder ()) {
Assert.IsTrue (b.Build (proj), "build should have succeeded.");

var intermediate = Path.Combine (Root, b.ProjectDirectory, proj.IntermediateOutputPath);
Expand All @@ -999,7 +999,7 @@ public void CheckTimestamps ([Values (true, false)] bool isRelease)

};

using (var b = CreateApkBuilder (Path.Combine ("temp", TestName))) {
using (var b = CreateApkBuilder ()) {
//To be sure we are at a clean state
var projectDir = Path.Combine (Root, b.ProjectDirectory);
if (Directory.Exists (projectDir))
Expand Down Expand Up @@ -1320,7 +1320,7 @@ public void BuildMultiDexApplication ()
{
var proj = CreateMultiDexRequiredApplication ();
proj.SetProperty ("AndroidEnableMultiDex", "True");
using (var b = CreateApkBuilder (Path.Combine ("temp", TestName), false, false)) {
using (var b = CreateApkBuilder ()) {
string intermediateDir = Path.Combine (Root, b.ProjectDirectory, proj.IntermediateOutputPath);
Assert.IsTrue (b.Build (proj), "Build should have succeeded.");
Assert.IsTrue (File.Exists (Path.Combine (Root, b.ProjectDirectory, intermediateDir, "android/bin/classes.dex")),
Expand Down Expand Up @@ -1412,7 +1412,7 @@ public void MultiDexAndCodeShrinker ()
proj.SetProperty ("AndroidEnableMultiDex", "True");
proj.IsRelease = true;
proj.LinkTool = "r8";
using (var b = CreateApkBuilder (Path.Combine ("temp", TestName))) {
using (var b = CreateApkBuilder ()) {
Assert.IsTrue (b.Build (proj), "Build should have succeeded.");

var className = "Landroid/support/multidex/MultiDexApplication;";
Expand Down Expand Up @@ -1662,7 +1662,7 @@ public void BuildWithJavaToolOptions ()
try {
Environment.SetEnvironmentVariable ("JAVA_TOOL_OPTIONS",
"-Dcom.sun.jndi.ldap.object.trustURLCodebase=false -Dcom.sun.jndi.rmi.object.trustURLCodebase=false -Dcom.sun.jndi.cosnaming.object.trustURLCodebase=false -Dlog4j2.formatMsgNoLookups=true");
using (var b = CreateApkBuilder (Path.Combine ("temp", TestName))) {
using (var b = CreateApkBuilder ()) {
b.Target = "Build";
Assert.IsTrue (b.Build (proj), "Build should have succeeded.");
b.AssertHasNoWarnings ();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -458,7 +458,7 @@ public void BuildWithNativeLibraryUnknownAbi ()
};
proj.SetAndroidSupportedAbis ("armeabi-v7a", "x86");

using (var builder = CreateApkBuilder (Path.Combine ("temp", TestName))) {
using (var builder = CreateApkBuilder ()) {
builder.ThrowOnBuildFailure = false;
Assert.IsFalse (builder.Build (proj), "Build should have failed.");
Assert.IsTrue (StringAssertEx.ContainsText (builder.LastBuildOutput, $"error XA4301: Cannot determine ABI of native library 'not-a-real-abi{Path.DirectorySeparatorChar}libtest.so'. Move this file to a directory with a valid Android ABI name such as 'libs/armeabi-v7a/'."),
Expand Down Expand Up @@ -615,7 +615,7 @@ public void LibraryProjectsShouldSkipGetPrimaryCpuAbi ()

const string target = "_GetPrimaryCpuAbi";
var proj = new XamarinAndroidLibraryProject ();
using (var b = CreateDllBuilder (Path.Combine ("temp", TestName))) {
using (var b = CreateDllBuilder ()) {
Assert.IsTrue (b.Build (proj), "Build should have succeeded.");
Assert.IsTrue (b.Output.IsTargetSkipped (target, defaultIfNotUsed: true), $"`{target}` should be skipped!");
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -427,7 +427,7 @@ public void AppProjectTargetsDoNotBreak ()
}
}
};
using (var b = CreateApkBuilder (Path.Combine ("temp", TestName))) {
using (var b = CreateApkBuilder ()) {
Assert.IsTrue (b.Build (proj), "first build should succeed");
var firstBuildTime = b.LastBuildTime;
foreach (var target in targets) {
Expand Down Expand Up @@ -498,7 +498,7 @@ public void LibraryProjectTargetsDoNotBreak ()
},
},
};
using (var b = CreateDllBuilder (Path.Combine ("temp", TestName))) {
using (var b = CreateDllBuilder ()) {
Assert.IsTrue (b.Build (proj), "first build should succeed");
foreach (var target in targets) {
Assert.IsFalse (b.Output.IsTargetSkipped (target), $"`{target}` should *not* be skipped!");
Expand Down Expand Up @@ -664,7 +664,7 @@ public void TransitiveDependencyProduceReferenceAssembly ()
public void LinkAssembliesNoShrink ()
{
var proj = new XamarinFormsAndroidApplicationProject ();
using (var b = CreateApkBuilder (Path.Combine ("temp", TestName))) {
using (var b = CreateApkBuilder ()) {
Assert.IsTrue (b.Build (proj), "build should have succeeded.");

// Touch an assembly to a timestamp older than build.props
Expand Down Expand Up @@ -812,7 +812,7 @@ public CustomTextView(Context context, IAttributeSet attributes) : base(context,
public void ResolveLibraryProjectImports ()
{
var proj = new XamarinFormsAndroidApplicationProject ();
using (var b = CreateApkBuilder (Path.Combine ("temp", TestName))) {
using (var b = CreateApkBuilder ()) {
Assert.IsTrue (b.Build (proj), "first build should have succeeded.");
var intermediate = Path.Combine (Root, b.ProjectDirectory, proj.IntermediateOutputPath);
var cacheFile = Path.Combine (intermediate, "libraryprojectimports.cache");
Expand Down Expand Up @@ -912,7 +912,7 @@ public void AddNewAndroidResourceOnSecondBuild ()
};

var proj = new XamarinAndroidApplicationProject ();
using (var b = CreateApkBuilder (Path.Combine ("temp", TestName))) {
using (var b = CreateApkBuilder ()) {
var projectFile = Path.Combine (Root, b.ProjectDirectory, proj.ProjectFilePath);
b.ThrowOnBuildFailure = false;
Assert.IsTrue (b.Build (proj), "Build should have succeeded.");
Expand All @@ -935,7 +935,7 @@ public void InvalidAndroidResource ()
};

var proj = new XamarinAndroidApplicationProject ();
using (var b = CreateApkBuilder (Path.Combine ("temp", TestName))) {
using (var b = CreateApkBuilder ()) {
var projectFile = Path.Combine (Root, b.ProjectDirectory, proj.ProjectFilePath);
b.ThrowOnBuildFailure = false;
proj.OtherBuildItems.Add (invalidXml);
Expand Down Expand Up @@ -974,7 +974,7 @@ public void CasingOnJavaLangObject ()
},
}
};
using (var b = CreateApkBuilder (Path.Combine ("temp", TestName))) {
using (var b = CreateApkBuilder ()) {
Assert.IsTrue (b.Build (proj), "first build should have succeeded.");
className = "fOO";
proj.Touch ("Foo.cs");
Expand All @@ -997,7 +997,7 @@ public void GenerateJavaStubsAndAssembly ([Values (true, false)] bool isRelease)
TextContent = () => "Foo=Bar",
});
proj.MainActivity = proj.DefaultMainActivity;
using (var b = CreateApkBuilder (Path.Combine ("temp", TestName))) {
using (var b = CreateApkBuilder ()) {
Assert.IsTrue (b.Build (proj), "first build should have succeeded.");
foreach (var target in targets) {
Assert.IsFalse (b.Output.IsTargetSkipped (target), $"`{target}` should *not* be skipped!");
Expand Down Expand Up @@ -1456,7 +1456,7 @@ public void BuildPropsBreaksConvertResourcesCasesOnSecondBuild ()
}
}
};
using (var b = CreateApkBuilder (Path.Combine ("temp", TestName))) {
using (var b = CreateApkBuilder ()) {
Assert.IsTrue (b.Build (proj), "first build should have succeeded.");
var assemblyPath = Path.Combine (Root, b.ProjectDirectory, proj.OutputPath, "UnnamedProject.dll");
var apkPath = Path.Combine (Root, b.ProjectDirectory, proj.OutputPath, $"{proj.PackageName}-Signed.apk");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ public void XA0119 ()
var proj = new XamarinAndroidApplicationProject ();
proj.SetProperty ("_XASupportsFastDev", "True");
proj.SetProperty (proj.DebugProperties, "AndroidLinkMode", "Full");
using (var b = CreateApkBuilder (Path.Combine ("temp", TestName))) {
using (var b = CreateApkBuilder ()) {
b.Target = "Build"; // SignAndroidPackage would fail for OSS builds
Assert.IsTrue (b.Build (proj), "Build should have succeeded.");
Assert.IsTrue (StringAssertEx.ContainsText (b.LastBuildOutput, "XA0119"), "Output should contain XA0119 warnings");
Expand Down
Loading
Loading