Skip to content

Support for single-file bundle from .NET 6. - #2373

Merged
dgrunwald merged 2 commits into
icsharpcode:masterfrom
vitek-karas:SingleFile6
May 4, 2021
Merged

Support for single-file bundle from .NET 6.#2373
dgrunwald merged 2 commits into
icsharpcode:masterfrom
vitek-karas:SingleFile6

Conversation

@vitek-karas

Copy link
Copy Markdown
Contributor

Adds support for the new version and also the new compressed files.

Reacts to .NET changes:
dotnet/runtime#49855
dotnet/runtime#50817

This supports the new version and also the new compressed files.
@christophwille christophwille added this to the 7.1-preview1 milestone Apr 20, 2021
@christophwille

Copy link
Copy Markdown
Member

In case you missed the milestone being added - we will merge this PR once 7.0 is released.

Comment thread ILSpy/LoadedPackage.cs
{
throw new InvalidDataException($"Corrupted single-file entry '${entry.RelativePath}'. Declared decompressed size '${entry.Size}' is not the same as actual decompressed size '${decompressedStream.Length}'.");
}

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't we have decompressedStream.Position == decompressedStream.Length at this point?
I think we need to seek back to the start before returning the stream.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good point - it somehow worked without it - but it should be done.

@dgrunwald
dgrunwald merged commit 9b18b50 into icsharpcode:master May 4, 2021
@vitek-karas
vitek-karas deleted the SingleFile6 branch May 4, 2021 18:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants