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

Edit IOException docs in ZipFile.ExtractToDirectory #55762

Merged
merged 15 commits into from
Jul 24, 2021
Merged

Edit IOException docs in ZipFile.ExtractToDirectory #55762

Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
16270cd
Update Path.Windows.cs
steveberdy Jul 8, 2021
086bae8
Merge branch 'dotnet:main' into main
steveberdy Jul 8, 2021
ce6bfd2
Change helper method to internal
steveberdy Jul 9, 2021
bdd1e36
Merge branch 'dotnet:main' into main
steveberdy Jul 12, 2021
80cbbe2
Merge branch 'dotnet:main' into main
steveberdy Jul 13, 2021
f69c35d
Merge branch 'dotnet:main' into main
steveberdy Jul 13, 2021
b88008d
Removed sourceFullPath from Unix FileSystem.MoveDirectory thrown exce…
steveberdy Jul 14, 2021
7890ab4
Undo commit from main fork branch
steveberdy Jul 14, 2021
208b9f4
Revert FileSystem.Windows.cs changes
steveberdy Jul 15, 2021
c36dc82
Merge branch 'dotnet:main' into main
steveberdy Jul 15, 2021
d2fd7ec
Update ZipFile.Extract.cs
steveberdy Jul 15, 2021
3077543
Update ZipFileExtensions.ZipArchiveEntry.Extract.cs
steveberdy Jul 15, 2021
a0b7863
Merge branch 'sb-53609' of https://github.com/steveberdy/runtime into…
steveberdy Jul 15, 2021
018a2ca
Revert "Removed sourceFullPath from Unix FileSystem.MoveDirectory thr…
steveberdy Jul 15, 2021
514ed37
Fix badly encoded character in comments
jeffhandley Jul 24, 2021
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
12 changes: 4 additions & 8 deletions src/libraries/System.IO.Compression.ZipFile/src/System/IO/Compression/ZipFile.Extract.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,7 @@ public static partial class ZipFile
/// and file names must be less than 260 characters.</exception>
/// <exception cref="DirectoryNotFoundException">The path specified by sourceArchive or destinationDirectoryName is invalid,
/// (for example, it is on an unmapped drive).</exception>
/// <exception cref="IOException">The directory specified by destinationDirectoryName already exists.
/// -or- An I/O error has occurred. -or- An archive entry?s name is zero-length, contains only whitespace, or contains one or
/// <exception cref="IOException">An I/O error has occurred. -or- An archive entry?s name is zero-length, contains only whitespace, or contains one or
jeffhandley marked this conversation as resolved.
Show resolved Hide resolved
/// more invalid characters as defined by InvalidPathChars. -or- Extracting an archive entry would result in a file destination that is outside the destination directory (for example, because of parent directory accessors). -or- An archive entry has the same name as an already extracted entry from the same archive.</exception>
/// <exception cref="UnauthorizedAccessException">The caller does not have the required permission.</exception>
/// <exception cref="NotSupportedException">sourceArchive or destinationDirectoryName is in an invalid format. </exception>
Expand Down Expand Up @@ -61,8 +60,7 @@ public static void ExtractToDirectory(string sourceArchiveFileName, string desti
/// and file names must be less than 260 characters.</exception>
/// <exception cref="DirectoryNotFoundException">The path specified by sourceArchive or destinationDirectoryName is invalid,
/// (for example, it is on an unmapped drive).</exception>
/// <exception cref="IOException">The directory specified by destinationDirectoryName already exists.
/// -or- An I/O error has occurred. -or- An archive entry?s name is zero-length, contains only whitespace, or contains one or
/// <exception cref="IOException">An I/O error has occurred. -or- An archive entry?s name is zero-length, contains only whitespace, or contains one or
jeffhandley marked this conversation as resolved.
Show resolved Hide resolved
/// more invalid characters as defined by InvalidPathChars. -or- Extracting an archive entry would result in a file destination that is outside the destination directory (for example, because of parent directory accessors). -or- An archive entry has the same name as an already extracted entry from the same archive.</exception>
/// <exception cref="UnauthorizedAccessException">The caller does not have the required permission.</exception>
/// <exception cref="NotSupportedException">sourceArchive or destinationDirectoryName is in an invalid format. </exception>
Expand Down Expand Up @@ -95,8 +93,7 @@ public static void ExtractToDirectory(string sourceArchiveFileName, string desti
/// and file names must be less than 260 characters.</exception>
/// <exception cref="DirectoryNotFoundException">The path specified by sourceArchive or destinationDirectoryName is invalid,
/// (for example, it is on an unmapped drive).</exception>
/// <exception cref="IOException">The directory specified by destinationDirectoryName already exists.
/// -or- An I/O error has occurred. -or- An archive entry?s name is zero-length, contains only whitespace, or contains one or
/// <exception cref="IOException">An I/O error has occurred. -or- An archive entry?s name is zero-length, contains only whitespace, or contains one or
jeffhandley marked this conversation as resolved.
Show resolved Hide resolved
/// more invalid characters as defined by InvalidPathChars. -or- Extracting an archive entry would result in a file destination that is outside the destination directory (for example, because of parent directory accessors). -or- An archive entry has the same name as an already extracted entry from the same archive.</exception>
/// <exception cref="UnauthorizedAccessException">The caller does not have the required permission.</exception>
/// <exception cref="NotSupportedException">sourceArchive or destinationDirectoryName is in an invalid format. </exception>
Expand Down Expand Up @@ -150,8 +147,7 @@ public static void ExtractToDirectory(string sourceArchiveFileName, string desti
/// and file names must be less than 260 characters.</exception>
/// <exception cref="DirectoryNotFoundException">The path specified by sourceArchive or destinationDirectoryName is invalid,
/// (for example, it is on an unmapped drive).</exception>
/// <exception cref="IOException">The directory specified by destinationDirectoryName already exists.
/// -or- An I/O error has occurred. -or- An archive entry?s name is zero-length, contains only whitespace, or contains one or
/// <exception cref="IOException">An I/O error has occurred. -or- An archive entry?s name is zero-length, contains only whitespace, or contains one or
jeffhandley marked this conversation as resolved.
Show resolved Hide resolved
/// more invalid characters as defined by InvalidPathChars. -or- Extracting an archive entry would result in a file destination that is outside the destination directory (for example, because of parent directory accessors). -or- An archive entry has the same name as an already extracted entry from the same archive.</exception>
/// <exception cref="UnauthorizedAccessException">The caller does not have the required permission.</exception>
/// <exception cref="NotSupportedException">sourceArchive or destinationDirectoryName is in an invalid format. </exception>
Expand Down
6 changes: 2 additions & 4 deletions ...ompression.ZipFile/src/System/IO/Compression/ZipFileExtensions.ZipArchiveEntry.Extract.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@ public static partial class ZipFileExtensions
/// For example, on Windows-based platforms, paths must be less than 248 characters, and file names must be less than 260 characters.</exception>
/// <exception cref="DirectoryNotFoundException">The path specified in destinationFileName is invalid (for example, it is on
/// an unmapped drive).</exception>
/// <exception cref="IOException">destinationFileName already exists.
/// -or- An I/O error has occurred. -or- The entry is currently open for writing.
/// <exception cref="IOException">An I/O error has occurred. -or- The entry is currently open for writing.
/// -or- The entry has been deleted from the archive.</exception>
/// <exception cref="NotSupportedException">destinationFileName is in an invalid format
/// -or- The ZipArchive that this entry belongs to was opened in a write-only mode.</exception>
Expand Down Expand Up @@ -48,8 +47,7 @@ public static void ExtractToFile(this ZipArchiveEntry source, string destination
/// For example, on Windows-based platforms, paths must be less than 248 characters, and file names must be less than 260 characters.</exception>
/// <exception cref="DirectoryNotFoundException">The path specified in destinationFileName is invalid
/// (for example, it is on an unmapped drive).</exception>
/// <exception cref="IOException">destinationFileName exists and overwrite is false.
/// -or- An I/O error has occurred.
/// <exception cref="IOException">An I/O error has occurred.
/// -or- The entry is currently open for writing.
/// -or- The entry has been deleted from the archive.</exception>
/// <exception cref="NotSupportedException">destinationFileName is in an invalid format
Expand Down