From 8c704ad18cf4cdbe1c4c64f27d45bf0cab697951 Mon Sep 17 00:00:00 2001
From: Cibbi <12004047+Cibbi@users.noreply.github.com>
Date: Fri, 22 Jul 2022 23:48:40 +0200
Subject: [PATCH 1/2] Update packaging

---
 .github/workflows/create-release.yml | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml
index 342ac7e..2b2a46a 100644
--- a/.github/workflows/create-release.yml
+++ b/.github/workflows/create-release.yml
@@ -20,19 +20,20 @@ jobs:
         run: |
           mkdir -p "Assets/VRLabs/ModularShaderSystem"
           ls | grep -v "Assets" | xargs mv -t "Assets/VRLabs/ModularShaderSystem"
-          echo "Assets/VRLabs.meta" > mssFullPackage
-          echo "Assets/VRLabs/ModularShaderSystem.meta" >> mssFullPackage
           echo -e "fileFormatVersion: 2\nguid: 652a1ba5b00554143bc9a76307dbc4e8\nfolderAsset: yes\nDefaultImporter:\n  externalObjects: {}\n  userData: \n  assetBundleName: \n  assetBundleVariant: " > "Assets/VRLabs.meta"
           echo -e "fileFormatVersion: 2\nguid: 433bedcd0ded4bcf993b0088e99f493c\nfolderAsset: yes\nDefaultImporter:\n  externalObjects: {}\n  userData: \n  assetBundleName: \n  assetBundleVariant: " > "Assets/VRLabs/ModularShaderSystem.meta"
           mkdir -p "Main"
+          mkdir -p "Examples"
           cp -r "Assets" "Main"
-          cp -r "Assets" "Examples"
-          rm -r "Examples/Assets/VRLabs/ModularShaderSystem/Examples"
-          find "Examples/Assets/VRLabs/ModularShaderSystem" -mindepth 1 ! -regex '^Examples/Assets/VRLabs/ModularShaderSystem\(/.*\)?' -delete
+          mkdir -p "Examples/Assets/VRLabs/ModularShaderSystem"
+          echo -e "fileFormatVersion: 2\nguid: 652a1ba5b00554143bc9a76307dbc4e8\nfolderAsset: yes\nDefaultImporter:\n  externalObjects: {}\n  userData: \n  assetBundleName: \n  assetBundleVariant: " > "Examples/Assets/VRLabs.meta"
+          echo -e "fileFormatVersion: 2\nguid: 433bedcd0ded4bcf993b0088e99f493c\nfolderAsset: yes\nDefaultImporter:\n  externalObjects: {}\n  userData: \n  assetBundleName: \n  assetBundleVariant: " > "Examples/Assets/VRLabs/ModularShaderSystem.meta"
+          mv "Main/Assets/VRLabs/ModularShaderSystem/Examples" "Examples/Assets/VRLabs/ModularShaderSystem"
+          mv "Main/Assets/VRLabs/ModularShaderSystem/Examples.meta" "Examples/Assets/VRLabs/ModularShaderSystem"
       - name: Create UnityPackage
         env:
           SOURCE_TAG: ${{ steps.branch_name.outputs.SOURCE_TAG }}
-        uses: FrostBanditTeam/extract-unity-package-action@1
+        uses: VRLabs/extract-unity-package-action@v1.2.1
         with:
           outputPackagePath: 'Modular.Shader.System.${{ env.SOURCE_TAG }}.unitypackage'
           unityProjectPath: 'Main'
@@ -40,7 +41,7 @@ jobs:
       - name: Create Examples UnityPackage
         env:
           SOURCE_TAG: ${{ steps.branch_name.outputs.SOURCE_TAG }}
-        uses: FrostBanditTeam/extract-unity-package-action@1
+        uses: VRLabs/extract-unity-package-action@v1.2.1
         with:
           outputPackagePath: 'Modular.Shader.System.Examples.${{ env.SOURCE_TAG }}.unitypackage'
           unityProjectPath: 'Examples'

From 79fe076862a6066fd283b06c10aa78838d78b4d2 Mon Sep 17 00:00:00 2001
From: Cibbi <12004047+Cibbi@users.noreply.github.com>
Date: Sat, 23 Jul 2022 01:17:06 +0200
Subject: [PATCH 2/2] Fix issue with asset name matching

---
 Editor/ShaderGenerator.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Editor/ShaderGenerator.cs b/Editor/ShaderGenerator.cs
index 0a1ed04..fe29f49 100644
--- a/Editor/ShaderGenerator.cs
+++ b/Editor/ShaderGenerator.cs
@@ -368,7 +368,7 @@ private static void AddFreshShaderToList(this Dictionary<TemplateAsset, Template
             switch (genericAsset)
             {
                 case TemplateCollectionAsset collection:
-                    template = collection.Templates.FirstOrDefault(x => assetName.Equals(asset.name));
+                    template = collection.Templates.FirstOrDefault(x => x.name.Equals(assetName));
                     break;
                 case TemplateAsset t:
                     template = t;