[main] Remove netstandard-2.1 from installer tests (#2402)

github-actions[bot] · NikolaMilosavljevic · web-flow · commit 99827afdd78b · 2025-09-12T15:29:34.000-07:00
Co-authored-by: Nikola Milosavljevic &lt;nikolam@microsoft.com&gt;
diff --git a/eng/pipelines/templates/stages/vmr-validation.yml b/eng/pipelines/templates/stages/vmr-validation.yml
@@ -66,7 +66,7 @@ stages:
   jobs:
   - job: ValidateInstallers_Linux_x64
     pool: ${{ parameters.pool_Linux }}
-    timeoutInMinutes: 30
+    timeoutInMinutes: 60
     steps:
     - template: ../steps/vmr-validate-installers.yml
       parameters:
diff --git a/test/Microsoft.DotNet.Installer.Tests/LinuxInstallerTests.cs b/test/Microsoft.DotNet.Installer.Tests/LinuxInstallerTests.cs
@@ -52,16 +52,12 @@ public partial class LinuxInstallerTests : IDisposable
                 $"{DotnetRuntimePrefix}{Config.TargetFrameworkVersion}",
                 $"{DotnetTargetingPackPrefix}{Config.TargetFrameworkVersion}",
                 $"{DotnetApphostPackPrefix}{Config.TargetFrameworkVersion}",
-                NetStandardTargetingPackName,
                 $"{AspNetCoreRuntimePrefix}{Config.TargetFrameworkVersion}",
                 $"{AspNetCoreTargetingPackPrefix}{Config.TargetFrameworkVersion}"
             }
         }
     };
 
-    private static readonly Uri NetStandard21RpmPackage = new Uri("https://dotnetcli.blob.core.windows.net/dotnet/Runtime/3.1.0/netstandard-targeting-pack-2.1.0-x64.rpm");
-    private static readonly Uri NetStandard21DebPackage = new Uri("https://dotnetcli.blob.core.windows.net/dotnet/Runtime/3.1.0/netstandard-targeting-pack-2.1.0-x64.deb");
-
     // Transform patch versions in 100-199 range by removing leading "1"
     // e.g., 10.0.100-rc.1.25405.108 -> 10.0.0-rc.1.25405.108
     // e.g., 10.0.112-rc.1.25405.108 -> 10.0.12-rc.1.25405.108
@@ -95,8 +91,6 @@ public partial class LinuxInstallerTests : IDisposable
     private const string AspNetCoreRuntimePrefix = "aspnetcore-runtime-";
     private const string AspNetCoreTargetingPackPrefix = "aspnetcore-targeting-pack-";
     private const string DotnetApphostPackPrefix = "dotnet-apphost-pack-";
-    private const string NetStandardTargetingPackPrefix = "netstandard-targeting-pack-";
-    private const string NetStandardTargetingPackName = $"{NetStandardTargetingPackPrefix}2.1";
     private const string DotnetSdkPrefix = "dotnet-sdk-";
 
     public static bool IncludeRpmTests => Config.TestRpmPackages;
@@ -200,7 +194,7 @@ private async Task InitializeContextAsync(PackageType packageType, bool initiali
                 File.Copy(rpmPackage, Path.Combine(_contextDir, Path.GetFileName(rpmPackage)));
             }
 
-            await DownloadPackagesAsync(packageArchitecture, packageType, NetStandard21RpmPackage);
+            await DownloadPackagesAsync(packageArchitecture, packageType);
             _rpmContextInitialized = true;
         }
         else if (!_debContextInitialized)
@@ -211,7 +205,7 @@ private async Task InitializeContextAsync(PackageType packageType, bool initiali
                 File.Copy(debPackage, Path.Combine(_contextDir, Path.GetFileName(debPackage)));
             }
 
-            await DownloadPackagesAsync(packageArchitecture, packageType, NetStandard21DebPackage);
+            await DownloadPackagesAsync(packageArchitecture, packageType);
             _debContextInitialized = true;
         }
 
@@ -246,16 +240,11 @@ private async Task InitializeContextAsync(PackageType packageType, bool initiali
         }
     }
 
-    private async Task DownloadPackagesAsync(string packageArchitecture, PackageType packageType, Uri netStandardPackageUri)
+    private async Task DownloadPackagesAsync(string packageArchitecture, PackageType packageType)
     {
         // Collect URLs and file names for downloading
         var downloadsToProcess = new List<(Uri url, string fileName)>();
         
-        if (Config.Architecture == Architecture.X64)
-        {
-            downloadsToProcess.Add((netStandardPackageUri, netStandardPackageUri.Segments.Last()));
-        }
-
         // Since this is for a non-1xx branch, we never produced runtime packages. Download these from
         // the referenced 1xx build instead.
         if (!Config.DotNetBuildSharedComponents)
@@ -437,11 +426,6 @@ private List<string> GetPackageList(string baseImage, PackageType packageType)
         AddPackage(packageList, AspNetCoreRuntimePrefix, packageType);
         AddPackage(packageList, AspNetCoreTargetingPackPrefix, packageType);
         AddPackage(packageList, DotnetApphostPackPrefix, packageType);
-        if (Config.Architecture == Architecture.X64)
-        {
-            // netstandard package exists for x64 only
-            AddPackage(packageList, NetStandardTargetingPackPrefix, packageType);
-        }
         AddPackage(packageList, DotnetSdkPrefix, packageType);
 
         return packageList;
@@ -570,8 +554,8 @@ private void ValidatePackageDependencies(List<string> list, PackageType packageT
     {
         foreach (string package in list)
         {
-            // Skip netstandard and runtime-deps packages as they are not expected to have .NET dependencies
-            if (package.StartsWith(NetStandardTargetingPackPrefix) || package.StartsWith(DotnetRuntimeDepsPrefix))
+            // Skip runtime-deps packages as they are not expected to have .NET dependencies
+            if (package.StartsWith(DotnetRuntimeDepsPrefix))
             {
                 continue;
             }
@@ -589,14 +573,6 @@ private void EnsurePackageContainsExpectedDependencies(string package, PackageTy
             ? _expectedPackageDependencies[packagePrefix]
             : [];
 
-        if (Config.Architecture == Architecture.Arm64 && expectedDependencies.Contains(NetStandardTargetingPackName))
-        {
-            // If we're on Arm64, remove netstandard-targeting-pack-2.1 dependency, as it is x64 only
-            expectedDependencies = expectedDependencies
-                .Where(dep => !dep.StartsWith(NetStandardTargetingPackName))
-                .ToList();
-        }
-
         Assert.Equal(expectedDependencies.OrderBy(x => x), dependencies.OrderBy(x => x));
     }
 
