Put optional arguments last

Check the rid of the launched process

Author: Mateo Torres Ruiz

src/installer/tests/HostActivation.Tests/InstallLocationCommandResultExtensions.cs

@@ -12,16 +12,20 @@ namespace HostActivation.Tests
 {
     internal static class InstallLocationCommandResultExtensions
     {
-        private static bool IsRunningInWoW64() => OperatingSystem.IsWindows() && !Environment.Is64BitProcess;
+        private static bool IsRunningInWoW64(string rid) => OperatingSystem.IsWindows() && Environment.Is64BitOperatingSystem && rid.Equals("win-x86");
 
         public static AndConstraint<CommandResultAssertions> HaveUsedDotNetRootInstallLocation(this CommandResultAssertions assertion, string installLocation)
         {
-            return assertion.HaveUsedDotNetRootInstallLocation(null, installLocation);
+            return assertion.HaveUsedDotNetRootInstallLocation(installLocation, null, null);
         }
 
-        public static AndConstraint<CommandResultAssertions> HaveUsedDotNetRootInstallLocation(this CommandResultAssertions assertion, string arch, string installLocation)
+        public static AndConstraint<CommandResultAssertions> HaveUsedDotNetRootInstallLocation(this CommandResultAssertions assertion,
+            string installLocation,
+            string arch,
+            string rid)
         {
-            string expectedEnvironmentVariable = !string.IsNullOrEmpty(arch) ? $"DOTNET_ROOT_{arch.ToUpper()}" : IsRunningInWoW64() ? "DOTNET_ROOT(x86)" : "DOTNET_ROOT";
+            string expectedEnvironmentVariable = !string.IsNullOrEmpty(arch) ? $"DOTNET_ROOT_{arch.ToUpper()}" :
+                IsRunningInWoW64(rid) ? "DOTNET_ROOT(x86)" : "DOTNET_ROOT";
 
             return assertion.HaveStdErrContaining($"Using environment variable {expectedEnvironmentVariable}=[{installLocation}] as runtime location.");
         }
@@ -41,7 +45,7 @@ public static AndConstraint<CommandResultAssertions> HaveFoundDefaultInstallLoca
             return assertion.HaveStdErrContaining($"Found install location path '{installLocation}'.");
         }
 
-        public static AndConstraint<CommandResultAssertions> HaveFoundArchSpecificInstallLocationInConfigFile(this CommandResultAssertions assertion, string arch, string installLocation)
+        public static AndConstraint<CommandResultAssertions> HaveFoundArchSpecificInstallLocationInConfigFile(this CommandResultAssertions assertion, string installLocation, string arch)
         {
             return assertion.HaveStdErrContaining($"Found architecture-specific install location path: '{installLocation}' ('{arch}').");
         }

src/installer/tests/HostActivation.Tests/MultiArchInstallLocation.cs

@@ -33,7 +33,7 @@ public void EnvironmentVariable_CurrentArchitectureIsUsedIfEnvVarSet()
                 .DotNetRoot(fixture.BuiltDotnet.BinPath, arch)
                 .Execute()
                 .Should().Pass()
-                .And.HaveUsedDotNetRootInstallLocation(arch, fixture.BuiltDotnet.BinPath);
+                .And.HaveUsedDotNetRootInstallLocation(fixture.BuiltDotnet.BinPath, arch, fixture.CurrentRid);
         }
 
         [Fact]
@@ -67,7 +67,7 @@ public void EnvironmentVariable_ArchSpecificDotnetRootIsUsedOverDotnetRoot()
                 .DotNetRoot(dotnet, arch)
                 .Execute()
                 .Should().Pass()
-                .And.HaveUsedDotNetRootInstallLocation(arch, dotnet)
+                .And.HaveUsedDotNetRootInstallLocation(dotnet, arch, fixture.CurrentRid)
                 .And.NotHaveStdErrContaining("Using environment variable DOTNET_ROOT=");
         }
 
@@ -98,8 +98,8 @@ public void InstallLocationFile_ArchSpecificLocationIsPickedFirst()
                     .DotNetRoot(null)
                     .Execute()
                     .Should().HaveFoundDefaultInstallLocationInConfigFile(path1)
-                    .And.HaveFoundArchSpecificInstallLocationInConfigFile(arch1, path1)
-                    .And.HaveFoundArchSpecificInstallLocationInConfigFile(arch2, path2)
+                    .And.HaveFoundArchSpecificInstallLocationInConfigFile(path1, arch1)
+                    .And.HaveFoundArchSpecificInstallLocationInConfigFile(path2, arch2)
                     .And.HaveUsedGlobalInstallLocation(path2);
             }
         }