diff --git a/Source/MonoGame.Extended.Collisions/MonoGame.Extended.Collisions.csproj b/Source/MonoGame.Extended.Collisions/MonoGame.Extended.Collisions.csproj
index abb4c4328..e8ce9fb14 100644
--- a/Source/MonoGame.Extended.Collisions/MonoGame.Extended.Collisions.csproj
+++ b/Source/MonoGame.Extended.Collisions/MonoGame.Extended.Collisions.csproj
@@ -17,7 +17,12 @@
-
+
+
+
+ All
+
+
\ No newline at end of file
diff --git a/Source/MonoGame.Extended.Content.Pipeline/MonoGame.Extended.Content.Pipeline.csproj b/Source/MonoGame.Extended.Content.Pipeline/MonoGame.Extended.Content.Pipeline.csproj
index a6ca456b7..f6f3de80b 100644
--- a/Source/MonoGame.Extended.Content.Pipeline/MonoGame.Extended.Content.Pipeline.csproj
+++ b/Source/MonoGame.Extended.Content.Pipeline/MonoGame.Extended.Content.Pipeline.csproj
@@ -28,7 +28,12 @@
-
+
+ All
+
+
+ All
+
diff --git a/Source/MonoGame.Extended.Content.Pipeline/Tiled/TiledMapProcessor.cs b/Source/MonoGame.Extended.Content.Pipeline/Tiled/TiledMapProcessor.cs
index ed9229259..93e5b9ace 100644
--- a/Source/MonoGame.Extended.Content.Pipeline/Tiled/TiledMapProcessor.cs
+++ b/Source/MonoGame.Extended.Content.Pipeline/Tiled/TiledMapProcessor.cs
@@ -1,14 +1,14 @@
using System;
using System.Collections.Generic;
using System.IO;
-using System.IO.Compression;
using System.Linq;
using Microsoft.Xna.Framework.Content.Pipeline;
using Microsoft.Xna.Framework.Content.Pipeline.Graphics;
using MonoGame.Extended.Tiled;
using MonoGame.Extended.Tiled.Serialization;
-using MonoGame.Utilities;
+using MonoGame.Framework.Utilities.Deflate;
using CompressionMode = System.IO.Compression.CompressionMode;
+using GZipStream = System.IO.Compression.GZipStream;
namespace MonoGame.Extended.Content.Pipeline.Tiled
{
@@ -324,15 +324,12 @@ private static Stream OpenStream(byte[] decodedData, string compressionMode)
{
var memoryStream = new MemoryStream(decodedData, false);
- switch (compressionMode)
+ return compressionMode switch
{
- case "gzip":
- return new GZipStream(memoryStream, CompressionMode.Decompress);
- case "zlib":
- return new ZlibStream(memoryStream, Utilities.CompressionMode.Decompress);
- default:
- return memoryStream;
- }
+ "gzip" => new GZipStream(memoryStream, CompressionMode.Decompress),
+ "zlib" => new ZlibStream(memoryStream, Framework.Utilities.Deflate.CompressionMode.Decompress),
+ _ => memoryStream
+ };
}
}
}
\ No newline at end of file
diff --git a/Source/MonoGame.Extended.Entities/MonoGame.Extended.Entities.csproj b/Source/MonoGame.Extended.Entities/MonoGame.Extended.Entities.csproj
index f90a73d8b..c013972c5 100644
--- a/Source/MonoGame.Extended.Entities/MonoGame.Extended.Entities.csproj
+++ b/Source/MonoGame.Extended.Entities/MonoGame.Extended.Entities.csproj
@@ -17,7 +17,12 @@
-
+
+
+
+ All
+
+
\ No newline at end of file
diff --git a/Source/MonoGame.Extended.Graphics/MonoGame.Extended.Graphics.csproj b/Source/MonoGame.Extended.Graphics/MonoGame.Extended.Graphics.csproj
index 85b3ac915..3a8a6c4bc 100644
--- a/Source/MonoGame.Extended.Graphics/MonoGame.Extended.Graphics.csproj
+++ b/Source/MonoGame.Extended.Graphics/MonoGame.Extended.Graphics.csproj
@@ -37,7 +37,12 @@
-
+
+
+
+ All
+
+
\ No newline at end of file
diff --git a/Source/MonoGame.Extended.Gui/MonoGame.Extended.Gui.csproj b/Source/MonoGame.Extended.Gui/MonoGame.Extended.Gui.csproj
index 93bde97c7..730cbff0d 100644
--- a/Source/MonoGame.Extended.Gui/MonoGame.Extended.Gui.csproj
+++ b/Source/MonoGame.Extended.Gui/MonoGame.Extended.Gui.csproj
@@ -17,8 +17,13 @@
-
+
+
+
+ All
+
+
\ No newline at end of file
diff --git a/Source/MonoGame.Extended.Input/MonoGame.Extended.Input.csproj b/Source/MonoGame.Extended.Input/MonoGame.Extended.Input.csproj
index e27ad6b6d..a8f7b7d85 100644
--- a/Source/MonoGame.Extended.Input/MonoGame.Extended.Input.csproj
+++ b/Source/MonoGame.Extended.Input/MonoGame.Extended.Input.csproj
@@ -17,7 +17,12 @@
-
+
+
+
+ All
+
+
\ No newline at end of file
diff --git a/Source/MonoGame.Extended.NuclexGui/MonoGame.Extended.NuclexGui.csproj b/Source/MonoGame.Extended.NuclexGui/MonoGame.Extended.NuclexGui.csproj
index fce9f6388..bdce2213b 100644
--- a/Source/MonoGame.Extended.NuclexGui/MonoGame.Extended.NuclexGui.csproj
+++ b/Source/MonoGame.Extended.NuclexGui/MonoGame.Extended.NuclexGui.csproj
@@ -17,7 +17,6 @@
-
@@ -27,4 +26,10 @@
PreserveNewest
+
+
+
+ All
+
+
\ No newline at end of file
diff --git a/Source/MonoGame.Extended.Particles/MonoGame.Extended.Particles.csproj b/Source/MonoGame.Extended.Particles/MonoGame.Extended.Particles.csproj
index 76bdfa0b2..b5cbd77ec 100644
--- a/Source/MonoGame.Extended.Particles/MonoGame.Extended.Particles.csproj
+++ b/Source/MonoGame.Extended.Particles/MonoGame.Extended.Particles.csproj
@@ -21,7 +21,12 @@
-
+
+
+
+ All
+
+
\ No newline at end of file
diff --git a/Source/MonoGame.Extended.SceneGraphs/MonoGame.Extended.SceneGraphs.csproj b/Source/MonoGame.Extended.SceneGraphs/MonoGame.Extended.SceneGraphs.csproj
index a3939fce8..7e8d4844b 100644
--- a/Source/MonoGame.Extended.SceneGraphs/MonoGame.Extended.SceneGraphs.csproj
+++ b/Source/MonoGame.Extended.SceneGraphs/MonoGame.Extended.SceneGraphs.csproj
@@ -17,7 +17,12 @@
-
+
+
+
+ All
+
+
\ No newline at end of file
diff --git a/Source/MonoGame.Extended.Tiled/MonoGame.Extended.Tiled.csproj b/Source/MonoGame.Extended.Tiled/MonoGame.Extended.Tiled.csproj
index 3c0141af4..cc8fa1f71 100644
--- a/Source/MonoGame.Extended.Tiled/MonoGame.Extended.Tiled.csproj
+++ b/Source/MonoGame.Extended.Tiled/MonoGame.Extended.Tiled.csproj
@@ -21,8 +21,13 @@
-
+
+
+
+ All
+
+
\ No newline at end of file
diff --git a/Source/MonoGame.Extended.Tweening/MonoGame.Extended.Tweening.csproj b/Source/MonoGame.Extended.Tweening/MonoGame.Extended.Tweening.csproj
index fe71ba50a..aead719f7 100644
--- a/Source/MonoGame.Extended.Tweening/MonoGame.Extended.Tweening.csproj
+++ b/Source/MonoGame.Extended.Tweening/MonoGame.Extended.Tweening.csproj
@@ -17,7 +17,12 @@
-
+
+
+
+ All
+
+
\ No newline at end of file
diff --git a/Source/MonoGame.Extended/MonoGame.Extended.csproj b/Source/MonoGame.Extended/MonoGame.Extended.csproj
index 2a28639f3..a4156bc71 100644
--- a/Source/MonoGame.Extended/MonoGame.Extended.csproj
+++ b/Source/MonoGame.Extended/MonoGame.Extended.csproj
@@ -17,7 +17,12 @@
-
+
+ All
+
+
+ All
+
diff --git a/Source/MonoGame.Extended/TextureAtlases/TextureAtlasJsonContentTypeReader.cs b/Source/MonoGame.Extended/TextureAtlases/TextureAtlasJsonContentTypeReader.cs
index a0749cd09..e339679b5 100644
--- a/Source/MonoGame.Extended/TextureAtlases/TextureAtlasJsonContentTypeReader.cs
+++ b/Source/MonoGame.Extended/TextureAtlases/TextureAtlasJsonContentTypeReader.cs
@@ -4,6 +4,7 @@
using MonoGame.Extended.Content;
using MonoGame.Extended.Serialization;
using Newtonsoft.Json;
+using ContentReaderExtensions = MonoGame.Extended.Content.ContentReaderExtensions;
namespace MonoGame.Extended.TextureAtlases
{
diff --git a/Source/Tests/MonoGame.Extended.Collisions.Tests/MonoGame.Extended.Collisions.Tests.csproj b/Source/Tests/MonoGame.Extended.Collisions.Tests/MonoGame.Extended.Collisions.Tests.csproj
index 33434d7fb..e77e29f86 100644
--- a/Source/Tests/MonoGame.Extended.Collisions.Tests/MonoGame.Extended.Collisions.Tests.csproj
+++ b/Source/Tests/MonoGame.Extended.Collisions.Tests/MonoGame.Extended.Collisions.Tests.csproj
@@ -6,7 +6,7 @@
-
+
diff --git a/Source/Tests/MonoGame.Extended.Content.Pipeline.Tests.Tiled/MonoGame.Extended.Content.Pipeline.Tests.Tiled.csproj b/Source/Tests/MonoGame.Extended.Content.Pipeline.Tests.Tiled/MonoGame.Extended.Content.Pipeline.Tests.Tiled.csproj
index 3b20cf333..442338595 100644
--- a/Source/Tests/MonoGame.Extended.Content.Pipeline.Tests.Tiled/MonoGame.Extended.Content.Pipeline.Tests.Tiled.csproj
+++ b/Source/Tests/MonoGame.Extended.Content.Pipeline.Tests.Tiled/MonoGame.Extended.Content.Pipeline.Tests.Tiled.csproj
@@ -37,7 +37,8 @@
-
+
+
diff --git a/Source/Tests/MonoGame.Extended.Content.Pipeline.Tests/MonoGame.Extended.Content.Pipeline.Tests.csproj b/Source/Tests/MonoGame.Extended.Content.Pipeline.Tests/MonoGame.Extended.Content.Pipeline.Tests.csproj
index 3a13a2e59..c9c81e50c 100644
--- a/Source/Tests/MonoGame.Extended.Content.Pipeline.Tests/MonoGame.Extended.Content.Pipeline.Tests.csproj
+++ b/Source/Tests/MonoGame.Extended.Content.Pipeline.Tests/MonoGame.Extended.Content.Pipeline.Tests.csproj
@@ -5,7 +5,8 @@
-
+
+
diff --git a/Source/Tests/MonoGame.Extended.Entities.Tests/MonoGame.Extended.Entities.Tests.csproj b/Source/Tests/MonoGame.Extended.Entities.Tests/MonoGame.Extended.Entities.Tests.csproj
index 2e35c8698..e78622b34 100644
--- a/Source/Tests/MonoGame.Extended.Entities.Tests/MonoGame.Extended.Entities.Tests.csproj
+++ b/Source/Tests/MonoGame.Extended.Entities.Tests/MonoGame.Extended.Entities.Tests.csproj
@@ -5,7 +5,7 @@
-
+
diff --git a/Source/Tests/MonoGame.Extended.Gui.Tests/MonoGame.Extended.Gui.Tests.csproj b/Source/Tests/MonoGame.Extended.Gui.Tests/MonoGame.Extended.Gui.Tests.csproj
index 28394d62c..9dbb59e6a 100644
--- a/Source/Tests/MonoGame.Extended.Gui.Tests/MonoGame.Extended.Gui.Tests.csproj
+++ b/Source/Tests/MonoGame.Extended.Gui.Tests/MonoGame.Extended.Gui.Tests.csproj
@@ -5,7 +5,7 @@
-
+
diff --git a/Source/Tests/MonoGame.Extended.Tests/MonoGame.Extended.Tests.csproj b/Source/Tests/MonoGame.Extended.Tests/MonoGame.Extended.Tests.csproj
index 1390d7d6b..c912b928d 100644
--- a/Source/Tests/MonoGame.Extended.Tests/MonoGame.Extended.Tests.csproj
+++ b/Source/Tests/MonoGame.Extended.Tests/MonoGame.Extended.Tests.csproj
@@ -5,7 +5,7 @@
-
+
diff --git a/Source/Tests/MonoGame.Extended.Tiled.Tests/MonoGame.Extended.Tiled.Tests.csproj b/Source/Tests/MonoGame.Extended.Tiled.Tests/MonoGame.Extended.Tiled.Tests.csproj
index 415418177..2576d4e56 100644
--- a/Source/Tests/MonoGame.Extended.Tiled.Tests/MonoGame.Extended.Tiled.Tests.csproj
+++ b/Source/Tests/MonoGame.Extended.Tiled.Tests/MonoGame.Extended.Tiled.Tests.csproj
@@ -5,7 +5,7 @@
-
+