struct deps_asset_t
{
- deps_asset_t() : deps_asset_t(_X(""), version_t(), version_t()) { }
+ deps_asset_t() : deps_asset_t(_X(""), _X(""), version_t(), version_t()) { }
- deps_asset_t(const pal::string_t& relative_path, const version_t& assembly_version, const version_t& file_version)
- : relative_path(get_replaced_char(relative_path, _X('\\'), _X('/'))) // Deps file does not follow spec. It uses '\\', should use '/'
+ deps_asset_t(const pal::string_t& name, const pal::string_t& relative_path, const version_t& assembly_version, const version_t& file_version)
+ : name(name)
+ , relative_path(get_replaced_char(relative_path, _X('\\'), _X('/'))) // Deps file does not follow spec. It uses '\\', should use '/'
, assembly_version(assembly_version)
- , file_version(file_version)
- , name(get_filename_without_ext(relative_path)) { }
+ , file_version(file_version) { }
pal::string_t name;
pal::string_t relative_path;
for (const auto& asset : get_assets_fn(library.first, i, &rid_specific))
{
bool ni_dll = false;
- auto asset_name = get_filename_without_ext(asset.relative_path);
+ auto asset_name = asset.name;
if (ends_with(asset_name, _X(".ni"), false))
{
ni_dll = true;
entry.is_rid_specific = rid_specific;
entry.deps_file = deps_file;
entry.asset = asset;
+ entry.asset.name = asset_name;
m_deps_entries[i].push_back(entry);
version_t::parse(file_version_str, &file_version);
}
- deps_asset_t asset(file.first, assembly_version, file_version);
+ deps_asset_t asset(get_filename_without_ext(file.first), file.first, assembly_version, file_version);
trace::info(_X("Adding runtimeTargets %s asset %s rid=%s assemblyVersion=%s fileVersion=%s from %s"),
deps_entry_t::s_known_asset_types[i],
version_t::parse(file_version_str, &file_version);
}
- deps_asset_t asset(file.first, assembly_version, file_version);
+ deps_asset_t asset(get_filename_without_ext(file.first), file.first, assembly_version, file_version);
trace::info(_X("Adding %s asset %s assemblyVersion=%s fileVersion=%s from %s"),
deps_entry_t::s_known_asset_types[i],
dir_name.c_str(),
file_path.c_str());
- deps_asset_t asset(file_name, empty, empty);
+ deps_asset_t asset(file_name, file, empty, empty);
deps_resolved_asset_t resolved_asset(asset, file_path);
add_tpa_asset(resolved_asset, items);
}
existing_entry = nullptr;
items.erase(existing);
- deps_asset_t asset(entry.asset.relative_path, entry.asset.assembly_version, entry.asset.file_version);
+ deps_asset_t asset(entry.asset.name, entry.asset.relative_path, entry.asset.assembly_version, entry.asset.file_version);
deps_resolved_asset_t resolved_asset(asset, resolved_path);
add_tpa_asset(resolved_asset, &items);
}
// First add managed assembly to the TPA.
// TODO: Remove: the deps should contain the managed DLL.
// Workaround for: csc.deps.json doesn't have the csc.dll
- pal::string_t managed_app_asset = get_filename_without_ext(m_managed_app);
- deps_asset_t asset(managed_app_asset, version_t(), version_t());
+ deps_asset_t asset(get_filename_without_ext(m_managed_app), get_filename(m_managed_app), version_t(), version_t());
deps_resolved_asset_t resolved_asset(asset, m_managed_app);
add_tpa_asset(resolved_asset, &items);