From f992b8c6f369fd9160ed3f47671b9dcd4d579664 Mon Sep 17 00:00:00 2001 From: Logan Bussell Date: Mon, 22 Jun 2026 14:12:10 -0700 Subject: [PATCH 1/2] Add test asserting SDK images don't set DOTNET_ROLL_FORWARD Extend EnvironmentVariableInfo with a symmetric Require/Forbid factory API so tests can assert that a variable must be set or must not be set. Use it to verify SDK images do not define DOTNET_ROLL_FORWARD, which currently fails for .NET 10 and 11 images. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- .../AspireDashboardImageTests.cs | 10 ++--- .../AspnetImageTests.cs | 2 +- .../CommonRuntimeImageTests.cs | 6 +-- .../EnvironmentVariableInfo.cs | 38 +++++++++++++++---- .../MonitorImageTests.cs | 20 +++++----- .../ProductImageTests.cs | 4 +- .../RuntimeImageTests.cs | 2 +- .../SampleImageTests.cs | 4 +- .../SdkImageTests.cs | 16 +++++--- .../YarpImageTests.cs | 4 +- 10 files changed, 67 insertions(+), 39 deletions(-) diff --git a/tests/Microsoft.DotNet.Docker.Tests/AspireDashboardImageTests.cs b/tests/Microsoft.DotNet.Docker.Tests/AspireDashboardImageTests.cs index cbfbe333a9..611fadf650 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/AspireDashboardImageTests.cs +++ b/tests/Microsoft.DotNet.Docker.Tests/AspireDashboardImageTests.cs @@ -47,11 +47,11 @@ public void VerifyEnvironmentVariables(ProductImageData imageData) IEnumerable expectedVariables = [ // Unset ASPNETCORE_HTTP_PORTS from base image - new EnvironmentVariableInfo("ASPNETCORE_HTTP_PORTS", string.Empty), - new EnvironmentVariableInfo("ASPNETCORE_URLS", $"{baseUrl}:{DashboardWebPort}"), - new EnvironmentVariableInfo("DOTNET_DASHBOARD_OTLP_ENDPOINT_URL", $"{baseUrl}:{DashboardOtlpPort}"), - new EnvironmentVariableInfo("DOTNET_DASHBOARD_OTLP_HTTP_ENDPOINT_URL", $"{baseUrl}:{DashboardOtlpHttpPort}"), - new EnvironmentVariableInfo("DOTNET_DASHBOARD_MCP_ENDPOINT_URL", $"{baseUrl}:{DashboardMcpPort}"), + EnvironmentVariableInfo.Require("ASPNETCORE_HTTP_PORTS", string.Empty), + EnvironmentVariableInfo.Require("ASPNETCORE_URLS", $"{baseUrl}:{DashboardWebPort}"), + EnvironmentVariableInfo.Require("DOTNET_DASHBOARD_OTLP_ENDPOINT_URL", $"{baseUrl}:{DashboardOtlpPort}"), + EnvironmentVariableInfo.Require("DOTNET_DASHBOARD_OTLP_HTTP_ENDPOINT_URL", $"{baseUrl}:{DashboardOtlpHttpPort}"), + EnvironmentVariableInfo.Require("DOTNET_DASHBOARD_MCP_ENDPOINT_URL", $"{baseUrl}:{DashboardMcpPort}"), ]; string imageTag = imageData.GetImage(ImageRepo, DockerHelper); diff --git a/tests/Microsoft.DotNet.Docker.Tests/AspnetImageTests.cs b/tests/Microsoft.DotNet.Docker.Tests/AspnetImageTests.cs index 2db43d9996..6815e2f297 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/AspnetImageTests.cs +++ b/tests/Microsoft.DotNet.Docker.Tests/AspnetImageTests.cs @@ -122,7 +122,7 @@ public static EnvironmentVariableInfo GetAspnetVersionVariableInfo( { string version = imageData.GetProductVersion(imageRepo, DotNetImageRepo.Aspnet, dockerHelper); - return new EnvironmentVariableInfo("ASPNET_VERSION", version) + return EnvironmentVariableInfo.Require("ASPNET_VERSION", version) with { IsProductVersion = true }; diff --git a/tests/Microsoft.DotNet.Docker.Tests/CommonRuntimeImageTests.cs b/tests/Microsoft.DotNet.Docker.Tests/CommonRuntimeImageTests.cs index 20d07f1bd7..a32d9a4b99 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/CommonRuntimeImageTests.cs +++ b/tests/Microsoft.DotNet.Docker.Tests/CommonRuntimeImageTests.cs @@ -35,10 +35,10 @@ protected void VerifyCommonEnvironmentVariables( if (!imageData.IsWindows) { - variables.Add(new EnvironmentVariableInfo("APP_UID", imageData.NonRootUID?.ToString())); + variables.Add(EnvironmentVariableInfo.Require("APP_UID", imageData.NonRootUID?.ToString())); } - variables.Add(new EnvironmentVariableInfo("ASPNETCORE_HTTP_PORTS", imageData.DefaultPort.ToString())); + variables.Add(EnvironmentVariableInfo.Require("ASPNETCORE_HTTP_PORTS", imageData.DefaultPort.ToString())); if (customVariables != null) { @@ -47,7 +47,7 @@ protected void VerifyCommonEnvironmentVariables( if (imageData.GlobalizationInvariantMode) { - variables.Add(new EnvironmentVariableInfo("DOTNET_SYSTEM_GLOBALIZATION_INVARIANT", "true")); + variables.Add(EnvironmentVariableInfo.Require("DOTNET_SYSTEM_GLOBALIZATION_INVARIANT", "true")); } string imageTag = imageData.GetImage(ImageRepo, DockerHelper); diff --git a/tests/Microsoft.DotNet.Docker.Tests/EnvironmentVariableInfo.cs b/tests/Microsoft.DotNet.Docker.Tests/EnvironmentVariableInfo.cs index 3f3cb8ad8b..20fb67fe04 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/EnvironmentVariableInfo.cs +++ b/tests/Microsoft.DotNet.Docker.Tests/EnvironmentVariableInfo.cs @@ -16,18 +16,34 @@ public record EnvironmentVariableInfo public string Name { get; init; } public bool IsProductVersion { get; init; } = false; - public EnvironmentVariableInfo(string name, string expectedValue) - { - Name = name; - ExpectedValue = expectedValue; - } + /// + /// When true, the variable is expected to NOT be set on the image. + /// + public bool ShouldNotExist { get; init; } = false; - public EnvironmentVariableInfo(string name, bool allowAnyValue) + private EnvironmentVariableInfo(string name) { Name = name; - AllowAnyValue = allowAnyValue; } + /// + /// Requires the named environment variable to be set to . + /// + public static EnvironmentVariableInfo Require(string name, string expectedValue) => + new(name) { ExpectedValue = expectedValue }; + + /// + /// Requires the named environment variable to be set to any non-empty value. + /// + public static EnvironmentVariableInfo Require(string name) => + new(name) { AllowAnyValue = true }; + + /// + /// Requires the named environment variable to NOT be set on the image. + /// + public static EnvironmentVariableInfo Forbid(string name) => + new(name) { ShouldNotExist = true }; + public static void Validate( IEnumerable expectedVariables, string imageName, @@ -40,6 +56,14 @@ public static void Validate( { foreach (EnvironmentVariableInfo variable in expectedVariables) { + if (variable.ShouldNotExist) + { + environmentVariables.Should().NotContainKey( + variable.Name, + because: $"{imageName} should not have the environment variable '{variable.Name}' defined"); + continue; + } + string environmentVariable = environmentVariables.Should() .ContainKey( variable.Name, diff --git a/tests/Microsoft.DotNet.Docker.Tests/MonitorImageTests.cs b/tests/Microsoft.DotNet.Docker.Tests/MonitorImageTests.cs index 5b7859ee47..76110df924 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/MonitorImageTests.cs +++ b/tests/Microsoft.DotNet.Docker.Tests/MonitorImageTests.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. // See the LICENSE file in the project root for more information. @@ -120,25 +120,25 @@ public void VerifyEnvironmentVariables(ProductImageData imageData) List variables = [ ..GetCommonEnvironmentVariables(), - new EnvironmentVariableInfo("ASPNETCORE_HTTP_PORTS", string.Empty), + EnvironmentVariableInfo.Require("ASPNETCORE_HTTP_PORTS", string.Empty), // Diagnostics should be disabled - new EnvironmentVariableInfo("COMPlus_EnableDiagnostics", "0"), + EnvironmentVariableInfo.Require("COMPlus_EnableDiagnostics", "0"), // DefaultProcess filter should select a process with a process ID of 1 - new EnvironmentVariableInfo("DefaultProcess__Filters__0__Key", "ProcessId"), - new EnvironmentVariableInfo("DefaultProcess__Filters__0__Value", "1"), + EnvironmentVariableInfo.Require("DefaultProcess__Filters__0__Key", "ProcessId"), + EnvironmentVariableInfo.Require("DefaultProcess__Filters__0__Value", "1"), // Existing (orphaned) diagnostic port should be delete before starting server - new EnvironmentVariableInfo("DiagnosticPort__DeleteEndpointOnStartup", "true"), + EnvironmentVariableInfo.Require("DiagnosticPort__DeleteEndpointOnStartup", "true"), // GC mode should be set to Server - new EnvironmentVariableInfo("DOTNET_gcServer", "1"), + EnvironmentVariableInfo.Require("DOTNET_gcServer", "1"), // Console logger format should be JSON and output UTC timestamps without timezone information - new EnvironmentVariableInfo("Logging__Console__FormatterName", "json"), - new EnvironmentVariableInfo("Logging__Console__FormatterOptions__TimestampFormat", "yyyy-MM-ddTHH:mm:ss.fffffffZ"), - new EnvironmentVariableInfo("Logging__Console__FormatterOptions__UseUtcTimestamp", "true"), + EnvironmentVariableInfo.Require("Logging__Console__FormatterName", "json"), + EnvironmentVariableInfo.Require("Logging__Console__FormatterOptions__TimestampFormat", "yyyy-MM-ddTHH:mm:ss.fffffffZ"), + EnvironmentVariableInfo.Require("Logging__Console__FormatterOptions__UseUtcTimestamp", "true"), ]; EnvironmentVariableInfo.Validate( diff --git a/tests/Microsoft.DotNet.Docker.Tests/ProductImageTests.cs b/tests/Microsoft.DotNet.Docker.Tests/ProductImageTests.cs index d38ec7833d..6c5d84679d 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/ProductImageTests.cs +++ b/tests/Microsoft.DotNet.Docker.Tests/ProductImageTests.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. // See the LICENSE file in the project root for more information. @@ -177,7 +177,7 @@ protected void VerifyNonRootUID(ProductImageData imageData) public static IEnumerable GetCommonEnvironmentVariables() { - yield return new EnvironmentVariableInfo("DOTNET_RUNNING_IN_CONTAINER", "true"); + yield return EnvironmentVariableInfo.Require("DOTNET_RUNNING_IN_CONTAINER", "true"); } /// diff --git a/tests/Microsoft.DotNet.Docker.Tests/RuntimeImageTests.cs b/tests/Microsoft.DotNet.Docker.Tests/RuntimeImageTests.cs index d370b96dd9..cbfc7a7522 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/RuntimeImageTests.cs +++ b/tests/Microsoft.DotNet.Docker.Tests/RuntimeImageTests.cs @@ -101,7 +101,7 @@ public static EnvironmentVariableInfo GetRuntimeVersionVariableInfo( DotNetImageRepo imageRepo, ProductImageData imageData, DockerHelper dockerHelper) { string version = imageData.GetProductVersion(imageRepo, DotNetImageRepo.Runtime, dockerHelper); - return new EnvironmentVariableInfo("DOTNET_VERSION", version) + return EnvironmentVariableInfo.Require("DOTNET_VERSION", version) with { IsProductVersion = true }; diff --git a/tests/Microsoft.DotNet.Docker.Tests/SampleImageTests.cs b/tests/Microsoft.DotNet.Docker.Tests/SampleImageTests.cs index d50e9b344b..00b5768662 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/SampleImageTests.cs +++ b/tests/Microsoft.DotNet.Docker.Tests/SampleImageTests.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. // See the LICENSE file in the project root for more information. @@ -179,7 +179,7 @@ private void ValidateEnvironmentVariables(SampleImageData imageData, string imag if (imageType == SampleImageType.Aspnetapp) { - variables.Add(new EnvironmentVariableInfo("ASPNETCORE_HTTP_PORTS", imageData.DefaultPort.ToString())); + variables.Add(EnvironmentVariableInfo.Require("ASPNETCORE_HTTP_PORTS", imageData.DefaultPort.ToString())); } EnvironmentVariableInfo.Validate( diff --git a/tests/Microsoft.DotNet.Docker.Tests/SdkImageTests.cs b/tests/Microsoft.DotNet.Docker.Tests/SdkImageTests.cs index 85dae83cbe..514f6381ef 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/SdkImageTests.cs +++ b/tests/Microsoft.DotNet.Docker.Tests/SdkImageTests.cs @@ -109,22 +109,26 @@ public void VerifyEnvironmentVariables(ProductImageData imageData) List variables = [ - new EnvironmentVariableInfo("DOTNET_GENERATE_ASPNET_CERTIFICATE", "false"), - new EnvironmentVariableInfo("DOTNET_USE_POLLING_FILE_WATCHER", "true"), - new EnvironmentVariableInfo("NUGET_XMLDOC_MODE", "skip"), - new EnvironmentVariableInfo("DOTNET_SDK_VERSION", version) + EnvironmentVariableInfo.Require("DOTNET_GENERATE_ASPNET_CERTIFICATE", "false"), + EnvironmentVariableInfo.Require("DOTNET_USE_POLLING_FILE_WATCHER", "true"), + EnvironmentVariableInfo.Require("NUGET_XMLDOC_MODE", "skip"), + EnvironmentVariableInfo.Require("DOTNET_SDK_VERSION", version) with { IsProductVersion = true }, AspnetImageTests.GetAspnetVersionVariableInfo(ImageRepo, imageData, DockerHelper), RuntimeImageTests.GetRuntimeVersionVariableInfo(ImageRepo, imageData, DockerHelper), - new EnvironmentVariableInfo("DOTNET_NOLOGO", "true"), + EnvironmentVariableInfo.Require("DOTNET_NOLOGO", "true"), + // DOTNET_ROLL_FORWARD must not be set globally, as it can silently change + // the runtime that unrelated workloads (e.g. dotnet test) execute on. + // See https://github.com/dotnet/dotnet-docker/issues/7255. + EnvironmentVariableInfo.Forbid("DOTNET_ROLL_FORWARD"), ..GetCommonEnvironmentVariables(), ]; if (imageData.SdkOS.Family == OSFamily.Alpine) { - variables.Add(new EnvironmentVariableInfo("DOTNET_SYSTEM_GLOBALIZATION_INVARIANT", "false")); + variables.Add(EnvironmentVariableInfo.Require("DOTNET_SYSTEM_GLOBALIZATION_INVARIANT", "false")); } EnvironmentVariableInfo.Validate(variables, imageName, imageData, DockerHelper); diff --git a/tests/Microsoft.DotNet.Docker.Tests/YarpImageTests.cs b/tests/Microsoft.DotNet.Docker.Tests/YarpImageTests.cs index acd3eba161..5dc0c5cdec 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/YarpImageTests.cs +++ b/tests/Microsoft.DotNet.Docker.Tests/YarpImageTests.cs @@ -43,8 +43,8 @@ public void VerifyEnvironmentVariables(ProductImageData imageData) IEnumerable expectedVariables = [ // Unset ASPNETCORE_HTTP_PORTS from base image - new EnvironmentVariableInfo("ASPNETCORE_HTTP_PORTS", string.Empty), - new EnvironmentVariableInfo("ASPNETCORE_URLS", "http://+:5000"), + EnvironmentVariableInfo.Require("ASPNETCORE_HTTP_PORTS", string.Empty), + EnvironmentVariableInfo.Require("ASPNETCORE_URLS", "http://+:5000"), ]; string imageTag = imageData.GetImage(ImageRepo, DockerHelper); From 79205dd72d7804f7e8380f7e790f76c2336acdc6 Mon Sep 17 00:00:00 2001 From: Logan Bussell Date: Mon, 22 Jun 2026 14:17:17 -0700 Subject: [PATCH 2/2] Remove global DOTNET_ROLL_FORWARD=Major from SDK images The SDK images set DOTNET_ROLL_FORWARD=Major globally as a temporary workaround for PowerShell/PowerShell#20685, until PowerShell shipped on the .NET 10 runtime. It was unintentionally left in. Because the variable is global, it affects unrelated workloads such as dotnet test, silently rolling older-TFM assemblies forward onto the newer installed runtime and masking compatibility failures. Remove the workaround from the SDK env template and regenerate the .NET 10 and .NET 11 SDK Dockerfiles and approved baselines. Fixes dotnet/dotnet-docker#7255 Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- eng/dockerfile-templates/sdk/Dockerfile.envs | 8 ++------ src/sdk/10.0/alpine3.23/amd64/Dockerfile | 4 +--- src/sdk/10.0/alpine3.24/amd64/Dockerfile | 4 +--- src/sdk/10.0/azurelinux3.0/amd64/Dockerfile | 4 +--- src/sdk/10.0/azurelinux3.0/arm64v8/Dockerfile | 4 +--- src/sdk/10.0/azurelinux4.0/amd64/Dockerfile | 4 +--- src/sdk/10.0/azurelinux4.0/arm64v8/Dockerfile | 4 +--- src/sdk/10.0/nanoserver-ltsc2022/amd64/Dockerfile | 4 +--- src/sdk/10.0/nanoserver-ltsc2025/amd64/Dockerfile | 4 +--- src/sdk/10.0/noble/amd64/Dockerfile | 4 +--- src/sdk/10.0/noble/arm32v7/Dockerfile | 4 +--- src/sdk/10.0/noble/arm64v8/Dockerfile | 4 +--- src/sdk/10.0/resolute/amd64/Dockerfile | 4 +--- src/sdk/10.0/resolute/arm32v7/Dockerfile | 4 +--- src/sdk/10.0/resolute/arm64v8/Dockerfile | 4 +--- src/sdk/10.0/windowsservercore-ltsc2022/amd64/Dockerfile | 4 +--- src/sdk/10.0/windowsservercore-ltsc2025/amd64/Dockerfile | 4 +--- src/sdk/11.0/alpine3.24/amd64/Dockerfile | 4 +--- src/sdk/11.0/azurelinux3.0/amd64/Dockerfile | 4 +--- src/sdk/11.0/azurelinux3.0/arm64v8/Dockerfile | 4 +--- src/sdk/11.0/azurelinux4.0/amd64/Dockerfile | 4 +--- src/sdk/11.0/azurelinux4.0/arm64v8/Dockerfile | 4 +--- src/sdk/11.0/nanoserver-ltsc2025/amd64/Dockerfile | 4 +--- src/sdk/11.0/resolute/amd64/Dockerfile | 4 +--- src/sdk/11.0/resolute/arm32v7/Dockerfile | 4 +--- src/sdk/11.0/resolute/arm64v8/Dockerfile | 4 +--- src/sdk/11.0/windowsservercore-ltsc2025/amd64/Dockerfile | 4 +--- .../sdk-10.0-alpine3.23-amd64-Dockerfile.approved.txt | 4 +--- .../sdk-10.0-alpine3.24-amd64-Dockerfile.approved.txt | 4 +--- .../sdk-10.0-azurelinux3.0-amd64-Dockerfile.approved.txt | 4 +--- ...sdk-10.0-azurelinux3.0-arm64v8-Dockerfile.approved.txt | 4 +--- .../sdk-10.0-azurelinux4.0-amd64-Dockerfile.approved.txt | 4 +--- ...sdk-10.0-azurelinux4.0-arm64v8-Dockerfile.approved.txt | 4 +--- ...10.0-nanoserver-ltsc2022-amd64-Dockerfile.approved.txt | 4 +--- ...10.0-nanoserver-ltsc2025-amd64-Dockerfile.approved.txt | 4 +--- .../sdk-10.0-noble-amd64-Dockerfile.approved.txt | 4 +--- .../sdk-10.0-noble-arm32v7-Dockerfile.approved.txt | 4 +--- .../sdk-10.0-noble-arm64v8-Dockerfile.approved.txt | 4 +--- .../sdk-10.0-resolute-amd64-Dockerfile.approved.txt | 4 +--- .../sdk-10.0-resolute-arm32v7-Dockerfile.approved.txt | 4 +--- .../sdk-10.0-resolute-arm64v8-Dockerfile.approved.txt | 4 +--- ...ndowsservercore-ltsc2022-amd64-Dockerfile.approved.txt | 4 +--- ...ndowsservercore-ltsc2025-amd64-Dockerfile.approved.txt | 4 +--- .../sdk-11.0-alpine3.24-amd64-Dockerfile.approved.txt | 4 +--- .../sdk-11.0-azurelinux3.0-amd64-Dockerfile.approved.txt | 4 +--- ...sdk-11.0-azurelinux3.0-arm64v8-Dockerfile.approved.txt | 4 +--- .../sdk-11.0-azurelinux4.0-amd64-Dockerfile.approved.txt | 4 +--- ...sdk-11.0-azurelinux4.0-arm64v8-Dockerfile.approved.txt | 4 +--- ...11.0-nanoserver-ltsc2025-amd64-Dockerfile.approved.txt | 4 +--- .../sdk-11.0-resolute-amd64-Dockerfile.approved.txt | 4 +--- .../sdk-11.0-resolute-arm32v7-Dockerfile.approved.txt | 4 +--- .../sdk-11.0-resolute-arm64v8-Dockerfile.approved.txt | 4 +--- ...ndowsservercore-ltsc2025-amd64-Dockerfile.approved.txt | 4 +--- 53 files changed, 54 insertions(+), 162 deletions(-) diff --git a/eng/dockerfile-templates/sdk/Dockerfile.envs b/eng/dockerfile-templates/sdk/Dockerfile.envs index 5fc01988f4..bc2fafcb15 100644 --- a/eng/dockerfile-templates/sdk/Dockerfile.envs +++ b/eng/dockerfile-templates/sdk/Dockerfile.envs @@ -17,9 +17,7 @@ VARIABLES[cat("sdk|", dotnetVersion, "|build-version")])) ^ set isAlpine to find(OS_VERSION, "alpine") >= 0 ^ set isWindows to find(OS_VERSION, "nanoserver") >= 0 || find(OS_VERSION, "windowsservercore") >= 0 ^ - set lineContinuation to when(isWindows, "`", "\") ^ - - set includePowerShellRollForward to dotnetVersion != "8.0" && dotnetVersion != "9.0" + set lineContinuation to when(isWindows, "`", "\") }}ENV {{lineContinuation}} # Do not generate certificate DOTNET_GENERATE_ASPNET_CERTIFICATE=false {{lineContinuation}} @@ -34,6 +32,4 @@ # Skip extraction of XML docs - generally not useful within an image/container - helps performance NUGET_XMLDOC_MODE=skip {{if ARGS["include-powershell-vars"]:{{lineContinuation}} # PowerShell telemetry for docker image usage - POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-{{OS_ARCH_HYPHENATED}}{{if includePowerShellRollForward: {{lineContinuation}} - # Workaround for https://github.com/PowerShell/PowerShell/issues/20685 - DOTNET_ROLL_FORWARD=Major}}}} + POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-{{OS_ARCH_HYPHENATED}}}} diff --git a/src/sdk/10.0/alpine3.23/amd64/Dockerfile b/src/sdk/10.0/alpine3.23/amd64/Dockerfile index 5c5431f15c..4ebfa3e060 100644 --- a/src/sdk/10.0/alpine3.23/amd64/Dockerfile +++ b/src/sdk/10.0/alpine3.23/amd64/Dockerfile @@ -32,9 +32,7 @@ ENV \ # Skip extraction of XML docs - generally not useful within an image/container - helps performance NUGET_XMLDOC_MODE=skip \ # PowerShell telemetry for docker image usage - POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Alpine-3.23 \ - # Workaround for https://github.com/PowerShell/PowerShell/issues/20685 - DOTNET_ROLL_FORWARD=Major + POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Alpine-3.23 RUN apk add --upgrade --no-cache \ curl \ diff --git a/src/sdk/10.0/alpine3.24/amd64/Dockerfile b/src/sdk/10.0/alpine3.24/amd64/Dockerfile index 1ad9046aee..8ea9adfb83 100644 --- a/src/sdk/10.0/alpine3.24/amd64/Dockerfile +++ b/src/sdk/10.0/alpine3.24/amd64/Dockerfile @@ -32,9 +32,7 @@ ENV \ # Skip extraction of XML docs - generally not useful within an image/container - helps performance NUGET_XMLDOC_MODE=skip \ # PowerShell telemetry for docker image usage - POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Alpine-3.24 \ - # Workaround for https://github.com/PowerShell/PowerShell/issues/20685 - DOTNET_ROLL_FORWARD=Major + POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Alpine-3.24 RUN apk add --upgrade --no-cache \ curl \ diff --git a/src/sdk/10.0/azurelinux3.0/amd64/Dockerfile b/src/sdk/10.0/azurelinux3.0/amd64/Dockerfile index 7ce4dda1b3..6ff0321573 100644 --- a/src/sdk/10.0/azurelinux3.0/amd64/Dockerfile +++ b/src/sdk/10.0/azurelinux3.0/amd64/Dockerfile @@ -34,9 +34,7 @@ ENV \ # Skip extraction of XML docs - generally not useful within an image/container - helps performance NUGET_XMLDOC_MODE=skip \ # PowerShell telemetry for docker image usage - POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Azure-Linux-3.0 \ - # Workaround for https://github.com/PowerShell/PowerShell/issues/20685 - DOTNET_ROLL_FORWARD=Major + POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Azure-Linux-3.0 RUN tdnf install -y \ git \ diff --git a/src/sdk/10.0/azurelinux3.0/arm64v8/Dockerfile b/src/sdk/10.0/azurelinux3.0/arm64v8/Dockerfile index 656b70df6d..cd3011a3b9 100644 --- a/src/sdk/10.0/azurelinux3.0/arm64v8/Dockerfile +++ b/src/sdk/10.0/azurelinux3.0/arm64v8/Dockerfile @@ -34,9 +34,7 @@ ENV \ # Skip extraction of XML docs - generally not useful within an image/container - helps performance NUGET_XMLDOC_MODE=skip \ # PowerShell telemetry for docker image usage - POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Azure-Linux-3.0-arm64 \ - # Workaround for https://github.com/PowerShell/PowerShell/issues/20685 - DOTNET_ROLL_FORWARD=Major + POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Azure-Linux-3.0-arm64 RUN tdnf install -y \ git \ diff --git a/src/sdk/10.0/azurelinux4.0/amd64/Dockerfile b/src/sdk/10.0/azurelinux4.0/amd64/Dockerfile index 5c836c2de8..5dd1710b52 100644 --- a/src/sdk/10.0/azurelinux4.0/amd64/Dockerfile +++ b/src/sdk/10.0/azurelinux4.0/amd64/Dockerfile @@ -35,9 +35,7 @@ ENV \ # Skip extraction of XML docs - generally not useful within an image/container - helps performance NUGET_XMLDOC_MODE=skip \ # PowerShell telemetry for docker image usage - POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Azure-Linux-4.0 \ - # Workaround for https://github.com/PowerShell/PowerShell/issues/20685 - DOTNET_ROLL_FORWARD=Major + POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Azure-Linux-4.0 RUN dnf install -y \ git \ diff --git a/src/sdk/10.0/azurelinux4.0/arm64v8/Dockerfile b/src/sdk/10.0/azurelinux4.0/arm64v8/Dockerfile index b109926e23..e8eb9aa2bb 100644 --- a/src/sdk/10.0/azurelinux4.0/arm64v8/Dockerfile +++ b/src/sdk/10.0/azurelinux4.0/arm64v8/Dockerfile @@ -35,9 +35,7 @@ ENV \ # Skip extraction of XML docs - generally not useful within an image/container - helps performance NUGET_XMLDOC_MODE=skip \ # PowerShell telemetry for docker image usage - POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Azure-Linux-4.0-arm64 \ - # Workaround for https://github.com/PowerShell/PowerShell/issues/20685 - DOTNET_ROLL_FORWARD=Major + POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Azure-Linux-4.0-arm64 RUN dnf install -y \ git \ diff --git a/src/sdk/10.0/nanoserver-ltsc2022/amd64/Dockerfile b/src/sdk/10.0/nanoserver-ltsc2022/amd64/Dockerfile index 70fa7640db..8052440684 100644 --- a/src/sdk/10.0/nanoserver-ltsc2022/amd64/Dockerfile +++ b/src/sdk/10.0/nanoserver-ltsc2022/amd64/Dockerfile @@ -78,9 +78,7 @@ ENV ` # Skip extraction of XML docs - generally not useful within an image/container - helps performance NUGET_XMLDOC_MODE=skip ` # PowerShell telemetry for docker image usage - POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-NanoServer-ltsc2022 ` - # Workaround for https://github.com/PowerShell/PowerShell/issues/20685 - DOTNET_ROLL_FORWARD=Major + POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-NanoServer-ltsc2022 # In order to set system PATH, ContainerAdministrator must be used USER ContainerAdministrator diff --git a/src/sdk/10.0/nanoserver-ltsc2025/amd64/Dockerfile b/src/sdk/10.0/nanoserver-ltsc2025/amd64/Dockerfile index c967535304..578787d6a3 100644 --- a/src/sdk/10.0/nanoserver-ltsc2025/amd64/Dockerfile +++ b/src/sdk/10.0/nanoserver-ltsc2025/amd64/Dockerfile @@ -78,9 +78,7 @@ ENV ` # Skip extraction of XML docs - generally not useful within an image/container - helps performance NUGET_XMLDOC_MODE=skip ` # PowerShell telemetry for docker image usage - POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-NanoServer-ltsc2025 ` - # Workaround for https://github.com/PowerShell/PowerShell/issues/20685 - DOTNET_ROLL_FORWARD=Major + POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-NanoServer-ltsc2025 # In order to set system PATH, ContainerAdministrator must be used USER ContainerAdministrator diff --git a/src/sdk/10.0/noble/amd64/Dockerfile b/src/sdk/10.0/noble/amd64/Dockerfile index 26d6e385a9..c0ca1f7041 100644 --- a/src/sdk/10.0/noble/amd64/Dockerfile +++ b/src/sdk/10.0/noble/amd64/Dockerfile @@ -30,9 +30,7 @@ ENV \ # Skip extraction of XML docs - generally not useful within an image/container - helps performance NUGET_XMLDOC_MODE=skip \ # PowerShell telemetry for docker image usage - POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Ubuntu-24.04 \ - # Workaround for https://github.com/PowerShell/PowerShell/issues/20685 - DOTNET_ROLL_FORWARD=Major + POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Ubuntu-24.04 RUN apt-get update \ && apt-get install -y --no-install-recommends \ diff --git a/src/sdk/10.0/noble/arm32v7/Dockerfile b/src/sdk/10.0/noble/arm32v7/Dockerfile index e24f835788..a036093f40 100644 --- a/src/sdk/10.0/noble/arm32v7/Dockerfile +++ b/src/sdk/10.0/noble/arm32v7/Dockerfile @@ -30,9 +30,7 @@ ENV \ # Skip extraction of XML docs - generally not useful within an image/container - helps performance NUGET_XMLDOC_MODE=skip \ # PowerShell telemetry for docker image usage - POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Ubuntu-24.04-arm32 \ - # Workaround for https://github.com/PowerShell/PowerShell/issues/20685 - DOTNET_ROLL_FORWARD=Major + POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Ubuntu-24.04-arm32 RUN apt-get update \ && apt-get install -y --no-install-recommends \ diff --git a/src/sdk/10.0/noble/arm64v8/Dockerfile b/src/sdk/10.0/noble/arm64v8/Dockerfile index c7707ac2b0..5420179b3a 100644 --- a/src/sdk/10.0/noble/arm64v8/Dockerfile +++ b/src/sdk/10.0/noble/arm64v8/Dockerfile @@ -30,9 +30,7 @@ ENV \ # Skip extraction of XML docs - generally not useful within an image/container - helps performance NUGET_XMLDOC_MODE=skip \ # PowerShell telemetry for docker image usage - POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Ubuntu-24.04-arm64 \ - # Workaround for https://github.com/PowerShell/PowerShell/issues/20685 - DOTNET_ROLL_FORWARD=Major + POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Ubuntu-24.04-arm64 RUN apt-get update \ && apt-get install -y --no-install-recommends \ diff --git a/src/sdk/10.0/resolute/amd64/Dockerfile b/src/sdk/10.0/resolute/amd64/Dockerfile index af96ed835d..0d0df5888c 100644 --- a/src/sdk/10.0/resolute/amd64/Dockerfile +++ b/src/sdk/10.0/resolute/amd64/Dockerfile @@ -30,9 +30,7 @@ ENV \ # Skip extraction of XML docs - generally not useful within an image/container - helps performance NUGET_XMLDOC_MODE=skip \ # PowerShell telemetry for docker image usage - POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Ubuntu-26.04 \ - # Workaround for https://github.com/PowerShell/PowerShell/issues/20685 - DOTNET_ROLL_FORWARD=Major + POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Ubuntu-26.04 RUN apt-get update \ && apt-get install -y --no-install-recommends \ diff --git a/src/sdk/10.0/resolute/arm32v7/Dockerfile b/src/sdk/10.0/resolute/arm32v7/Dockerfile index daa549118e..f12b4ca9ad 100644 --- a/src/sdk/10.0/resolute/arm32v7/Dockerfile +++ b/src/sdk/10.0/resolute/arm32v7/Dockerfile @@ -30,9 +30,7 @@ ENV \ # Skip extraction of XML docs - generally not useful within an image/container - helps performance NUGET_XMLDOC_MODE=skip \ # PowerShell telemetry for docker image usage - POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Ubuntu-26.04-arm32 \ - # Workaround for https://github.com/PowerShell/PowerShell/issues/20685 - DOTNET_ROLL_FORWARD=Major + POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Ubuntu-26.04-arm32 RUN apt-get update \ && apt-get install -y --no-install-recommends \ diff --git a/src/sdk/10.0/resolute/arm64v8/Dockerfile b/src/sdk/10.0/resolute/arm64v8/Dockerfile index 162dad90c3..a7a8f480f8 100644 --- a/src/sdk/10.0/resolute/arm64v8/Dockerfile +++ b/src/sdk/10.0/resolute/arm64v8/Dockerfile @@ -30,9 +30,7 @@ ENV \ # Skip extraction of XML docs - generally not useful within an image/container - helps performance NUGET_XMLDOC_MODE=skip \ # PowerShell telemetry for docker image usage - POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Ubuntu-26.04-arm64 \ - # Workaround for https://github.com/PowerShell/PowerShell/issues/20685 - DOTNET_ROLL_FORWARD=Major + POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Ubuntu-26.04-arm64 RUN apt-get update \ && apt-get install -y --no-install-recommends \ diff --git a/src/sdk/10.0/windowsservercore-ltsc2022/amd64/Dockerfile b/src/sdk/10.0/windowsservercore-ltsc2022/amd64/Dockerfile index d94ab4a93a..42f574b675 100644 --- a/src/sdk/10.0/windowsservercore-ltsc2022/amd64/Dockerfile +++ b/src/sdk/10.0/windowsservercore-ltsc2022/amd64/Dockerfile @@ -78,9 +78,7 @@ ENV ` # Skip extraction of XML docs - generally not useful within an image/container - helps performance NUGET_XMLDOC_MODE=skip ` # PowerShell telemetry for docker image usage - POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-WindowsServerCore-ltsc2022 ` - # Workaround for https://github.com/PowerShell/PowerShell/issues/20685 - DOTNET_ROLL_FORWARD=Major + POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-WindowsServerCore-ltsc2022 RUN setx /M PATH "%PATH%;C:\Program Files\powershell;C:\Program Files\MinGit\cmd" diff --git a/src/sdk/10.0/windowsservercore-ltsc2025/amd64/Dockerfile b/src/sdk/10.0/windowsservercore-ltsc2025/amd64/Dockerfile index 17f01adb84..e2151c7660 100644 --- a/src/sdk/10.0/windowsservercore-ltsc2025/amd64/Dockerfile +++ b/src/sdk/10.0/windowsservercore-ltsc2025/amd64/Dockerfile @@ -78,9 +78,7 @@ ENV ` # Skip extraction of XML docs - generally not useful within an image/container - helps performance NUGET_XMLDOC_MODE=skip ` # PowerShell telemetry for docker image usage - POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-WindowsServerCore-ltsc2025 ` - # Workaround for https://github.com/PowerShell/PowerShell/issues/20685 - DOTNET_ROLL_FORWARD=Major + POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-WindowsServerCore-ltsc2025 RUN setx /M PATH "%PATH%;C:\Program Files\powershell;C:\Program Files\MinGit\cmd" diff --git a/src/sdk/11.0/alpine3.24/amd64/Dockerfile b/src/sdk/11.0/alpine3.24/amd64/Dockerfile index 24d97d3cba..d4162a1f6a 100644 --- a/src/sdk/11.0/alpine3.24/amd64/Dockerfile +++ b/src/sdk/11.0/alpine3.24/amd64/Dockerfile @@ -32,9 +32,7 @@ ENV \ # Skip extraction of XML docs - generally not useful within an image/container - helps performance NUGET_XMLDOC_MODE=skip \ # PowerShell telemetry for docker image usage - POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Alpine-3.24 \ - # Workaround for https://github.com/PowerShell/PowerShell/issues/20685 - DOTNET_ROLL_FORWARD=Major + POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Alpine-3.24 RUN apk add --upgrade --no-cache \ curl \ diff --git a/src/sdk/11.0/azurelinux3.0/amd64/Dockerfile b/src/sdk/11.0/azurelinux3.0/amd64/Dockerfile index 5e63470e4d..7b989f71f2 100644 --- a/src/sdk/11.0/azurelinux3.0/amd64/Dockerfile +++ b/src/sdk/11.0/azurelinux3.0/amd64/Dockerfile @@ -34,9 +34,7 @@ ENV \ # Skip extraction of XML docs - generally not useful within an image/container - helps performance NUGET_XMLDOC_MODE=skip \ # PowerShell telemetry for docker image usage - POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Azure-Linux-3.0 \ - # Workaround for https://github.com/PowerShell/PowerShell/issues/20685 - DOTNET_ROLL_FORWARD=Major + POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Azure-Linux-3.0 RUN tdnf install -y \ git \ diff --git a/src/sdk/11.0/azurelinux3.0/arm64v8/Dockerfile b/src/sdk/11.0/azurelinux3.0/arm64v8/Dockerfile index 6010464633..c8bcf8882e 100644 --- a/src/sdk/11.0/azurelinux3.0/arm64v8/Dockerfile +++ b/src/sdk/11.0/azurelinux3.0/arm64v8/Dockerfile @@ -34,9 +34,7 @@ ENV \ # Skip extraction of XML docs - generally not useful within an image/container - helps performance NUGET_XMLDOC_MODE=skip \ # PowerShell telemetry for docker image usage - POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Azure-Linux-3.0-arm64 \ - # Workaround for https://github.com/PowerShell/PowerShell/issues/20685 - DOTNET_ROLL_FORWARD=Major + POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Azure-Linux-3.0-arm64 RUN tdnf install -y \ git \ diff --git a/src/sdk/11.0/azurelinux4.0/amd64/Dockerfile b/src/sdk/11.0/azurelinux4.0/amd64/Dockerfile index c8ebc298b1..f000c892fd 100644 --- a/src/sdk/11.0/azurelinux4.0/amd64/Dockerfile +++ b/src/sdk/11.0/azurelinux4.0/amd64/Dockerfile @@ -35,9 +35,7 @@ ENV \ # Skip extraction of XML docs - generally not useful within an image/container - helps performance NUGET_XMLDOC_MODE=skip \ # PowerShell telemetry for docker image usage - POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Azure-Linux-4.0 \ - # Workaround for https://github.com/PowerShell/PowerShell/issues/20685 - DOTNET_ROLL_FORWARD=Major + POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Azure-Linux-4.0 RUN dnf install -y \ git \ diff --git a/src/sdk/11.0/azurelinux4.0/arm64v8/Dockerfile b/src/sdk/11.0/azurelinux4.0/arm64v8/Dockerfile index 1c3b5724d3..9966579621 100644 --- a/src/sdk/11.0/azurelinux4.0/arm64v8/Dockerfile +++ b/src/sdk/11.0/azurelinux4.0/arm64v8/Dockerfile @@ -35,9 +35,7 @@ ENV \ # Skip extraction of XML docs - generally not useful within an image/container - helps performance NUGET_XMLDOC_MODE=skip \ # PowerShell telemetry for docker image usage - POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Azure-Linux-4.0-arm64 \ - # Workaround for https://github.com/PowerShell/PowerShell/issues/20685 - DOTNET_ROLL_FORWARD=Major + POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Azure-Linux-4.0-arm64 RUN dnf install -y \ git \ diff --git a/src/sdk/11.0/nanoserver-ltsc2025/amd64/Dockerfile b/src/sdk/11.0/nanoserver-ltsc2025/amd64/Dockerfile index 0253603bc1..a0770ea67d 100644 --- a/src/sdk/11.0/nanoserver-ltsc2025/amd64/Dockerfile +++ b/src/sdk/11.0/nanoserver-ltsc2025/amd64/Dockerfile @@ -78,9 +78,7 @@ ENV ` # Skip extraction of XML docs - generally not useful within an image/container - helps performance NUGET_XMLDOC_MODE=skip ` # PowerShell telemetry for docker image usage - POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-NanoServer-ltsc2025 ` - # Workaround for https://github.com/PowerShell/PowerShell/issues/20685 - DOTNET_ROLL_FORWARD=Major + POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-NanoServer-ltsc2025 # In order to set system PATH, ContainerAdministrator must be used USER ContainerAdministrator diff --git a/src/sdk/11.0/resolute/amd64/Dockerfile b/src/sdk/11.0/resolute/amd64/Dockerfile index cc837996b6..2cbb86d358 100644 --- a/src/sdk/11.0/resolute/amd64/Dockerfile +++ b/src/sdk/11.0/resolute/amd64/Dockerfile @@ -30,9 +30,7 @@ ENV \ # Skip extraction of XML docs - generally not useful within an image/container - helps performance NUGET_XMLDOC_MODE=skip \ # PowerShell telemetry for docker image usage - POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Ubuntu-26.04 \ - # Workaround for https://github.com/PowerShell/PowerShell/issues/20685 - DOTNET_ROLL_FORWARD=Major + POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Ubuntu-26.04 RUN apt-get update \ && apt-get install -y --no-install-recommends \ diff --git a/src/sdk/11.0/resolute/arm32v7/Dockerfile b/src/sdk/11.0/resolute/arm32v7/Dockerfile index 47158ec239..5e4bf44f74 100644 --- a/src/sdk/11.0/resolute/arm32v7/Dockerfile +++ b/src/sdk/11.0/resolute/arm32v7/Dockerfile @@ -30,9 +30,7 @@ ENV \ # Skip extraction of XML docs - generally not useful within an image/container - helps performance NUGET_XMLDOC_MODE=skip \ # PowerShell telemetry for docker image usage - POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Ubuntu-26.04-arm32 \ - # Workaround for https://github.com/PowerShell/PowerShell/issues/20685 - DOTNET_ROLL_FORWARD=Major + POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Ubuntu-26.04-arm32 RUN apt-get update \ && apt-get install -y --no-install-recommends \ diff --git a/src/sdk/11.0/resolute/arm64v8/Dockerfile b/src/sdk/11.0/resolute/arm64v8/Dockerfile index eb0cc0611c..c44b3b2fe5 100644 --- a/src/sdk/11.0/resolute/arm64v8/Dockerfile +++ b/src/sdk/11.0/resolute/arm64v8/Dockerfile @@ -30,9 +30,7 @@ ENV \ # Skip extraction of XML docs - generally not useful within an image/container - helps performance NUGET_XMLDOC_MODE=skip \ # PowerShell telemetry for docker image usage - POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Ubuntu-26.04-arm64 \ - # Workaround for https://github.com/PowerShell/PowerShell/issues/20685 - DOTNET_ROLL_FORWARD=Major + POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Ubuntu-26.04-arm64 RUN apt-get update \ && apt-get install -y --no-install-recommends \ diff --git a/src/sdk/11.0/windowsservercore-ltsc2025/amd64/Dockerfile b/src/sdk/11.0/windowsservercore-ltsc2025/amd64/Dockerfile index 66dfde9349..b0967c9fe8 100644 --- a/src/sdk/11.0/windowsservercore-ltsc2025/amd64/Dockerfile +++ b/src/sdk/11.0/windowsservercore-ltsc2025/amd64/Dockerfile @@ -78,9 +78,7 @@ ENV ` # Skip extraction of XML docs - generally not useful within an image/container - helps performance NUGET_XMLDOC_MODE=skip ` # PowerShell telemetry for docker image usage - POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-WindowsServerCore-ltsc2025 ` - # Workaround for https://github.com/PowerShell/PowerShell/issues/20685 - DOTNET_ROLL_FORWARD=Major + POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-WindowsServerCore-ltsc2025 RUN setx /M PATH "%PATH%;C:\Program Files\powershell;C:\Program Files\MinGit\cmd" diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-alpine3.23-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-alpine3.23-amd64-Dockerfile.approved.txt index 9692e141a4..c252f36bfc 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-alpine3.23-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-alpine3.23-amd64-Dockerfile.approved.txt @@ -35,9 +35,7 @@ ENV \ # Skip extraction of XML docs - generally not useful within an image/container - helps performance NUGET_XMLDOC_MODE=skip \ # PowerShell telemetry for docker image usage - POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Alpine-3.23 \ - # Workaround for https://github.com/PowerShell/PowerShell/issues/20685 - DOTNET_ROLL_FORWARD=Major + POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Alpine-3.23 RUN apk add --upgrade --no-cache \ curl \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-alpine3.24-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-alpine3.24-amd64-Dockerfile.approved.txt index bd38e7b178..e44794ef0c 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-alpine3.24-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-alpine3.24-amd64-Dockerfile.approved.txt @@ -35,9 +35,7 @@ ENV \ # Skip extraction of XML docs - generally not useful within an image/container - helps performance NUGET_XMLDOC_MODE=skip \ # PowerShell telemetry for docker image usage - POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Alpine-3.24 \ - # Workaround for https://github.com/PowerShell/PowerShell/issues/20685 - DOTNET_ROLL_FORWARD=Major + POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Alpine-3.24 RUN apk add --upgrade --no-cache \ curl \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-azurelinux3.0-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-azurelinux3.0-amd64-Dockerfile.approved.txt index 55a59eae7d..08bef22e3e 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-azurelinux3.0-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-azurelinux3.0-amd64-Dockerfile.approved.txt @@ -37,9 +37,7 @@ ENV \ # Skip extraction of XML docs - generally not useful within an image/container - helps performance NUGET_XMLDOC_MODE=skip \ # PowerShell telemetry for docker image usage - POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Azure-Linux-3.0 \ - # Workaround for https://github.com/PowerShell/PowerShell/issues/20685 - DOTNET_ROLL_FORWARD=Major + POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Azure-Linux-3.0 RUN tdnf install -y \ git \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-azurelinux3.0-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-azurelinux3.0-arm64v8-Dockerfile.approved.txt index 5c4467db08..0d6d259b7f 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-azurelinux3.0-arm64v8-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-azurelinux3.0-arm64v8-Dockerfile.approved.txt @@ -37,9 +37,7 @@ ENV \ # Skip extraction of XML docs - generally not useful within an image/container - helps performance NUGET_XMLDOC_MODE=skip \ # PowerShell telemetry for docker image usage - POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Azure-Linux-3.0-arm64 \ - # Workaround for https://github.com/PowerShell/PowerShell/issues/20685 - DOTNET_ROLL_FORWARD=Major + POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Azure-Linux-3.0-arm64 RUN tdnf install -y \ git \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-azurelinux4.0-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-azurelinux4.0-amd64-Dockerfile.approved.txt index 9469084645..11806c4b27 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-azurelinux4.0-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-azurelinux4.0-amd64-Dockerfile.approved.txt @@ -38,9 +38,7 @@ ENV \ # Skip extraction of XML docs - generally not useful within an image/container - helps performance NUGET_XMLDOC_MODE=skip \ # PowerShell telemetry for docker image usage - POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Azure-Linux-4.0 \ - # Workaround for https://github.com/PowerShell/PowerShell/issues/20685 - DOTNET_ROLL_FORWARD=Major + POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Azure-Linux-4.0 RUN dnf install -y \ git \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-azurelinux4.0-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-azurelinux4.0-arm64v8-Dockerfile.approved.txt index 84dab23313..2bed8cc1c0 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-azurelinux4.0-arm64v8-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-azurelinux4.0-arm64v8-Dockerfile.approved.txt @@ -38,9 +38,7 @@ ENV \ # Skip extraction of XML docs - generally not useful within an image/container - helps performance NUGET_XMLDOC_MODE=skip \ # PowerShell telemetry for docker image usage - POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Azure-Linux-4.0-arm64 \ - # Workaround for https://github.com/PowerShell/PowerShell/issues/20685 - DOTNET_ROLL_FORWARD=Major + POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Azure-Linux-4.0-arm64 RUN dnf install -y \ git \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-nanoserver-ltsc2022-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-nanoserver-ltsc2022-amd64-Dockerfile.approved.txt index 967d8b74f1..f4bed34674 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-nanoserver-ltsc2022-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-nanoserver-ltsc2022-amd64-Dockerfile.approved.txt @@ -86,9 +86,7 @@ ENV ` # Skip extraction of XML docs - generally not useful within an image/container - helps performance NUGET_XMLDOC_MODE=skip ` # PowerShell telemetry for docker image usage - POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-NanoServer-ltsc2022 ` - # Workaround for https://github.com/PowerShell/PowerShell/issues/20685 - DOTNET_ROLL_FORWARD=Major + POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-NanoServer-ltsc2022 # In order to set system PATH, ContainerAdministrator must be used USER ContainerAdministrator diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-nanoserver-ltsc2025-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-nanoserver-ltsc2025-amd64-Dockerfile.approved.txt index 2a37cc0f75..20d4b3f664 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-nanoserver-ltsc2025-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-nanoserver-ltsc2025-amd64-Dockerfile.approved.txt @@ -86,9 +86,7 @@ ENV ` # Skip extraction of XML docs - generally not useful within an image/container - helps performance NUGET_XMLDOC_MODE=skip ` # PowerShell telemetry for docker image usage - POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-NanoServer-ltsc2025 ` - # Workaround for https://github.com/PowerShell/PowerShell/issues/20685 - DOTNET_ROLL_FORWARD=Major + POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-NanoServer-ltsc2025 # In order to set system PATH, ContainerAdministrator must be used USER ContainerAdministrator diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-noble-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-noble-amd64-Dockerfile.approved.txt index 686c59c991..12a74353dc 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-noble-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-noble-amd64-Dockerfile.approved.txt @@ -33,9 +33,7 @@ ENV \ # Skip extraction of XML docs - generally not useful within an image/container - helps performance NUGET_XMLDOC_MODE=skip \ # PowerShell telemetry for docker image usage - POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Ubuntu-24.04 \ - # Workaround for https://github.com/PowerShell/PowerShell/issues/20685 - DOTNET_ROLL_FORWARD=Major + POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Ubuntu-24.04 RUN apt-get update \ && apt-get install -y --no-install-recommends \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-noble-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-noble-arm32v7-Dockerfile.approved.txt index 8ac20920cb..2c56032bd4 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-noble-arm32v7-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-noble-arm32v7-Dockerfile.approved.txt @@ -33,9 +33,7 @@ ENV \ # Skip extraction of XML docs - generally not useful within an image/container - helps performance NUGET_XMLDOC_MODE=skip \ # PowerShell telemetry for docker image usage - POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Ubuntu-24.04-arm32 \ - # Workaround for https://github.com/PowerShell/PowerShell/issues/20685 - DOTNET_ROLL_FORWARD=Major + POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Ubuntu-24.04-arm32 RUN apt-get update \ && apt-get install -y --no-install-recommends \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-noble-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-noble-arm64v8-Dockerfile.approved.txt index f0c6891f2d..cd41fb7183 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-noble-arm64v8-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-noble-arm64v8-Dockerfile.approved.txt @@ -33,9 +33,7 @@ ENV \ # Skip extraction of XML docs - generally not useful within an image/container - helps performance NUGET_XMLDOC_MODE=skip \ # PowerShell telemetry for docker image usage - POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Ubuntu-24.04-arm64 \ - # Workaround for https://github.com/PowerShell/PowerShell/issues/20685 - DOTNET_ROLL_FORWARD=Major + POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Ubuntu-24.04-arm64 RUN apt-get update \ && apt-get install -y --no-install-recommends \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-resolute-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-resolute-amd64-Dockerfile.approved.txt index 1b2d5118ff..c8758aa2d7 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-resolute-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-resolute-amd64-Dockerfile.approved.txt @@ -33,9 +33,7 @@ ENV \ # Skip extraction of XML docs - generally not useful within an image/container - helps performance NUGET_XMLDOC_MODE=skip \ # PowerShell telemetry for docker image usage - POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Ubuntu-26.04 \ - # Workaround for https://github.com/PowerShell/PowerShell/issues/20685 - DOTNET_ROLL_FORWARD=Major + POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Ubuntu-26.04 RUN apt-get update \ && apt-get install -y --no-install-recommends \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-resolute-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-resolute-arm32v7-Dockerfile.approved.txt index 03ca92c2f2..d29ad4c3e1 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-resolute-arm32v7-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-resolute-arm32v7-Dockerfile.approved.txt @@ -33,9 +33,7 @@ ENV \ # Skip extraction of XML docs - generally not useful within an image/container - helps performance NUGET_XMLDOC_MODE=skip \ # PowerShell telemetry for docker image usage - POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Ubuntu-26.04-arm32 \ - # Workaround for https://github.com/PowerShell/PowerShell/issues/20685 - DOTNET_ROLL_FORWARD=Major + POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Ubuntu-26.04-arm32 RUN apt-get update \ && apt-get install -y --no-install-recommends \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-resolute-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-resolute-arm64v8-Dockerfile.approved.txt index 4d2244e318..9f1124784f 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-resolute-arm64v8-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-resolute-arm64v8-Dockerfile.approved.txt @@ -33,9 +33,7 @@ ENV \ # Skip extraction of XML docs - generally not useful within an image/container - helps performance NUGET_XMLDOC_MODE=skip \ # PowerShell telemetry for docker image usage - POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Ubuntu-26.04-arm64 \ - # Workaround for https://github.com/PowerShell/PowerShell/issues/20685 - DOTNET_ROLL_FORWARD=Major + POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Ubuntu-26.04-arm64 RUN apt-get update \ && apt-get install -y --no-install-recommends \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-windowsservercore-ltsc2022-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-windowsservercore-ltsc2022-amd64-Dockerfile.approved.txt index a53fd568aa..6e562aec62 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-windowsservercore-ltsc2022-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-windowsservercore-ltsc2022-amd64-Dockerfile.approved.txt @@ -86,9 +86,7 @@ ENV ` # Skip extraction of XML docs - generally not useful within an image/container - helps performance NUGET_XMLDOC_MODE=skip ` # PowerShell telemetry for docker image usage - POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-WindowsServerCore-ltsc2022 ` - # Workaround for https://github.com/PowerShell/PowerShell/issues/20685 - DOTNET_ROLL_FORWARD=Major + POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-WindowsServerCore-ltsc2022 RUN setx /M PATH "%PATH%;C:\Program Files\powershell;C:\Program Files\MinGit\cmd" diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-windowsservercore-ltsc2025-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-windowsservercore-ltsc2025-amd64-Dockerfile.approved.txt index ed4ca594c3..14b5398307 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-windowsservercore-ltsc2025-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-10.0-windowsservercore-ltsc2025-amd64-Dockerfile.approved.txt @@ -86,9 +86,7 @@ ENV ` # Skip extraction of XML docs - generally not useful within an image/container - helps performance NUGET_XMLDOC_MODE=skip ` # PowerShell telemetry for docker image usage - POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-WindowsServerCore-ltsc2025 ` - # Workaround for https://github.com/PowerShell/PowerShell/issues/20685 - DOTNET_ROLL_FORWARD=Major + POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-WindowsServerCore-ltsc2025 RUN setx /M PATH "%PATH%;C:\Program Files\powershell;C:\Program Files\MinGit\cmd" diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.24-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.24-amd64-Dockerfile.approved.txt index 117ae7265a..f2c601707f 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.24-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.24-amd64-Dockerfile.approved.txt @@ -34,9 +34,7 @@ ENV \ # Skip extraction of XML docs - generally not useful within an image/container - helps performance NUGET_XMLDOC_MODE=skip \ # PowerShell telemetry for docker image usage - POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Alpine-3.24 \ - # Workaround for https://github.com/PowerShell/PowerShell/issues/20685 - DOTNET_ROLL_FORWARD=Major + POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Alpine-3.24 RUN apk add --upgrade --no-cache \ curl \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-azurelinux3.0-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-azurelinux3.0-amd64-Dockerfile.approved.txt index b44d07fcc9..095836e69a 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-azurelinux3.0-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-azurelinux3.0-amd64-Dockerfile.approved.txt @@ -36,9 +36,7 @@ ENV \ # Skip extraction of XML docs - generally not useful within an image/container - helps performance NUGET_XMLDOC_MODE=skip \ # PowerShell telemetry for docker image usage - POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Azure-Linux-3.0 \ - # Workaround for https://github.com/PowerShell/PowerShell/issues/20685 - DOTNET_ROLL_FORWARD=Major + POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Azure-Linux-3.0 RUN tdnf install -y \ git \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-azurelinux3.0-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-azurelinux3.0-arm64v8-Dockerfile.approved.txt index 5c53201da3..2c2126ffbc 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-azurelinux3.0-arm64v8-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-azurelinux3.0-arm64v8-Dockerfile.approved.txt @@ -36,9 +36,7 @@ ENV \ # Skip extraction of XML docs - generally not useful within an image/container - helps performance NUGET_XMLDOC_MODE=skip \ # PowerShell telemetry for docker image usage - POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Azure-Linux-3.0-arm64 \ - # Workaround for https://github.com/PowerShell/PowerShell/issues/20685 - DOTNET_ROLL_FORWARD=Major + POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Azure-Linux-3.0-arm64 RUN tdnf install -y \ git \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-azurelinux4.0-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-azurelinux4.0-amd64-Dockerfile.approved.txt index 4a286277fc..57df32e5ae 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-azurelinux4.0-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-azurelinux4.0-amd64-Dockerfile.approved.txt @@ -37,9 +37,7 @@ ENV \ # Skip extraction of XML docs - generally not useful within an image/container - helps performance NUGET_XMLDOC_MODE=skip \ # PowerShell telemetry for docker image usage - POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Azure-Linux-4.0 \ - # Workaround for https://github.com/PowerShell/PowerShell/issues/20685 - DOTNET_ROLL_FORWARD=Major + POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Azure-Linux-4.0 RUN dnf install -y \ git \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-azurelinux4.0-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-azurelinux4.0-arm64v8-Dockerfile.approved.txt index 185ea6402f..f179c3fdee 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-azurelinux4.0-arm64v8-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-azurelinux4.0-arm64v8-Dockerfile.approved.txt @@ -37,9 +37,7 @@ ENV \ # Skip extraction of XML docs - generally not useful within an image/container - helps performance NUGET_XMLDOC_MODE=skip \ # PowerShell telemetry for docker image usage - POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Azure-Linux-4.0-arm64 \ - # Workaround for https://github.com/PowerShell/PowerShell/issues/20685 - DOTNET_ROLL_FORWARD=Major + POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Azure-Linux-4.0-arm64 RUN dnf install -y \ git \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-nanoserver-ltsc2025-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-nanoserver-ltsc2025-amd64-Dockerfile.approved.txt index 126cf83a04..08a9ccd4f5 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-nanoserver-ltsc2025-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-nanoserver-ltsc2025-amd64-Dockerfile.approved.txt @@ -85,9 +85,7 @@ ENV ` # Skip extraction of XML docs - generally not useful within an image/container - helps performance NUGET_XMLDOC_MODE=skip ` # PowerShell telemetry for docker image usage - POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-NanoServer-ltsc2025 ` - # Workaround for https://github.com/PowerShell/PowerShell/issues/20685 - DOTNET_ROLL_FORWARD=Major + POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-NanoServer-ltsc2025 # In order to set system PATH, ContainerAdministrator must be used USER ContainerAdministrator diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-resolute-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-resolute-amd64-Dockerfile.approved.txt index 900332fd8c..1d0765e6a1 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-resolute-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-resolute-amd64-Dockerfile.approved.txt @@ -32,9 +32,7 @@ ENV \ # Skip extraction of XML docs - generally not useful within an image/container - helps performance NUGET_XMLDOC_MODE=skip \ # PowerShell telemetry for docker image usage - POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Ubuntu-26.04 \ - # Workaround for https://github.com/PowerShell/PowerShell/issues/20685 - DOTNET_ROLL_FORWARD=Major + POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Ubuntu-26.04 RUN apt-get update \ && apt-get install -y --no-install-recommends \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-resolute-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-resolute-arm32v7-Dockerfile.approved.txt index 3d6d6d8405..272936e5be 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-resolute-arm32v7-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-resolute-arm32v7-Dockerfile.approved.txt @@ -32,9 +32,7 @@ ENV \ # Skip extraction of XML docs - generally not useful within an image/container - helps performance NUGET_XMLDOC_MODE=skip \ # PowerShell telemetry for docker image usage - POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Ubuntu-26.04-arm32 \ - # Workaround for https://github.com/PowerShell/PowerShell/issues/20685 - DOTNET_ROLL_FORWARD=Major + POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Ubuntu-26.04-arm32 RUN apt-get update \ && apt-get install -y --no-install-recommends \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-resolute-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-resolute-arm64v8-Dockerfile.approved.txt index acbfd8a381..e959afe8c6 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-resolute-arm64v8-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-resolute-arm64v8-Dockerfile.approved.txt @@ -32,9 +32,7 @@ ENV \ # Skip extraction of XML docs - generally not useful within an image/container - helps performance NUGET_XMLDOC_MODE=skip \ # PowerShell telemetry for docker image usage - POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Ubuntu-26.04-arm64 \ - # Workaround for https://github.com/PowerShell/PowerShell/issues/20685 - DOTNET_ROLL_FORWARD=Major + POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Ubuntu-26.04-arm64 RUN apt-get update \ && apt-get install -y --no-install-recommends \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-windowsservercore-ltsc2025-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-windowsservercore-ltsc2025-amd64-Dockerfile.approved.txt index 5aa5d6d377..2518344ba0 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-windowsservercore-ltsc2025-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-windowsservercore-ltsc2025-amd64-Dockerfile.approved.txt @@ -85,9 +85,7 @@ ENV ` # Skip extraction of XML docs - generally not useful within an image/container - helps performance NUGET_XMLDOC_MODE=skip ` # PowerShell telemetry for docker image usage - POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-WindowsServerCore-ltsc2025 ` - # Workaround for https://github.com/PowerShell/PowerShell/issues/20685 - DOTNET_ROLL_FORWARD=Major + POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-WindowsServerCore-ltsc2025 RUN setx /M PATH "%PATH%;C:\Program Files\powershell;C:\Program Files\MinGit\cmd"