Modified to skip the assemblies in the TPA list when applying TAC

diff --git a/NativeLauncher/tool/tac_common.cc b/NativeLauncher/tool/tac_common.cc
index 33d3eb6..1baa97f 100644 (file)
--- a/NativeLauncher/tool/tac_common.cc
+++ b/NativeLauncher/tool/tac_common.cc
@@ -452,8 +452,9 @@ std::vector<std::string> depsJsonParser(std::string rootPath, std::string execNa
                                                                for (auto& assembly : assemblies.getMemberNames()) {
                                                                        std::string assemblyName = assembly.substr(assembly.rfind('/') + 1);
                                                                        //Skip the assembly present in the TPA list
-                                                                       for (auto& tpa : tpaAssemblies) {
-                                                                               if (!strcmp(replaceAll(tpa, ".ni.dll", ".dll").c_str(), assembly.c_str())) {
+                                                                       for (auto& tpaPath : tpaAssemblies) {
+                                                                               std::string tpaName = replaceAll(tpaPath.substr(tpaPath.rfind('/') + 1), ".ni.dll", ".dll");
+                                                                               if (!strcmp(tpaName.c_str(), assemblyName.c_str())) {
                                                                                        isExistTpaAssembly = true;
                                                                                        break;
                                                                                }