net8

Ragath · Ragath · commit 15686a140972 · 2024-08-18T12:28:56.000+02:00
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -3,31 +3,31 @@
   "isRoot": true,
   "tools": {
     "dotnet-mgcb": {
-      "version": "3.8.1.303",
+      "version": "3.8.2.1105",
       "commands": [
         "mgcb"
       ]
     },
     "dotnet-mgcb-editor": {
-      "version": "3.8.1.303",
+      "version": "3.8.2.1105",
       "commands": [
         "mgcb-editor"
       ]
     },
     "dotnet-mgcb-editor-linux": {
-      "version": "3.8.1.303",
+      "version": "3.8.2.1105",
       "commands": [
         "mgcb-editor-linux"
       ]
     },
     "dotnet-mgcb-editor-windows": {
-      "version": "3.8.1.303",
+      "version": "3.8.2.1105",
       "commands": [
         "mgcb-editor-windows"
       ]
     },
     "dotnet-mgcb-editor-mac": {
-      "version": "3.8.1.303",
+      "version": "3.8.2.1105",
       "commands": [
         "mgcb-editor-mac"
       ]
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -34,13 +34,13 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 7.0.x
+        dotnet-version: 8.0.x
 
     - name: Build
-      run: dotnet build -p:Version=$GITVERSION_NUGETVERSION
+      run: dotnet build --configuration Release -p:Version=$GITVERSION_NUGETVERSION
 
     - name: Test
-      run: dotnet test --no-build --verbosity normal
+      run: dotnet test --configuration Release --no-build --verbosity normal
       
     - name: Pack
       run: dotnet pack --no-build -o ./ -p:Version=$GITVERSION_NUGETVERSION
diff --git a/TiledLib.Pipeline/TiledLib.Pipeline.csproj b/TiledLib.Pipeline/TiledLib.Pipeline.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFramework>net6.0</TargetFramework>
+		<TargetFramework>net8.0</TargetFramework>
 	</PropertyGroup>
 
 	<PropertyGroup>
@@ -24,10 +24,10 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="MonoGame.Framework.Content.Pipeline" Version="3.8.1.303">
+		<PackageReference Include="MonoGame.Framework.Content.Pipeline" Version="3.8.2.1105">
 			<PrivateAssets>All</PrivateAssets>
 		</PackageReference>
-		<PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.1.303">
+		<PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.2.1105">
 			<PrivateAssets>All</PrivateAssets>
 		</PackageReference>
 	</ItemGroup>
diff --git a/TiledLib.Tests/TiledLib.Tests.csproj b/TiledLib.Tests/TiledLib.Tests.csproj
@@ -1,18 +1,21 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFramework>net7.0</TargetFramework>
+		<TargetFramework>net8.0</TargetFramework>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
 
 		<IsPackable>false</IsPackable>
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
-		<PackageReference Include="MSTest.TestAdapter" Version="2.2.10" />
-		<PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
-		<PackageReference Include="coverlet.collector" Version="3.1.2" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
+		<PackageReference Include="MSTest.TestAdapter" Version="3.5.2" />
+		<PackageReference Include="MSTest.TestFramework" Version="3.5.2" />
+		<PackageReference Include="coverlet.collector" Version="6.0.2">
+		  <PrivateAssets>all</PrivateAssets>
+		  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+		</PackageReference>
 	</ItemGroup>
 
 	<ItemGroup>
diff --git a/TiledLib.sln b/TiledLib.sln
@@ -1,14 +1,20 @@
 ﻿
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29009.5
+# Visual Studio Version 17
+VisualStudioVersion = 17.10.34928.147
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TiledLib", "TiledLib\TiledLib.csproj", "{39334840-001D-48E5-A13C-4A9CA6BAB142}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TiledLib.Pipeline", "TiledLib.Pipeline\TiledLib.Pipeline.csproj", "{8F4869B1-35A2-4EC7-86C5-D60143E3FC05}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TiledLib.Tests", "TiledLib.Tests\TiledLib.Tests.csproj", "{13A3D034-B392-4027-ADEE-8BE3AF17FEC5}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{AF61C04A-6F22-49BE-B73C-C55CFC207962}"
+	ProjectSection(SolutionItems) = preProject
+		.config\dotnet-tools.json = .config\dotnet-tools.json
+		.github\workflows\dotnet.yml = .github\workflows\dotnet.yml
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
diff --git a/TiledLib/Layer/BaseLayer.cs b/TiledLib/Layer/BaseLayer.cs
@@ -42,5 +42,5 @@ public abstract class BaseLayer
 
     [JsonPropertyName("properties")]
     [JsonConverter(typeof(PropertiesConverter))]
-    public Dictionary<string, string> Properties { get; init; } = new Dictionary<string, string>();
+    public Dictionary<string, string> Properties { get; init; } = [];
 }
diff --git a/TiledLib/Map.cs b/TiledLib/Map.cs
@@ -9,17 +9,15 @@ namespace TiledLib;
 [XmlRoot("map")]
 public class Map : IXmlSerializable
 {
-    [Required]
     [JsonPropertyName("version")]
     [JsonConverter(typeof(VersionConverter))]
-    public string Version { get; set; } = "1.0";
+    public required string Version { get; set; } = "1.0";
 
     [JsonPropertyName("tiledversion")]
     public string TiledVersion { get; set; }
 
-    [Required]
     [JsonPropertyName("orientation")]
-    public Orientation Orientation { get; set; }
+    public required Orientation Orientation { get; set; }
 
     [JsonPropertyName("renderorder")]
     public RenderOrder RenderOrder { get; set; }
@@ -67,7 +65,7 @@ public class Map : IXmlSerializable
 
     [JsonPropertyName("properties")]
     [JsonConverter(typeof(PropertiesConverter))]
-    public Dictionary<string, string> Properties { get; init; } = new Dictionary<string, string>();
+    public Dictionary<string, string> Properties { get; init; } = [];
 
     /// <summary>
     /// Parses map from JSON stream
diff --git a/TiledLib/Objects/BaseObject.cs b/TiledLib/Objects/BaseObject.cs
@@ -27,7 +27,7 @@ public abstract class BaseObject
 
     [JsonPropertyName("properties")]
     [JsonConverter(typeof(PropertiesConverter))]
-    public Dictionary<string, string> Properties { get; init; } = new Dictionary<string, string>();
+    public Dictionary<string, string> Properties { get; init; } = [];
 
     public BaseObject(Dictionary<string, string> properties) { Properties = properties; }
 }
diff --git a/TiledLib/Objects/EllipseObject.cs b/TiledLib/Objects/EllipseObject.cs
@@ -7,7 +7,7 @@ namespace TiledLib.Objects;
 public class EllipseObject : BaseObject, IXmlSerializable
 {
     public EllipseObject(Dictionary<string, string> properties) : base(properties) { }
-    public EllipseObject() : base(new Dictionary<string, string>()) { }
+    public EllipseObject() : base([]) { }
 
     [JsonPropertyName("ellipse")]
     public bool IsEllipse { get; set; }
diff --git a/TiledLib/Objects/PointObject.cs b/TiledLib/Objects/PointObject.cs
@@ -3,5 +3,5 @@
 public class PointObject : BaseObject
 {
     internal PointObject(Dictionary<string, string> properties) : base(properties) { }
-    public PointObject() : base(new Dictionary<string, string>()) { }
+    public PointObject() : base([]) { }
 }
diff --git a/TiledLib/Objects/PolyLineObject.cs b/TiledLib/Objects/PolyLineObject.cs
@@ -3,7 +3,7 @@
 public class PolyLineObject : BaseObject
 {
     internal PolyLineObject(Dictionary<string, string> properties) : base(properties) { }
-    public PolyLineObject() : base(new Dictionary<string, string>()) { }
+    public PolyLineObject() : base([]) { }
 
     public Position[] Polyline { get; set; }
 }
diff --git a/TiledLib/Objects/PolygonObject.cs b/TiledLib/Objects/PolygonObject.cs
@@ -3,7 +3,7 @@
 public class PolygonObject : BaseObject
 {
     internal PolygonObject(Dictionary<string, string> properties) : base(properties) { }
-    public PolygonObject() : base(new Dictionary<string, string>()) { }
+    public PolygonObject() : base([]) { }
 
     public Position[] Polygon { get; set; }
 }
diff --git a/TiledLib/Objects/RectangleObject.cs b/TiledLib/Objects/RectangleObject.cs
@@ -3,5 +3,5 @@
 public class RectangleObject : BaseObject
 {
     internal RectangleObject(Dictionary<string, string> properties) : base(properties) { }
-    public RectangleObject() : base(new Dictionary<string, string>()) { }
+    public RectangleObject() : base([]) { }
 }
diff --git a/TiledLib/Objects/TileObject.cs b/TiledLib/Objects/TileObject.cs
@@ -3,7 +3,7 @@
 public class TileObject : BaseObject
 {
     internal TileObject(Dictionary<string, string> properties) : base(properties) { }
-    public TileObject() : base(new Dictionary<string, string>()) { }
+    public TileObject() : base([]) { }
 
     [JsonPropertyName("gid")]
     public int Gid { get; set; }
diff --git a/TiledLib/TiledLib.csproj b/TiledLib/TiledLib.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+		<TargetFrameworks>net8.0</TargetFrameworks>
 	</PropertyGroup>
 
 	<PropertyGroup>
diff --git a/TiledLib/Tileset.cs b/TiledLib/Tileset.cs
@@ -37,14 +37,14 @@ public class Tileset : ITileset, IXmlSerializable
 
     [JsonPropertyName("properties")]
     [JsonConverter(typeof(PropertiesConverter))]
-    public Dictionary<string, string> Properties { get; init; } = new Dictionary<string, string>();
+    public Dictionary<string, string> Properties { get; init; } = [];
     [JsonPropertyName("tileproperties")]
-    public Dictionary<int, Dictionary<string, string>> TileProperties { get; init; } = new Dictionary<int, Dictionary<string, string>>();
+    public Dictionary<int, Dictionary<string, string>> TileProperties { get; init; } = [];
 
 
 
     [JsonIgnore] //TODO: Add json support
-    public Dictionary<int, Frame[]> TileAnimations { get; init; } = new Dictionary<int, Frame[]>();
+    public Dictionary<int, Frame[]> TileAnimations { get; init; } = [];
 
     public Tile this[uint gid]
     {
diff --git a/TiledLib/TmxMisc.cs b/TiledLib/TmxMisc.cs
@@ -94,7 +94,7 @@ static void ReadTile(this XmlReader reader, Dictionary<int, Dictionary<string, s
 
         var id = int.Parse(reader["id"]);
         if (!tileProperties.TryGetValue(id, out var properties) || properties == null)
-            properties = tileProperties[id] = new Dictionary<string, string>();
+            properties = tileProperties[id] = [];
 
         if (reader.IsEmptyElement)
         {
@@ -186,25 +186,18 @@ public static uint[] ReadData(this XmlReader reader, int count, out string encod
         encoding = reader["encoding"];
         compression = reader["compression"];
 
-        switch (encoding)
+        return encoding switch
         {
-            case "csv":
-                return reader.ReadCSV(count);
-            case "base64":
-                switch (compression)
-                {
-                    case null:
-                        return reader.ReadBase64(count);
-                    case "gzip":
-                        return reader.ReadBase64Decompress((stream, mode) => new Zlib.GZipStream(stream, mode), count);
-                    case "zlib":
-                        return reader.ReadBase64Decompress((stream, mode) => new Zlib.ZlibStream(stream, mode), count);
-                    default:
-                        throw new XmlException(compression);
-                }
-            default:
-                throw new NotImplementedException($"Encoding: {encoding}");
-        }
+            "csv" => reader.ReadCSV(count),
+            "base64" => compression switch
+            {
+                null => reader.ReadBase64(count),
+                "gzip" => reader.ReadBase64Decompress((stream, mode) => new Zlib.GZipStream(stream, mode), count),
+                "zlib" => reader.ReadBase64Decompress((stream, mode) => new Zlib.ZlibStream(stream, mode), count),
+                _ => throw new XmlException(compression),
+            },
+            _ => throw new NotImplementedException($"Encoding: {encoding}"),
+        };
     }
 
     public static void WriteAttribute(this XmlWriter writer, string localName, int? value)
@@ -214,7 +207,6 @@ public static void WriteAttribute(this XmlWriter writer, string localName, int?
         writer.WriteAttribute(localName, value.Value);
     }
 
-
     public static void WriteAttribute(this XmlWriter writer, string localName, Orientation value)
     {
         switch (value)

Original file line number	Diff line number	Diff line change
`@@ -42,5 +42,5 @@ public abstract class BaseLayer`
`42`	`42`
`43`	`43`	`[JsonPropertyName("properties")]`
`44`	`44`	`[JsonConverter(typeof(PropertiesConverter))]`
`45`		`- public Dictionary<string, string> Properties { get; init; } = new Dictionary<string, string>();`
	`45`	`+ public Dictionary<string, string> Properties { get; init; } = [];`
`46`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public abstract class BaseObject`
`27`	`27`
`28`	`28`	`[JsonPropertyName("properties")]`
`29`	`29`	`[JsonConverter(typeof(PropertiesConverter))]`
`30`		`- public Dictionary<string, string> Properties { get; init; } = new Dictionary<string, string>();`
	`30`	`+ public Dictionary<string, string> Properties { get; init; } = [];`
`31`	`31`
`32`	`32`	`public BaseObject(Dictionary<string, string> properties) { Properties = properties; }`
`33`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ namespace TiledLib.Objects;`
`7`	`7`	`public class EllipseObject : BaseObject, IXmlSerializable`
`8`	`8`	`{`
`9`	`9`	`public EllipseObject(Dictionary<string, string> properties) : base(properties) { }`
`10`		`- public EllipseObject() : base(new Dictionary<string, string>()) { }`
	`10`	`+ public EllipseObject() : base([]) { }`
`11`	`11`
`12`	`12`	`[JsonPropertyName("ellipse")]`
`13`	`13`	`public bool IsEllipse { get; set; }`
Original file line number	Diff line number	Diff line change
`@@ -3,5 +3,5 @@`
`3`	`3`	`public class PointObject : BaseObject`
`4`	`4`	`{`
`5`	`5`	`internal PointObject(Dictionary<string, string> properties) : base(properties) { }`
`6`		`- public PointObject() : base(new Dictionary<string, string>()) { }`
	`6`	`+ public PointObject() : base([]) { }`
`7`	`7`	`}`