Skip to content
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

Jump to bottom

Ported interleaving support to System.IO.Packaging #97898

Merged
merged 12 commits into from
Jul 16, 2024
Merged

Ported interleaving support to System.IO.Packaging #97898

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
e18c425
Added interleaving support to System.IO.Packaging
edwardneal Feb 2, 2024
c0b174a
Removed reference to NuGet.Frameworks
edwardneal Feb 2, 2024
7d3217e
Changes following code review
edwardneal Feb 4, 2024
d873e1b
Adjusted the compilation conditions for Read
edwardneal Feb 9, 2024
ca3ecfe
Moved the ArrayPool.Return calls into a finally block, for safety pur…
edwardneal Feb 9, 2024
e921812
Changes following second round of code review
edwardneal Feb 19, 2024
1d68f98
Eliminating duplicate casts, minor comment cleanup
edwardneal Feb 21, 2024
fd6283b
Merge branch 'main' into issue-51929
carlossanlop Jul 8, 2024
80b2c48
Replaced InternalsVisibleTo
edwardneal Jul 8, 2024
9519dc1
Code review
edwardneal Jul 12, 2024
a82adfc
Added tests for non-seekable streams
edwardneal Jul 12, 2024
ad6b1f2
Swapped conditional compilation to newer form
edwardneal Jul 12, 2024
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
41 changes: 40 additions & 1 deletion src/libraries/System.IO.Packaging/src/Resources/Strings.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,4 +375,43 @@
<data name="FileContainsCorruptedData" xml:space="preserve">
<value>File contains corrupted data.</value>
</data>
</root>
<data name="DuplicatePiecesFound" xml:space="preserve">
<value>Duplicate pieces found in the package.</value>
</data>
<data name="OffsetNegative" xml:space="preserve">
<value>Offset must be greater than or equal to zero.</value>
</data>
<data name="PieceDoesNotExist" xml:space="preserve">
<value>Cannot find piece with the specified piece number.</value>
</data>
<data name="ReadBufferTooSmall" xml:space="preserve">
<value>Buffer too small to hold results of Read.</value>
</data>
<data name="ReadCountNegative" xml:space="preserve">
<value>Count of bytes to read cannot be negative.</value>
</data>
<data name="ReadNotSupported" xml:space="preserve">
<value>Reading is not supported on this stream.</value>
</data>
<data name="SeekNegative" xml:space="preserve">
<value>Cannot set seek pointer to a negative position.</value>
</data>
<data name="SeekNotSupported" xml:space="preserve">
<value>Stream does not support Seek.</value>
</data>
<data name="StreamDoesNotSupportWrite" xml:space="preserve">
<value>Cannot change content of a read-only stream.</value>
</data>
<data name="WriteBufferTooSmall" xml:space="preserve">
<value>Buffer of bytes to be written is too small.</value>
</data>
<data name="WriteCountNegative" xml:space="preserve">
<value>Count of bytes to write cannot be negative.</value>
</data>
<data name="WriteNotSupported" xml:space="preserve">
<value>Stream does not support writing.</value>
</data>
<data name="UnexpectedPartPieceUri" xml:space="preserve">
<value>Provided URI is a part piece URI, not a part URI.</value>
</data>
</root>
5 changes: 5 additions & 0 deletions src/libraries/System.IO.Packaging/src/System.IO.Packaging.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
<Compile Include="System\IO\Packaging\EncryptionOption.cs" />
<Compile Include="System\IO\Packaging\FileFormatException.cs" />
<Compile Include="System\IO\Packaging\IgnoreFlushAndCloseStream.cs" />
<Compile Include="System\IO\Packaging\InterleavedZipPackagePartStream.cs" />
<Compile Include="System\IO\Packaging\InterleavedZipPackagePartStream.PieceDirectory.cs" />
<Compile Include="System\IO\Packaging\InternalRelationshipCollection.cs" />
<Compile Include="System\IO\Packaging\OrderedDictionary.cs" />
<Compile Include="System\IO\Packaging\Package.cs" />
Expand All @@ -39,10 +41,13 @@
<Compile Include="System\IO\Packaging\XmlWrappingReader.cs" />
<Compile Include="System\IO\Packaging\ZipPackage.cs" />
<Compile Include="System\IO\Packaging\ZipPackagePart.cs" />
<Compile Include="System\IO\Packaging\ZipPackagePartPiece.cs" />
<Compile Include="System\IO\Packaging\ZipStreamManager.cs" />
<Compile Include="System\IO\Packaging\ZipWrappingStream.cs" />
<Compile Include="System\IO\Packaging\PackUriHelper.PackUriScheme.cs" />
<Compile Include="$(CommonPath)System\Obsoletions.cs" Link="Common\System\Obsoletions.cs" />

<InternalsVisibleTo Include="System.IO.Packaging.Tests" Key="00240000048000009400000006020000002400005253413100040000010001004b86c4cb78549b34bab61a3b1800e23bfeb5b3ec390074041536a7e3cbd97f5f04cf0f857155a8928eaa29ebfd11cfbbad3ba70efea7bda3226c6a8d370a4cd303f714486b6ebc225985a638471e6ef571cc92a4613c00b8fa65d61ccee0cbe5f36330c9a01f4183559f1bef24cc2917c6d913e3a541333a1d05d9bed22b38cb" />
edwardneal marked this conversation as resolved.
Show resolved Hide resolved
</ItemGroup>

<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETStandard'">
Expand Down
Loading
Loading