Make host look for RID-specific assets via a known list by default (#…

…84100)

src/installer/tests/HostActivation.Tests/DependencyResolution/DependencyResolutionCommandResultExtensions.cs

@@ -162,6 +162,15 @@ public static AndConstraint<CommandResultAssertions> HaveUsedAdditionalProbingPa
                 .And.HaveStdErrContaining($"probe type=lookup dir=[{path}]");
         }
 
+        public static AndConstraint<CommandResultAssertions> HaveReadRidGraph(this CommandResultAssertions assertion, bool readRidGraph)
+        {
+            string ridGraphMsg = "RID fallback graph =";
+            string hostRidsMsg = "Host RID list =";
+            return readRidGraph
+                ? assertion.HaveStdErrContaining(ridGraphMsg).And.NotHaveStdErrContaining(hostRidsMsg)
+                : assertion.HaveStdErrContaining(hostRidsMsg).And.NotHaveStdErrContaining(ridGraphMsg);
+        }
+
         public static AndConstraint<CommandResultAssertions> HaveUsedFallbackRid(this CommandResultAssertions assertion, bool usedFallbackRid)
         {
             string msg = "Falling back to base HostRID";
@@ -209,7 +218,7 @@ private static string[] RelativePathsToAbsoluteAppPaths(string relativePaths, Te
             }
 
             List<string> paths = new List<string>();
-            foreach (string relativePath in relativePaths.Split(';'))
+            foreach (string relativePath in relativePaths.Split(';', StringSplitOptions.RemoveEmptyEntries))
             {
                 string path = relativePath.Replace('/', Path.DirectorySeparatorChar);
                 if (app != null)

src/installer/tests/TestUtils/RuntimeConfig.cs

@@ -145,7 +145,7 @@ public static RuntimeConfig FromFile(string path)
                     {
                         foreach (var includedFramework in includedFrameworks)
                         {
-                            runtimeConfig.WithFramework(Framework.FromJson((JsonObject)includedFramework));
+                            runtimeConfig.WithIncludedFramework(Framework.FromJson((JsonObject)includedFramework));
                         }
                     }
 

src/native/corehost/hostmisc/utils.cpp

@@ -245,13 +245,14 @@ const pal::char_t* get_arch_name(pal::architecture arch)
 
 const pal::char_t* get_current_arch_name()
 {
-    return get_arch_name(get_current_arch());
+    assert(pal::strcmp(get_arch_name(get_current_arch()), _STRINGIFY(CURRENT_ARCH_NAME)) == 0);
+    return _STRINGIFY(CURRENT_ARCH_NAME);
 }
 
 pal::string_t get_current_runtime_id(bool use_fallback)
 {
     pal::string_t rid;
-    if (pal::getenv(_X("DOTNET_RUNTIME_ID"), &rid))
+    if (try_get_runtime_id_from_env(rid))
         return rid;
 
     rid = pal::get_current_os_rid_platform();
@@ -267,6 +268,11 @@ pal::string_t get_current_runtime_id(bool use_fallback)
     return rid;
 }
 
+bool try_get_runtime_id_from_env(pal::string_t& out_rid)
+{
+    return pal::getenv(_X("DOTNET_RUNTIME_ID"), &out_rid);
+}
+
 /**
 * Multilevel Lookup is enabled by default
 *  It can be disabled by setting DOTNET_MULTILEVEL_LOOKUP env var to a value that is not 1

src/native/corehost/hostmisc/utils.h

@@ -89,6 +89,8 @@ const pal::char_t* get_arch_name(pal::architecture arch);
 const pal::char_t* get_current_arch_name();
 
 pal::string_t get_current_runtime_id(bool use_fallback);
+bool try_get_runtime_id_from_env(pal::string_t& out_rid);
+
 bool multilevel_lookup_enabled();
 void get_framework_and_sdk_locations(const pal::string_t& dotnet_dir, const bool disable_multilevel_lookup, std::vector<pal::string_t>* locations);
 bool get_file_path_from_env(const pal::char_t* env_key, pal::string_t* recv);