Skip to content

Don't exclude .gz files from assets.zip #73077

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
steveisok merged 1 commit into from
Jul 31, 2022
Merged

Don't exclude .gz files from assets.zip #73077

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 0 additions & 9 deletions src/libraries/Common/tests/System/IO/Compression/CompressionStreamUnitTestBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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];
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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());
Expand All @@ -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);
Expand Down Expand Up @@ -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()));
Expand All @@ -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();
Expand Down Expand Up @@ -329,7 +323,6 @@ IEnumerable<Func<Stream, Stream>> CtorFunctions()
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/36845", TestPlatforms.Android)]
public async Task TestLeaveOpenAfterValidDecompress()
{
//Create the Stream
Expand Down Expand Up @@ -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())))
Expand Down Expand Up @@ -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()));
Expand Down
1 change: 0 additions & 1 deletion src/libraries/System.IO.Compression/tests/CompressionStreamUnitTests.Deflate.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ public static IEnumerable<object[]> DecompressFailsWithWrapperStream_MemberData(
/// <summary>Test to pass GZipStream data and ZLibStream data to a DeflateStream</summary>
[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);
Expand Down
2 changes: 1 addition & 1 deletion src/tasks/AndroidAppBuilder/ApkBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ public ApkBuilder(TaskLoggingHelper logger)
Directory.CreateDirectory(Path.Combine(OutputDir, "assets"));
Directory.CreateDirectory(Path.Combine(OutputDir, "res"));

var extensionsToIgnore = new List<string> { ".so", ".a", ".gz" };
var extensionsToIgnore = new List<string> { ".so", ".a" };
if (StripDebugSymbols)
{
extensionsToIgnore.Add(".pdb");
Expand Down