Skip to content
Merged
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
285983a
[tests] try to use jdk 11 for device tests (#6033)
dellis1972 Jun 22, 2021
8d42584
[ci] Use macOS 11 for Android Designer tests (#6035)
pjcollins Jun 22, 2021
81f955a
[One .NET] enable C# bindings for @(AndroidLibrary) (#6056)
jonathanpeppers Jun 29, 2021
a51e889
[tests] update jfrog/bintray urls (#6086)
moljac Jul 13, 2021
13f1800
[ci] Use new 1ES Hosted win2019 Pool (#6063)
pjcollins Jul 8, 2021
ae70076
[build] delete platform-31 folder on test jobs (#6103)
jonathanpeppers Jul 20, 2021
708a49e
[xaprepare] don't install microsoft-net-runtime-android workload (#6114)
jonathanpeppers Jul 22, 2021
059b65a
[tests] we don't need to check if Clean deletes directories (#6117)
jonathanpeppers Jul 23, 2021
a5e6806
[Xamarin.Android.Build.Tasks] require JDK 11 for API-31+ (#6084)
jonathanpeppers Jul 29, 2021
d9d15c8
Bump to MSbuild.StructuredLogger 2.1.500 (#6168)
jonathanpeppers Aug 5, 2021
ff05a0d
[Mono.Android] Bind Android 12 Beta 3 and API-31 enumification (#6089)
jpobst Aug 9, 2021
4044112
[API-31 enumification] Fix some enum namespaces names (#6177)
jpobst Aug 12, 2021
aa4dc67
[One .NET] enable WebSocketTests (#6028)
jonathanpeppers Jun 17, 2021
bfc4530
[Tests] Disable Mono.Android WebSocket tests (#6197)
grendello Aug 18, 2021
1fff7b8
[Xamarin.Android.Build.Tasks] exported="true" when MauiLauncher=true …
jonathanpeppers Aug 21, 2021
fe0d5ab
[One .NET] implement $(SupportedPlatformOSVersion) for minSdkVersion …
jonathanpeppers Jul 30, 2021
9d58fad
[Mono.Android] API-31 stabilization (#6174)
jpobst Aug 23, 2021
7c2f588
[Mono.Android] Fix incorrect Bluetooth enumification (#6214)
jpobst Aug 25, 2021
c46e836
Bump to dotnet/installer/main@9c463710 6.0.100-rc.1.21369 (#6072)
dotnet-maestro[bot] Jul 21, 2021
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
Prev Previous commit
Next Next commit
[tests] we don't need to check if Clean deletes directories (#6117)
Context: #6112

The .NET 6 Preview 7 bump had a test failure:

    CleanBasicBindingLibrary("class-parse")
    obj/Release should have no directories.
    Expected: <empty>
    But was:  < "/Users/runner/work/1/s/bin/TestRelease/temp/CleanBasicBindingLibraryclass-parse/obj/Release/refint" >

`refint` is a new directory, see:

* dotnet/sdk@e424c0e
* https://github.com/dotnet/msbuild/blob/9e576281e638d60701ca34411e2483bed01e35c7/src/Tasks/Microsoft.Common.CurrentVersion.targets#L397

Clean doesn't actually delete directories, no need to test for this.

The test already is checking if any files exist, and that should be
sufficient.
  • Loading branch information
jonathanpeppers authored and jonpryor committed Aug 25, 2021
commit 059b65a6ece01b512a45d54cd9145deeb300e801
Original file line number Diff line number Diff line change
Expand Up @@ -94,13 +94,6 @@ public void CleanBasicBindingLibrary (string classParser)
};
var files = Directory.GetFiles (Path.Combine (Root, b.ProjectDirectory, proj.IntermediateOutputPath), "*", SearchOption.AllDirectories)
.Where (x => !ignoreFiles.Any (i => !Path.GetFileName (x).Contains (i)));
var directories = Directory.GetDirectories (Path.Combine (Root, b.ProjectDirectory, proj.IntermediateOutputPath), "*", SearchOption.AllDirectories)
// designtime folder is left behind, so Intellisense continues to work after a Clean
.Where (x => Path.GetFileName (x) != "designtime")
// .NET 5+ sets $(ProduceReferenceAssembly) by default
// https://github.com/dotnet/sdk/blob/18ee4eac8b3abe6d554d2e0c39d8952da0f23ce5/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.TargetFrameworkInference.targets#L242-L244
.Where (x => Path.GetFileName (x) != "ref");
CollectionAssert.IsEmpty (directories, $"{proj.IntermediateOutputPath} should have no directories.");
CollectionAssert.IsEmpty (files, $"{proj.IntermediateOutputPath} should have no files.");
}
}
Expand Down