ChainSafe · robGG1997 · Jan 10, 2024 · Sep 14, 2023 · Sep 14, 2023 · Sep 14, 2023
diff --git a/.github/workflows/publish_dependencies.yml b/.github/workflows/publish_dependencies.yml
@@ -35,7 +35,10 @@ jobs:
 
           echo -e "DLLs Generated\n$(ls "$PUBLISH_PATH")"
 
-          export PACKAGE_DEPENDENCIES=($(<${GITHUB_WORKSPACE}/.github/data/published_dependencies.txt))
+          export PACKAGE_DEPENDENCIES=($(<${GITHUB_WORKSPACE}/scripts/data/published_dependencies.txt))
+
+          PACKAGE_DEPENDENCIES="${PACKAGE_DEPENDENCIES//$'\n'/ }"
+          PACKAGE_DEPENDENCIES="${PACKAGE_DEPENDENCIES//$'\r'/}"
 
           export DLL_META_FILE_TEMPLATE="${{ vars.DLL_META_FILE_TEMPLATE }}"
 

diff --git a/...web3-unity.lootboxes/Chainlink/Runtime/Libraries/ChainSafe.Gaming.Lootboxes.Chainlink.dll b/...web3-unity.lootboxes/Chainlink/Runtime/Libraries/ChainSafe.Gaming.Lootboxes.Chainlink.dll
diff --git a/...chainsafe.web3-unity.lootboxes/Chainlink/Runtime/Libraries/Chainsafe.Gaming.Chainlink.dll b/...chainsafe.web3-unity.lootboxes/Chainlink/Runtime/Libraries/Chainsafe.Gaming.Chainlink.dll
diff --git a/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.Debugging.dll b/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.Debugging.dll
diff --git a/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.Gelato.dll b/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.Gelato.dll
diff --git a/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.InProcessSigner.dll b/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.InProcessSigner.dll
diff --git a/...safe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.InProcessTransactionExecutor.Unity.dll b/...safe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.InProcessTransactionExecutor.Unity.dll
diff --git a/....chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.InProcessTransactionExecutor.dll b/....chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.InProcessTransactionExecutor.dll
diff --git a/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.MetaMask.Unity.dll b/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.MetaMask.Unity.dll
diff --git a/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.MetaMask.dll b/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.MetaMask.dll
diff --git a/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.Unity.ThirdParty.dll b/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.Unity.ThirdParty.dll
diff --git a/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.Unity.dll b/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.Unity.dll
diff --git a/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.WalletConnect.dll b/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.WalletConnect.dll
diff --git a/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.dll b/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.dll
diff --git a/.github/data/published_dependencies.txt → scripts/data/published_dependencies.txt b/.github/data/published_dependencies.txt → scripts/data/published_dependencies.txt
@@ -1 +1,2 @@
-Packages/io.chainsafe.web3-unity/Runtime/Libraries/:ADRaffy.ENSNormalize;Nethereum.Model;BouncyCastle.Crypto;Nethereum.RLP;ChainSafe.Gaming.Debugging;Nethereum.RPC;ChainSafe.Gaming.Gelato;Nethereum.Signer.EIP712;ChainSafe.Gaming.InProcessSigner;Nethereum.Signer;ChainSafe.Gaming.InProcessTransactionExecutor;Nethereum.Util;ChainSafe.Gaming.Unity.ThirdParty;Nethereum.Web3;ChainSafe.Gaming.Unity;System.Buffers;ChainSafe.Gaming.WalletConnect;System.Memory;ChainSafe.Gaming;System.Numerics.Vectors;Microsoft.Bcl.AsyncInterfaces;System.Reactive;Microsoft.Extensions.DependencyInjection.Abstractions;System.Runtime.CompilerServices.Unsafe;Microsoft.Extensions.DependencyInjection;System.Runtime.InteropServices.WindowsRuntime;Microsoft.Extensions.Logging.Abstractions;System.Security.Cryptography.Cng;Microsoft.IdentityModel.Abstractions;System.Text.Encodings.Web;Microsoft.IdentityModel.Logging;System.Text.Json;Microsoft.IdentityModel.Tokens;System.Threading.Channels;NBitcoin;System.Threading.Tasks.Extensions;Nethereum.ABI;WalletConnectSharp.Auth;Nethereum.Accounts;WalletConnectSharp.Common;WalletConnectSharp.Events;Nethereum.BlockchainProcessing;WalletConnectSharp.Core;Nethereum.Contracts;WalletConnectSharp.Crypto;Nethereum.Hex;Nethereum.JsonRpc.Client;WalletConnectSharp.Network.Websocket;Nethereum.JsonRpc.IpcClient;WalletConnectSharp.Network;Nethereum.JsonRpc.RpcClient;WalletConnectSharp.Sign;Nethereum.KeyStore;WalletConnectSharp.Storage;Nethereum.Merkle.Patricia;WalletConnectSharp.Web3Wallet;Nethereum.Merkle;Websocket.Client;Nethereum.Metamask;Nethereum.Siwe.Core;Nethereum.Siwe;Nethereum.UI;Nethereum.Unity.Metamask;Nethereum.Unity;ChainSafe.Gaming.MetaMask;ChainSafe.Gaming.MetaMask.Unity;ChainSafe.Gaming.InProcessTransactionExecutor.Unity Packages/io.chainsafe.web3-unity.lootboxes/Chainlink/Runtime/Libraries/:Chainsafe.Gaming.Chainlink;ChainSafe.Gaming.Lootboxes.Chainlink
+Packages/io.chainsafe.web3-unity/Runtime/Libraries/:ADRaffy.ENSNormalize;Nethereum.Model;BouncyCastle.Crypto;Nethereum.RLP;ChainSafe.Gaming.Debugging;Nethereum.RPC;ChainSafe.Gaming.Gelato;Nethereum.Signer.EIP712;ChainSafe.Gaming.InProcessSigner;Nethereum.Signer;ChainSafe.Gaming.InProcessTransactionExecutor;Nethereum.Util;ChainSafe.Gaming.Unity.ThirdParty;Nethereum.Web3;ChainSafe.Gaming.Unity;System.Buffers;ChainSafe.Gaming.WalletConnect;System.Memory;ChainSafe.Gaming;System.Numerics.Vectors;Microsoft.Bcl.AsyncInterfaces;System.Reactive;Microsoft.Extensions.DependencyInjection.Abstractions;System.Runtime.CompilerServices.Unsafe;Microsoft.Extensions.DependencyInjection;System.Runtime.InteropServices.WindowsRuntime;Microsoft.Extensions.Logging.Abstractions;System.Security.Cryptography.Cng;Microsoft.IdentityModel.Abstractions;System.Text.Encodings.Web;Microsoft.IdentityModel.Logging;System.Text.Json;Microsoft.IdentityModel.Tokens;System.Threading.Channels;NBitcoin;System.Threading.Tasks.Extensions;Nethereum.ABI;WalletConnectSharp.Auth;Nethereum.Accounts;WalletConnectSharp.Common;WalletConnectSharp.Events;Nethereum.BlockchainProcessing;WalletConnectSharp.Core;Nethereum.Contracts;WalletConnectSharp.Crypto;Nethereum.Hex;Nethereum.JsonRpc.Client;WalletConnectSharp.Network.Websocket;Nethereum.JsonRpc.IpcClient;WalletConnectSharp.Network;Nethereum.JsonRpc.RpcClient;WalletConnectSharp.Sign;Nethereum.KeyStore;WalletConnectSharp.Storage;Nethereum.Merkle.Patricia;WalletConnectSharp.Web3Wallet;Nethereum.Merkle;Websocket.Client;Nethereum.Metamask;Nethereum.Siwe.Core;Nethereum.Siwe;Nethereum.UI;Nethereum.Unity.Metamask;Nethereum.Unity;ChainSafe.Gaming.MetaMask;ChainSafe.Gaming.MetaMask.Unity;ChainSafe.Gaming.InProcessTransactionExecutor.Unity
+Packages/io.chainsafe.web3-unity.lootboxes/Chainlink/Runtime/Libraries/:Chainsafe.Gaming.Chainlink;ChainSafe.Gaming.Lootboxes.Chainlink
diff --git a/scripts/publish-to-unity-package.bat b/scripts/publish-to-unity-package.bat
@@ -11,32 +11,34 @@ dotnet restore
 dotnet publish -c release -f netstandard2.1 /property:Unity=true
 if %errorlevel% neq 0 exit /b %errorlevel%
 
-echo Restoring non-Unity packages...
+echo Moving files to Unity package...
 
 echo Moving files to Unity package...
 
-pushd bin\release\netstandard2.1\publish
-del Newtonsoft.Json.dll
-del UnityEngine.dll
-
-if exist "..\..\..\..\..\..\Packages\io.chainsafe.web3-unity.lootboxes" (
-    echo Directory exists, performing actions...
-    rmdir /s /q "..\..\..\..\..\..\Packages\io.chainsafe.web3-unity.lootboxes\Chainlink\Runtime\Libraries"
-    mkdir "..\..\..\..\..\..\Packages\io.chainsafe.web3-unity.lootboxes\Chainlink\Runtime\Libraries"
-    copy Chainsafe.Gaming.Chainlink.dll "..\..\..\..\..\..\Packages\io.chainsafe.web3-unity.lootboxes\Chainlink\Runtime\Libraries"
-    copy Chainsafe.Gaming.LootBoxes.Chainlink.dll "..\..\..\..\..\..\Packages\io.chainsafe.web3-unity.lootboxes\Chainlink\Runtime\Libraries"
-) else (
-    echo Directory does not exist, skipping actions.
+set "PUBLISH_PATH=bin\Release\netstandard2.1\publish"
+
+echo DLLs Generated
+dir /b "%PUBLISH_PATH%"
+
+setlocal enabledelayedexpansion
+set "PACKAGE_DEPENDENCIES_FILE=%SCRIPT_DIR%\data\published_dependencies.txt"
+
+for /f "usebackq tokens=*" %%a in (%PACKAGE_DEPENDENCIES_FILE%) do (
+    for /f "tokens=1,* delims=:" %%b in ('echo %%a') do (
+        set "PACKAGE_LIB_PATH=%SCRIPT_DIR%\..\%%b"
+
+        if exist "!PACKAGE_LIB_PATH!" (
+            del /q "!PACKAGE_LIB_PATH!\*.dll"
+        ) else (
+            mkdir "!PACKAGE_LIB_PATH!"
+        )
+
+        for %%d in (%%c) do (
+            copy "%PUBLISH_PATH%\%%d.dll" "!PACKAGE_LIB_PATH!"
+        )
+    )
 )
 
-del Chainsafe.Gaming.Chainlink.dll
-del Chainsafe.Gaming.LootBoxes.Chainlink.dll
-
-del Microsoft.CSharp.dll
-if not exist ..\..\..\..\..\..\Packages\io.chainsafe.web3-unity\Runtime\Libraries mkdir ..\..\..\..\..\..\Packages\io.chainsafe.web3-unity\Runtime\Libraries\
-del ..\..\..\..\..\..\Packages\io.chainsafe.web3-unity\Runtime\Libraries\* /F /Q
-copy *.dll ..\..\..\..\..\..\Packages\io.chainsafe.web3-unity\Runtime\Libraries
-popd
 popd
 
 echo Done
diff --git a/scripts/publish-to-unity-package.sh b/scripts/publish-to-unity-package.sh
@@ -16,26 +16,35 @@ dotnet restore
 
 echo Moving files to Unity package...
 
-pushd bin/release/netstandard2.1/publish
-rm Newtonsoft.Json.dll
-rm UnityEngine.dll
-
-# Check if io.chainsafe.web3-unity.lootboxes directory exists
-if [ -d "../../../../../../Packages/io.chainsafe.web3-unity.lootboxes" ]; then
-    rm -rf ../../../../../../Packages/io.chainsafe.web3-unity.lootboxes/Chainlink/Runtime/Libraries
-    mkdir -p ../../../../../../Packages/io.chainsafe.web3-unity.lootboxes/Chainlink/Runtime/Libraries
-    cp Chainsafe.Gaming.Chainlink.dll ../../../../../../Packages/io.chainsafe.web3-unity.lootboxes/Chainlink/Runtime/Libraries
-    cp Chainsafe.Gaming.LootBoxes.Chainlink.dll ../../../../../../Packages/io.chainsafe.web3-unity.lootboxes/Chainlink/Runtime/Libraries
-fi
-
-# Delete those DLLs so they don't get copied in the next step
-rm Chainsafe.Gaming.Chainlink.dll
-rm Chainsafe.Gaming.LootBoxes.Chainlink.dll
-
-rm Microsoft.CSharp.dll
-rm -rf ../../../../../../Packages/io.chainsafe.web3-unity/Runtime/Libraries
-mkdir -p ../../../../../../Packages/io.chainsafe.web3-unity/Runtime/Libraries
-cp *.dll ../../../../../../Packages/io.chainsafe.web3-unity/Runtime/Libraries
-popd
+export PUBLISH_PATH="bin/Release/netstandard2.1/publish"
+
+echo -e "DLLs Generated\n$(ls "$PUBLISH_PATH")"
+
+export PACKAGE_DEPENDENCIES=($(<$scripts_dir/data/published_dependencies.txt))
+
+PACKAGE_DEPENDENCIES="${PACKAGE_DEPENDENCIES//$'\n'/ }"
+PACKAGE_DEPENDENCIES="${PACKAGE_DEPENDENCIES//$'\r'/}"
+
+for entry in "${PACKAGE_DEPENDENCIES[@]}"
+do
+  IFS=':' read -ra dirs <<< "$entry"
+
+  export PACKAGE_LIB_PATH=$scripts_dir/../${dirs[0]}
+
+  if [ -d "$PACKAGE_LIB_PATH" ]; then
+    rm -f "$PACKAGE_LIB_PATH"*.dll
+  else
+    mkdir -p "$PACKAGE_LIB_PATH"
+  fi
+
+  IFS=';' read -ra dependencies <<< "${dirs[1]}"
+
+  for dependency in "${dependencies[@]}"
+  do
+    cp "$PUBLISH_PATH/$dependency.dll" $PACKAGE_LIB_PATH
+  done
+done
+
 popd
+
 echo Done