Addressing comments

Author: NikolaMilosavljevic

src/SourceBuild/content/test/Microsoft.DotNet.Installer.Tests/Config.cs

@@ -9,6 +9,12 @@
 
 namespace Microsoft.DotNet.Installer.Tests;
 
+public enum Architecture
+{
+    X64,
+    Arm64
+}
+
 public static class Config
 {
     public static string AssetsDirectory { get; } = GetRuntimeConfig(AssetsDirectorySwitch);
@@ -20,7 +26,7 @@ public static class Config
     public static string ScenarioTestsNuGetConfigPath { get; } = GetRuntimeConfig(ScenarioTestsNuGetConfigSwitch);
     const string ScenarioTestsNuGetConfigSwitch = RuntimeConfigSwitchPrefix + nameof(ScenarioTestsNuGetConfigPath);
 
-    public static string Architecture { get; } = GetRuntimeConfig(ArchitectureSwitch);
+    public static Architecture Architecture { get; } = GetArchitecture(GetRuntimeConfig(ArchitectureSwitch));
     const string ArchitectureSwitch = RuntimeConfigSwitchPrefix + nameof(Architecture);
 
     public static bool TestRpmPackages { get; } = TryGetRuntimeConfig(TestRpmPackagesSwitch, out bool value) ? value : false;
@@ -34,6 +40,13 @@ public static class Config
 
     public const string RuntimeConfigSwitchPrefix = "Microsoft.DotNet.Installer.Tests.";
 
+    public static Architecture GetArchitecture(string architecture) => architecture switch
+    {
+        "x64" => Architecture.X64,
+        "arm64" => Architecture.Arm64,
+        _ => throw new ArgumentException($"Unknown architecture: {architecture}")
+    };
+
     public static string GetRuntimeConfig(string key)
     {
         return TryGetRuntimeConfig(key, out string? value) ? value : throw new InvalidOperationException($"Runtime config setting '{key}' must be specified");

src/SourceBuild/content/test/Microsoft.DotNet.Installer.Tests/LinuxInstallerTests.cs

@@ -55,7 +55,7 @@ public LinuxInstallerTests(ITestOutputHelper outputHelper)
         _contextDir = Path.Combine(_tmpDir, Path.GetRandomFileName());
         Directory.CreateDirectory(_contextDir);
 
-        _excludeLinuxArch = Config.Architecture == "x64" ? "arm64" : "x64";
+        _excludeLinuxArch = Config.Architecture == Architecture.X64 ? "arm64" : "x64";
     }
 
     public void Dispose()
@@ -96,7 +96,7 @@ public void DebTest(string repo, string tag)
     private void InitializeContext(PackageType packageType)
     {
         string packageArchitecture =
-            Config.Architecture == "x64" ?
+            Config.Architecture == Architecture.X64 ?
                 "x64" :
                 packageType == PackageType.Rpm ?
                     "aarch64" :
@@ -117,7 +117,7 @@ private void InitializeContext(PackageType packageType)
                 File.Copy(rpmPackage, Path.Combine(_contextDir, Path.GetFileName(rpmPackage)));
             }
 
-            if (Config.Architecture == "x64")
+            if (Config.Architecture == Architecture.X64)
             {
                 DownloadFileAsync(NetStandard21RpmPackage, Path.Combine(_contextDir, Path.GetFileName(NetStandard21RpmPackage))).Wait();
             }
@@ -131,7 +131,7 @@ private void InitializeContext(PackageType packageType)
                 File.Copy(debPackage, Path.Combine(_contextDir, Path.GetFileName(debPackage)));
             }
 
-            if (Config.Architecture == "x64")
+            if (Config.Architecture == Architecture.X64)
             {
                 DownloadFileAsync(NetStandard21DebPackage, Path.Combine(_contextDir, Path.GetFileName(NetStandard21DebPackage))).Wait();
             }
@@ -286,7 +286,7 @@ private List<string> GetPackageList(string baseImage, PackageType packageType)
         AddPackage(packageList, "aspnetcore-runtime-", packageType);
         AddPackage(packageList, "aspnetcore-targeting-pack-", packageType);
         AddPackage(packageList, "dotnet-apphost-pack-", packageType);
-        if (Config.Architecture == "x64")
+        if (Config.Architecture == Architecture.X64)
         {
             // netstandard package exists for x64 only
             AddPackage(packageList, "netstandard-targeting-pack-", packageType);

src/SourceBuild/content/test/tests.proj

@@ -21,7 +21,7 @@
   </PropertyGroup>
 
   <ItemGroup Condition="'$(TestInstallerPackages)' == 'true'">
-    <ProjectReference Condition="'$(TestRpmPackages)' == 'true' or '$(TestDebPackages)' == 'true'" Include="Microsoft.DotNet.Installer.Tests\Microsoft.DotNet.Installer.Tests.csproj" BuildInParallel="false" />
+    <ProjectReference Include="Microsoft.DotNet.Installer.Tests\Microsoft.DotNet.Installer.Tests.csproj" BuildInParallel="false" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TestInstallerPackages)' != 'true'">