Add test

elinor-fung · elinor-fung · commit c17d51a2488d · 2024-08-29T15:58:55.000-07:00
diff --git a/src/installer/tests/HostActivation.Tests/FrameworkResolution/ApplyPatchesSettings.cs b/src/installer/tests/HostActivation.Tests/FrameworkResolution/ApplyPatchesSettings.cs
@@ -5,6 +5,8 @@
 using Microsoft.DotNet.Cli.Build.Framework;
 using Xunit;
 
+using static Microsoft.DotNet.CoreSetup.Test.Constants;
+
 namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.FrameworkResolution
 {
     public class ApplyPatchesSettings :
diff --git a/src/installer/tests/HostActivation.Tests/FrameworkResolution/ComplexHierarchies.cs b/src/installer/tests/HostActivation.Tests/FrameworkResolution/ComplexHierarchies.cs
@@ -6,6 +6,8 @@
 using System;
 using Xunit;
 
+using static Microsoft.DotNet.CoreSetup.Test.Constants;
+
 namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.FrameworkResolution
 {
     public class ComplexHierarchies :
diff --git a/src/installer/tests/HostActivation.Tests/FrameworkResolution/FrameworkResolutionBase.Settings.cs b/src/installer/tests/HostActivation.Tests/FrameworkResolution/FrameworkResolutionBase.Settings.cs
@@ -85,7 +85,7 @@ public enum SettingLocation
         public static Func<TestSettings, TestSettings> RollForwardSetting(
             SettingLocation location,
             string value,
-            string frameworkReferenceName = MicrosoftNETCoreApp)
+            string frameworkReferenceName = Constants.MicrosoftNETCoreApp)
         {
             if (value == null || location == SettingLocation.None)
             {
@@ -114,7 +114,7 @@ public static Func<TestSettings, TestSettings> RollForwardSetting(
         public static Func<TestSettings, TestSettings> RollForwardOnNoCandidateFxSetting(
             SettingLocation location,
             int? value,
-            string frameworkReferenceName = MicrosoftNETCoreApp)
+            string frameworkReferenceName = Constants.MicrosoftNETCoreApp)
         {
             if (!value.HasValue || location == SettingLocation.None)
             {
@@ -143,7 +143,7 @@ public static Func<TestSettings, TestSettings> RollForwardOnNoCandidateFxSetting
         public static Func<TestSettings, TestSettings> ApplyPatchesSetting(
             SettingLocation location,
             bool? value,
-            string frameworkReferenceName = MicrosoftNETCoreApp)
+            string frameworkReferenceName = Constants.MicrosoftNETCoreApp)
         {
             if (!value.HasValue || location == SettingLocation.None)
             {
diff --git a/src/installer/tests/HostActivation.Tests/FrameworkResolution/FrameworkResolutionBase.cs b/src/installer/tests/HostActivation.Tests/FrameworkResolution/FrameworkResolutionBase.cs
@@ -11,8 +11,6 @@ namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.FrameworkResolution
 {
     public abstract partial class FrameworkResolutionBase
     {
-        protected const string MicrosoftNETCoreApp = "Microsoft.NETCore.App";
-
         public static class ResolvedFramework
         {
             public const string NotFound = "[not found]";
@@ -23,7 +21,6 @@ protected CommandResult RunTest(
             DotNetCli dotnet,
             TestApp app,
             TestSettings settings,
-            Action<CommandResult> resultAction = null,
             bool? multiLevelLookup = false)
         {
             using (DotNetCliExtensions.DotNetCliCustomizer dotnetCustomizer = settings.DotnetCustomizer == null ? null : dotnet.Customize())
@@ -53,8 +50,6 @@ protected CommandResult RunTest(
                     .Environment(settings.Environment)
                     .Execute();
 
-                resultAction?.Invoke(result);
-
                 return result;
             }
         }
diff --git a/src/installer/tests/HostActivation.Tests/FrameworkResolution/FxVersionCLI.cs b/src/installer/tests/HostActivation.Tests/FrameworkResolution/FxVersionCLI.cs
@@ -5,6 +5,8 @@
 using Microsoft.DotNet.Cli.Build.Framework;
 using Xunit;
 
+using static Microsoft.DotNet.CoreSetup.Test.Constants;
+
 namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.FrameworkResolution
 {
     public class FXVersionCLI :
diff --git a/src/installer/tests/HostActivation.Tests/FrameworkResolution/IncludedFrameworksSettings.cs b/src/installer/tests/HostActivation.Tests/FrameworkResolution/IncludedFrameworksSettings.cs
@@ -5,6 +5,8 @@
 using Microsoft.DotNet.Cli.Build.Framework;
 using Xunit;
 
+using static Microsoft.DotNet.CoreSetup.Test.Constants;
+
 namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.FrameworkResolution
 {
     public class IncludedFrameworksSettings :
diff --git a/src/installer/tests/HostActivation.Tests/FrameworkResolution/MultipleHives.cs b/src/installer/tests/HostActivation.Tests/FrameworkResolution/MultipleHives.cs
@@ -8,6 +8,7 @@
 using Microsoft.DotNet.Cli.Build;
 using Microsoft.DotNet.Cli.Build.Framework;
 using Xunit;
+using static Microsoft.DotNet.CoreSetup.Test.Constants;
 
 namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.FrameworkResolution
 {
@@ -217,6 +218,50 @@ public void FrameworkResolutionError(string tfm, bool? multiLevelLookup, bool ef
                 .And.HaveStdErrContaining("Ignoring FX version [9999.9.9] without .deps.json");
         }
 
+        [Fact]
+        public void FrameworkResolutionError_ListOtherArchitectures()
+        {
+            using (var registeredInstallLocationOverride = new RegisteredInstallLocationOverride(SharedState.DotNetMainHive.GreatestVersionHostFxrFilePath))
+            using (var otherArchArtifact = TestArtifact.Create("otherArch"))
+            {
+                string requestedVersion = "9999.9.9";
+                string[] otherArchs = ["arm64", "x64", "x86"];
+                var installLocations = new (string, string)[otherArchs.Length];
+                for (int i = 0; i < otherArchs.Length; i++)
+                {
+                    string arch = otherArchs[i];
+
+                    // Create a .NET install with Microsoft.NETCoreApp at the registered location
+                    var dotnet = new DotNetBuilder(otherArchArtifact.Location, TestContext.BuiltDotNet.BinPath, arch)
+                        .AddMicrosoftNETCoreAppFrameworkMockHostPolicy(requestedVersion)
+                        .Build();
+                    installLocations[i] = (arch, dotnet.BinPath);
+                }
+
+                registeredInstallLocationOverride.SetInstallLocation(installLocations);
+
+                CommandResult result = RunTest(
+                    new TestSettings()
+                        .WithRuntimeConfigCustomizer(c => c.WithFramework(MicrosoftNETCoreApp, requestedVersion))
+                        .WithEnvironment(TestOnlyEnvironmentVariables.RegisteredConfigLocation, registeredInstallLocationOverride.PathValueOverride),
+                    multiLevelLookup: null);
+
+                result.ShouldFailToFindCompatibleFrameworkVersion(MicrosoftNETCoreApp, requestedVersion)
+                    .And.HaveStdErrContaining("The following frameworks for other architectures were found:");
+
+                // Error message should list framework found for other architectures
+                foreach ((string arch, string path) in installLocations)
+                {
+                    if (arch == TestContext.BuildArchitecture)
+                        continue;
+
+                    string expectedPath = System.Text.RegularExpressions.Regex.Escape(Path.Combine(path, "shared", MicrosoftNETCoreApp));
+                    result.Should()
+                        .HaveStdErrMatching($@"{arch}\s*{requestedVersion} at \[{expectedPath}\]", System.Text.RegularExpressions.RegexOptions.Multiline);
+                }
+            }
+        }
+
         private CommandResult RunTest(Func<RuntimeConfig, RuntimeConfig> runtimeConfig, bool? multiLevelLookup = true)
             => RunTest(new TestSettings().WithRuntimeConfigCustomizer(runtimeConfig), multiLevelLookup);
 
diff --git a/src/installer/tests/HostActivation.Tests/FrameworkResolution/RollForwardAndRollForwardOnNoCandidateFxSettings.cs b/src/installer/tests/HostActivation.Tests/FrameworkResolution/RollForwardAndRollForwardOnNoCandidateFxSettings.cs
@@ -5,6 +5,8 @@
 using Microsoft.DotNet.Cli.Build.Framework;
 using Xunit;
 
+using static Microsoft.DotNet.CoreSetup.Test.Constants;
+
 namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.FrameworkResolution
 {
     public class RollForwardAndRollForwardOnNoCandidateFxSettings :
diff --git a/src/installer/tests/HostActivation.Tests/FrameworkResolution/RollForwardMultipleFrameworks.cs b/src/installer/tests/HostActivation.Tests/FrameworkResolution/RollForwardMultipleFrameworks.cs
@@ -6,6 +6,8 @@
 using System;
 using Xunit;
 
+using static Microsoft.DotNet.CoreSetup.Test.Constants;
+
 namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.FrameworkResolution
 {
     public class RollForwardMultipleFrameworks :
diff --git a/src/installer/tests/HostActivation.Tests/FrameworkResolution/RollForwardOnNoCandidateFx.cs b/src/installer/tests/HostActivation.Tests/FrameworkResolution/RollForwardOnNoCandidateFx.cs
@@ -1,11 +1,13 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System;
 using Microsoft.DotNet.Cli.Build;
 using Microsoft.DotNet.Cli.Build.Framework;
-using System;
 using Xunit;
 
+using static Microsoft.DotNet.CoreSetup.Test.Constants;
+
 namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.FrameworkResolution
 {
     public class RollForwardOnNoCandidateFx :
diff --git a/src/installer/tests/HostActivation.Tests/FrameworkResolution/RollForwardOnNoCandidateFxMultipleFrameworks.cs b/src/installer/tests/HostActivation.Tests/FrameworkResolution/RollForwardOnNoCandidateFxMultipleFrameworks.cs
@@ -6,6 +6,8 @@
 using System;
 using Xunit;
 
+using static Microsoft.DotNet.CoreSetup.Test.Constants;
+
 namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.FrameworkResolution
 {
     public class RollForwardOnNoCandidateFxMultipleFrameworks :
diff --git a/src/installer/tests/HostActivation.Tests/FrameworkResolution/RollForwardOnNoCandidateFxSettings.cs b/src/installer/tests/HostActivation.Tests/FrameworkResolution/RollForwardOnNoCandidateFxSettings.cs
@@ -5,6 +5,8 @@
 using Microsoft.DotNet.Cli.Build.Framework;
 using Xunit;
 
+using static Microsoft.DotNet.CoreSetup.Test.Constants;
+
 namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.FrameworkResolution
 {
     public class RollForwardOnNoCandidateFxSettings :
diff --git a/src/installer/tests/HostActivation.Tests/FrameworkResolution/RollForwardPreReleaseOnly.cs b/src/installer/tests/HostActivation.Tests/FrameworkResolution/RollForwardPreReleaseOnly.cs
@@ -5,6 +5,8 @@
 using Microsoft.DotNet.Cli.Build.Framework;
 using Xunit;
 
+using static Microsoft.DotNet.CoreSetup.Test.Constants;
+
 namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.FrameworkResolution
 {
     /// <summary>
diff --git a/src/installer/tests/HostActivation.Tests/FrameworkResolution/RollForwardReleaseAndPreRelease.cs b/src/installer/tests/HostActivation.Tests/FrameworkResolution/RollForwardReleaseAndPreRelease.cs
@@ -5,6 +5,8 @@
 using Microsoft.DotNet.Cli.Build.Framework;
 using Xunit;
 
+using static Microsoft.DotNet.CoreSetup.Test.Constants;
+
 namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.FrameworkResolution
 {
     /// <summary>
diff --git a/src/installer/tests/HostActivation.Tests/FrameworkResolution/RollForwardReleaseOnly.cs b/src/installer/tests/HostActivation.Tests/FrameworkResolution/RollForwardReleaseOnly.cs
@@ -5,6 +5,8 @@
 using Microsoft.DotNet.Cli.Build.Framework;
 using Xunit;
 
+using static Microsoft.DotNet.CoreSetup.Test.Constants;
+
 namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.FrameworkResolution
 {
     /// <summary>
diff --git a/src/installer/tests/HostActivation.Tests/FrameworkResolution/RollForwardSettings.cs b/src/installer/tests/HostActivation.Tests/FrameworkResolution/RollForwardSettings.cs
@@ -5,6 +5,8 @@
 using Microsoft.DotNet.Cli.Build.Framework;
 using Xunit;
 
+using static Microsoft.DotNet.CoreSetup.Test.Constants;
+
 namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.FrameworkResolution
 {
     public class RollForwardSettings :
diff --git a/src/installer/tests/TestUtils/Constants.cs b/src/installer/tests/TestUtils/Constants.cs
@@ -1,6 +1,8 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System;
+
 namespace Microsoft.DotNet.CoreSetup.Test
 {
     public static class Constants
@@ -82,8 +84,10 @@ public static class DisableGuiErrors
         public static class TestOnlyEnvironmentVariables
         {
             public const string DefaultInstallPath = "_DOTNET_TEST_DEFAULT_INSTALL_PATH";
-            public const string RegistryPath = "_DOTNET_TEST_REGISTRY_PATH";
             public const string GloballyRegisteredPath = "_DOTNET_TEST_GLOBALLY_REGISTERED_PATH";
+
+            public static string RegisteredConfigLocation = OperatingSystem.IsWindows() ? RegistryPath : InstallLocationPath;
+            public const string RegistryPath = "_DOTNET_TEST_REGISTRY_PATH";
             public const string InstallLocationPath = "_DOTNET_TEST_INSTALL_LOCATION_PATH";
         }
 

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,8 @@`
`5`	`5`	`using Microsoft.DotNet.Cli.Build.Framework;`
`6`	`6`	`using Xunit;`
`7`	`7`
	`8`	`+using static Microsoft.DotNet.CoreSetup.Test.Constants;`
	`9`	`+`
`8`	`10`	`namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.FrameworkResolution`
`9`	`11`	`{`
`10`	`12`	`public class ApplyPatchesSettings :`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,8 @@`
`6`	`6`	`using System;`
`7`	`7`	`using Xunit;`
`8`	`8`
	`9`	`+using static Microsoft.DotNet.CoreSetup.Test.Constants;`
	`10`	`+`
`9`	`11`	`namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.FrameworkResolution`
`10`	`12`	`{`
`11`	`13`	`public class ComplexHierarchies :`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ public enum SettingLocation`
`85`	`85`	`public static Func<TestSettings, TestSettings> RollForwardSetting(`
`86`	`86`	`SettingLocation location,`
`87`	`87`	`string value,`
`88`		`- string frameworkReferenceName = MicrosoftNETCoreApp)`
	`88`	`+ string frameworkReferenceName = Constants.MicrosoftNETCoreApp)`
`89`	`89`	`{`
`90`	`90`	`if (value == null \|\| location == SettingLocation.None)`
`91`	`91`	`{`
`@@ -114,7 +114,7 @@ public static Func<TestSettings, TestSettings> RollForwardSetting(`
`114`	`114`	`public static Func<TestSettings, TestSettings> RollForwardOnNoCandidateFxSetting(`
`115`	`115`	`SettingLocation location,`
`116`	`116`	`int? value,`
`117`		`- string frameworkReferenceName = MicrosoftNETCoreApp)`
	`117`	`+ string frameworkReferenceName = Constants.MicrosoftNETCoreApp)`
`118`	`118`	`{`
`119`	`119`	`if (!value.HasValue \|\| location == SettingLocation.None)`
`120`	`120`	`{`
`@@ -143,7 +143,7 @@ public static Func<TestSettings, TestSettings> RollForwardOnNoCandidateFxSetting`
`143`	`143`	`public static Func<TestSettings, TestSettings> ApplyPatchesSetting(`
`144`	`144`	`SettingLocation location,`
`145`	`145`	`bool? value,`
`146`		`- string frameworkReferenceName = MicrosoftNETCoreApp)`
	`146`	`+ string frameworkReferenceName = Constants.MicrosoftNETCoreApp)`
`147`	`147`	`{`
`148`	`148`	`if (!value.HasValue \|\| location == SettingLocation.None)`
`149`	`149`	`{`
Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,6 @@ namespace Microsoft.DotNet.CoreSetup.Test.HostActivation.FrameworkResolution`
`11`	`11`	`{`
`12`	`12`	`public abstract partial class FrameworkResolutionBase`
`13`	`13`	`{`
`14`		`- protected const string MicrosoftNETCoreApp = "Microsoft.NETCore.App";`
`15`		`-`
`16`	`14`	`public static class ResolvedFramework`
`17`	`15`	`{`
`18`	`16`	`public const string NotFound = "[not found]";`
`@@ -23,7 +21,6 @@ protected CommandResult RunTest(`
`23`	`21`	`DotNetCli dotnet,`
`24`	`22`	`TestApp app,`
`25`	`23`	`TestSettings settings,`
`26`		`- Action<CommandResult> resultAction = null,`
`27`	`24`	`bool? multiLevelLookup = false)`
`28`	`25`	`{`
`29`	`26`	`using (DotNetCliExtensions.DotNetCliCustomizer dotnetCustomizer = settings.DotnetCustomizer == null ? null : dotnet.Customize())`
`@@ -53,8 +50,6 @@ protected CommandResult RunTest(`
`53`	`50`	`.Environment(settings.Environment)`
`54`	`51`	`.Execute();`
`55`	`52`
`56`		`- resultAction?.Invoke(result);`
`57`		`-`
`58`	`53`	`return result;`
`59`	`54`	`}`
`60`	`55`	`}`