diff --git a/src/AppInstallerCLICore/AppInstallerCLICore.vcxproj b/src/AppInstallerCLICore/AppInstallerCLICore.vcxproj
index c1361d9d1e3d5..2754cf2e9eeed 100644
--- a/src/AppInstallerCLICore/AppInstallerCLICore.vcxproj
+++ b/src/AppInstallerCLICore/AppInstallerCLICore.vcxproj
@@ -122,9 +122,9 @@
Disabled
_DEBUG;%(PreprocessorDefinitions);CLICOREDLLBUILD
- $(ProjectDir);$(ProjectDir)\Public;$(ProjectDir)..\AppInstallerRepositoryCore;$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\YamlCppLib\yaml-cpp\include;%(AdditionalIncludeDirectories)
- $(ProjectDir);$(ProjectDir)\Public;$(ProjectDir)..\AppInstallerRepositoryCore;$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\YamlCppLib\yaml-cpp\include;%(AdditionalIncludeDirectories)
- $(ProjectDir);$(ProjectDir)\Public;$(ProjectDir)..\AppInstallerRepositoryCore;$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\YamlCppLib\yaml-cpp\include;%(AdditionalIncludeDirectories)
+ $(ProjectDir);$(ProjectDir)..\AppInstallerRepositoryCore;$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\YamlCppLib\yaml-cpp\include;%(AdditionalIncludeDirectories)
+ $(ProjectDir);$(ProjectDir)..\AppInstallerRepositoryCore;$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\YamlCppLib\yaml-cpp\include;%(AdditionalIncludeDirectories)
+ $(ProjectDir);$(ProjectDir)..\AppInstallerRepositoryCore;$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\YamlCppLib\yaml-cpp\include;%(AdditionalIncludeDirectories)
false
@@ -136,7 +136,7 @@
WIN32;%(PreprocessorDefinitions);CLICOREDLLBUILD
- $(ProjectDir);$(ProjectDir)\Public;$(ProjectDir)..\AppInstallerRepositoryCore;$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\YamlCppLib\yaml-cpp\include;%(AdditionalIncludeDirectories)
+ $(ProjectDir);$(ProjectDir)..\AppInstallerRepositoryCore;$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\YamlCppLib\yaml-cpp\include;%(AdditionalIncludeDirectories)
Windows
@@ -148,10 +148,10 @@
true
true
NDEBUG;%(PreprocessorDefinitions);CLICOREDLLBUILD
- $(ProjectDir);$(ProjectDir)\Public;$(ProjectDir)..\AppInstallerRepositoryCore;$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\YamlCppLib\yaml-cpp\include;%(AdditionalIncludeDirectories)
- $(ProjectDir);$(ProjectDir)\Public;$(ProjectDir)..\AppInstallerRepositoryCore;$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\YamlCppLib\yaml-cpp\include;%(AdditionalIncludeDirectories)
- $(ProjectDir);$(ProjectDir)\Public;$(ProjectDir)..\AppInstallerRepositoryCore;$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\YamlCppLib\yaml-cpp\include;%(AdditionalIncludeDirectories)
- $(ProjectDir);$(ProjectDir)\Public;$(ProjectDir)..\AppInstallerRepositoryCore;$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\YamlCppLib\yaml-cpp\include;$(ProjectDir)..\YamlCppLib\yaml-cpp\include;%(AdditionalIncludeDirectories)
+ $(ProjectDir);$(ProjectDir)..\AppInstallerRepositoryCore;$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\YamlCppLib\yaml-cpp\include;%(AdditionalIncludeDirectories)
+ $(ProjectDir);$(ProjectDir)..\AppInstallerRepositoryCore;$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\YamlCppLib\yaml-cpp\include;%(AdditionalIncludeDirectories)
+ $(ProjectDir);$(ProjectDir)..\AppInstallerRepositoryCore;$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\YamlCppLib\yaml-cpp\include;%(AdditionalIncludeDirectories)
+ $(ProjectDir);$(ProjectDir)..\AppInstallerRepositoryCore;$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\YamlCppLib\yaml-cpp\include;$(ProjectDir)..\YamlCppLib\yaml-cpp\include;%(AdditionalIncludeDirectories)
true
diff --git a/src/AppInstallerCLICore/Core.cpp b/src/AppInstallerCLICore/Core.cpp
index 4c85aa3366638..e8f2dcc4cd2a3 100644
--- a/src/AppInstallerCLICore/Core.cpp
+++ b/src/AppInstallerCLICore/Core.cpp
@@ -63,7 +63,7 @@ namespace AppInstaller::CLI
{
commandToExecute->OutputHelp(std::cout, &ce);
AICLI_LOG(CLI, Error, << "Error encountered parsing command line: " << ce.Message());
- return CLICORE_ERROR_INVALID_CL_ARGUMENTS;
+ return APPINSTALLER_CLI_ERROR_INVALID_CL_ARGUMENTS;
}
try
@@ -77,14 +77,14 @@ namespace AppInstaller::CLI
std::string message = Utility::ConvertToUTF8(hre.message());
std::cout << "An error occured while executing the command: " << message << std::endl;
AICLI_LOG(CLI, Error, << "Error encountered executing command: " << message);
- return CLICORE_ERROR_COMMAND_FAILED;
+ return APPINSTALLER_CLI_ERROR_COMMAND_FAILED;
}
catch (const std::exception& e)
{
// TODO: Better error output
std::cout << "An error occured while executing the command: " << e.what() << std::endl;
AICLI_LOG(CLI, Error, << "Error encountered executing command: " << e.what());
- return CLICORE_ERROR_COMMAND_FAILED;
+ return APPINSTALLER_CLI_ERROR_COMMAND_FAILED;
}
return 0;
@@ -93,15 +93,15 @@ namespace AppInstaller::CLI
// Telemetry cannot be reliable beyond this point, so don't let these happen.
catch (const winrt::hresult_error&)
{
- return CLICORE_ERROR_INTERNAL_ERROR;
+ return APPINSTALLER_CLI_ERROR_INTERNAL_ERROR;
}
catch (const std::exception&)
{
- return CLICORE_ERROR_INTERNAL_ERROR;
+ return APPINSTALLER_CLI_ERROR_INTERNAL_ERROR;
}
catch (...)
{
- return CLICORE_ERROR_INTERNAL_ERROR;
+ return APPINSTALLER_CLI_ERROR_INTERNAL_ERROR;
}
}
diff --git a/src/AppInstallerCLICore/Public/AppInstallerCLICore.h b/src/AppInstallerCLICore/Public/AppInstallerCLICore.h
index a5a0bf048ef07..01db30f8003cb 100644
--- a/src/AppInstallerCLICore/Public/AppInstallerCLICore.h
+++ b/src/AppInstallerCLICore/Public/AppInstallerCLICore.h
@@ -2,17 +2,6 @@
// Licensed under the MIT License.
#pragma once
-#define CLICORE_ERROR_FACILITY 0x8A150000
-
-#define CLICORE_ERROR_INTERNAL_ERROR 0x8A150001
-#define CLICORE_ERROR_INVALID_CL_ARGUMENTS 0x8A150002
-#define CLICORE_ERROR_COMMAND_FAILED 0x8A150003
-#define CLICORE_ERROR_MANIFEST_FAILED 0x8A150004
-#define CLICORE_ERROR_WORKFLOW_FAILED 0x8A150005
-#define CLICORE_ERROR_INSTALLFLOW_FAILED 0x8A150006
-#define CLICORE_ERROR_RUNTIME_ERROR 0x8A150007
-#define CLICORE_ERROR_DOWNLOAD_FAILED 0x8A150008
-
namespace AppInstaller::CLI
{
int CoreMain(int argc, wchar_t const** argv);
diff --git a/src/AppInstallerCLICore/Workflows/InstallFlow.cpp b/src/AppInstallerCLICore/Workflows/InstallFlow.cpp
index 0922b1a9bddb5..2d11e301a86d5 100644
--- a/src/AppInstallerCLICore/Workflows/InstallFlow.cpp
+++ b/src/AppInstallerCLICore/Workflows/InstallFlow.cpp
@@ -51,12 +51,12 @@ namespace AppInstaller::Workflow {
if (downloadResult == DownloaderResult::Failed)
{
m_reporter.ShowMsg(WorkflowReporter::Level::Error, "Package download failed.");
- THROW_EXCEPTION_MSG(WorkflowException(CLICORE_ERROR_INSTALLFLOW_FAILED), "Package download failed");
+ THROW_EXCEPTION_MSG(WorkflowException(APPINSTALLER_CLI_ERROR_INSTALLFLOW_FAILED), "Package download failed");
}
else if (downloadResult == DownloaderResult::Canceled)
{
m_reporter.ShowMsg(WorkflowReporter::Level::Info, "Package download canceled.");
- THROW_EXCEPTION_MSG(WorkflowException(CLICORE_ERROR_INSTALLFLOW_FAILED), "Package download canceled");
+ THROW_EXCEPTION_MSG(WorkflowException(APPINSTALLER_CLI_ERROR_INSTALLFLOW_FAILED), "Package download canceled");
}
if (!std::equal(
@@ -73,7 +73,7 @@ namespace AppInstaller::Workflow {
if (!m_reporter.PromptForBoolResponse(WorkflowReporter::Level::Warning, "Package hash verification failed. Continue?"))
{
m_reporter.ShowMsg(WorkflowReporter::Level::Error, "Canceled. Package hash mismatch.");
- THROW_EXCEPTION_MSG(WorkflowException(CLICORE_ERROR_INSTALLFLOW_FAILED), "Package installation canceled");
+ THROW_EXCEPTION_MSG(WorkflowException(APPINSTALLER_CLI_ERROR_INSTALLFLOW_FAILED), "Package installation canceled");
}
}
else
@@ -89,7 +89,7 @@ namespace AppInstaller::Workflow {
{
if (m_downloadedInstaller.empty())
{
- THROW_EXCEPTION_MSG(WorkflowException(CLICORE_ERROR_INSTALLFLOW_FAILED), "Installer not downloaded yet");
+ THROW_EXCEPTION_MSG(WorkflowException(APPINSTALLER_CLI_ERROR_INSTALLFLOW_FAILED), "Installer not downloaded yet");
}
m_reporter.ShowMsg(WorkflowReporter::Level::Info, "Installing package ...");
@@ -106,7 +106,7 @@ namespace AppInstaller::Workflow {
else
{
m_reporter.ShowMsg(WorkflowReporter::Level::Error, "Installer type not supported.");
- THROW_EXCEPTION_MSG(WorkflowException(CLICORE_ERROR_INSTALLFLOW_FAILED), "Installer type not supported");
+ THROW_EXCEPTION_MSG(WorkflowException(APPINSTALLER_CLI_ERROR_INSTALLFLOW_FAILED), "Installer type not supported");
}
m_reporter.ShowIndefiniteSpinner(true);
@@ -121,7 +121,7 @@ namespace AppInstaller::Workflow {
{
m_reporter.ShowMsg(WorkflowReporter::Level::Error, "Install failed. Exit code: " + std::to_string(installResult));
- THROW_EXCEPTION_MSG(WorkflowException(CLICORE_ERROR_INSTALLFLOW_FAILED),
+ THROW_EXCEPTION_MSG(WorkflowException(APPINSTALLER_CLI_ERROR_INSTALLFLOW_FAILED),
"Install failed. Installer task returned: %u", installResult);
}
diff --git a/src/AppInstallerCLICore/Workflows/ManifestComparator.cpp b/src/AppInstallerCLICore/Workflows/ManifestComparator.cpp
index 8ceb39b1cf07d..0c84ccc382791 100644
--- a/src/AppInstallerCLICore/Workflows/ManifestComparator.cpp
+++ b/src/AppInstallerCLICore/Workflows/ManifestComparator.cpp
@@ -47,7 +47,7 @@ namespace AppInstaller::Workflow
if (Utility::IsApplicableArchitecture(m_manifestRef.Installers[0].Arch) == -1)
{
m_reporterRef.ShowMsg(WorkflowReporter::Level::Error, "No applicable installer found.");
- THROW_EXCEPTION_MSG(WorkflowException(CLICORE_ERROR_WORKFLOW_FAILED), "No installer with applicable architecture found.");
+ THROW_EXCEPTION_MSG(WorkflowException(APPINSTALLER_CLI_ERROR_WORKFLOW_FAILED), "No installer with applicable architecture found.");
}
ManifestInstaller selectedInstaller = m_manifestRef.Installers[0];
diff --git a/src/AppInstallerCLICore/pch.h b/src/AppInstallerCLICore/pch.h
index b8561ce5bbbfc..b9b37fbf3e960 100644
--- a/src/AppInstallerCLICore/pch.h
+++ b/src/AppInstallerCLICore/pch.h
@@ -26,5 +26,6 @@
#include "AppInstallerRuntime.h"
#include "AppInstallerSHA256.h"
#include "AppInstallerDownloader.h"
+#include "AppInstallerErrors.h"
#include "Manifest/ManifestInstaller.h"
#include "Manifest/Manifest.h"
diff --git a/src/AppInstallerCommonCore/AppInstallerCommonCore.vcxproj b/src/AppInstallerCommonCore/AppInstallerCommonCore.vcxproj
index 90c584199d32d..ae9a566916021 100644
--- a/src/AppInstallerCommonCore/AppInstallerCommonCore.vcxproj
+++ b/src/AppInstallerCommonCore/AppInstallerCommonCore.vcxproj
@@ -122,9 +122,9 @@
Disabled
_DEBUG;%(PreprocessorDefinitions);CLICOREDLLBUILD
- $(ProjectDir);$(ProjectDir)Telemetry;$(ProjectDir)..\AppInstallerCliCore\Public;%(AdditionalIncludeDirectories)
- $(ProjectDir);$(ProjectDir)Telemetry;$(ProjectDir)..\AppInstallerCliCore\Public;%(AdditionalIncludeDirectories)
- $(ProjectDir);$(ProjectDir)Telemetry;$(ProjectDir)..\AppInstallerCliCore\Public;%(AdditionalIncludeDirectories)
+ $(ProjectDir);$(ProjectDir)Telemetry;%(AdditionalIncludeDirectories)
+ $(ProjectDir);$(ProjectDir)Telemetry;%(AdditionalIncludeDirectories)
+ $(ProjectDir);$(ProjectDir)Telemetry;%(AdditionalIncludeDirectories)
false
@@ -136,7 +136,7 @@
WIN32;%(PreprocessorDefinitions);CLICOREDLLBUILD
- $(ProjectDir);$(ProjectDir)Telemetry;$(ProjectDir)..\AppInstallerCliCore\Public;%(AdditionalIncludeDirectories)
+ $(ProjectDir);$(ProjectDir)Telemetry;%(AdditionalIncludeDirectories)
Windows
@@ -148,10 +148,10 @@
true
true
NDEBUG;%(PreprocessorDefinitions);CLICOREDLLBUILD
- $(ProjectDir);$(ProjectDir)Telemetry;$(ProjectDir)..\AppInstallerCliCore\Public;%(AdditionalIncludeDirectories)
- $(ProjectDir);$(ProjectDir)Telemetry;$(ProjectDir)..\AppInstallerCliCore\Public;%(AdditionalIncludeDirectories)
- $(ProjectDir);$(ProjectDir)Telemetry;$(ProjectDir)..\AppInstallerCliCore\Public;%(AdditionalIncludeDirectories)
- $(ProjectDir);$(ProjectDir)Telemetry;$(ProjectDir)..\AppInstallerCliCore\Public;%(AdditionalIncludeDirectories)
+ $(ProjectDir);$(ProjectDir)Telemetry;%(AdditionalIncludeDirectories)
+ $(ProjectDir);$(ProjectDir)Telemetry;%(AdditionalIncludeDirectories)
+ $(ProjectDir);$(ProjectDir)Telemetry;%(AdditionalIncludeDirectories)
+ $(ProjectDir);$(ProjectDir)Telemetry;%(AdditionalIncludeDirectories)
true
@@ -168,6 +168,7 @@
+
diff --git a/src/AppInstallerCommonCore/AppInstallerCommonCore.vcxproj.filters b/src/AppInstallerCommonCore/AppInstallerCommonCore.vcxproj.filters
index d33a560458b55..c10e4c60183d4 100644
--- a/src/AppInstallerCommonCore/AppInstallerCommonCore.vcxproj.filters
+++ b/src/AppInstallerCommonCore/AppInstallerCommonCore.vcxproj.filters
@@ -60,6 +60,9 @@
Public
+
+ Public
+
diff --git a/src/AppInstallerCommonCore/Public/AppInstallerErrors.h b/src/AppInstallerCommonCore/Public/AppInstallerErrors.h
new file mode 100644
index 0000000000000..f36584974107e
--- /dev/null
+++ b/src/AppInstallerCommonCore/Public/AppInstallerErrors.h
@@ -0,0 +1,15 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+#pragma once
+
+#define APPINSTALLER_CLI_ERROR_FACILITY 0x8A150000
+
+#define APPINSTALLER_CLI_ERROR_INTERNAL_ERROR 0x8A150001
+#define APPINSTALLER_CLI_ERROR_INVALID_CL_ARGUMENTS 0x8A150002
+#define APPINSTALLER_CLI_ERROR_COMMAND_FAILED 0x8A150003
+#define APPINSTALLER_CLI_ERROR_MANIFEST_FAILED 0x8A150004
+#define APPINSTALLER_CLI_ERROR_WORKFLOW_FAILED 0x8A150005
+#define APPINSTALLER_CLI_ERROR_INSTALLFLOW_FAILED 0x8A150006
+#define APPINSTALLER_CLI_ERROR_RUNTIME_ERROR 0x8A150007
+#define APPINSTALLER_CLI_ERROR_DOWNLOAD_FAILED 0x8A150008
\ No newline at end of file
diff --git a/src/AppInstallerCommonCore/Public/AppInstallerRuntime.h b/src/AppInstallerCommonCore/Public/AppInstallerRuntime.h
index a89ffd1d861b4..aaaf76471f2fe 100644
--- a/src/AppInstallerCommonCore/Public/AppInstallerRuntime.h
+++ b/src/AppInstallerCommonCore/Public/AppInstallerRuntime.h
@@ -2,7 +2,6 @@
// Licensed under the MIT License.
#pragma once
#include "AppInstallerArchitecture.h"
-#include "AppInstallerCLICore.h"
#include
#include
diff --git a/src/AppInstallerRepositoryCore/AppInstallerRepositoryCore.vcxproj b/src/AppInstallerRepositoryCore/AppInstallerRepositoryCore.vcxproj
index d5a42cd78fc88..dad4a81bba7ab 100644
--- a/src/AppInstallerRepositoryCore/AppInstallerRepositoryCore.vcxproj
+++ b/src/AppInstallerRepositoryCore/AppInstallerRepositoryCore.vcxproj
@@ -122,9 +122,9 @@
Disabled
_DEBUG;%(PreprocessorDefinitions);CLICOREDLLBUILD
- $(ProjectDir);$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\YamlCppLib\yaml-cpp\include;$(ProjectDir)..\AppInstallerCLICore\Public;%(AdditionalIncludeDirectories)
- $(ProjectDir);$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\YamlCppLib\yaml-cpp\include;$(ProjectDir)..\AppInstallerCLICore\Public;%(AdditionalIncludeDirectories)
- $(ProjectDir);$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\YamlCppLib\yaml-cpp\include;$(ProjectDir)..\AppInstallerCLICore\Public;%(AdditionalIncludeDirectories)
+ $(ProjectDir);$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\YamlCppLib\yaml-cpp\include;%(AdditionalIncludeDirectories)
+ $(ProjectDir);$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\YamlCppLib\yaml-cpp\include;%(AdditionalIncludeDirectories)
+ $(ProjectDir);$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\YamlCppLib\yaml-cpp\include;%(AdditionalIncludeDirectories)
false
@@ -136,7 +136,7 @@
WIN32;%(PreprocessorDefinitions);CLICOREDLLBUILD
- $(ProjectDir);$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\YamlCppLib\yaml-cpp\include;$(ProjectDir)..\AppInstallerCLICore\Public;%(AdditionalIncludeDirectories)
+ $(ProjectDir);$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\YamlCppLib\yaml-cpp\include;%(AdditionalIncludeDirectories)
Windows
@@ -148,10 +148,10 @@
true
true
NDEBUG;%(PreprocessorDefinitions);CLICOREDLLBUILD
- $(ProjectDir);$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\YamlCppLib\yaml-cpp\include;$(ProjectDir)..\AppInstallerCLICore\Public;%(AdditionalIncludeDirectories)
- $(ProjectDir);$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\YamlCppLib\yaml-cpp\include;$(ProjectDir)..\AppInstallerCLICore\Public;%(AdditionalIncludeDirectories)
- $(ProjectDir);$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\YamlCppLib\yaml-cpp\include;$(ProjectDir)..\AppInstallerCLICore\Public;%(AdditionalIncludeDirectories)
- $(ProjectDir);$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\YamlCppLib\yaml-cpp\include;$(ProjectDir)..\AppInstallerCLICore\Public;%(AdditionalIncludeDirectories)
+ $(ProjectDir);$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\YamlCppLib\yaml-cpp\include;%(AdditionalIncludeDirectories)
+ $(ProjectDir);$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\YamlCppLib\yaml-cpp\include;%(AdditionalIncludeDirectories)
+ $(ProjectDir);$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\YamlCppLib\yaml-cpp\include;%(AdditionalIncludeDirectories)
+ $(ProjectDir);$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\YamlCppLib\yaml-cpp\include;%(AdditionalIncludeDirectories)
true
diff --git a/src/AppInstallerRepositoryCore/Manifest/Manifest.h b/src/AppInstallerRepositoryCore/Manifest/Manifest.h
index faaf42a49df68..e8dad5e2fa8dc 100644
--- a/src/AppInstallerRepositoryCore/Manifest/Manifest.h
+++ b/src/AppInstallerRepositoryCore/Manifest/Manifest.h
@@ -2,7 +2,7 @@
// Licensed under the MIT License.
#pragma once
-#include "AppInstallerCLICore.h"
+#include "AppInstallerErrors.h"
#include "ManifestInstaller.h"
#include "ManifestLocalization.h"
@@ -15,7 +15,7 @@ namespace AppInstaller::Manifest
{
struct ManifestException : public wil::ResultException
{
- ManifestException() : wil::ResultException(CLICORE_ERROR_MANIFEST_FAILED) {}
+ ManifestException() : wil::ResultException(APPINSTALLER_CLI_ERROR_MANIFEST_FAILED) {}
};
// Our representation of the parsed manifest file.
diff --git a/src/AppInstallerSQLiteIndexUtil/AppInstallerSQLiteIndexUtil.vcxproj b/src/AppInstallerSQLiteIndexUtil/AppInstallerSQLiteIndexUtil.vcxproj
index 7b23d6a9c20a0..8335b0a742711 100644
--- a/src/AppInstallerSQLiteIndexUtil/AppInstallerSQLiteIndexUtil.vcxproj
+++ b/src/AppInstallerSQLiteIndexUtil/AppInstallerSQLiteIndexUtil.vcxproj
@@ -122,9 +122,9 @@
Disabled
_DEBUG;%(PreprocessorDefinitions);CLICOREDLLBUILD
- $(ProjectDir);$(ProjectDir)..\AppInstallerCommonCore;$(ProjectDir)..\AppInstallerRepositoryCore;$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\AppInstallerCLICore\Public;%(AdditionalIncludeDirectories)
- $(ProjectDir);$(ProjectDir)..\AppInstallerCommonCore;$(ProjectDir)..\AppInstallerRepositoryCore;$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\AppInstallerCLICore\Public;%(AdditionalIncludeDirectories)
- $(ProjectDir);$(ProjectDir)..\AppInstallerCommonCore;$(ProjectDir)..\AppInstallerRepositoryCore;$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\AppInstallerCLICore\Public;%(AdditionalIncludeDirectories)
+ $(ProjectDir);$(ProjectDir)..\AppInstallerCommonCore;$(ProjectDir)..\AppInstallerRepositoryCore;$(ProjectDir)..\AppInstallerCommonCore\Public;%(AdditionalIncludeDirectories)
+ $(ProjectDir);$(ProjectDir)..\AppInstallerCommonCore;$(ProjectDir)..\AppInstallerRepositoryCore;$(ProjectDir)..\AppInstallerCommonCore\Public;%(AdditionalIncludeDirectories)
+ $(ProjectDir);$(ProjectDir)..\AppInstallerCommonCore;$(ProjectDir)..\AppInstallerRepositoryCore;$(ProjectDir)..\AppInstallerCommonCore\Public;%(AdditionalIncludeDirectories)
false
@@ -142,7 +142,7 @@
WIN32;%(PreprocessorDefinitions);CLICOREDLLBUILD
- $(ProjectDir);$(ProjectDir)..\AppInstallerCommonCore;$(ProjectDir)..\AppInstallerRepositoryCore;$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\AppInstallerCLICore\Public;%(AdditionalIncludeDirectories)
+ $(ProjectDir);$(ProjectDir)..\AppInstallerCommonCore;$(ProjectDir)..\AppInstallerRepositoryCore;$(ProjectDir)..\AppInstallerCommonCore\Public;%(AdditionalIncludeDirectories)
Windows
@@ -156,10 +156,10 @@
true
true
NDEBUG;%(PreprocessorDefinitions);CLICOREDLLBUILD
- $(ProjectDir);$(ProjectDir)..\AppInstallerCommonCore;$(ProjectDir)..\AppInstallerRepositoryCore;$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\AppInstallerCLICore\Public;%(AdditionalIncludeDirectories)
- $(ProjectDir);$(ProjectDir)..\AppInstallerCommonCore;$(ProjectDir)..\AppInstallerRepositoryCore;$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\AppInstallerCLICore\Public;%(AdditionalIncludeDirectories)
- $(ProjectDir);$(ProjectDir)..\AppInstallerCommonCore;$(ProjectDir)..\AppInstallerRepositoryCore;$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\AppInstallerCLICore\Public;%(AdditionalIncludeDirectories)
- $(ProjectDir);$(ProjectDir)..\AppInstallerCommonCore;$(ProjectDir)..\AppInstallerRepositoryCore;$(ProjectDir)..\AppInstallerCommonCore\Public;$(ProjectDir)..\AppInstallerCLICore\Public;%(AdditionalIncludeDirectories)
+ $(ProjectDir);$(ProjectDir)..\AppInstallerCommonCore;$(ProjectDir)..\AppInstallerRepositoryCore;$(ProjectDir)..\AppInstallerCommonCore\Public;%(AdditionalIncludeDirectories)
+ $(ProjectDir);$(ProjectDir)..\AppInstallerCommonCore;$(ProjectDir)..\AppInstallerRepositoryCore;$(ProjectDir)..\AppInstallerCommonCore\Public;%(AdditionalIncludeDirectories)
+ $(ProjectDir);$(ProjectDir)..\AppInstallerCommonCore;$(ProjectDir)..\AppInstallerRepositoryCore;$(ProjectDir)..\AppInstallerCommonCore\Public;%(AdditionalIncludeDirectories)
+ $(ProjectDir);$(ProjectDir)..\AppInstallerCommonCore;$(ProjectDir)..\AppInstallerRepositoryCore;$(ProjectDir)..\AppInstallerCommonCore\Public;%(AdditionalIncludeDirectories)
true