Skip to content

Commit d8841e2

Browse files
Bumps [external/xamarin-android-tools](https://github.com/dotnet/android-tools) from `a428178` to `9b8ef3c`. - [Commits](dotnet/android-tools@a428178...9b8ef3c) --- updated-dependencies: - dependency-name: external/xamarin-android-tools dependency-version: 9b8ef3c2b946bd1451206dafedb53e9c3fe283dc dependency-type: direct:production ... ### Pass `TaskLoggingHelper` to `Files.ExtractAll()` calls The xamarin-android-tools update adds a path traversal check to Files.ExtractAll that logs a warning when zip entries would extract outside the destination directory. Pass log: Log at all three call sites in ResolveLibraryProjectImports to enable this warning. Co-authored-by: Jonathan Peppers <jonathan.peppers@microsoft.com>
1 parent c4dbc85 commit d8841e2

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

src/Xamarin.Android.Build.Tasks/Tasks/ResolveLibraryProjectImports.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ void Extract (
297297
.Replace ("native_library_imports/", "");
298298
}, deleteCallback: (fileToDelete) => {
299299
return !files.Contains (fileToDelete);
300-
});
300+
}, log: Log);
301301
} catch (PathTooLongException ex) {
302302
Log.LogCodedError ("XA4303", Properties.Resources.XA4303, assemblyPath, ex);
303303
return;
@@ -324,7 +324,7 @@ void Extract (
324324
return path;
325325
}, deleteCallback: (fileToDelete) => {
326326
return !jars.ContainsKey (fileToDelete);
327-
});
327+
}, log: Log);
328328
} catch (PathTooLongException ex) {
329329
Log.LogCodedError ("XA4303", Properties.Resources.XA4303, assemblyPath, ex);
330330
return;
@@ -465,7 +465,7 @@ void Extract (
465465
return entryFullName;
466466
}, deleteCallback: (fileToDelete) => {
467467
return !jars.ContainsKey (fileToDelete);
468-
}, skipCallback: Files.ShouldSkipEntryInAar);
468+
}, skipCallback: Files.ShouldSkipEntryInAar, log: Log);
469469

470470
if (Directory.Exists (importsDir) && aarHash != stampHash) {
471471
Log.LogDebugMessage ($"Saving hash to {stamp}, changes: {updated}");

0 commit comments

Comments
 (0)