Handle runtime dlls

Author: bobuc-havok

src/UnityNuGet.Tests/UnityMetaTests.cs

@@ -8,7 +8,9 @@ public class UnityMetaTests
         [Test]
         public void GetMetaForDll_FormatsDefineConstraintsProperly_WithoutConstraints()
         {
-            var output = UnityMeta.GetMetaForDll(Guid.NewGuid(), true, Array.Empty<string>(), Array.Empty<string>());
+            var platformDefs = PlatformDefinition.CreateAllPlatforms();
+            var anyOs = platformDefs.Find(UnityOs.AnyOs, UnityCpu.AnyCpu);
+            var output = UnityMeta.GetMetaForDll(Guid.NewGuid(), anyOs, Array.Empty<string>(), Array.Empty<string>());
             StringAssert.DoesNotContain("defineConstraints", output);
 
             // This is on the same line in the template, so ensure it's intact
@@ -18,7 +20,9 @@ public void GetMetaForDll_FormatsDefineConstraintsProperly_WithoutConstraints()
         [Test]
         public void GetMetaForDll_FormatsLabelsProperly_WithoutLabels()
         {
-            var output = UnityMeta.GetMetaForDll(Guid.NewGuid(), true, Array.Empty<string>(), Array.Empty<string>());
+            var platformDefs = PlatformDefinition.CreateAllPlatforms();
+            var anyOs = platformDefs.Find(UnityOs.AnyOs, UnityCpu.AnyCpu);
+            var output = UnityMeta.GetMetaForDll(Guid.NewGuid(), anyOs, Array.Empty<string>(), Array.Empty<string>());
             StringAssert.DoesNotContain("labels", output);
 
             // This is on the same line in the template, so ensure it's intact
@@ -30,7 +34,9 @@ public void GetMetaForDll_FormatsLabelsProperly_WithoutLabels()
         public void GetMetaForDll_FormatsDefineConstraintsProperly_WithConstraints(
             string[] constraints, string expected)
         {
-            var output = UnityMeta.GetMetaForDll(Guid.NewGuid(), true, Array.Empty<string>(), constraints);
+            var platformDefs = PlatformDefinition.CreateAllPlatforms();
+            var anyOs = platformDefs.Find(UnityOs.AnyOs, UnityCpu.AnyCpu);
+            var output = UnityMeta.GetMetaForDll(Guid.NewGuid(), anyOs, Array.Empty<string>(), constraints);
 
             StringAssert.Contains(expected, output);
 
@@ -43,7 +49,9 @@ public void GetMetaForDll_FormatsDefineConstraintsProperly_WithConstraints(
         public void GetMetaForDll_FormatsLabelsProperly_WithLabels(
             string[] labels, string expected)
         {
-            var output = UnityMeta.GetMetaForDll(Guid.NewGuid(), true, labels, Array.Empty<string>());
+            var platformDefs = PlatformDefinition.CreateAllPlatforms();
+            var anyOs = platformDefs.Find(UnityOs.AnyOs, UnityCpu.AnyCpu);
+            var output = UnityMeta.GetMetaForDll(Guid.NewGuid(), anyOs, labels, Array.Empty<string>());
 
             StringAssert.Contains(expected, output);
 
@@ -55,15 +63,29 @@ public void GetMetaForDll_FormatsLabelsProperly_WithLabels(
         [TestCase(false, "0")]
         public void GetMetaForDll_FormatsAnyPlatformEnabledProperly(bool value, string expected)
         {
-            var output = UnityMeta.GetMetaForDll(Guid.NewGuid(), value, Array.Empty<string>(), Array.Empty<string>());
+            PlatformDefinition platformDef;
+
+            if (value)
+            {
+                var platformDefs = PlatformDefinition.CreateAllPlatforms();
+                platformDef = platformDefs.Find(UnityOs.AnyOs, UnityCpu.AnyCpu);
+            }
+            else
+            {
+                platformDef = new PlatformDefinition(UnityOs.AnyOs, UnityCpu.None, isEditorConfig: false);
+            }
+
+            var output = UnityMeta.GetMetaForDll(Guid.NewGuid(), platformDef, Array.Empty<string>(), Array.Empty<string>());
 
             StringAssert.Contains($"\n  platformData:\n  - first:\n      Any:\n    second:\n      enabled: {expected}\n", output);
         }
 
         [Test]
         public void GetMetaForDll_ContainsNoWindowsNewlines()
         {
-            var output = UnityMeta.GetMetaForDll(Guid.NewGuid(), true, Array.Empty<string>(), new[] { "TEST" });
+            var platformDefs = PlatformDefinition.CreateAllPlatforms();
+            var anyOs = platformDefs.Find(UnityOs.AnyOs, UnityCpu.AnyCpu);
+            var output = UnityMeta.GetMetaForDll(Guid.NewGuid(), anyOs, Array.Empty<string>(), new[] { "TEST" });
             StringAssert.DoesNotContain("\r", output);
         }
     }

src/UnityNuGet/NativeLibraries.cs

@@ -5,13 +5,14 @@
 using System.Threading;
 using NuGet.Common;
 using NuGet.Packaging;
-using Scriban;
 
 namespace UnityNuGet
 {
     static class NativeLibraries
     {
-        public static async IAsyncEnumerable<(string file, string[] folders, string platform, string architecture)> GetSupportedNativeLibsAsync(PackageReaderBase packageReader, ILogger logger)
+        public static async IAsyncEnumerable<(string file, string[] folders, UnityOs os, UnityCpu cpu)> GetSupportedNativeLibsAsync(
+            PackageReaderBase packageReader,
+            ILogger logger)
         {
             var versions = await packageReader.GetItemsAsync(PackagingConstants.Folders.Runtimes, CancellationToken.None);
             var files = versions.SelectMany(v => v.Items);
@@ -35,144 +36,36 @@ static class NativeLibraries
                     continue;
                 }
 
-                var platform = system[0][..3] switch
+                UnityOs? os = system[0][..3] switch
                 {
-                    "lin" => "Linux",
-                    "osx" => "OSX",
-                    "win" => "Windows",
+                    "lin" => UnityOs.Linux,
+                    "osx" => UnityOs.OSX,
+                    "win" => UnityOs.Windows,
                     _ => null
                 };
 
-                if (platform is null)
+                if (os is null)
                 {
-                    logger.LogInformation($"Skipping file for unsupported platform: {file} ...");
+                    logger.LogInformation($"Skipping file for unsupported OS: {file} ...");
                     continue;
                 }
 
-                var architecture = system[1] switch
+                UnityCpu? cpu = system[1] switch
                 {
-                    "x86" => "x86",
-                    "x64" => "x86_64",
-                    "arm64" => "ARM64",
+                    "x86" => UnityCpu.X86,
+                    "x64" => UnityCpu.X64,
+                    "arm64" => UnityCpu.ARM64,
                     _ => null
                 };
 
-                if (architecture is null)
+                if (cpu is null)
                 {
-                    logger.LogInformation($"Skipping file for unsupported architecture: {file} ...");
+                    logger.LogInformation($"Skipping file for unsupported CPU: {file} ...");
                     continue;
                 }
 
-                yield return (file, folders, platform, architecture);
+                yield return (file, folders, os.Value, cpu.Value);
             }
         }
-
-        private readonly struct PlatformEnables
-        {
-            public readonly int Editor, Linux64, OSXUniversal, Win, Win64;
-
-            public PlatformEnables(int editor, int linux64, int oSXUniversal, int win, int win64)
-            {
-                Editor = editor;
-                Linux64 = linux64;
-                OSXUniversal = oSXUniversal;
-                Win = win;
-                Win64 = win64;
-            }
-        }
-
-        public static string? GetMetaForNative(Guid guid, string platform, string architecture, string[] labels)
-        {
-            // TODO: Support other platforms
-            PlatformEnables? enables = (platform, architecture) switch
-            {
-                ("Linux", _) => new(1, 1, 0, 0, 0),
-                ("OSX", _) => new(1, 0, 1, 0, 0),
-                ("Windows", "x86") => new(0, 0, 0, 1, 0),
-                ("Windows", "x86_64") => new(1, 0, 0, 0, 1),
-                _ => null,
-            };
-
-            if (enables is null) return null;
-
-            const string text = @"{{ cpu(x) = x == 1 ? architecture : ""None"" }}fileFormatVersion: 2
-guid: {{ guid }}
-{{ labels }}PluginImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  iconMap: {}
-  executionOrder: {}
-  defineConstraints: []
-  isPreloaded: 0
-  isOverridable: 0
-  isExplicitlyReferenced: 0
-  validateReferences: 1
-  platformData:
-  - first:
-      : Any
-    second:
-      enabled: 0
-      settings:
-        Exclude Editor: {{ 1 - enables.Editor }}
-        Exclude Linux64: {{ 1 - enables.Linux64 }}
-        Exclude OSXUniversal: {{ 1 - enables.OSXUniversal }}
-        Exclude Win: {{ 1 - enables.Win }}
-        Exclude Win64: {{ 1 - enables.Win64 }}
-  - first:
-      Any: 
-    second:
-      enabled: 1
-      settings: {}
-  - first:
-      Editor: Editor
-    second:
-      enabled: {{ enables.Editor }}
-      settings:
-        CPU: {{ cpu enables.Editor }}
-        DefaultValueInitialized: true
-        OS: {{ enables.Editor == 1 ? platform : ""None"" }}
-  - first:
-      Standalone: Linux64
-    second:
-      enabled: {{ enables.Linux64 }}
-      settings:
-        CPU: {{ cpu enables.Linux64 }}
-  - first:
-      Standalone: OSXUniversal
-    second:
-      enabled: {{ enables.OSXUniversal }}
-      settings:
-        CPU: {{ cpu enables.OSXUniversal }}
-  - first:
-      Standalone: Win
-    second:
-      enabled: {{ enables.Win }}
-      settings:
-        CPU: {{ cpu enables.Win }}
-  - first:
-      Standalone: Win64
-    second:
-      enabled: {{ enables.Win64 }}
-      settings:
-        CPU: {{ cpu enables.Win64 }}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
-";
-
-            return Template
-                .Parse(text)
-                .Render(new
-                {
-                    guid = guid.ToString("N"),
-                    enables,
-                    platform,
-                    architecture,
-                    labels = labels.Length == 0
-                    ? string.Empty
-                    : $"labels:\n{string.Concat(labels.Select(l => $"  - {l}\n"))}",
-                })
-                .Replace("\r\n", "\n");
-        }
     }
 }