Enable container tests

build/RunTestsOnHelix.sh

@@ -1,5 +1,46 @@
 #!/usr/bin/env bash
 
+install_dependencies() {
+  echo "Installing dependencies..."
+
+  if [ -f /etc/os-release ]; then
+    . /etc/os-release
+    echo "Detected OS: $ID $VERSION_ID"
+
+    case "$ID" in
+      centos)
+        sudo dnf install -y epel-release || echo "Warning: Failed to install epel-release"
+        sudo dnf install -y zlib-devel libunwind || echo "Warning: Failed to install zlib-devel or libunwind"
+        ;;
+
+      fedora)
+        sudo dnf install -y zlib-devel clang icu libicu libicu-devel || echo "Warning: Failed to install zlib-devel or clang"
+        export DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false
+        export LD_LIBRARY_PATH=/usr/lib64:$LD_LIBRARY_PATH
+        sudo ldconfig
+        echo "Verifying ICU installation..."
+        if ldconfig -p | grep libicu; then
+          echo "ICU libraries found."
+        else
+          echo "ICU libraries not found in ldconfig. You may need to check your installation."
+        fi
+        echo ".NET Info:"
+        dotnet --info
+        ;;
+
+      alpine)
+        sudo apk add --no-cache zlib-dev musl-dev clang || echo "Warning: Failed to install zlib-dev, musl-dev or clang"
+        ;;
+    esac
+  else
+    echo "Notice: /etc/os-release not found. Skipping dependency installation."
+  fi
+
+  echo "Dependencies installation complete."
+}
+
+install_dependencies
+
 # make NuGet network operations more robust
 export NUGET_ENABLE_EXPERIMENTAL_HTTP_RETRY=true
 export NUGET_EXPERIMENTAL_MAX_NETWORK_TRY_COUNT=6

eng/pipelines/templates/jobs/sdk-job-matrix.yml

@@ -35,19 +35,14 @@ parameters:
     runTests: true
   - categoryName: ContainerBased
     container: fedora39
-    # No fedora Helix container is available, so use the ubuntu one instead.
-    helixTargetContainer: $(helixTargetContainerPrefix)ubuntu-22.04-helix-amd64
+    helixTargetContainer: $(helixTargetContainerPrefix)fedora-41-helix-amd64
     osProperties: $(linuxOsPortableProperties)
-    # Skipping all container-based testing for now.
-    # See: https://github.com/dotnet/sdk/issues/40935
-    runTests: false
+    runTests: true
   - categoryName: ContainerBased
     container: centosStream9
     helixTargetContainer: $(helixTargetContainerPrefix)centos-stream9-helix
     osProperties: /p:OSName=linux
-    # Skipping all container-based testing for now.
-    # See: https://github.com/dotnet/sdk/issues/40935
-    runTests: false
+    runTests: true
   - categoryName: ContainerBased
     container: debian12Amd64
     helixTargetContainer: $(helixTargetContainerPrefix)debian-11-helix-amd64
@@ -58,12 +53,10 @@ parameters:
     helixTargetContainer: $(helixTargetContainerPrefix)alpine-3.18-helix-amd64
     runtimeIdentifier: linux-musl-x64
     # Use HostOSName when running on alpine.
-    osProperties: /p:HostOSName=linux-musl
+    osProperties: /p:HostOSName=linux-musl /p:UseCrossgen2=true
     # SBOM generation is not supported for alpine.
     enableSbom: false
-    # Skipping all container-based testing for now.
-    # See: https://github.com/dotnet/sdk/issues/40935
-    runTests: false
+    runTests: true
   - categoryName: TemplateEngine
     osProperties: $(linuxOsPortableProperties)
     testProjects: $(Build.SourcesDirectory)/test/Microsoft.TemplateEngine.Cli.UnitTests/Microsoft.TemplateEngine.Cli.UnitTests.csproj;$(Build.SourcesDirectory)/test/dotnet-new.IntegrationTests/dotnet-new.IntegrationTests.csproj

test/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildASelfContainedApp.cs

@@ -18,7 +18,7 @@ public GivenThatWeWantToBuildASelfContainedApp(ITestOutputHelper log) : base(log
         [Theory]
         [InlineData("netcoreapp1.1", false)]
         [InlineData("netcoreapp2.0", false)]
-        [InlineData("netcoreapp3.0", true)]
+        [InlineData(ToolsetInfo.CurrentTargetFramework, true)]
         public void It_builds_a_runnable_output(string targetFramework, bool dependenciesIncluded)
         {
             if (!EnvironmentInfo.SupportsTargetFramework(targetFramework))

test/Microsoft.NET.TestFramework/EnvironmentInfo.cs

@@ -101,70 +101,32 @@ public static bool SupportsTargetFramework(string targetFramework)
                         return false;
                     }
                 }
-                else if (osId.Equals("debian", StringComparison.OrdinalIgnoreCase))
+                else if (osId.Equals("centos", StringComparison.OrdinalIgnoreCase))
                 {
                     if (nugetFramework.Version < new Version(2, 0, 0, 0))
                     {
                         return false;
                     }
                 }
-                else if (Version.TryParse(versionString, out Version? osVersion))
+                else if (osId.Equals("debian", StringComparison.OrdinalIgnoreCase))
                 {
-                    if (osId.Equals("fedora", StringComparison.OrdinalIgnoreCase))
+                    if (nugetFramework.Version < new Version(2, 0, 0, 0))
                     {
-                        if (osVersion.Major <= 27)
-                        {
-                            if (nugetFramework.Version < new Version(2, 1, 0, 0))
-                            {
-                                return true;
-                            }
-                            else
-                            {
-                                return false;
-                            }
-                        }
-                        else if (osVersion.Major == 28)
-                        {
-                            if (nugetFramework.Version < new Version(2, 1, 0, 0))
-                            {
-                                return false;
-                            }
-                            else
-                            {
-                                return true;
-                            }
-                        }
-                        else if (osVersion.Major >= 29)
-                        {
-                            if (nugetFramework.Version < new Version(2, 2, 0, 0))
-                            {
-                                return false;
-                            }
-                            else
-                            {
-                                return true;
-                            }
-                        }
+                        return false;
                     }
-                    else if (osId.Equals("rhel", StringComparison.OrdinalIgnoreCase))
+                }
+                else if (osId.Equals("fedora", StringComparison.OrdinalIgnoreCase))
+                {
+                    if (nugetFramework.Version < new Version(2, 2, 0, 0))
                     {
-                        if (osVersion.Major == 6)
-                        {
-                            if (nugetFramework.Version < new Version(2, 0, 0, 0))
-                            {
-                                return false;
-                            }
-                        }
+                        return false;
                     }
-                    else if (osId.Equals("ubuntu", StringComparison.OrdinalIgnoreCase))
+                }
+                else if (osId.Equals("ubuntu", StringComparison.OrdinalIgnoreCase))
+                {
+                    if (nugetFramework.Version < new Version(2, 0, 0, 0))
                     {
-                        if (osVersion > new Version(16, 04))
-                        {
-                            if (nugetFramework.Version < new Version(2, 0, 0, 0))
-                            {
-                                return false;
-                            }
-                        }
+                        return false;
                     }
                 }
             }

test/dotnet.Tests/CommandTests/Workload/Restore/GivenDotnetWorkloadRestore.cs

@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
 namespace Microsoft.DotNet.Cli.Workload.Restore.Tests;
@@ -60,6 +60,16 @@ public void ProjectsThatDoNotSupportWorkloadsAndAreTransitivelyReferencedDoNotBr
 
     private bool IsRunningInContainer()
     {
-        return File.Exists("/.dockerenv") && (RuntimeInformation.OSDescription.Contains("Ubuntu") || RuntimeInformation.OSDescription.Contains("Debian"));
+        if (!File.Exists("/.dockerenv"))
+        {
+            return false;
+        }
+
+        string osDescription = RuntimeInformation.OSDescription.ToLowerInvariant();
+        return osDescription.Contains("alpine") ||
+               osDescription.Contains("centos") ||
+               osDescription.Contains("debian") ||
+               osDescription.Contains("fedora") ||
+               osDescription.Contains("ubuntu");
     }
 }