From d260d035a840dd314ddc7ef194489933a9929794 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Fri, 6 May 2022 16:03:01 -0500 Subject: [PATCH] [tests] update to Xamarin.Build.Download 0.11.2 (#6989) Context: https://github.com/dotnet/runtime/issues/68734 Context: https://github.com/xamarin/XamarinComponents/pull/1368 We have a newer Xamarin.Build.Download package that shouldn't suffer from the duplicate `ZipArchive.CreateEntry()` issue were are hitting in .NET 7. Let's use it, and enable previously failing tests. --- build-tools/automation/azure-pipelines.yaml | 3 +-- .../Tests/Xamarin.ProjectTools/Android/KnownPackages.cs | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/build-tools/automation/azure-pipelines.yaml b/build-tools/automation/azure-pipelines.yaml index 35e7c11b8c4..4f1f4e60d9d 100644 --- a/build-tools/automation/azure-pipelines.yaml +++ b/build-tools/automation/azure-pipelines.yaml @@ -53,9 +53,8 @@ variables: value: $[and(ne(variables['System.PullRequest.IsFork'], 'True'), or(contains(variables['Build.SourceBranchName'], 'mono-'), contains(variables['System.PullRequest.SourceBranch'], 'mono-')))] - name: RunAllTests value: $[or(eq(variables['XA.RunAllTests'], true), eq(variables['IsMonoBranch'], true))] - # XamarinBuildDownload disabled, due to: https://github.com/dotnet/runtime/issues/68734 - name: DotNetNUnitCategories - value: '& TestCategory != DotNetIgnore & TestCategory != HybridAOT & TestCategory != MkBundle & TestCategory != MonoSymbolicate & TestCategory != PackagesConfig & TestCategory != StaticProject & TestCategory != Debugger & TestCategory != SystemApplication & TestCategory != XamarinBuildDownload' + value: '& TestCategory != DotNetIgnore & TestCategory != HybridAOT & TestCategory != MkBundle & TestCategory != MonoSymbolicate & TestCategory != PackagesConfig & TestCategory != StaticProject & TestCategory != Debugger & TestCategory != SystemApplication' - ${{ if eq(variables['Build.DefinitionName'], 'Xamarin.Android-Private') }}: - group: AzureDevOps-Artifact-Feeds-Pats - group: DotNet-MSRC-Storage diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Android/KnownPackages.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Android/KnownPackages.cs index 8f7e43e1777..c85ee5ad898 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Android/KnownPackages.cs +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Android/KnownPackages.cs @@ -472,7 +472,7 @@ public static class KnownPackages }; public static Package Xamarin_Build_Download = new Package { Id = "Xamarin.Build.Download", - Version = "0.11.0", + Version = "0.11.2", }; // NOTE: old version required for some tests public static Package Xamarin_Build_Download_0_4_11 = new Package {