Update error message and test

Commit migrated from https://github.com/dotnet/core-setup/commit/a9b44ef3ea79adf631d6fcf347eb32d50c1550ae

diff --git a/src/installer/corehost/cli/deps_resolver.cpp b/src/installer/corehost/cli/deps_resolver.cpp
index 8cdd726..cf41401 100644 (file)
--- a/src/installer/corehost/cli/deps_resolver.cpp
+++ b/src/installer/corehost/cli/deps_resolver.cpp
@@ -306,7 +306,8 @@ bool deps_resolver_t::probe_deps_entry(const deps_entry_t& entry, const pal::str
 bool report_missing_assembly_in_manifest(const deps_entry_t& entry)
 {
     trace::error(_X(
-        "Error: An assembly specified in the application dependencies manifest (%s) was not found:\n"
+        "Error:\n"
+        "  An assembly specified in the application dependencies manifest (%s) was not found:\n"
         "    package: '%s', version: '%s'\n"
         "    path: '%s'"),
         entry.deps_file.c_str(), entry.library_name.c_str(), entry.library_version.c_str(), entry.relative_path.c_str());

diff --git a/src/installer/test/HostActivationTests/GivenThatICareAboutLightupAppActivation.cs b/src/installer/test/HostActivationTests/GivenThatICareAboutLightupAppActivation.cs
index 861f1ac..a856bb1 100644 (file)
--- a/src/installer/test/HostActivationTests/GivenThatICareAboutLightupAppActivation.cs
+++ b/src/installer/test/HostActivationTests/GivenThatICareAboutLightupAppActivation.cs
@@ -63,11 +63,15 @@ namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.LightupApp
             dotnet.Exec("exec", "--additional-deps", libDepsJson, appDll)
                 .CaptureStdErr()
                 .CaptureStdOut()
-                .Execute(fExpectedToFail:true)
+                .Execute(fExpectedToFail: true)
                 .Should()
                 .Fail()
                 .And
-                .HaveStdErrContaining("Error: assembly specified in the dependencies manifest was not found -- package: \'LightupLib\', version: \'1.0.0\', path: \'LightupLib.dll\'");
+                .HaveStdErrContaining(
+                    "Error:" + Environment.NewLine +
+                    "  An assembly specified in the application dependencies manifest (LightupLib.deps.json) was not found:" + Environment.NewLine +
+                    "    package: \'LightupLib\', version: \'1.0.0\'" + Environment.NewLine +
+                    "    path: \'LightupLib.dll\'");
         }
 
         // Attempt to run the app with lightup deps.json specified and lightup library present in the expected