Relese 2.7.5.2

升级 SourceLink 包并移除 RecyclableMemoryStream

common.props

@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <Version>2.7.5.1</Version>
+    <Version>2.7.5.2</Version>
     <IncludeSymbols>true</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
     <NoWarn>1591</NoWarn>
@@ -30,9 +30,9 @@
 		<NoWarn>1701;1702;CS1591;CS1573</NoWarn>
 	</PropertyGroup>
 	<ItemGroup>
-		<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
+		<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
 			<PrivateAssets>all</PrivateAssets>
-			<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
 	</ItemGroup>
 </Project>

src/EPPlus/EPPlus/Compatibility/ImageCompat.cs

@@ -1,4 +1,5 @@
-using OfficeOpenXml.Utils;
+using System.IO;
+using OfficeOpenXml.Utils;
 using SixLabors.ImageSharp;
 using SixLabors.ImageSharp.Formats;
 
@@ -8,7 +9,7 @@ internal class ImageCompat
     {
         internal static byte[] GetImageAsByteArray(Image image, IImageFormat format)
         {
-            using (var ms = RecyclableMemoryStream.GetStream())
+            using (var ms = new MemoryStream())
             {
                 image.Save(ms, format);
                 return ms.ToArray();

src/EPPlus/EPPlus/Encryption/EncryptionHandler.cs

@@ -173,23 +173,23 @@ private MemoryStream EncryptPackageAgile(byte[] package, ExcelEncryption encrypt
             var VerifierHashKey = GetFinalHash(hashProvider, BlockKey_HashValue, baseHash);
             var KeyValueKey = GetFinalHash(hashProvider, BlockKey_KeyValue, baseHash);
 
-            var ms = RecyclableMemoryStream.GetStream();
+            var ms = new MemoryStream();
             EncryptAgileFromKey(encr, VerifierInputKey, encr.VerifierHashInput, 0, encr.VerifierHashInput.Length, encr.SaltValue, ms);
             encr.EncryptedVerifierHashInput = ms.ToArray();
 
-            ms = RecyclableMemoryStream.GetStream();
+            ms = new MemoryStream();
             EncryptAgileFromKey(encr, VerifierHashKey, encr.VerifierHash, 0, encr.VerifierHash.Length, encr.SaltValue, ms);
             encr.EncryptedVerifierHash = ms.ToArray();
 
-            ms = RecyclableMemoryStream.GetStream();
+            ms = new MemoryStream();
             EncryptAgileFromKey(encr, KeyValueKey, encr.KeyValue, 0, encr.KeyValue.Length, encr.SaltValue, ms);
             encr.EncryptedKeyValue = ms.ToArray();
 
             xml = encryptionInfo.Xml.OuterXml;
 
             var byXml = Encoding.UTF8.GetBytes(xml);
 
-            ms = RecyclableMemoryStream.GetStream();
+            ms = new MemoryStream();
             ms.Write(BitConverter.GetBytes((ushort)4), 0, 2); //Major Version
             ms.Write(BitConverter.GetBytes((ushort)4), 0, 2); //Minor Version
             ms.Write(BitConverter.GetBytes((uint)0x40), 0, 4); //Reserved
@@ -204,7 +204,7 @@ private MemoryStream EncryptPackageAgile(byte[] package, ExcelEncryption encrypt
             //...and the encrypted package
             doc.Storage.DataStreams.Add("EncryptedPackage", encrData);
 
-            ms = RecyclableMemoryStream.GetStream();
+            ms = new MemoryStream();
             doc.Save(ms);
             //ms.Write(e,0,e.Length);
             return ms;
@@ -226,7 +226,7 @@ private byte[] EncryptDataAgile(byte[] data, EncryptionInfoAgile encryptionInfo,
             int segment = 0;
 
             //Encrypt the data
-            var ms = RecyclableMemoryStream.GetStream();
+            var ms = new MemoryStream();
             ms.Write(BitConverter.GetBytes((ulong)data.Length), 0, 8);
             while (pos < data.Length)
             {
@@ -248,14 +248,14 @@ private byte[] EncryptDataAgile(byte[] data, EncryptionInfoAgile encryptionInfo,
         private void SetHMAC(EncryptionInfoAgile ei, HashAlgorithm hashProvider, byte[] salt, byte[] data)
         {
             var iv = GetFinalHash(hashProvider, BlockKey_HmacKey, ei.KeyData.SaltValue);
-            var ms = RecyclableMemoryStream.GetStream();
+            var ms = new MemoryStream();
             EncryptAgileFromKey(ei.KeyEncryptors[0], ei.KeyEncryptors[0].KeyValue, salt, 0L, salt.Length, iv, ms);
             ei.DataIntegrity.EncryptedHmacKey = ms.ToArray();
 
             var h = GetHmacProvider(ei.KeyEncryptors[0], salt);
             var hmacValue = h.ComputeHash(data);
 
-            ms = RecyclableMemoryStream.GetStream();
+            ms = new MemoryStream();
             iv = GetFinalHash(hashProvider, BlockKey_HmacValue, ei.KeyData.SaltValue);
             EncryptAgileFromKey(ei.KeyEncryptors[0], ei.KeyEncryptors[0].KeyValue, hmacValue, 0L, hmacValue.Length, iv, ms);
             ei.DataIntegrity.EncryptedHmacValue = ms.ToArray();
@@ -308,12 +308,12 @@ private MemoryStream EncryptPackageBinary(byte[] package, ExcelEncryption encryp
 
             //Encrypt the package
             byte[] encryptedPackage = EncryptData(encryptionKey, package, false);
-            MemoryStream ms = RecyclableMemoryStream.GetStream();
+            MemoryStream ms = new MemoryStream();
             ms.Write(BitConverter.GetBytes((ulong)package.Length), 0, 8);
             ms.Write(encryptedPackage, 0, encryptedPackage.Length);
             doc.Storage.DataStreams.Add("EncryptedPackage", ms.ToArray());
 
-            var ret = RecyclableMemoryStream.GetStream();
+            var ret = new MemoryStream();
             doc.Save(ret);
 
             return ret;
@@ -341,7 +341,7 @@ private void CreateDataSpaces(CompoundDocument doc)
         }
         private byte[] CreateStrongEncryptionDataSpaceStream()
         {
-            MemoryStream ms = RecyclableMemoryStream.GetStream();
+            MemoryStream ms = new MemoryStream();
             BinaryWriter bw = new BinaryWriter(ms);
 
             bw.Write((int)8);       //HeaderLength
@@ -356,7 +356,7 @@ private byte[] CreateStrongEncryptionDataSpaceStream()
         }
         private byte[] CreateVersionStream()
         {
-            MemoryStream ms = RecyclableMemoryStream.GetStream();
+            MemoryStream ms = new MemoryStream();
             BinaryWriter bw = new BinaryWriter(ms);
 
             bw.Write((short)0x3C);  //Major
@@ -371,7 +371,7 @@ private byte[] CreateVersionStream()
         }
         private byte[] CreateDataSpaceMap()
         {
-            MemoryStream ms = RecyclableMemoryStream.GetStream();
+            MemoryStream ms = new MemoryStream();
             BinaryWriter bw = new BinaryWriter(ms);
 
             bw.Write((int)8);       //HeaderLength
@@ -391,7 +391,7 @@ private byte[] CreateDataSpaceMap()
         }
         private byte[] CreateTransformInfoPrimary()
         {
-            MemoryStream ms = RecyclableMemoryStream.GetStream();
+            MemoryStream ms = new MemoryStream();
             BinaryWriter bw = new BinaryWriter(ms);
             string TransformID = "{FF9A3F03-56EF-4613-BDD5-5A41C1D07246}";
             string TransformName = "Microsoft.Container.EncryptionTransform";
@@ -485,7 +485,7 @@ private byte[] EncryptData(byte[] key, byte[] data, bool useDataSize)
 
             //Encrypt the data
             var crypt = aes.CreateEncryptor(key, null);
-            var ms = RecyclableMemoryStream.GetStream();
+            var ms = new MemoryStream();
             var cs = new CryptoStream(ms, crypt, CryptoStreamMode.Write);
             cs.Write(data, 0, data.Length);
 
@@ -506,7 +506,7 @@ private byte[] EncryptData(byte[] key, byte[] data, bool useDataSize)
         }
         private MemoryStream GetStreamFromPackage(CompoundDocument doc, ExcelEncryption encryption)
         {
-            //var ret = RecyclableMemoryStream.GetStream();
+            //var ret = new MemoryStream();
             if (doc.Storage.DataStreams.ContainsKey("EncryptionInfo") ||
                doc.Storage.DataStreams.ContainsKey("EncryptedPackage"))
             {
@@ -553,7 +553,7 @@ private MemoryStream DecryptDocument(byte[] data, EncryptionInfo encryptionInfo,
 
         private MemoryStream DecryptAgile(EncryptionInfoAgile encryptionInfo, string password, long size, byte[] encryptedData, byte[] data)
         {
-            MemoryStream doc = RecyclableMemoryStream.GetStream();
+            MemoryStream doc = new MemoryStream();
 
             if (encryptionInfo.KeyData.CipherAlgorithm == eCipherAlgorithm.AES)
             {
@@ -665,7 +665,7 @@ private HashAlgorithm GetHashProvider(EncryptionInfoAgile.EncryptionKeyData encr
 #endif
         private MemoryStream DecryptBinary(EncryptionInfoBinary encryptionInfo, string password, long size, byte[] encryptedData)
         {
-            MemoryStream doc = RecyclableMemoryStream.GetStream();
+            MemoryStream doc = new MemoryStream();
 
             if (encryptionInfo.Header.AlgID == AlgorithmID.AES128 || (encryptionInfo.Header.AlgID == AlgorithmID.Flags && ((encryptionInfo.Flags & (Flags.fAES | Flags.fExternal | Flags.fCryptoAPI)) == (Flags.fAES | Flags.fCryptoAPI)))
                 ||
@@ -690,7 +690,7 @@ private MemoryStream DecryptBinary(EncryptionInfoBinary encryptionInfo, string p
                                                              key,
                                                              null);
 
-                    var dataStream = RecyclableMemoryStream.GetStream(encryptedData);
+                    var dataStream = new MemoryStream(encryptedData);
                     var cryptoStream = new CryptoStream(dataStream,
                                                                   decryptor,
                                                                   CryptoStreamMode.Read);
@@ -730,14 +730,14 @@ private bool IsPasswordValid(byte[] key, EncryptionInfoBinary encryptionInfo)
 
 
             //Decrypt the verifier
-            MemoryStream dataStream = RecyclableMemoryStream.GetStream(encryptionInfo.Verifier.EncryptedVerifier);
+            MemoryStream dataStream = new MemoryStream(encryptionInfo.Verifier.EncryptedVerifier);
             CryptoStream cryptoStream = new CryptoStream(dataStream,
                                                           decryptor,
                                                           CryptoStreamMode.Read);
             var decryptedVerifier = new byte[16];
             cryptoStream.Read(decryptedVerifier, 0, 16);
 
-            dataStream = RecyclableMemoryStream.GetStream(encryptionInfo.Verifier.EncryptedVerifierHash);
+            dataStream = new MemoryStream(encryptionInfo.Verifier.EncryptedVerifierHash);
 
             cryptoStream = new CryptoStream(dataStream,
                                                 decryptor,
@@ -803,7 +803,7 @@ private byte[] DecryptAgileFromKey(EncryptionInfoAgile.EncryptionKeyData encr, b
                                                         FixHashSize(iv, encr.BlockSize, 0x36));
 
 
-            MemoryStream dataStream = RecyclableMemoryStream.GetStream(encryptedData);
+            MemoryStream dataStream = new MemoryStream(encryptedData);
 
             CryptoStream cryptoStream = new CryptoStream(dataStream,
                                                             decryptor,

src/EPPlus/EPPlus/Encryption/EncryptionHeader.cs

@@ -80,7 +80,7 @@ internal class EncryptionHeader
         internal string CSPName;            //SHOULD<11> be set to either "Microsoft Enhanced RSA and AES Cryptographic Provider" or "Microsoft Enhanced RSA and AES Cryptographic Provider (Prototype)" as a null-terminated Unicode string.
         internal byte[] WriteBinary()
         {
-            MemoryStream ms = RecyclableMemoryStream.GetStream();
+            MemoryStream ms = new MemoryStream();
             BinaryWriter bw = new BinaryWriter(ms);
 
             bw.Write((int)Flags);

src/EPPlus/EPPlus/Encryption/EncryptionInfo.cs

@@ -566,7 +566,7 @@ internal override void Read(byte[] data)
         }
         internal byte[] WriteBinary()
         {
-            MemoryStream ms = RecyclableMemoryStream.GetStream();
+            MemoryStream ms = new MemoryStream();
             BinaryWriter bw = new BinaryWriter(ms);
 
             bw.Write(MajorVersion);

src/EPPlus/EPPlus/Encryption/EncryptionVerifier.cs

@@ -45,7 +45,7 @@ internal class EncryptionVerifier
         internal byte[] EncryptedVerifierHash; //(variable): An array of bytes that contains the encrypted form of the hash of the randomly generated Verifier value. The length of the array MUST be the size of the encryption block size multiplied by the number of blocks needed to encrypt the hash of the Verifier. If the encryption algorithm is RC4, the length MUST be 20 bytes. If the encryption algorithm is AES, the length MUST be 32 bytes.
         internal byte[] WriteBinary()
         {
-            MemoryStream ms = RecyclableMemoryStream.GetStream();
+            MemoryStream ms = new MemoryStream();
             BinaryWriter bw = new BinaryWriter(ms);
 
             bw.Write(SaltSize);

src/EPPlus/EPPlus/ExcelPackage.cs

@@ -555,8 +555,8 @@ private void CreateFromTemplate(FileInfo template, string password)
             if (template != null) template.Refresh();
             if (template.Exists)
             {
-                if (_stream == null) _stream = RecyclableMemoryStream.GetStream();
-                var ms = RecyclableMemoryStream.GetStream();
+                if (_stream == null) _stream = new MemoryStream();
+                var ms = new MemoryStream();
                 if (password != null)
                 {
                     Encryption.IsEncrypted = true;
@@ -592,8 +592,8 @@ private void CreateFromTemplate(FileInfo template, string password)
         }
         private void ConstructNewFile(string password)
         {
-            var ms = RecyclableMemoryStream.GetStream();
-            if (_stream == null) _stream = RecyclableMemoryStream.GetStream();
+            var ms = new MemoryStream();
+            if (_stream == null) _stream = new MemoryStream();
             if (File != null) File.Refresh();
             if (File != null && File.Exists)
             {
@@ -842,7 +842,7 @@ public void Save()
                 {
                     if (Encryption.IsEncrypted)
                     {
-                        var ms = RecyclableMemoryStream.GetStream();
+                        var ms = new MemoryStream();
                         _package.Save(ms);
                         byte[] file = ms.ToArray();
                         EncryptedPackageHandler eph = new EncryptedPackageHandler();
@@ -999,7 +999,7 @@ internal void CloseStream()
                 _stream.Dispose();
             }
 
-            _stream = RecyclableMemoryStream.GetStream();
+            _stream = new MemoryStream();
         }
         /// <summary>
         /// The output stream. This stream is the not the encrypted package.
@@ -1166,7 +1166,7 @@ internal async Task<byte[]> GetAsByteArrayAsync(bool save)
         /// <param name="input">The input.</param>
         public void Load(Stream input)
         {
-            Load(input, RecyclableMemoryStream.GetStream(), null);
+            Load(input, new MemoryStream(), null);
         }
         /// <summary>
         /// Loads the specified package data from a stream.
@@ -1175,7 +1175,7 @@ public void Load(Stream input)
         /// <param name="Password">The password to decrypt the document</param>
         public void Load(Stream input, string Password)
         {
-            Load(input, RecyclableMemoryStream.GetStream(), Password);
+            Load(input, new MemoryStream(), Password);
         }
         /// <summary>
         /// 
@@ -1205,7 +1205,7 @@ private void Load(Stream input, Stream output, string Password)
             }
             else
             {
-                Stream ms = RecyclableMemoryStream.GetStream();
+                Stream ms = new MemoryStream();
                 this._stream = output;
                 if (Password != null)
                 {

src/EPPlus/EPPlus/ExcelWorksheet.cs

@@ -899,7 +899,7 @@ private void CreateXml()
 
             // now release stream buffer (already converted whole Xml into XmlDocument Object and String)
             stream.Dispose();
-            packPart.Stream = RecyclableMemoryStream.GetStream();
+            packPart.Stream = new MemoryStream();
 
             //first char is invalid sometimes?? 
             if (xml[0] != '<')

src/EPPlus/EPPlus/Magicodes.IE.EPPlus.csproj

@@ -53,7 +53,6 @@
 		<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.0" />
 	</ItemGroup>
 	<ItemGroup>
-		<PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="2.1.1" />
 		<PackageReference Include="SkiaSharp" Version="2.88.6" />
 	</ItemGroup>
 

src/EPPlus/EPPlus/Packaging/DotNetZip/ZipFile.AddUpdate.cs

@@ -1199,7 +1199,7 @@ public ZipEntry AddEntry(string entryName, string content, System.Text.Encoding
         {
             // cannot employ a using clause here.  We need the stream to
             // persist after exit from this method.
-            var ms = RecyclableMemoryStream.GetStream();
+            var ms = new MemoryStream();
 
             // cannot use a using clause here; StreamWriter takes
             // ownership of the stream and Disposes it before we are ready.
@@ -1858,7 +1858,7 @@ private void RemoveEntryForUpdate(string entryName)
         public ZipEntry AddEntry(string entryName, byte[] byteContent)
         {
             if (byteContent == null) throw new ArgumentException("bad argument", "byteContent");
-            var ms = RecyclableMemoryStream.GetStream(byteContent);
+            var ms = new MemoryStream(byteContent);
             return AddEntry(entryName, ms);
         }
 

src/EPPlus/EPPlus/Packaging/DotNetZip/ZipFile.Save.cs

@@ -522,7 +522,7 @@ public void Save(String fileName)
         ///     zip.Password = "VerySecret.";
         ///     zip.Encryption = EncryptionAlgorithm.WinZipAes128;
         ///     zip.AddFile(sourceFileName);
-        ///     MemoryStream output = RecyclableMemoryStream.GetStream();
+        ///     MemoryStream output = new MemoryStream();
         ///     zip.Save(output);
         ///
         ///     byte[] zipbytes = output.ToArray();
@@ -606,7 +606,7 @@ public static bool WriteCentralDirectoryStructure(Stream s,
             // write to a memory stream in order to keep the
             // CDR contiguous
             Int64 aLength = 0;
-            using (var ms = RecyclableMemoryStream.GetStream())
+            using (var ms = new MemoryStream())
             {
                 foreach (ZipEntry e in entries)
                 {

src/EPPlus/EPPlus/Packaging/DotNetZip/Zlib/GZipStream.cs

@@ -946,7 +946,7 @@ private int EmitHeader()
         /// <returns>The string in compressed form</returns>
         public static byte[] CompressString(String s)
         {
-            using (var ms = RecyclableMemoryStream.GetStream())
+            using (var ms = new MemoryStream())
             {
                 System.IO.Stream compressor =
                     new GZipStream(ms, CompressionMode.Compress, CompressionLevel.BestCompression);
@@ -974,7 +974,7 @@ public static byte[] CompressString(String s)
         /// <returns>The data in compressed form</returns>
         public static byte[] CompressBuffer(byte[] b)
         {
-            using (var ms = RecyclableMemoryStream.GetStream())
+            using (var ms = new MemoryStream())
             {
                 System.IO.Stream compressor =
                     new GZipStream(ms, CompressionMode.Compress, CompressionLevel.BestCompression);
@@ -999,7 +999,7 @@ public static byte[] CompressBuffer(byte[] b)
         /// <returns>The uncompressed string</returns>
         public static String UncompressString(byte[] compressed)
         {
-            using (var input = RecyclableMemoryStream.GetStream(compressed))
+            using (var input = new MemoryStream(compressed))
             {
                 Stream decompressor = new GZipStream(input, CompressionMode.Decompress);
                 return ZlibBaseStream.UncompressString(compressed, decompressor);