Skip to content

Commit e044f97

Browse files
[tests] Simplify CreateDllBuilder() and CreateApkBuilder() calls (#10373)
Fixes: #10372 This PR simplifies MSBuild integration test code by removing redundant explicit directory parameters from `CreateDllBuilder()` and `CreateApkBuilder()` calls where the default behavior already provides the same result. ## Changes Made The `BaseTest.CreateDllBuilder()` and `BaseTest.CreateApkBuilder()` methods have default parameters that automatically use `Path.Combine("temp", TestName)` when no directory is specified. Many tests were explicitly passing this same path, making the code more verbose than necessary. **Before:** using (var b = CreateApkBuilder(Path.Combine("temp", TestName))) { // test code } **After:** using (var b = CreateApkBuilder()) { // test code } Co-authored-by: Jonathan Peppers <[email protected]>
1 parent 49c34cb commit e044f97

17 files changed

+67
-67
lines changed

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/AndroidUpdateResourcesTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ public void ReportAaptWarningsForBlankLevel ()
196196
proj.AndroidResources.Add (new AndroidItem.AndroidResource ("Resources\\drawable\\Image (1).png") {
197197
BinaryContent = () => XamarinAndroidCommonProject.icon_binary_mdpi
198198
});
199-
using (var b = CreateApkBuilder ($"temp/{TestName}")) {
199+
using (var b = CreateApkBuilder ()) {
200200
b.ThrowOnBuildFailure = false;
201201
Assert.IsFalse (b.Build (proj), "Build should have failed.");
202202
StringAssertEx.Contains ("APT0003", b.LastBuildOutput, "An error message with a blank \"level\", should be reported as an error!");

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BindingBuildTest.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ public void CleanBasicBindingLibrary (string classParser)
147147
WebContent = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/svg-android/svg-android.jar"
148148
});
149149
proj.AndroidClassParser = classParser;
150-
using (var b = CreateDllBuilder (Path.Combine ("temp", TestName))) {
150+
using (var b = CreateDllBuilder ()) {
151151
Assert.IsTrue (b.Build (proj), "Build should have succeeded.");
152152
b.BuildLogFile = "clean.log";
153153
Assert.IsTrue (b.Clean (proj), "Clean should have succeeded");
@@ -243,7 +243,7 @@ public void BindByteArrayInMethodParameter ()
243243
proj.Jars.Add (new AndroidItem.EmbeddedJar ("Jars\\svg-android.jar") {
244244
WebContentFileNameFromAzure = "javaBindingIssue.jar"
245245
});
246-
using (var b = CreateDllBuilder ("temp/BindByteArrayInMethodParameter")) {
246+
using (var b = CreateDllBuilder ()) {
247247
Assert.IsTrue (b.Build (proj), "Build should have succeeded.");
248248
}
249249
}

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,7 @@ public void CheckWhichRuntimeIsIncluded (string supportedAbi, bool debugSymbols,
365365
proj.SetProperty (proj.ActiveConfigurationProperties, KnownProperties.EmbedAssembliesIntoApk, embedAssemblies.Value);
366366
else
367367
proj.RemoveProperty (proj.ActiveConfigurationProperties, KnownProperties.EmbedAssembliesIntoApk);
368-
using (var b = CreateApkBuilder (Path.Combine ("temp", TestName))) {
368+
using (var b = CreateApkBuilder ()) {
369369
var runtimeInfo = b.GetSupportedRuntimes ();
370370
Assert.IsTrue (b.Build (proj), "Build should have succeeded.");
371371
var apkPath = Path.Combine (Root, b.ProjectDirectory,
@@ -743,7 +743,7 @@ public void BuildAfterUpgradingNuget ()
743743
Version = "1.6.1.5",
744744
});
745745

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

@@ -1021,7 +1021,7 @@ public void SystemDrawingCommon ()
10211021
KnownPackages.Acr_UserDialogs,
10221022
}
10231023
};
1024-
using (var b = CreateApkBuilder (Path.Combine ("temp", TestName))) {
1024+
using (var b = CreateApkBuilder ()) {
10251025
Assert.IsTrue (b.Build (proj), "Build should have succeeded.");
10261026
}
10271027
}
@@ -1050,7 +1050,7 @@ public void MicrosoftExtensionsHttp ()
10501050
</Target>
10511051
</Project>"
10521052
});
1053-
using (var b = CreateApkBuilder (Path.Combine ("temp", TestName))) {
1053+
using (var b = CreateApkBuilder ()) {
10541054
Assert.IsTrue (b.Build (proj), "Build should have succeeded.");
10551055
}
10561056
}
@@ -1064,7 +1064,7 @@ public void FastDeploymentDoesNotAddContentProvider ()
10641064
EmbedAssembliesIntoApk = false,
10651065
};
10661066
proj.SetProperty ("_XASupportsFastDev", "True");
1067-
using (var b = CreateApkBuilder (Path.Combine ("temp", TestName))) {
1067+
using (var b = CreateApkBuilder ()) {
10681068
//NOTE: build will fail, due to $(_XASupportsFastDev)
10691069
b.ThrowOnBuildFailure = false;
10701070
b.Build (proj);
@@ -1115,7 +1115,7 @@ public void BuildOutsideVisualStudio ()
11151115
public void RemoveOldMonoPackageManager ()
11161116
{
11171117
var proj = new XamarinAndroidApplicationProject ();
1118-
using (var b = CreateApkBuilder (Path.Combine ("temp", TestName))) {
1118+
using (var b = CreateApkBuilder ()) {
11191119
b.ThrowOnBuildFailure = false;
11201120
Assert.IsTrue (b.Build (proj), "Build should have succeeded.");
11211121
var targets = new [] {
@@ -1158,7 +1158,7 @@ public void CompilerErrorShouldNotRunLinkAssemblies ()
11581158
proj.Sources.Add (new BuildItem.Source ("SyntaxError.cs") {
11591159
TextContent = () => "class SyntaxError {"
11601160
});
1161-
using (var b = CreateApkBuilder (Path.Combine ("temp", TestName))) {
1161+
using (var b = CreateApkBuilder ()) {
11621162
b.ThrowOnBuildFailure = false;
11631163
Assert.IsFalse (b.Build (proj), "Build should have failed.");
11641164
Assert.IsFalse (StringAssertEx.ContainsText (b.LastBuildOutput, "The \"LinkAssemblies\" task failed unexpectedly"), "The LinkAssemblies MSBuild task should not run!");
@@ -1185,7 +1185,7 @@ public void AssemblyWithMissingTargetFramework ()
11851185
}
11861186
};
11871187
proj.PackageReferences.Add (KnownPackages.CircleImageView);
1188-
using (var b = CreateApkBuilder (Path.Combine ("temp", TestName))) {
1188+
using (var b = CreateApkBuilder ()) {
11891189
Assert.IsTrue (b.Build (proj), "build should have succeeded.");
11901190

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

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

12701270
var manifest = Path.Combine (Root, b.ProjectDirectory, proj.IntermediateOutputPath, "android", "AndroidManifest.xml");
@@ -1282,7 +1282,7 @@ public void AbiNameInIntermediateOutputPath ()
12821282
proj.OutputPath = Path.Combine ("bin", "x86", "Debug");
12831283
proj.IntermediateOutputPath = Path.Combine ("obj", "x86", "Debug");
12841284
proj.MainActivity = proj.DefaultMainActivity.Replace ("//${AFTER_ONCREATE}", "var task = Akavache.BlobCache.LocalMachine.GetAllKeys();");
1285-
using (var b = CreateApkBuilder (Path.Combine ("temp", TestName))) {
1285+
using (var b = CreateApkBuilder ()) {
12861286
Assert.IsTrue (b.Build (proj), "Build should have succeeded.");
12871287
Assert.IsFalse (StringAssertEx.ContainsText (b.LastBuildOutput, Path.Combine ("armeabi", "libe_sqlite3.so")), "Build should not use `armeabi`.");
12881288
}
@@ -1694,7 +1694,7 @@ public void CheckLintResourceFileReferencesAreFixed ()
16941694
</ConstraintLayout>";
16951695
}
16961696
});
1697-
using (var b = CreateApkBuilder (Path.Combine ("temp", TestName))) {
1697+
using (var b = CreateApkBuilder ()) {
16981698
Assert.IsTrue (b.Build (proj), "Project should have built.");
16991699
StringAssertEx.Contains ("XA0102", b.LastBuildOutput, "Output should contain XA0102 warnings");
17001700
var errorFilePath = Path.Combine (proj.IntermediateOutputPath, "android", proj.IntermediateOutputPath, "res", "layout", "test.xml");

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest2.cs

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -445,7 +445,7 @@ public void BuildHasNoWarnings (bool isRelease, bool xamarinForms, bool multidex
445445
proj.SetProperty ("XamarinAndroidSupportSkipVerifyVersions", "True"); // Disables API 29 warning in Xamarin.Build.Download
446446
proj.SetProperty ("AndroidPackageFormat", packageFormat);
447447
proj.SetProperty ("TrimmerSingleWarn", "false");
448-
using (var b = CreateApkBuilder (Path.Combine ("temp", TestName))) {
448+
using (var b = CreateApkBuilder ()) {
449449
Assert.IsTrue (b.Build (proj), "Build should have succeeded.");
450450
b.AssertHasNoWarnings ();
451451
Assert.IsFalse (StringAssertEx.ContainsText (b.LastBuildOutput, "Warning: end of file not at end of a line"),
@@ -483,7 +483,7 @@ public void BuildHasTrimmerWarnings (string properties, string [] codes, bool is
483483
}
484484
}
485485

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

489489
if (codes.Length == 0) {
@@ -529,7 +529,7 @@ public void XA1037PropertyDeprecatedWarning (string property, string value, bool
529529
proj.IsRelease = isRelease;
530530
proj.SetProperty (property, value);
531531

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

772772

773-
using (var b = CreateApkBuilder (Path.Combine ("temp", TestName))) {
773+
using (var b = CreateApkBuilder ()) {
774774
//We don't want these things stepping on each other
775775
b.BuildLogFile = null;
776776
b.Save (proj, saveProject: true);
@@ -853,7 +853,7 @@ public void FooMethod () {{
853853
}}
854854
",
855855
});
856-
using (var b = CreateApkBuilder (Path.Combine ("temp", TestName))) {
856+
using (var b = CreateApkBuilder ()) {
857857
b.Target = "Compile";
858858
Assert.IsTrue (b.Build (proj), "Build should have succeeded.");
859859
}
@@ -896,7 +896,7 @@ public CustomTextView(Context context, IAttributeSet attributes) : base(context,
896896
}"
897897
});
898898

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

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

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

10001000
};
10011001

1002-
using (var b = CreateApkBuilder (Path.Combine ("temp", TestName))) {
1002+
using (var b = CreateApkBuilder ()) {
10031003
//To be sure we are at a clean state
10041004
var projectDir = Path.Combine (Root, b.ProjectDirectory);
10051005
if (Directory.Exists (projectDir))
@@ -1320,7 +1320,7 @@ public void BuildMultiDexApplication ()
13201320
{
13211321
var proj = CreateMultiDexRequiredApplication ();
13221322
proj.SetProperty ("AndroidEnableMultiDex", "True");
1323-
using (var b = CreateApkBuilder (Path.Combine ("temp", TestName), false, false)) {
1323+
using (var b = CreateApkBuilder ()) {
13241324
string intermediateDir = Path.Combine (Root, b.ProjectDirectory, proj.IntermediateOutputPath);
13251325
Assert.IsTrue (b.Build (proj), "Build should have succeeded.");
13261326
Assert.IsTrue (File.Exists (Path.Combine (Root, b.ProjectDirectory, intermediateDir, "android/bin/classes.dex")),
@@ -1412,7 +1412,7 @@ public void MultiDexAndCodeShrinker ()
14121412
proj.SetProperty ("AndroidEnableMultiDex", "True");
14131413
proj.IsRelease = true;
14141414
proj.LinkTool = "r8";
1415-
using (var b = CreateApkBuilder (Path.Combine ("temp", TestName))) {
1415+
using (var b = CreateApkBuilder ()) {
14161416
Assert.IsTrue (b.Build (proj), "Build should have succeeded.");
14171417

14181418
var className = "Landroid/support/multidex/MultiDexApplication;";
@@ -1662,7 +1662,7 @@ public void BuildWithJavaToolOptions ()
16621662
try {
16631663
Environment.SetEnvironmentVariable ("JAVA_TOOL_OPTIONS",
16641664
"-Dcom.sun.jndi.ldap.object.trustURLCodebase=false -Dcom.sun.jndi.rmi.object.trustURLCodebase=false -Dcom.sun.jndi.cosnaming.object.trustURLCodebase=false -Dlog4j2.formatMsgNoLookups=true");
1665-
using (var b = CreateApkBuilder (Path.Combine ("temp", TestName))) {
1665+
using (var b = CreateApkBuilder ()) {
16661666
b.Target = "Build";
16671667
Assert.IsTrue (b.Build (proj), "Build should have succeeded.");
16681668
b.AssertHasNoWarnings ();

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildWithLibraryTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -458,7 +458,7 @@ public void BuildWithNativeLibraryUnknownAbi ()
458458
};
459459
proj.SetAndroidSupportedAbis ("armeabi-v7a", "x86");
460460

461-
using (var builder = CreateApkBuilder (Path.Combine ("temp", TestName))) {
461+
using (var builder = CreateApkBuilder ()) {
462462
builder.ThrowOnBuildFailure = false;
463463
Assert.IsFalse (builder.Build (proj), "Build should have failed.");
464464
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/'."),
@@ -615,7 +615,7 @@ public void LibraryProjectsShouldSkipGetPrimaryCpuAbi ()
615615

616616
const string target = "_GetPrimaryCpuAbi";
617617
var proj = new XamarinAndroidLibraryProject ();
618-
using (var b = CreateDllBuilder (Path.Combine ("temp", TestName))) {
618+
using (var b = CreateDllBuilder ()) {
619619
Assert.IsTrue (b.Build (proj), "Build should have succeeded.");
620620
Assert.IsTrue (b.Output.IsTargetSkipped (target, defaultIfNotUsed: true), $"`{target}` should be skipped!");
621621
}

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/IncrementalBuildTest.cs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -427,7 +427,7 @@ public void AppProjectTargetsDoNotBreak ()
427427
}
428428
}
429429
};
430-
using (var b = CreateApkBuilder (Path.Combine ("temp", TestName))) {
430+
using (var b = CreateApkBuilder ()) {
431431
Assert.IsTrue (b.Build (proj), "first build should succeed");
432432
var firstBuildTime = b.LastBuildTime;
433433
foreach (var target in targets) {
@@ -498,7 +498,7 @@ public void LibraryProjectTargetsDoNotBreak ()
498498
},
499499
},
500500
};
501-
using (var b = CreateDllBuilder (Path.Combine ("temp", TestName))) {
501+
using (var b = CreateDllBuilder ()) {
502502
Assert.IsTrue (b.Build (proj), "first build should succeed");
503503
foreach (var target in targets) {
504504
Assert.IsFalse (b.Output.IsTargetSkipped (target), $"`{target}` should *not* be skipped!");
@@ -664,7 +664,7 @@ public void TransitiveDependencyProduceReferenceAssembly ()
664664
public void LinkAssembliesNoShrink ()
665665
{
666666
var proj = new XamarinFormsAndroidApplicationProject ();
667-
using (var b = CreateApkBuilder (Path.Combine ("temp", TestName))) {
667+
using (var b = CreateApkBuilder ()) {
668668
Assert.IsTrue (b.Build (proj), "build should have succeeded.");
669669

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

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

937937
var proj = new XamarinAndroidApplicationProject ();
938-
using (var b = CreateApkBuilder (Path.Combine ("temp", TestName))) {
938+
using (var b = CreateApkBuilder ()) {
939939
var projectFile = Path.Combine (Root, b.ProjectDirectory, proj.ProjectFilePath);
940940
b.ThrowOnBuildFailure = false;
941941
proj.OtherBuildItems.Add (invalidXml);
@@ -974,7 +974,7 @@ public void CasingOnJavaLangObject ()
974974
},
975975
}
976976
};
977-
using (var b = CreateApkBuilder (Path.Combine ("temp", TestName))) {
977+
using (var b = CreateApkBuilder ()) {
978978
Assert.IsTrue (b.Build (proj), "first build should have succeeded.");
979979
className = "fOO";
980980
proj.Touch ("Foo.cs");
@@ -997,7 +997,7 @@ public void GenerateJavaStubsAndAssembly ([Values (true, false)] bool isRelease)
997997
TextContent = () => "Foo=Bar",
998998
});
999999
proj.MainActivity = proj.DefaultMainActivity;
1000-
using (var b = CreateApkBuilder (Path.Combine ("temp", TestName))) {
1000+
using (var b = CreateApkBuilder ()) {
10011001
Assert.IsTrue (b.Build (proj), "first build should have succeeded.");
10021002
foreach (var target in targets) {
10031003
Assert.IsFalse (b.Output.IsTargetSkipped (target), $"`{target}` should *not* be skipped!");
@@ -1456,7 +1456,7 @@ public void BuildPropsBreaksConvertResourcesCasesOnSecondBuild ()
14561456
}
14571457
}
14581458
};
1459-
using (var b = CreateApkBuilder (Path.Combine ("temp", TestName))) {
1459+
using (var b = CreateApkBuilder ()) {
14601460
Assert.IsTrue (b.Build (proj), "first build should have succeeded.");
14611461
var assemblyPath = Path.Combine (Root, b.ProjectDirectory, proj.OutputPath, "UnnamedProject.dll");
14621462
var apkPath = Path.Combine (Root, b.ProjectDirectory, proj.OutputPath, $"{proj.PackageName}-Signed.apk");

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/InvalidConfigTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ public void XA0119 ()
7878
var proj = new XamarinAndroidApplicationProject ();
7979
proj.SetProperty ("_XASupportsFastDev", "True");
8080
proj.SetProperty (proj.DebugProperties, "AndroidLinkMode", "Full");
81-
using (var b = CreateApkBuilder (Path.Combine ("temp", TestName))) {
81+
using (var b = CreateApkBuilder ()) {
8282
b.Target = "Build"; // SignAndroidPackage would fail for OSS builds
8383
Assert.IsTrue (b.Build (proj), "Build should have succeeded.");
8484
Assert.IsTrue (StringAssertEx.ContainsText (b.LastBuildOutput, "XA0119"), "Output should contain XA0119 warnings");

0 commit comments

Comments
 (0)