Skip to content

Only forward the verbose property if it has been set #5449

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 12, 2025
Merged

Only forward the verbose property if it has been set #5449

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions src/AppInstallerCLICore/ConfigurationDynamicRuntimeFactory.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,10 +130,10 @@ namespace AppInstaller::CLI::ConfigurationRemoting
return m_processorEngine;
}

winrt::hstring GetFactoryMapValue(winrt::hstring key)
std::optional<winrt::hstring> GetFactoryMapValue(winrt::hstring key)
{
auto itr = m_factoryMapValues.find(key);
return itr != m_factoryMapValues.end() ? itr->second : winrt::hstring{};
return itr != m_factoryMapValues.end() ? std::make_optional(itr->second) : std::nullopt;
}

private:
Expand Down Expand Up @@ -340,21 +340,21 @@ namespace AppInstaller::CLI::ConfigurationRemoting
if (m_dynamicFactory->Engine() == ProcessorEngine::DSCv3)
{
winrt::hstring dscExecutablePathPropertyName = ToHString(PropertyName::DscExecutablePath);
winrt::hstring dscExecutablePath = m_dynamicFactory->GetFactoryMapValue(dscExecutablePathPropertyName);
std::optional<winrt::hstring> dscExecutablePath = m_dynamicFactory->GetFactoryMapValue(dscExecutablePathPropertyName);

if (dscExecutablePath.empty())
if (!dscExecutablePath)
{
dscExecutablePath = m_dynamicFactory->Lookup(ToHString(PropertyName::FoundDscExecutablePath));
}

if (dscExecutablePath.empty())
if (dscExecutablePath->empty())
{
// This is backstop to prevent a case where dsc.exe not found.
AICLI_LOG(Config, Error, << "Could not find dsc.exe, it must be provided by the user.");
THROW_WIN32(ERROR_FILE_NOT_FOUND);
}

json["processorPath"] = Utility::ConvertToUTF8(dscExecutablePath);
json["processorPath"] = Utility::ConvertToUTF8(dscExecutablePath.value());
}

Json::StreamWriterBuilder writerBuilder;
Expand Down Expand Up @@ -437,7 +437,10 @@ namespace AppInstaller::CLI::ConfigurationRemoting
});

winrt::hstring propertyName = ConfigurationRemoting::ToHString(ConfigurationRemoting::PropertyName::DiagnosticTraceEnabled);
factory.as<Collections::IMap<winrt::hstring, winrt::hstring>>().Insert(propertyName, m_dynamicFactory->GetFactoryMapValue(propertyName));
if (auto propertyValue = m_dynamicFactory->GetFactoryMapValue(propertyName))
{
factory.as<Collections::IMap<winrt::hstring, winrt::hstring>>().Insert(propertyName, propertyValue.value());
}
}

return m_setProcessors.emplace(integrityLevel, DynamicProcessorInfo{ factory, factory.CreateSetProcessor(m_configurationSet), std::move(factoryDiagnosticsEventRevoker) }).first;
Expand Down