Bug fixes:

- When reading a regular file entry from one format, and writing it to an archive of another format, need to make sure the entry type is converted to the compatible type. Added tests to verify this for all formats.

Changes:
- Change NotSupportedException to InvalidOperationException. Adjusted tests.
- Improved resource messages based on suggestions.
- Clean unused interop code.
- Remove PNSE line in csproj.

src/libraries/Common/src/Interop/Unix/System.Native/Interop.DeviceFiles.cs

@@ -20,10 +20,7 @@ internal static int CreateCharacterDevice(string pathName, uint mode, uint major
         }
 
         [LibraryImport(Libraries.SystemNative, EntryPoint = "SystemNative_MkNod", StringMarshalling = StringMarshalling.Utf8, SetLastError = true)]
-        internal static partial int MkNod(string pathName, uint mode, uint major, uint minor);
-
-        [LibraryImport(Libraries.SystemNative, EntryPoint = "SystemNative_MakeDev", SetLastError = true)]
-        internal static partial ulong MakeDev(uint major, uint minor);
+        private static partial int MkNod(string pathName, uint mode, uint major, uint minor);
 
         [LibraryImport(Libraries.SystemNative, EntryPoint = "SystemNative_GetDeviceIdentifiers", SetLastError = true)]
         internal static partial void GetDeviceIdentifiers(ulong dev, out uint major, out uint minor);

src/libraries/System.Formats.Tar/src/Resources/Strings.resx

@@ -193,41 +193,32 @@
     <value>A metadata entry of type '{0}' was unexpectedly found after a metadata entry of type '{1}'.</value>
   </data>
   <data name="TarEntriesInDifferentFormats" xml:space="preserve">
-    <value>The archive contains entries in different formats.</value>
+    <value>An entry in '{0}' format was found in an archive where other entries of format '{1}' have been found.</value>
   </data>
   <data name="TarEntryBlockOrCharacterExpected" xml:space="preserve">
-    <value>Cannot set the DevMajor or DevMinor fields on an entry that does not represent a block or character device.</value>
+    <value>Cannot set the 'DeviceMajor' or 'DeviceMinor' fields on an entry that does not represent a block or character device.</value>
   </data>
   <data name="TarEntryHardLinkOrSymLinkExpected" xml:space="preserve">
     <value>Cannot set the LinkName field on an entry that does not represent a hard link or a symbolic link.</value>
   </data>
-  <data name="TarEntryModeOutOfRange" xml:space="preserve">
-    <value>The mode must be a base 10 number between 0 and 511 (777 in octal).</value>
-  </data>
-  <data name="TarEntryNotARegularFile" xml:space="preserve">
-    <value>Entry type is not a regular file, so it does not support setting the data stream.</value>
+  <data name="TarEntryDoesNotSupportDataStream" xml:space="preserve">
+    <value>The entry '{0}' has a '{1}' type, which does not support setting a data stream.</value>
   </data>
   <data name="TarEntryTypeNotSupported" xml:space="preserve">
     <value>Entry type '{0}' not supported in format '{1}'.</value>
   </data>
   <data name="TarEntryTypeNotSupportedForExtracting" xml:space="preserve">
-    <value>Entry type not supported for extraction: '{0}'</value>
+    <value>Entry type '{0}' not supported for extraction.</value>
   </data>
   <data name="TarExtractingResultsInOutside" xml:space="preserve">
     <value>Extracting Tar entry would have resulted in a file outside the specified destination directory.</value>
   </data>
   <data name="TarGnuFormatExpected" xml:space="preserve">
-    <value>A GNU format was expected, but could not be reliably determined for entry '{0}'.</value>
+    <value>Entry '{0}' was expected to be in the GNU format, but did not have the expected version data.</value>
   </data>
   <data name="TarInvalidFormat" xml:space="preserve">
     <value>The archive format is invalid: '{0}'</value>
   </data>
-  <data name="TarMalformedTwoExtendedAttributesEntries" xml:space="preserve">
-    <value>The archive is malformed. It contains two extended attributes entries in a row.</value>
-  </data>
-  <data name="TarPaxFormatExpected" xml:space="preserve">
-    <value>A PAX format was expected, but could not be reliably determined for entry '{0}'.</value>
-  </data>
   <data name="TarPosixFormatExpected" xml:space="preserve">
     <value>A POSIX format was expected (Ustar or PAX), but could not be reliably determined for entry '{0}'.</value>
   </data>
@@ -241,7 +232,7 @@
     <value>The archive has more than one global extended attributes entry.</value>
   </data>
   <data name="TarUnsupportedFile" xml:space="preserve">
-    <value>The file '{0}' is not supported for tar archiving.</value>
+    <value>The file '{0}' is a type of file not supported for tar archiving.</value>
   </data>
   <data name="UnauthorizedAccess_IODenied_NoPathName" xml:space="preserve">
     <value>Access to the path is denied.</value>

src/libraries/System.Formats.Tar/src/System.Formats.Tar.csproj

@@ -16,7 +16,6 @@
   <!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. -->
   <PropertyGroup>
     <TargetPlatformIdentifier>$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)'))</TargetPlatformIdentifier>
-    <GeneratePlatformNotSupportedAssemblyMessage Condition="'$(TargetPlatformIdentifier)' == ''">SR.PlatformNotSupported_SystemFormatsTar</GeneratePlatformNotSupportedAssemblyMessage>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="System\Formats\Tar\FieldLengths.cs" />

src/libraries/System.Formats.Tar/src/System/Formats/Tar/GnuTarEntry.cs

@@ -21,7 +21,7 @@ internal GnuTarEntry(TarHeader header, TarReader readerOfOrigin)
         /// <param name="entryType">The type of the entry.</param>
         /// <param name="entryName">A string with the relative path and file name of this entry.</param>
         /// <exception cref="ArgumentException"><paramref name="entryName"/> is null or empty.</exception>
-        /// <exception cref="NotSupportedException">The entry type is not supported for creating an entry.</exception>
+        /// <exception cref="InvalidOperationException">The entry type is not supported for creating an entry.</exception>
         /// <remarks>When creating an instance using the <see cref="GnuTarEntry(TarEntryType, string)"/> constructor, only the following entry types are supported:
         /// <list type="bullet">
         /// <item>In all platforms: <see cref="TarEntryType.Directory"/>, <see cref="TarEntryType.HardLink"/>, <see cref="TarEntryType.SymbolicLink"/>, <see cref="TarEntryType.RegularFile"/>.</item>

src/libraries/System.Formats.Tar/src/System/Formats/Tar/PaxTarEntry.cs

@@ -28,7 +28,7 @@ internal PaxTarEntry(TarHeader header, TarReader readerOfOrigin)
         /// <param name="entryType">The type of the entry.</param>
         /// <param name="entryName">A string with the relative path and file name of this entry.</param>
         /// <exception cref="ArgumentException"><paramref name="entryName"/> is null or empty.</exception>
-        /// <exception cref="NotSupportedException">The entry type is not supported for creating an entry.</exception>
+        /// <exception cref="InvalidOperationException">The entry type is not supported for creating an entry.</exception>
         /// <remarks><para>When creating an instance using the <see cref="PaxTarEntry(TarEntryType, string)"/> constructor, only the following entry types are supported:</para>
         /// <list type="bullet">
         /// <item>In all platforms: <see cref="TarEntryType.Directory"/>, <see cref="TarEntryType.HardLink"/>, <see cref="TarEntryType.SymbolicLink"/>, <see cref="TarEntryType.RegularFile"/>.</item>
@@ -62,7 +62,7 @@ public PaxTarEntry(TarEntryType entryType, string entryName!!)
         /// <param name="extendedAttributes">An enumeration of string key-value pairs that represents the metadata to include in the Extended Attributes entry that precedes the current entry.</param>
         /// <exception cref="ArgumentNullException"><paramref name="extendedAttributes"/> is <see langword="null"/>.</exception>
         /// <exception cref="ArgumentException"><paramref name="entryName"/> is null or empty.</exception>
-        /// <exception cref="NotSupportedException">The entry type is not supported for creating an entry.</exception>
+        /// <exception cref="InvalidOperationException">The entry type is not supported for creating an entry.</exception>
         /// <remarks>When creating an instance using the <see cref="PaxTarEntry(TarEntryType, string)"/> constructor, only the following entry types are supported:
         /// <list type="bullet">
         /// <item>In all platforms: <see cref="TarEntryType.Directory"/>, <see cref="TarEntryType.HardLink"/>, <see cref="TarEntryType.SymbolicLink"/>, <see cref="TarEntryType.RegularFile"/>.</item>

src/libraries/System.Formats.Tar/src/System/Formats/Tar/PosixTarEntry.cs

@@ -26,7 +26,7 @@ internal PosixTarEntry(TarEntryType entryType, string entryName, TarFormat forma
         /// When the current entry represents a character device or a block device, the major number identifies the driver associated with the device.
         /// </summary>
         /// <remarks>Character and block devices are Unix-specific entry types.</remarks>
-        /// <exception cref="NotSupportedException">The entry does not represent a block device or a character device.</exception>
+        /// <exception cref="InvalidOperationException">The entry does not represent a block device or a character device.</exception>
         /// <exception cref="ArgumentOutOfRangeException">Cannot set a negative value.</exception>
         public int DeviceMajor
         {
@@ -35,7 +35,7 @@ public int DeviceMajor
             {
                 if (_header._typeFlag is not TarEntryType.BlockDevice and not TarEntryType.CharacterDevice)
                 {
-                    throw new NotSupportedException(SR.TarEntryBlockOrCharacterExpected);
+                    throw new InvalidOperationException(SR.TarEntryBlockOrCharacterExpected);
                 }
 
                 if (value < 0 || value > 99_999_999)
@@ -50,7 +50,7 @@ public int DeviceMajor
         /// When the current entry represents a character device or a block device, the minor number is used by the driver to distinguish individual devices it controls.
         /// </summary>
         /// <remarks>Character and block devices are Unix-specific entry types.</remarks>
-        /// <exception cref="NotSupportedException">The entry does not represent a block device or a character device.</exception>
+        /// <exception cref="InvalidOperationException">The entry does not represent a block device or a character device.</exception>
         /// <exception cref="ArgumentOutOfRangeException">Cannot set a negative value.</exception>
         public int DeviceMinor
         {
@@ -59,7 +59,7 @@ public int DeviceMinor
             {
                 if (_header._typeFlag is not TarEntryType.BlockDevice and not TarEntryType.CharacterDevice)
                 {
-                    throw new NotSupportedException(SR.TarEntryBlockOrCharacterExpected);
+                    throw new InvalidOperationException(SR.TarEntryBlockOrCharacterExpected);
                 }
                 if (value < 0 || value > 99_999_999)
                 {

src/libraries/System.Formats.Tar/src/System/Formats/Tar/SeekableSubReadStream.cs

@@ -18,7 +18,7 @@ public SeekableSubReadStream(Stream superStream, long startPosition, long maxLen
         {
             if (!superStream.CanSeek)
             {
-                throw new NotSupportedException(SR.IO_NotSupported_UnseekableStream);
+                throw new InvalidOperationException(SR.IO_NotSupported_UnseekableStream);
             }
         }
 

src/libraries/System.Formats.Tar/src/System/Formats/Tar/SubReadStream.cs

@@ -25,7 +25,7 @@ public SubReadStream(Stream superStream, long startPosition, long maxLength)
         {
             if (!superStream.CanRead)
             {
-                throw new NotSupportedException(SR.IO_NotSupported_UnreadableStream);
+                throw new InvalidOperationException(SR.IO_NotSupported_UnreadableStream);
             }
             _startInSuperStream = startPosition;
             _positionInSuperStream = startPosition;
@@ -54,7 +54,7 @@ public override long Position
             set
             {
                 ThrowIfDisposed();
-                throw new NotSupportedException(SR.IO_NotSupported_UnseekableStream);
+                throw new InvalidOperationException(SR.IO_NotSupported_UnseekableStream);
             }
         }
 
@@ -158,13 +158,13 @@ protected async ValueTask<int> ReadAsyncCore(Memory<byte> buffer, CancellationTo
             return ret;
         }
 
-        public override long Seek(long offset, SeekOrigin origin) => throw new NotSupportedException(SR.IO_NotSupported_UnseekableStream);
+        public override long Seek(long offset, SeekOrigin origin) => throw new InvalidOperationException(SR.IO_NotSupported_UnseekableStream);
 
-        public override void SetLength(long value) => throw new NotSupportedException(SR.IO_NotSupported_UnseekableStream);
+        public override void SetLength(long value) => throw new InvalidOperationException(SR.IO_NotSupported_UnseekableStream);
 
-        public override void Write(byte[] buffer, int offset, int count) => throw new NotSupportedException(SR.IO_NotSupported_UnwritableStream);
+        public override void Write(byte[] buffer, int offset, int count) => throw new InvalidOperationException(SR.IO_NotSupported_UnwritableStream);
 
-        public override void Flush() => throw new NotSupportedException(SR.IO_NotSupported_UnwritableStream);
+        public override void Flush() => throw new InvalidOperationException(SR.IO_NotSupported_UnwritableStream);
 
         // Close the stream for reading.  Note that this does NOT close the superStream (since
         // the substream is just 'a chunk' of the super-stream

src/libraries/System.Formats.Tar/src/System/Formats/Tar/TarEntry.Windows.cs

@@ -13,21 +13,21 @@ public abstract partial class TarEntry
         partial void ExtractAsBlockDevice(string destinationFileName)
         {
             Debug.Assert(EntryType is TarEntryType.BlockDevice or TarEntryType.CharacterDevice);
-            throw new NotSupportedException(SR.IO_DeviceFiles_NotSupported);
+            throw new InvalidOperationException(SR.IO_DeviceFiles_NotSupported);
         }
 
         // Throws on Windows. Character devices are not supported on this platform.
         partial void ExtractAsCharacterDevice(string destinationFileName)
         {
             Debug.Assert(EntryType is TarEntryType.BlockDevice or TarEntryType.CharacterDevice);
-            throw new NotSupportedException(SR.IO_DeviceFiles_NotSupported);
+            throw new InvalidOperationException(SR.IO_DeviceFiles_NotSupported);
         }
 
         // Throws on Windows. Fifo files are not supported on this platform.
         partial void ExtractAsFifo(string destinationFileName)
         {
             Debug.Assert(EntryType is TarEntryType.Fifo);
-            throw new NotSupportedException(SR.IO_FifoFiles_NotSupported);
+            throw new InvalidOperationException(SR.IO_FifoFiles_NotSupported);
         }
 
         // Windows specific implementation of the method that extracts the current entry as a hard link.

src/libraries/System.Formats.Tar/src/System/Formats/Tar/TarEntry.cs

@@ -33,7 +33,7 @@ internal TarEntry(TarEntryType entryType, string entryName, TarFormat format)
             ArgumentException.ThrowIfNullOrEmpty(entryName);
 
             // Throws if format is unknown or out of range
-            TarHelpers.VerifyEntryTypeIsSupported(entryType, format);
+            TarHelpers.VerifyEntryTypeIsSupported(entryType, format, forWriting: false);
 
             _readerOfOrigin = null;
 
@@ -101,14 +101,15 @@ public DateTimeOffset ModificationTime
         /// <summary>
         /// When the <see cref="EntryType"/> indicates a <see cref="TarEntryType.SymbolicLink"/> or a <see cref="TarEntryType.HardLink"/>, this property returns the link target path of such link.
         /// </summary>
+        /// <exception cref="InvalidOperationException">Cannot set the link name if the entry type is not <see cref="TarEntryType.HardLink"/> or <see cref="TarEntryType.SymbolicLink"/>.</exception>
         public string LinkName
         {
             get => _header._linkName;
             set
             {
                 if (_header._typeFlag is not TarEntryType.HardLink and not TarEntryType.SymbolicLink)
                 {
-                    throw new NotSupportedException(SR.TarEntryHardLinkOrSymLinkExpected);
+                    throw new InvalidOperationException(SR.TarEntryHardLinkOrSymLinkExpected);
                 }
                 _header._linkName = value;
             }
@@ -169,7 +170,7 @@ public int Uid
         /// <para>A directory exists with the same name as <paramref name="destinationFileName"/>.</para>
         /// <para>-or-</para>
         /// <para>An I/O problem occurred.</para></exception>
-        /// <exception cref="NotSupportedException">Attempted to extract an unsupported entry type.</exception>
+        /// <exception cref="InvalidOperationException">Attempted to extract an unsupported entry type.</exception>
         /// <exception cref="UnauthorizedAccessException">Operation not permitted due to insufficient permissions.</exception>
         public void ExtractToFile(string destinationFileName, bool overwrite)
         {
@@ -231,7 +232,7 @@ public void ExtractToFile(string destinationFileName, bool overwrite)
                 case TarEntryType.SparseFile:
                 case TarEntryType.TapeVolume:
                 default:
-                    throw new NotSupportedException(string.Format(SR.TarEntryTypeNotSupportedForExtracting, EntryType));
+                    throw new InvalidOperationException(string.Format(SR.TarEntryTypeNotSupportedForExtracting, EntryType));
             }
         }
 
@@ -252,7 +253,7 @@ public void ExtractToFile(string destinationFileName, bool overwrite)
         /// <para>A directory exists with the same name as <paramref name="destinationFileName"/>.</para>
         /// <para>-or-</para>
         /// <para>An I/O problem occurred.</para></exception>
-        /// <exception cref="NotSupportedException">Attempted to extract an unsupported entry type.</exception>
+        /// <exception cref="InvalidOperationException">Attempted to extract an unsupported entry type.</exception>
         /// <exception cref="UnauthorizedAccessException">Operation not permitted due to insufficient permissions.</exception>
         public Task ExtractToFileAsync(string destinationFileName, bool overwrite, CancellationToken cancellationToken = default)
         {
@@ -265,7 +266,7 @@ public Task ExtractToFileAsync(string destinationFileName, bool overwrite, Cance
         /// <value><para>Gets a stream that represents the data section of this entry.</para>
         /// <para>Sets a new stream that represents the data section, if it makes sense for the <see cref="EntryType"/> to contain data; if a stream already existed, the old stream gets disposed before substituting it with the new stream. Setting a <see langword="null"/> stream is allowed.</para></value>
         /// <remarks>If you write data to this data stream, make sure to rewind it to the desired start position before writing this entry into an archive using <see cref="TarWriter.WriteEntry(TarEntry)"/> or <see cref="TarWriter.WriteEntryAsync(TarEntry, CancellationToken)"/>.</remarks>
-        /// <exception cref="NotSupportedException">Setting a data section is not supported because the <see cref="EntryType"/> is not <see cref="TarEntryType.RegularFile"/> (or <see cref="TarEntryType.V7RegularFile"/> for an archive of <see cref="TarFormat.V7"/> format).</exception>
+        /// <exception cref="InvalidOperationException">Setting a data section is not supported because the <see cref="EntryType"/> is not <see cref="TarEntryType.RegularFile"/> (or <see cref="TarEntryType.V7RegularFile"/> for an archive of <see cref="TarFormat.V7"/> format).</exception>
         /// <exception cref="IOException"><para>Cannot set an unreadable stream.</para>
         /// <para>-or-</para>
         /// <para>An I/O problem occurred.</para></exception>
@@ -276,7 +277,7 @@ public Stream? DataStream
             {
                 if (!IsDataStreamSetterSupported())
                 {
-                    throw new NotSupportedException(SR.TarEntryNotARegularFile);
+                    throw new InvalidOperationException(string.Format(SR.TarEntryDoesNotSupportDataStream, Name, EntryType));
                 }
 
                 if (value != null && !value.CanRead)

src/libraries/System.Formats.Tar/src/System/Formats/Tar/TarHeader.Read.cs

@@ -549,7 +549,7 @@ private void ReadExtendedAttributesBlock(Stream archiveStream)
             // 4096 is a common max path length, and also the size field is 12 bytes long, which is under int.MaxValue.
             if (_size > int.MaxValue)
             {
-                throw new NotSupportedException(string.Format(SR.TarSizeFieldTooLargeForExtendedAttribute, _typeFlag.ToString()));
+                throw new InvalidOperationException(string.Format(SR.TarSizeFieldTooLargeForExtendedAttribute, _typeFlag.ToString()));
             }
 
             byte[] buffer = new byte[(int)_size];