From c63589e86a114c205e163349e753f08483223853 Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Fri, 29 Jul 2022 14:44:34 -0400 Subject: [PATCH] Don't exclude .gz files from assets.zip Would love to know why .gz specifically is excluded, before this gets merged. Closes: #36845 --- .../IO/Compression/CompressionStreamUnitTestBase.cs | 9 --------- .../tests/CompressionStreamUnitTests.Deflate.cs | 1 - src/tasks/AndroidAppBuilder/ApkBuilder.cs | 2 +- 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/src/libraries/Common/tests/System/IO/Compression/CompressionStreamUnitTestBase.cs b/src/libraries/Common/tests/System/IO/Compression/CompressionStreamUnitTestBase.cs index ab63c2151d046d..684af671e9ac41 100644 --- a/src/libraries/Common/tests/System/IO/Compression/CompressionStreamUnitTestBase.cs +++ b/src/libraries/Common/tests/System/IO/Compression/CompressionStreamUnitTestBase.cs @@ -50,7 +50,6 @@ public virtual void FlushAsync_DuringWriteAsync() } [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsThreadingSupported))] - [ActiveIssue("https://github.com/dotnet/runtime/issues/36845", TestPlatforms.Android)] public async Task FlushAsync_DuringReadAsync() { byte[] buffer = new byte[32]; @@ -78,7 +77,6 @@ public async Task FlushAsync_DuringReadAsync() } [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsThreadingSupported))] - [ActiveIssue("https://github.com/dotnet/runtime/issues/36845", TestPlatforms.Android)] public async Task FlushAsync_DuringFlushAsync() { byte[] buffer = null; @@ -120,7 +118,6 @@ public async Task FlushAsync_DuringFlushAsync() } [ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsThreadingSupported))] - [ActiveIssue("https://github.com/dotnet/runtime/issues/36845", TestPlatforms.Android)] public virtual async Task Dispose_WithUnfinishedReadAsync() { string compressedPath = CompressedTestFile(UncompressedTestFile()); @@ -139,7 +136,6 @@ public virtual async Task Dispose_WithUnfinishedReadAsync() [Theory] [MemberData(nameof(UncompressedTestFiles))] - [ActiveIssue("https://github.com/dotnet/runtime/issues/36845", TestPlatforms.Android)] public async Task Read(string testFile) { var uncompressedStream = await LocalMemoryStream.readAppFileAsync(testFile); @@ -175,7 +171,6 @@ public async Task Read(string testFile) } [Fact] - [ActiveIssue("https://github.com/dotnet/runtime/issues/36845", TestPlatforms.Android)] public async Task Read_EndOfStreamPosition() { var compressedStream = await LocalMemoryStream.readAppFileAsync(CompressedTestFile(UncompressedTestFile())); @@ -195,7 +190,6 @@ public async Task Read_EndOfStreamPosition() } [Fact] - [ActiveIssue("https://github.com/dotnet/runtime/issues/36845", TestPlatforms.Android)] public async Task Read_BaseStreamSlowly() { string testFile = UncompressedTestFile(); @@ -329,7 +323,6 @@ IEnumerable> CtorFunctions() } [Fact] - [ActiveIssue("https://github.com/dotnet/runtime/issues/36845", TestPlatforms.Android)] public async Task TestLeaveOpenAfterValidDecompress() { //Create the Stream @@ -404,7 +397,6 @@ public void BaseStreamTest(CompressionMode mode) [Theory] [InlineData(CompressionMode.Compress)] [InlineData(CompressionMode.Decompress)] - [ActiveIssue("https://github.com/dotnet/runtime/issues/36845", TestPlatforms.Android)] public async Task BaseStream_Modify(CompressionMode mode) { using (var baseStream = await LocalMemoryStream.readAppFileAsync(CompressedTestFile(UncompressedTestFile()))) @@ -436,7 +428,6 @@ public void BaseStream_NullAfterDisposeWithFalseLeaveOpen(CompressionMode mode) [Theory] [InlineData(CompressionMode.Compress)] [InlineData(CompressionMode.Decompress)] - [ActiveIssue("https://github.com/dotnet/runtime/issues/36845", TestPlatforms.Android)] public async Task BaseStream_ValidAfterDisposeWithTrueLeaveOpen(CompressionMode mode) { var ms = await LocalMemoryStream.readAppFileAsync(CompressedTestFile(UncompressedTestFile())); diff --git a/src/libraries/System.IO.Compression/tests/CompressionStreamUnitTests.Deflate.cs b/src/libraries/System.IO.Compression/tests/CompressionStreamUnitTests.Deflate.cs index 68cd0f1779b30d..0dbf8a4b7dd5c2 100644 --- a/src/libraries/System.IO.Compression/tests/CompressionStreamUnitTests.Deflate.cs +++ b/src/libraries/System.IO.Compression/tests/CompressionStreamUnitTests.Deflate.cs @@ -31,7 +31,6 @@ public static IEnumerable DecompressFailsWithWrapperStream_MemberData( /// Test to pass GZipStream data and ZLibStream data to a DeflateStream [Theory] [MemberData(nameof(DecompressFailsWithWrapperStream_MemberData))] - [ActiveIssue("https://github.com/dotnet/runtime/issues/36845", TestPlatforms.Android)] public async Task DecompressFailsWithWrapperStream(string uncompressedPath, string newDirectory, string newSuffix) { string fileName = Path.Combine(newDirectory, Path.GetFileName(uncompressedPath) + newSuffix); diff --git a/src/tasks/AndroidAppBuilder/ApkBuilder.cs b/src/tasks/AndroidAppBuilder/ApkBuilder.cs index 2d77b8332aa253..e8eeac673998ce 100644 --- a/src/tasks/AndroidAppBuilder/ApkBuilder.cs +++ b/src/tasks/AndroidAppBuilder/ApkBuilder.cs @@ -181,7 +181,7 @@ public ApkBuilder(TaskLoggingHelper logger) Directory.CreateDirectory(Path.Combine(OutputDir, "assets")); Directory.CreateDirectory(Path.Combine(OutputDir, "res")); - var extensionsToIgnore = new List { ".so", ".a", ".gz" }; + var extensionsToIgnore = new List { ".so", ".a" }; if (StripDebugSymbols) { extensionsToIgnore.Add(".pdb");