SabreTools/SabreTools.Serialization
1
0
Fork 0
mirror of https://github.com/SabreTools/SabreTools.Serialization.git synced 2026-07-08 18:06:41 +00:00
Code Issues 56 Packages Projects Releases 20 Wiki Activity

Fix compilation issues

Browse Source
This commit is contained in:
Matt Nadareski
2023-09-08 18:53:01 -04:00
parent 6490207faa
commit b325086429
5 changed files with 24 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CrossModel/ArchiveDotOrg.Serializer.cs
View File

@@ -8,7 +8,7 @@ namespace SabreTools.Serialization.CrossModel
#if NET48
public Models.Metadata.MetadataFile Serialize(Models.ArchiveDotOrg.Files item)
#else
public static Models.Metadata.MetadataFile? Serialize(Models.ArchiveDotOrg.Files? item)
public Models.Metadata.MetadataFile? Serialize(Models.ArchiveDotOrg.Files? item)
#endif
{
if (item == null)

7
Files/XmlFile.Serializer.cs
View File

@@ -1,7 +1,4 @@
using System.IO;
using System.Text;
using System.Xml;
using System.Xml.Serialization;
namespace SabreTools.Serialization.Files
{
@@ -31,9 +28,9 @@ namespace SabreTools.Serialization.Files
/// <param name="subset">Optional DOCTYPE name</param>
/// <returns>True on successful serialization, false otherwise</returns>
#if NET48
protected static bool Serialize(T obj, string path, string name = null, string pubid = null, string sysid = null, string subset = null)
public static bool Serialize(T obj, string path, string name = null, string pubid = null, string sysid = null, string subset = null)
#else
protected static bool Serialize(T? obj, string? path, string? name = null, string? pubid = null, string? sysid = null, string? subset = null)
public static bool Serialize(T? obj, string? path, string? name = null, string? pubid = null, string? sysid = null, string? subset = null)
#endif
{
using (var stream = new Streams.XmlFile<T>().Serialize(obj, name, pubid, sysid, subset))

6
Streams/AACS.Deserializer.cs
View File

@@ -9,11 +9,7 @@ namespace SabreTools.Serialization.Streams
{
public partial class AACS : IStreamSerializer<MediaKeyBlock>
{
/// <summary>
/// Parse a Stream into an AACS media key block
/// </summary>
/// <param name="data">Stream to parse</param>
/// <returns>Filled cmedia key block on success, null on error</returns>
/// <inheritdoc/>
#if NET48
public MediaKeyBlock Deserialize(Stream data)
#else

16
Streams/AACS.Serializer.cs Normal file
View File

@@ -0,0 +1,16 @@
using System;
using System.IO;
using SabreTools.Models.AACS;
namespace SabreTools.Serialization.Streams
{
public partial class AACS : IStreamSerializer<MediaKeyBlock>
{
/// <inheritdoc/>
#if NET48
public Stream Serialize(MediaKeyBlock obj) => throw new NotImplementedException();
#else
public Stream? Serialize(MediaKeyBlock? obj) => throw new NotImplementedException();
#endif
}
}

8
Streams/XmlFile.Serializer.cs
View File

@@ -17,9 +17,9 @@ namespace SabreTools.Serialization.Streams
/// <param name="obj">Data to serialize</param>
/// <returns>Stream containing serialized data on success, null otherwise</returns>
#if NET48
public static Stream Serialize(T obj)
public Stream Serialize(T obj)
#else
public static Stream? Serialize(T? obj)
public Stream? Serialize(T? obj)
#endif
=> Serialize(obj, null, null, null, null);
@@ -33,9 +33,9 @@ namespace SabreTools.Serialization.Streams
/// <param name="subset">Optional DOCTYPE name</param>
/// <returns>Stream containing serialized data on success, null otherwise</returns>
#if NET48
protected static Stream Serialize(T obj, string name = null, string pubid = null, string sysid = null, string subset = null)
public Stream Serialize(T obj, string name = null, string pubid = null, string sysid = null, string subset = null)
#else
protected static Stream? Serialize(T? obj, string? name = null, string? pubid = null, string? sysid = null, string? subset = null)
public Stream? Serialize(T? obj, string? name = null, string? pubid = null, string? sysid = null, string? subset = null)
#endif
{
// If the object is null