Replace Close with Dispose for PORTABLE

2 files changed, 37 insertions, 2 deletions

diff --git a/crypto/src/openpgp/PgpCompressedDataGenerator.cs b/crypto/src/openpgp/PgpCompressedDataGenerator.cs

index 307fdbf08..ea366e0c6 100644
--- a/crypto/src/openpgp/PgpCompressedDataGenerator.cs
+++ b/crypto/src/openpgp/PgpCompressedDataGenerator.cs
@@ -173,10 +173,21 @@ namespace Org.BouncyCastle.Bcpg.OpenPgp
 			{
 			}
 
-			public override void Close()
+#if PORTABLE
+            protected override void Disposing(bool disposing)
+            {
+                if (disposing)
+                {
+				    Finish();
+                }
+                base.Dispose(disposing);
+            }
+#else
+            public override void Close()
 			{
 				Finish();
 			}
+#endif
 		}
 
 		private class SafeZOutputStream : ZOutputStream
@@ -186,11 +197,23 @@ namespace Org.BouncyCastle.Bcpg.OpenPgp
 			{
 			}
 
-			public override void Close()
+#if PORTABLE
+            protected override void Disposing(bool disposing)
+            {
+                if (disposing)
+                {
+				    Finish();
+				    End();
+                }
+                base.Dispose(disposing);
+            }
+#else
+            public override void Close()
 			{
 				Finish();
 				End();
 			}
+#endif
 		}
 	}
 }
diff --git a/crypto/src/openpgp/WrappedGeneratorStream.cs b/crypto/src/openpgp/WrappedGeneratorStream.cs

index cdc9befb3..ffa199255 100644
--- a/crypto/src/openpgp/WrappedGeneratorStream.cs
+++ b/crypto/src/openpgp/WrappedGeneratorStream.cs
@@ -17,9 +17,21 @@ namespace Org.BouncyCastle.Bcpg.OpenPgp
 			this.gen = gen;
 		}
 
+#if PORTABLE
+        protected override void Disposing(bool disposing)
+        {
+            if (disposing)
+            {
+                gen.Close();
+                return;
+            }
+            base.Dispose(disposing);
+        }
+#else
 		public override void Close()
 		{
 			gen.Close();
 		}
+#endif
 	}
 }