diff --git a/.github/workflows/pull_request_checks_main.yml b/.github/workflows/pull_request_checks_main.yml index d7cb045a3..1f29a69f7 100644 --- a/.github/workflows/pull_request_checks_main.yml +++ b/.github/workflows/pull_request_checks_main.yml @@ -54,8 +54,9 @@ jobs: needs: [ pre_job ] duplicate_samples: name: Duplicate Samples 🪞 - if: ${{ github.event.action == 'ready_for_review' || github.event.label.name == 'ready-to-merge'}} + if: ${{ (github.event.action == 'ready_for_review' || (!github.event.pull_request.draft && contains( github.event.pull_request.labels.*.name, 'ready-to-merge'))) && needs.check_commit.outputs.commit_message != 'Sync Dependencies - Auto Commit'}} uses: ChainSafe/web3.unity/.github/workflows/duplicate_samples.yaml@main + needs: [ check_commit ] secrets: inherit sync_dependencies: name: Sync Dependencies 🔄 diff --git a/Packages/io.chainsafe.web3-unity.hyperplay/Runtime/Libraries/ChainSafe.Gaming.HyperPlay.dll b/Packages/io.chainsafe.web3-unity.hyperplay/Runtime/Libraries/ChainSafe.Gaming.HyperPlay.dll index 16028c473..cc130184c 100644 Binary files a/Packages/io.chainsafe.web3-unity.hyperplay/Runtime/Libraries/ChainSafe.Gaming.HyperPlay.dll and b/Packages/io.chainsafe.web3-unity.hyperplay/Runtime/Libraries/ChainSafe.Gaming.HyperPlay.dll differ diff --git a/Packages/io.chainsafe.web3-unity.lootboxes/Chainlink/Runtime/Libraries/ChainSafe.Gaming.Lootboxes.Chainlink.dll b/Packages/io.chainsafe.web3-unity.lootboxes/Chainlink/Runtime/Libraries/ChainSafe.Gaming.Lootboxes.Chainlink.dll index 61fc6c793..f72f21cd1 100644 Binary files a/Packages/io.chainsafe.web3-unity.lootboxes/Chainlink/Runtime/Libraries/ChainSafe.Gaming.Lootboxes.Chainlink.dll and b/Packages/io.chainsafe.web3-unity.lootboxes/Chainlink/Runtime/Libraries/ChainSafe.Gaming.Lootboxes.Chainlink.dll differ diff --git a/Packages/io.chainsafe.web3-unity.lootboxes/Chainlink/Runtime/Libraries/Chainsafe.Gaming.Chainlink.dll b/Packages/io.chainsafe.web3-unity.lootboxes/Chainlink/Runtime/Libraries/Chainsafe.Gaming.Chainlink.dll index ff044097f..1a62f0013 100644 Binary files a/Packages/io.chainsafe.web3-unity.lootboxes/Chainlink/Runtime/Libraries/Chainsafe.Gaming.Chainlink.dll and b/Packages/io.chainsafe.web3-unity.lootboxes/Chainlink/Runtime/Libraries/Chainsafe.Gaming.Chainlink.dll differ diff --git a/Packages/io.chainsafe.web3-unity.mud/Runtime/Libraries/ChainSafe.Gaming.Mud.dll b/Packages/io.chainsafe.web3-unity.mud/Runtime/Libraries/ChainSafe.Gaming.Mud.dll index d8b01a689..260edc819 100644 Binary files a/Packages/io.chainsafe.web3-unity.mud/Runtime/Libraries/ChainSafe.Gaming.Mud.dll and b/Packages/io.chainsafe.web3-unity.mud/Runtime/Libraries/ChainSafe.Gaming.Mud.dll differ 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 index 1a670fd19..4fbf1a7f1 100644 Binary files a/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.Debugging.dll and b/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.Debugging.dll differ 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 index 95b884af8..d8fcd8859 100644 Binary files a/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.Gelato.dll and b/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.Gelato.dll differ 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 index 47e2c7b4a..a6f67d951 100644 Binary files a/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.InProcessSigner.dll and b/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.InProcessSigner.dll differ diff --git a/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.InProcessTransactionExecutor.dll b/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.InProcessTransactionExecutor.dll index 2e436578d..b6e7b4c1b 100644 Binary files a/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.InProcessTransactionExecutor.dll and b/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.InProcessTransactionExecutor.dll differ diff --git a/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.Marketplace.dll b/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.Marketplace.dll index e7b41d5d3..220dec4ce 100644 Binary files a/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.Marketplace.dll and b/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.Marketplace.dll differ diff --git a/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.SygmaClient.dll b/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.SygmaClient.dll index 06cadb7fd..d0a56a1fd 100644 Binary files a/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.SygmaClient.dll and b/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.SygmaClient.dll differ diff --git a/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.Unity.EthereumWindow.dll b/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.Unity.EthereumWindow.dll index d3fe4314c..1d5458eed 100644 Binary files a/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.Unity.EthereumWindow.dll and b/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.Unity.EthereumWindow.dll differ diff --git a/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.Unity.MetaMask.dll b/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.Unity.MetaMask.dll index 2359830d9..e059a5045 100644 Binary files a/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.Unity.MetaMask.dll and b/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.Unity.MetaMask.dll differ 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 index 68bff0211..fd909f3b0 100644 Binary files a/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.Unity.ThirdParty.dll and b/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.Unity.ThirdParty.dll differ 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 index 04c6eb54e..fedf0a33a 100644 Binary files a/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.Unity.dll and b/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.Unity.dll differ 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 index f24862aca..ed8d7afd3 100644 Binary files a/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.WalletConnect.dll and b/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.WalletConnect.dll differ diff --git a/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.dll b/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.dll index d90f8798f..934d7a970 100644 Binary files a/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.dll and b/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.dll differ diff --git a/Setup/SyncDependencies.cs b/Setup/SyncDependencies.cs index 3f991170b..fe154c8b3 100644 --- a/Setup/SyncDependencies.cs +++ b/Setup/SyncDependencies.cs @@ -58,13 +58,23 @@ public void Run() foreach (string name in namespaces) { - File.Copy(Path.Combine(source, $"{name}.dll"), Path.Combine(destination, $"{name}.dll"), true); + string fileSource = Path.Combine(source, $"{name}.dll"); + + string fileDestination = Path.Combine(destination, $"{name}.dll"); + + File.Copy(fileSource, fileDestination, true); + + AddMetaFile(fileDestination); #if DEBUG - string filePath = Path.Combine(source, $"{name}.pdb"); + fileSource = fileSource.Replace(".dll", ".pdb"); - if (File.Exists(filePath)) + if (File.Exists(fileSource)) { - File.Copy(filePath, Path.Combine(destination, $"{name}.pdb"), true); + fileDestination = fileDestination.Replace(".dll", ".pdb"); + + File.Copy(fileSource, fileDestination, true); + + AddMetaFile(fileDestination); } #endif Console.WriteLine(name); @@ -77,4 +87,21 @@ public void Run() Console.WriteLine("Dependencies Synced Successfully!"); } + + private void AddMetaFile(string destination) + { + destination += ".meta"; + + if (File.Exists(destination)) return; + + string text = File.ReadAllText("meta_file_template.txt"); + + string guid = Guid.NewGuid().ToString(); + + guid = guid.Replace("-", string.Empty); + + text = text.Replace("[[assetGuid]]", guid.Substring(0, 32)); + + File.WriteAllText(destination, text); + } } \ No newline at end of file diff --git a/Setup/meta_file_template.txt b/Setup/meta_file_template.txt new file mode 100644 index 000000000..a2fc81a9b --- /dev/null +++ b/Setup/meta_file_template.txt @@ -0,0 +1,33 @@ +fileFormatVersion: 2 +guid: [[assetGuid]] +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + defineConstraints: [] + isPreloaded: 0 + isOverridable: 1 + isExplicitlyReferenced: 0 + validateReferences: 1 + platformData: + - first: + Any: + second: + enabled: 1 + settings: {} + - first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + - first: + Windows Store Apps: WindowsStoreApps + second: + enabled: 0 + settings: + CPU: AnyCPU + userData: + assetBundleName: + assetBundleVariant: diff --git a/src/UnitySampleProject/Packages/packages-lock.json b/src/UnitySampleProject/Packages/packages-lock.json index 57abdf312..06d1a6023 100644 --- a/src/UnitySampleProject/Packages/packages-lock.json +++ b/src/UnitySampleProject/Packages/packages-lock.json @@ -182,7 +182,7 @@ "source": "local", "dependencies": { "com.unity.nuget.newtonsoft-json": "3.0.2", - "io.chainsafe.web3-unity": "3.0.5" + "io.chainsafe.web3-unity": "3.0.6" } }, "io.chainsafe.web3-unity.lootboxes": { @@ -190,7 +190,7 @@ "depth": 0, "source": "local", "dependencies": { - "io.chainsafe.web3-unity": "3.0.5" + "io.chainsafe.web3-unity": "3.0.6" } }, "io.chainsafe.web3-unity.marketplace": { @@ -199,7 +199,7 @@ "source": "local", "dependencies": { "com.unity.nuget.newtonsoft-json": "3.0.2", - "io.chainsafe.web3-unity": "3.0.5" + "io.chainsafe.web3-unity": "3.0.6" } }, "io.chainsafe.web3-unity.mud": { @@ -207,7 +207,7 @@ "depth": 0, "source": "local", "dependencies": { - "io.chainsafe.web3-unity": "3.0.5" + "io.chainsafe.web3-unity": "3.0.6" } }, "io.chainsafe.web3-unity.ramp": { @@ -216,7 +216,7 @@ "source": "local", "dependencies": { "com.unity.nuget.newtonsoft-json": "3.0.2", - "io.chainsafe.web3-unity": "3.0.5" + "io.chainsafe.web3-unity": "3.0.6" } }, "io.chainsafe.web3-unity.web3auth": { @@ -225,7 +225,7 @@ "source": "local", "dependencies": { "com.unity.nuget.newtonsoft-json": "3.0.2", - "io.chainsafe.web3-unity": "3.0.5" + "io.chainsafe.web3-unity": "3.0.6" } }, "nuget.mono-cecil": { diff --git a/src/UnitySampleProject/ProjectSettings/EditorBuildSettings.asset b/src/UnitySampleProject/ProjectSettings/EditorBuildSettings.asset index 08b5a5691..1aeb29328 100644 --- a/src/UnitySampleProject/ProjectSettings/EditorBuildSettings.asset +++ b/src/UnitySampleProject/ProjectSettings/EditorBuildSettings.asset @@ -6,6 +6,6 @@ EditorBuildSettings: serializedVersion: 2 m_Scenes: - enabled: 1 - path: Assets/Samples/web3.unity SDK/3.0.5/Web3.Unity Samples/Scenes/SampleMain.unity + path: Assets/Samples/web3.unity SDK/3.0.6/Web3.Unity Samples/Scenes/SampleMain.unity guid: 516f54f8261cf44459691b7adc25e055 m_configObjects: {}