Skip to content

Commit 2c77535

Browse files
artl93wfurtericstj
authored
Add Windows Server 2025 to test configurations (#111938)
* (WIP) Add Windows Server 2025 test runs * Fixup names to match helix * Remove missing image * fix NegotiateStream_StreamToStream_Authentication_EmptyCredentials test * Update eng/pipelines/libraries/helix-queues-setup.yml Simplify selecting server. Co-authored-by: Eric StJohn <[email protected]> * Add back docker image. * Remove excess matrix on InnerLoop --------- Co-authored-by: wfurt <[email protected]> Co-authored-by: Eric StJohn <[email protected]>
1 parent 219622a commit 2c77535

File tree

3 files changed

+13
-4
lines changed

3 files changed

+13
-4
lines changed

eng/pipelines/libraries/helix-queues-setup.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -119,14 +119,17 @@ jobs:
119119
# libraries on mono outerloop
120120
- ${{ if and(eq(parameters.jobParameters.testScope, 'outerloop'), eq(parameters.jobParameters.runtimeFlavor, 'mono')) }}:
121121
- Windows.Amd64.Server2022.Open
122+
- Windows.Server2025.Amd64.Open
122123
# libraries on coreclr (outerloop and innerloop), or libraries on mono innerloop
123124
- ${{ if or(ne(parameters.jobParameters.testScope, 'outerloop'), ne(parameters.jobParameters.runtimeFlavor, 'mono')) }}:
124125
- ${{ if or(eq(parameters.jobParameters.isExtraPlatformsBuild, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}:
125126
- Windows.Amd64.Server2022.Open
127+
- Windows.Server2025.Amd64.Open
126128
- ${{ if ne(parameters.jobParameters.testScope, 'outerloop') }}:
127129
- (Windows.10.Amd64.ServerRS5.Open)[email protected]/dotnet-buildtools/prereqs:windowsservercore-ltsc2019-helix-amd64
128130
- ${{ if or(ne(parameters.jobParameters.isExtraPlatformsBuild, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}:
129131
- Windows.Amd64.Server2022.Open
132+
- Windows.Server2025.Amd64.Open
130133
- Windows.11.Amd64.Client.Open
131134
- ${{ if eq(parameters.jobParameters.testScope, 'outerloop') }}:
132135
- (Windows.10.Amd64.ServerRS5.Open)[email protected]/dotnet-buildtools/prereqs:windowsservercore-ltsc2019-helix-amd64
@@ -147,11 +150,9 @@ jobs:
147150
- Windows.11.Amd64.Client.Open
148151
# libraries on coreclr (outerloop and innerloop), or libraries on mono innerloop
149152
- ${{ if or(ne(parameters.jobParameters.testScope, 'outerloop'), ne(parameters.jobParameters.runtimeFlavor, 'mono')) }}:
153+
- Windows.Server2025.Amd64.Open
150154
- ${{ if or(eq(parameters.jobParameters.isExtraPlatformsBuild, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}:
151155
- Windows.11.Amd64.Client.Open
152-
- Windows.Amd64.Server2022.Open
153-
- ${{ if or(ne(parameters.jobParameters.isExtraPlatformsBuild, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}:
154-
- Windows.Amd64.Server2022.Open
155156

156157
# .NETFramework
157158
- ${{ if eq(parameters.jobParameters.framework, 'net48') }}:
@@ -176,5 +177,6 @@ jobs:
176177
# Browser WebAssembly windows
177178
- ${{ if in(parameters.platform, 'browser_wasm_win', 'wasi_wasm_win') }}:
178179
- (Windows.Amd64.Server2022.Open)[email protected]/dotnet-buildtools/prereqs:windowsservercore-ltsc2022-helix-webassembly
180+
- (Windows.Server2025.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:windowsservercore-ltsc2025-helix-webassembly-amd64
179181

180182
${{ insert }}: ${{ parameters.jobParameters }}

src/libraries/Common/tests/TestUtilities/System/PlatformDetection.Windows.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ public static partial class PlatformDetection
2626
public static bool IsWindows10OrLater => IsWindowsVersionOrLater(10, 0);
2727
public static bool IsWindowsServer2019 => IsWindows && IsNotWindowsNanoServer && GetWindowsVersion() == 10 && GetWindowsMinorVersion() == 0 && GetWindowsBuildVersion() == 17763;
2828
public static bool IsWindowsServer2022 => IsWindows && IsNotWindowsNanoServer && GetWindowsVersion() == 10 && GetWindowsMinorVersion() == 0 && GetWindowsBuildVersion() == 20348;
29+
public static bool IsWindowsServer2025 => IsWindows && IsNotWindowsNanoServer && GetWindowsVersion() == 10 && GetWindowsMinorVersion() == 0 && GetWindowsBuildVersion() == 26100;
2930
public static bool IsWindowsNanoServer => IsWindows && (IsNotWindowsIoTCore && GetWindowsInstallationType().Equals("Nano Server", StringComparison.OrdinalIgnoreCase));
3031
public static bool IsWindowsServerCore => IsWindows && GetWindowsInstallationType().Equals("Server Core", StringComparison.OrdinalIgnoreCase);
3132
public static int WindowsVersion => IsWindows ? (int)GetWindowsVersion() : -1;

src/libraries/System.Net.Security/tests/FunctionalTests/NegotiateStreamStreamToStreamTest.cs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@
99
using System.Text;
1010
using System.Threading;
1111
using System.Threading.Tasks;
12-
12+
using Microsoft.DotNet.XUnitExtensions;
1313
using Xunit;
14+
using Xunit.Abstractions;
1415

1516
namespace System.Net.Security.Tests
1617
{
@@ -192,6 +193,11 @@ public async Task NegotiateStream_StreamToStream_Authentication_EmptyCredentials
192193
{
193194
string targetName = "testTargetName";
194195

196+
if (PlatformDetection.IsWindowsServer2025)
197+
{
198+
throw new SkipTestException("Empty credentials not supported on Server 2025");
199+
}
200+
195201
// Ensure there is no confusion between DefaultCredentials / DefaultNetworkCredentials and a
196202
// NetworkCredential object with empty user, password and domain.
197203
NetworkCredential emptyNetworkCredential = new NetworkCredential("", "", "");

0 commit comments

Comments
 (0)