Merge branch 'develop' into main

Author: sandrofigo

CHANGELOG.md

@@ -7,6 +7,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 -->
 
+## [2.0.4] - 2022-12-29
+
+### Added
+
+- Support for OpenUPM package
+
 ## [2.0.3] - 2022-12-28
 
 ### Added

VoxReader/VoxReader.csproj

@@ -14,5 +14,10 @@
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
         <NoWarn>1591</NoWarn>
     </PropertyGroup>
+
+    <ItemGroup>
+      <None Remove="com.sandrofigo.voxreader.asmdef" />
+      <None Remove="package.json" />
+    </ItemGroup>
 
 </Project>

VoxReader/com.sandrofigo.voxreader.asmdef

@@ -0,0 +1,14 @@
+{
+    "name": "com.sandrofigo.voxreader",
+    "rootNamespace": "",
+    "references": [],
+    "includePlatforms": [],
+    "excludePlatforms": [],
+    "allowUnsafeCode": false,
+    "overrideReferences": false,
+    "precompiledReferences": [],
+    "autoReferenced": true,
+    "defineConstraints": [],
+    "versionDefines": [],
+    "noEngineReferences": false
+}

VoxReader/package.json

@@ -0,0 +1,22 @@
+{
+    "name": "com.sandrofigo.voxreader",
+    "version": "2.0.4",
+    "displayName": "VoxReader",
+    "description": "A C# library to read .vox files created with MagicaVoxel",
+    "documentationUrl": "https://github.com/sandrofigo/VoxReader",
+    "changelogUrl": "https://github.com/sandrofigo/VoxReader/blob/main/CHANGELOG.md",
+    "licensesUrl": "https://github.com/sandrofigo/VoxReader/blob/main/LICENSE.md",
+    "dependencies": {
+    },
+    "keywords": [
+        "parser",
+        "voxel",
+        "reader",
+        "vox",
+        "magicavoxel"
+    ],
+    "author": {
+        "name": "Sandro Figo",
+        "url": "https://sandrofigo.com"
+    }
+}

build/Build.cs

@@ -1,6 +1,8 @@
 using System;
 using System.IO;
 using Microsoft.AspNetCore.StaticFiles;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 using NuGet.Versioning;
 using Nuke.Common;
 using Nuke.Common.ChangeLog;
@@ -56,6 +58,14 @@ protected override void OnBuildInitialized()
             // Validate latest version in changelog file matches the version tag in git
             Assert.True(ChangelogTasksExtensions.TryGetLatestVersionInChangelog(RootDirectory / "CHANGELOG.md", out SemanticVersion version, out string rawVersionValue) && version == GitRepository.GetLatestVersionTag(),
                 $"Latest version '{rawVersionValue}' in the changelog file does not match the version tag '{GitRepository.GetLatestVersionTag()}'!");
+
+            // Verify version in Unity package file matches the version tag in git
+            dynamic packageFile = JsonConvert.DeserializeObject(File.ReadAllText(Solution.VoxReader.Directory / "package.json"));
+            SemanticVersion versionInPackageFile = SemanticVersion.Parse(packageFile.version.ToString());
+
+            SemanticVersion versionTag = GitRepository.GetLatestVersionTag();
+
+            Assert.True(versionInPackageFile == versionTag, $"The version '{versionInPackageFile}' in the Unity package file does not match the latest version tag '{versionTag}'!");
         }
     }