diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 691057819c5..0b82229bdca 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,16 +1,16 @@ - + https://github.com/dotnet/installer - 808795cca8cfaa143ef556cac0dc40d15d2dc186 + 456900dd18975ff48c3152248428a7c07e81c4ee https://github.com/mono/linker 9ecf5bd2809f93d98c1dbea640790ca5a88d35ec - + https://github.com/dotnet/runtime - 8d3afa3a4a42021be024ffa4a1dee77e35d33911 + 743bd894c40b00b93e805db9d62664c915e0c0ee diff --git a/eng/Versions.props b/eng/Versions.props index f5e9a75e0e0..2690fde2282 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,11 +1,11 @@ - 6.0.100-preview.7.21369.5 + 6.0.100-preview.7.21372.19 6.0.100-preview.6.21365.1 5.0.0-beta.20181.7 6.0.0-beta.21212.6 - 6.0.0-preview.7.21368.2 + 6.0.0-preview.7.21371.11 diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BindingBuildTest.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BindingBuildTest.cs index 8fe7d132fda..1135a2c95ff 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BindingBuildTest.cs +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BindingBuildTest.cs @@ -97,13 +97,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."); } }