Remove Windows arm32 support (#5081)

dotnet · Dec 4, 2024 · d12018b · d12018b
1 parent 5f957db
commit d12018b
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 34 deletions.
diff --git a/diagnostics.yml b/diagnostics.yml
@@ -77,9 +77,6 @@ extends:
             architecture: x86
             artifactUploadPath: bin/Windows_NT.x86.Release
           - ${{ if ne(variables['System.TeamProject'], 'public') }}:
-            - configuration: Release
-              architecture: arm
-              artifactUploadPath: bin/Windows_NT.arm.Release
             - configuration: Release
               architecture: arm64
               artifactUploadPath: bin/Windows_NT.arm64.Release

diff --git a/eng/release/tool-list.json b/eng/release/tool-list.json
@@ -4,35 +4,35 @@
     "AssetList": [
       {
         "name": "dotnet-counters",
-        "rids": ["win-x64", "win-x86", "win-arm", "win-arm64", "linux-x64", "linux-musl-arm64", "osx-x64", "linux-arm64", "linux-musl-x64", "linux-arm"]
+        "rids": ["win-x64", "win-x86", "win-arm64", "linux-x64", "linux-musl-arm64", "osx-x64", "linux-arm64", "linux-musl-x64", "linux-arm"]
       },
       {
         "name": "dotnet-dump",
-        "rids": ["win-x64", "win-x86", "win-arm", "win-arm64", "linux-x64", "linux-musl-arm64", "osx-x64", "linux-arm64", "linux-musl-x64", "linux-arm"]
+        "rids": ["win-x64", "win-x86", "win-arm64", "linux-x64", "linux-musl-arm64", "osx-x64", "linux-arm64", "linux-musl-x64", "linux-arm"]
       },
       {
         "name": "dotnet-gcdump",
-        "rids": ["win-x64", "win-x86", "win-arm", "win-arm64", "linux-x64", "linux-musl-arm64", "osx-x64", "linux-arm64", "linux-musl-x64", "linux-arm"]
+        "rids": ["win-x64", "win-x86", "win-arm64", "linux-x64", "linux-musl-arm64", "osx-x64", "linux-arm64", "linux-musl-x64", "linux-arm"]
       },
       {
         "name": "dotnet-sos",
-        "rids": ["win-x64", "win-x86", "win-arm", "win-arm64", "linux-x64", "linux-musl-arm64", "osx-x64", "linux-arm64", "linux-musl-x64", "linux-arm"]
+        "rids": ["win-x64", "win-x86", "win-arm64", "linux-x64", "linux-musl-arm64", "osx-x64", "linux-arm64", "linux-musl-x64", "linux-arm"]
       },
       {
         "name": "dotnet-trace",
-        "rids": ["win-x64", "win-x86", "win-arm", "win-arm64", "linux-x64", "linux-musl-arm64", "osx-x64", "linux-arm64", "linux-musl-x64", "linux-arm"]
+        "rids": ["win-x64", "win-x86", "win-arm64", "linux-x64", "linux-musl-arm64", "osx-x64", "linux-arm64", "linux-musl-x64", "linux-arm"]
       },
       {
         "name": "dotnet-stack",
-        "rids": ["win-x64", "win-x86", "win-arm", "win-arm64", "linux-x64", "linux-musl-arm64", "osx-x64", "linux-arm64", "linux-musl-x64", "linux-arm"]
+        "rids": ["win-x64", "win-x86", "win-arm64", "linux-x64", "linux-musl-arm64", "osx-x64", "linux-arm64", "linux-musl-x64", "linux-arm"]
       },
       {
         "name": "dotnet-dsrouter",
-        "rids": ["win-x64", "win-x86", "win-arm", "win-arm64", "linux-x64", "linux-musl-arm64", "osx-x64", "linux-arm64", "linux-musl-x64", "linux-arm"]
+        "rids": ["win-x64", "win-x86", "win-arm64", "linux-x64", "linux-musl-arm64", "osx-x64", "linux-arm64", "linux-musl-x64", "linux-arm"]
       },
       {
         "name": "dotnet-symbol",
-        "rids": ["win-x64", "win-x86", "win-arm", "win-arm64", "linux-x64", "linux-musl-arm64", "osx-x64", "linux-arm64", "linux-musl-x64", "linux-arm"]
+        "rids": ["win-x64", "win-x86", "win-arm64", "linux-x64", "linux-musl-arm64", "osx-x64", "linux-arm64", "linux-musl-x64", "linux-arm"]
       }
     ]
   },

diff --git a/src/SOS/SOS.Package/SOS.Package.csproj b/src/SOS/SOS.Package/SOS.Package.csproj
@@ -44,7 +44,6 @@
             <Files>
                 <File Architecture="amd64" Module="win-x64\sos.dll" />
                 <File Architecture="x86"   Module="win-x86\sos.dll" />
-                <File Architecture="arm32" Module="win-arm\sos.dll" />
                 <File Architecture="arm64" Module="win-arm64\sos.dll" />
             </Files>
             <LoadTriggers>

diff --git a/src/SOS/SOS.Package/SOS.Symbol.Package.csproj b/src/SOS/SOS.Package/SOS.Symbol.Package.csproj
@@ -27,9 +27,6 @@
     <None Include="$(ArtifactsBinDir)\Windows_NT.x86.$(Configuration)\PDB\sos.pdb" Pack="true" Visible="false">
       <PackagePath>$(SOSPackagePathPrefix)/win-x86</PackagePath>
     </None>
-    <None Include="$(ArtifactsBinDir)\Windows_NT.arm.$(Configuration)\PDB\sos.pdb" Pack="true" Visible="false">
-      <PackagePath>$(SOSPackagePathPrefix)/win-arm</PackagePath>
-    </None>
     <None Include="$(ArtifactsBinDir)\Windows_NT.arm64.$(Configuration)\PDB\sos.pdb" Pack="true" Visible="false">
       <PackagePath>$(SOSPackagePathPrefix)/win-arm64</PackagePath>
     </None>

diff --git a/src/Tools/Directory.Build.props b/src/Tools/Directory.Build.props
@@ -23,9 +23,9 @@
       <PropertyGroup>
         <IsPackable>true</IsPackable>
         <PackAsTool>true</PackAsTool>
-        <PackAsToolShimRuntimeIdentifiers>win-x64;win-x86;win-arm;osx-x64</PackAsToolShimRuntimeIdentifiers>
+        <PackAsToolShimRuntimeIdentifiers>win-x64;win-x86;osx-x64</PackAsToolShimRuntimeIdentifiers>
         <PackagedShimOutputRootDirectory>$(OutputPath)</PackagedShimOutputRootDirectory>
       </PropertyGroup>
     </Otherwise>
   </Choose>
-</Project>
+</Project>
diff --git a/src/dbgshim/dbgshim.vcxproj b/src/dbgshim/dbgshim.vcxproj
@@ -378,7 +378,6 @@
     <None Include="pkg\Microsoft.Diagnostics.DbgShim.osx-x64.proj" />
     <None Include="pkg\Microsoft.Diagnostics.DbgShim.proj" />
     <None Include="pkg\Microsoft.Diagnostics.DbgShim.props" />
-    <None Include="pkg\Microsoft.Diagnostics.DbgShim.win-arm.proj" />
     <None Include="pkg\Microsoft.Diagnostics.DbgShim.win-arm64.proj" />
     <None Include="pkg\Microsoft.Diagnostics.DbgShim.win-x64.proj" />
     <None Include="pkg\Microsoft.Diagnostics.DbgShim.win-x86.proj" />
@@ -393,4 +392,4 @@
   <ImportGroup Label="ExtensionTargets">
     <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.targets" />
   </ImportGroup>
-</Project>
+</Project>
diff --git a/src/dbgshim/dbgshim.vcxproj.filters b/src/dbgshim/dbgshim.vcxproj.filters
@@ -36,9 +36,6 @@
     <None Include="pkg\Microsoft.Diagnostics.DbgShim.props">
       <Filter>pkg</Filter>
     </None>
-    <None Include="pkg\Microsoft.Diagnostics.DbgShim.win-arm.proj">
-      <Filter>pkg</Filter>
-    </None>
     <None Include="pkg\Microsoft.Diagnostics.DbgShim.win-arm64.proj">
       <Filter>pkg</Filter>
     </None>
@@ -63,4 +60,4 @@
     <ClInclude Include="debugshim.h" />
     <ClInclude Include="dbgshim.h" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/src/dbgshim/pkg/Microsoft.Diagnostics.DbgShim.win-arm.proj b/src/dbgshim/pkg/Microsoft.Diagnostics.DbgShim.win-arm.proj
diff --git a/src/singlefile-tools.proj b/src/singlefile-tools.proj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>$(NetCoreAppMinTargetFramework)</TargetFramework>
-    <SupportedRids>win-x64;win-x86;win-arm;win-arm64;linux-x64;linux-musl-arm64;linux-arm64;linux-musl-x64;linux-arm</SupportedRids>
+    <SupportedRids>win-x64;win-x86;win-arm64;linux-x64;linux-musl-arm64;linux-arm64;linux-musl-x64;linux-arm</SupportedRids>
     <ArcadeSdkMSBuildProjectDir>$([System.IO.Path]::GetDirectoryName('$(ArcadeSdkBuildTasksAssembly)'))\..\</ArcadeSdkMSBuildProjectDir>
     <ArcadeSdkSignProject>$(ArcadeSdkMSBuildProjectDir)Sign.proj</ArcadeSdkSignProject>
     <BundledToolsZipDirectory>$(BundledToolsPath)$(Configuration)/zips/</BundledToolsZipDirectory>

diff --git a/src/sos-packaging.props b/src/sos-packaging.props
@@ -16,9 +16,6 @@
     <SosRequiredBinaries Include="$(ArtifactsBinDir)\Windows_NT.x86.$(Configuration)\sos.dll" TargetRid="win-x86" />
     <SosRequiredBinaries Include="$(ArtifactsBinDir)\Windows_NT.x86.$(Configuration)\Microsoft.DiaSymReader.Native.x86.dll" TargetRid="win-x86" />
 
-    <SosRequiredBinaries Include="$(ArtifactsBinDir)\Windows_NT.arm.$(Configuration)\sos.dll" TargetRid="win-arm" />
-    <SosRequiredBinaries Include="$(ArtifactsBinDir)\Windows_NT.arm.$(Configuration)\Microsoft.DiaSymReader.Native.arm.dll" TargetRid="win-arm" />
-
     <SosRequiredBinaries Include="$(ArtifactsBinDir)\Windows_NT.arm64.$(Configuration)\sos.dll" TargetRid="win-arm64" />
     <SosRequiredBinaries Include="$(ArtifactsBinDir)\Windows_NT.arm64.$(Configuration)\Microsoft.DiaSymReader.Native.arm64.dll" TargetRid="win-arm64" />