Skip to content

Commit 72a5ef7

Browse files
richlanderrichlander
authored
Remove Raspbian 10 (#115129)
1 parent 8fa9785 commit 72a5ef7

File tree

11 files changed

+4
-75
lines changed

11 files changed

+4
-75
lines changed

‎Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@
200200
<NoTargetFrameworkFiltering>true</NoTargetFrameworkFiltering>
201201

202202
<NativeBuildPartitionPropertiesToRemove>ClrFullNativeBuild;ClrRuntimeSubset;ClrJitSubset;ClrPalTestsSubset;ClrAllJitsSubset;ClrAllJitsCommunitySubset;ClrILToolsSubset;ClrNativeAotSubset;ClrSpmiSubset;ClrCrossComponentsSubset;ClrDebugSubset;HostArchitecture;PgoInstrument;NativeOptimizationDataSupported;CMakeArgs;CxxStandardLibrary;CxxStandardLibraryStatic;CxxAbiLibrary</NativeBuildPartitionPropertiesToRemove>
203-
<UseSystemZlib Condition="'$(TargetsAppleMobile)' == 'true' or '$(TargetOS)' == 'android' or '$(TargetArchitecture)' == 'armv6'">true</UseSystemZlib>
203+
<UseSystemZlib Condition="'$(TargetsAppleMobile)' == 'true' or '$(TargetOS)' == 'android'">true</UseSystemZlib>
204204
</PropertyGroup>
205205

206206
<!-- RepositoryEngineeringDir isn't set when Installer tests import this file. -->

‎docs/workflow/using-docker.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ The main Docker images are the most commonly used ones, and the ones you will pr
4949
| Azure Linux (x64) | Ubuntu 18.04 (Wasm) | x64 | `mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-webassembly-amd64` | `/crossrootfs/x64` |
5050
| Debian (x64) | Debian 12 | x64 | `mcr.microsoft.com/dotnet-buildtools/prereqs:debian-12-gcc15-amd64` | *N/A* |
5151
| Ubuntu (x64) | Tizen 9.0 | Arm32 (armel) | `mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-cross-armel-tizen` | `/crossrootfs/armel` |
52-
| Ubuntu (x64) | Ubuntu 20.04 | Arm32 (v6) | `mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-20.04-cross-armv6-raspbian-10` | `/crossrootfs/armv6` |
5352

5453
## Build the Repo
5554

‎eng/Subsets.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
<_CoreCLRSupportedOS Condition="'$(TargetsAndroid)' == 'true' and '$(TargetArchitecture)' != 'arm' and '$(TargetArchitecture)' != 'x86'">true</_CoreCLRSupportedOS>
3434
<_CoreCLRSupportedOS Condition="'$(TargetsBrowser)' == 'true'">true</_CoreCLRSupportedOS>
3535

36-
<_CoreCLRSupportedArch Condition="'$(TargetArchitecture)' != 'armv6' and '$(TargetArchitecture)' != 'ppc64le' and '$(TargetArchitecture)' != 's390x'">true</_CoreCLRSupportedArch>
36+
<_CoreCLRSupportedArch Condition="'$(TargetArchitecture)' != 'ppc64le' and '$(TargetArchitecture)' != 's390x'">true</_CoreCLRSupportedArch>
3737
<CoreCLRSupported Condition="'$(_CoreCLRSupportedOS)' == 'true' and '$(_CoreCLRSupportedArch)' == 'true'">true</CoreCLRSupported>
3838

3939
<!-- Determine if the Mono runtime can build/run for the specified target. -->

‎eng/pipelines/common/platform-matrix.yml

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -45,27 +45,6 @@ jobs:
4545
crossBuild: true
4646
${{ insert }}: ${{ parameters.jobParameters }}
4747

48-
# Linux armv6
49-
50-
- ${{ if containsValue(parameters.platforms, 'linux_armv6') }}:
51-
- template: xplat-setup.yml
52-
parameters:
53-
jobTemplate: ${{ parameters.jobTemplate }}
54-
helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
55-
variables: ${{ parameters.variables }}
56-
osGroup: linux
57-
archType: armv6
58-
targetRid: linux-armv6
59-
platform: linux_armv6
60-
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
61-
container: linux_armv6
62-
jobParameters:
63-
runtimeFlavor: ${{ parameters.runtimeFlavor }}
64-
buildConfig: ${{ parameters.buildConfig }}
65-
helixQueueGroup: ${{ parameters.helixQueueGroup }}
66-
crossBuild: true
67-
${{ insert }}: ${{ parameters.jobParameters }}
68-
6948
# Linux arm64
7049

7150
- ${{ if or(containsValue(parameters.platforms, 'linux_arm64'), in(parameters.platformGroup, 'all', 'gcstress')) }}:

‎eng/pipelines/common/templates/pipeline-with-resources.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,6 @@ extends:
2121
env:
2222
ROOTFS_DIR: /crossrootfs/arm
2323

24-
linux_armv6:
25-
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-20.04-cross-armv6-raspbian-10
26-
env:
27-
ROOTFS_DIR: /crossrootfs/armv6
28-
2924
linux_arm64:
3025
image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-cross-arm64
3126
env:

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,6 @@ jobs:
2828
- ${{ if or(eq(parameters.jobParameters.isExtraPlatformsBuild, true), eq(parameters.jobParameters.includeAllPlatforms, true)) }}:
2929
- (Debian.13.Arm32.Open)[email protected]/dotnet-buildtools/prereqs:debian-13-helix-arm32v7
3030

31-
# Linux armv6
32-
- ${{ if eq(parameters.platform, 'linux_armv6') }}:
33-
- (Raspbian.10.Armv6.Open)[email protected]/dotnet-buildtools/prereqs:raspbian-10-helix-arm32v6
34-
3531
# Linux arm64
3632
- ${{ if eq(parameters.platform, 'linux_arm64') }}:
3733
- (Ubuntu.2504.Arm64.Open)[email protected]/dotnet-buildtools/prereqs:ubuntu-25.04-helix-arm64v8

‎eng/pipelines/runtime-community.yml

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -110,39 +110,3 @@ extends:
110110
eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true),
111111
eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true),
112112
eq(variables['isRollingBuild'], true))
113-
114-
# disable armv6 until https://github.com/dotnet/runtime/issues/104333 is fixed
115-
#
116-
# Build the whole product using Mono and run libraries tests
117-
#
118-
#- template: /eng/pipelines/common/platform-matrix.yml
119-
# parameters:
120-
# jobTemplate: /eng/pipelines/common/global-build-job.yml
121-
# helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml
122-
# buildConfig: Release
123-
# runtimeFlavor: mono
124-
# platforms:
125-
# - linux_armv6
126-
# variables:
127-
# # map dependencies variables to local variables
128-
# - name: librariesContainsChange
129-
# value: $[ stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_libraries.containsChange'] ]
130-
# - name: monoContainsChange
131-
# value: $[ stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'] ]
132-
# jobParameters:
133-
# testScope: innerloop
134-
# nameSuffix: AllSubsets_Mono
135-
# buildArgs: -s mono+clr.iltools+clr.packages+libs+host+packs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true
136-
# timeoutInMinutes: 120
137-
# condition: >-
138-
# or(
139-
# eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true),
140-
# eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true),
141-
# eq(variables['isRollingBuild'], true))
142-
# ${{ if eq(variables['isRollingBuild'], true) }}:
143-
# # extra steps, run tests
144-
# postBuildSteps:
145-
# - template: /eng/pipelines/libraries/helix.yml
146-
# parameters:
147-
# creator: dotnet-bot
148-
# testRunNamePrefixSuffix: Mono_$(_BuildConfig)

‎src/libraries/Common/tests/TestUtilities/System/PlatformDetection.Unix.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ public static partial class PlatformDetection
2323
public static bool IsUbuntu24OrHigher => IsDistroAndVersionOrHigher("ubuntu", 24);
2424
public static bool IsDebian => IsDistroAndVersion("debian");
2525
public static bool IsAlpine => IsDistroAndVersion("alpine");
26-
public static bool IsRaspbian10 => IsDistroAndVersion("raspbian", 10);
2726
public static bool IsMariner => IsDistroAndVersion("mariner");
2827
public static bool IsSLES => IsDistroAndVersion("sles");
2928
public static bool IsTizen => IsDistroAndVersion("tizen");

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ public static partial class PlatformDetection
6666
public static bool IsNotArmNorArm64Process => !IsArmOrArm64Process;
6767
public static bool IsS390xProcess => (int)RuntimeInformation.ProcessArchitecture == 5; // Architecture.S390x
6868
public static bool IsLoongArch64Process => (int)RuntimeInformation.ProcessArchitecture == 6; // Architecture.LoongArch64;
69-
public static bool IsArmv6Process => (int)RuntimeInformation.ProcessArchitecture == 7; // Architecture.Armv6
7069
public static bool IsPpc64leProcess => (int)RuntimeInformation.ProcessArchitecture == 8; // Architecture.Ppc64le
7170
public static bool IsRiscV64Process => (int)RuntimeInformation.ProcessArchitecture == 9; // Architecture.RiscV64;
7271
public static bool IsX64Process => RuntimeInformation.ProcessArchitecture == Architecture.X64;
@@ -117,9 +116,9 @@ public static int SlowRuntimeTimeoutModifier
117116
if (IsReleaseRuntime)
118117
return 1;
119118
if (IsRiscV64Process)
120-
return IsDebugRuntime? 10 : 2;
119+
return IsDebugRuntime ? 10 : 2;
121120
else
122-
return IsDebugRuntime? 5 : 1;
121+
return IsDebugRuntime ? 5 : 1;
123122
}
124123
}
125124

‎src/libraries/System.Net.Quic/tests/FunctionalTests/MsQuicPlatformDetectionTests.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ public async Task SupportedLinuxPlatformsWithMsQuic_IsSupportedIsTrue()
5757
}
5858
}
5959

60-
[ActiveIssue("https://github.com/dotnet/runtime/issues/82154", typeof(PlatformDetection), nameof(PlatformDetection.IsRaspbian10), nameof(PlatformDetection.IsArmv6Process), nameof(PlatformDetection.IsInContainer))]
6160
[ActiveIssue("https://github.com/dotnet/runtime/issues/82154", typeof(PlatformDetection), nameof(PlatformDetection.IsPpc64leProcess))]
6261
[ActiveIssue("https://github.com/dotnet/runtime/issues/82154", typeof(PlatformDetection), nameof(PlatformDetection.IsUbuntu2004), nameof(PlatformDetection.IsS390xProcess))]
6362
[ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsInHelix))]

‎src/libraries/System.Net.Requests/tests/ServicePointTests/ServicePointManagerTest.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,6 @@ await RemoteExecutor.Invoke(() =>
284284

285285
[ConditionalFact(typeof(RemoteExecutor), nameof(RemoteExecutor.IsSupported))]
286286
[ActiveIssue("https://github.com/dotnet/runtime/issues/36217", typeof(PlatformDetection), nameof(PlatformDetection.IsMonoInterpreter))]
287-
[ActiveIssue("https://github.com/dotnet/runtime/issues/64674", typeof(PlatformDetection), nameof(PlatformDetection.IsArmv6Process))]
288287
public static async Task FindServicePoint_Collectible()
289288
{
290289
await RemoteExecutor.Invoke(() =>

0 commit comments

Comments
 (0)