Skip to content

Commit 2aed347

Browse files
authored
GitHub Actions workflow cannot build arm32 after updating Windows SDK (#1454)
arm32 is not supported anymore by Windows. There has not been a native arm32 OS since before Win11. The wow32 backcompat on arm64 devices to run arm32 programs was removed with Win11 24H2. Most notably, the ability to build arm32 with newer SDKs and toolsets has seemingly been removed. This is now breaking the CI build. The easiest fix is to simply remove arm32 support.
1 parent febda5d commit 2aed347

File tree

61 files changed

+172
-2468
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+172
-2468
lines changed

.pipelines/OneBranch.Official.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -130,12 +130,6 @@ extends:
130130
artifactName: 'drop_build_x64'
131131
targetPath: '$(Build.SourcesDirectory)/x64'
132132

133-
- task: DownloadPipelineArtifact@2
134-
displayName: 'Download arm artifacts'
135-
inputs:
136-
artifactName: 'drop_build_arm'
137-
targetPath: '$(Build.SourcesDirectory)/arm'
138-
139133
- task: DownloadPipelineArtifact@2
140134
displayName: 'Download arm64 artifacts'
141135
inputs:
@@ -159,7 +153,6 @@ extends:
159153
echo d | xcopy $(Build.SourcesDirectory)\x86\cppwinrt_fast_forwarder.lib build\native\lib\Win32
160154
echo d | xcopy $(Build.SourcesDirectory)\x64\cppwinrt_fast_forwarder.lib build\native\lib\amd64
161155
echo d | xcopy $(Build.SourcesDirectory)\x64\cppwinrt_fast_forwarder.lib build\native\lib\x64
162-
echo d | xcopy $(Build.SourcesDirectory)\arm\cppwinrt_fast_forwarder.lib build\native\lib\arm
163156
echo d | xcopy $(Build.SourcesDirectory)\arm64\cppwinrt_fast_forwarder.lib build\native\lib\arm64
164157
165158
- stage: NuGet

.pipelines/build.yml

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@ jobs:
3131
buildPlatform: 'x86'
3232
x64:
3333
buildPlatform: 'x64'
34-
arm:
35-
buildPlatform: 'arm'
3634
arm64:
3735
buildPlatform: 'arm64'
3836

@@ -169,12 +167,6 @@ jobs:
169167
artifactName: $(BuildConfiguration)_x64
170168
downloadPath: $(Build.SourcesDirectory)\x64
171169

172-
- task: DownloadPipelineArtifact@1
173-
displayName: Download arm Artifacts
174-
inputs:
175-
artifactName: $(BuildConfiguration)_arm
176-
downloadPath: $(Build.SourcesDirectory)\arm
177-
178170
- task: DownloadPipelineArtifact@1
179171
displayName: Download arm64 Artifacts
180172
inputs:
@@ -262,7 +254,7 @@ jobs:
262254
- task: CmdLine@2
263255
displayName: Stage MSBuild vpack
264256
inputs:
265-
script: "set TargetDir=$(Build.SourcesDirectory)\\msbuild\nrd /s /q %TargetDir% >nul 2>&1\nmd %TargetDir%\ncd %TargetDir%\n\ncopy $(Build.SourcesDirectory)\\vsix\\Microsoft.Cpp.CppWinRT.props\ncopy $(Build.SourcesDirectory)\\nuget\\Microsoft.Windows.CppWinRT.props Microsoft.Cpp.CppWinRTEnabled.props \ncopy $(Build.SourcesDirectory)\\nuget\\Microsoft.Windows.CppWinRT.targets Microsoft.Cpp.CppWinRTEnabled.targets\ncopy $(Build.SourcesDirectory)\\nuget\\CppWinrtRules.Project.xml CppWinrtRules.Project.xml\necho d | xcopy $(Build.SourcesDirectory)\\x86\\cppwinrt_fast_forwarder.lib build\\native\\lib\\i386\necho d | xcopy $(Build.SourcesDirectory)\\x86\\cppwinrt_fast_forwarder.lib build\\native\\lib\\Win32\necho d | xcopy $(Build.SourcesDirectory)\\x64\\cppwinrt_fast_forwarder.lib build\\native\\lib\\amd64\necho d | xcopy $(Build.SourcesDirectory)\\x64\\cppwinrt_fast_forwarder.lib build\\native\\lib\\x64\necho d | xcopy $(Build.SourcesDirectory)\\arm\\cppwinrt_fast_forwarder.lib build\\native\\lib\\arm\necho d | xcopy $(Build.SourcesDirectory)\\arm64\\cppwinrt_fast_forwarder.lib build\\native\\lib\\arm64\n"
257+
script: "set TargetDir=$(Build.SourcesDirectory)\\msbuild\nrd /s /q %TargetDir% >nul 2>&1\nmd %TargetDir%\ncd %TargetDir%\n\ncopy $(Build.SourcesDirectory)\\vsix\\Microsoft.Cpp.CppWinRT.props\ncopy $(Build.SourcesDirectory)\\nuget\\Microsoft.Windows.CppWinRT.props Microsoft.Cpp.CppWinRTEnabled.props \ncopy $(Build.SourcesDirectory)\\nuget\\Microsoft.Windows.CppWinRT.targets Microsoft.Cpp.CppWinRTEnabled.targets\ncopy $(Build.SourcesDirectory)\\nuget\\CppWinrtRules.Project.xml CppWinrtRules.Project.xml\necho d | xcopy $(Build.SourcesDirectory)\\x86\\cppwinrt_fast_forwarder.lib build\\native\\lib\\i386\necho d | xcopy $(Build.SourcesDirectory)\\x86\\cppwinrt_fast_forwarder.lib build\\native\\lib\\Win32\necho d | xcopy $(Build.SourcesDirectory)\\x64\\cppwinrt_fast_forwarder.lib build\\native\\lib\\amd64\necho d | xcopy $(Build.SourcesDirectory)\\x64\\cppwinrt_fast_forwarder.lib build\\native\\lib\\x64\necho d | xcopy $(Build.SourcesDirectory)\\arm64\\cppwinrt_fast_forwarder.lib build\\native\\lib\\arm64\n"
266258
failOnStderr: true
267259

268260
- task: PkgESVPack@12
@@ -343,12 +335,6 @@ jobs:
343335
artifactName: $(BuildConfiguration)_x64
344336
downloadPath: $(Build.SourcesDirectory)\x64
345337

346-
- task: DownloadPipelineArtifact@1
347-
displayName: Download arm Artifacts
348-
inputs:
349-
artifactName: $(BuildConfiguration)_arm
350-
downloadPath: $(Build.SourcesDirectory)\arm
351-
352338
- task: DownloadPipelineArtifact@1
353339
displayName: Download arm64 Artifacts
354340
inputs:
@@ -430,7 +416,7 @@ jobs:
430416
command: pack
431417
searchPatternPack: nuget/Microsoft.Windows.CppWinRT.nuspec
432418
versioningScheme: byBuildNumber
433-
buildProperties: 'target_version=$(Build.BuildNumber);cppwinrt_exe=$(Build.ArtifactStagingDirectory)\x86\cppwinrt.exe;cppwinrt_fast_fwd_x86=$(Build.SourcesDirectory)\x86\cppwinrt_fast_forwarder.lib;cppwinrt_fast_fwd_x64=$(Build.SourcesDirectory)\x64\cppwinrt_fast_forwarder.lib;cppwinrt_fast_fwd_arm=$(Build.SourcesDirectory)\arm\cppwinrt_fast_forwarder.lib;cppwinrt_fast_fwd_arm64=$(Build.SourcesDirectory)\arm64\cppwinrt_fast_forwarder.lib '
419+
buildProperties: 'target_version=$(Build.BuildNumber);cppwinrt_exe=$(Build.ArtifactStagingDirectory)\x86\cppwinrt.exe;cppwinrt_fast_fwd_x86=$(Build.SourcesDirectory)\x86\cppwinrt_fast_forwarder.lib;cppwinrt_fast_fwd_x64=$(Build.SourcesDirectory)\x64\cppwinrt_fast_forwarder.lib;cppwinrt_fast_fwd_arm64=$(Build.SourcesDirectory)\arm64\cppwinrt_fast_forwarder.lib '
434420

435421
- task: ComponentGovernanceComponentDetection@0
436422
displayName: Component Detection

.pipelines/jobs/OneBranchBuild.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ jobs:
2020
BuildPlatform: 'x86'
2121
x64:
2222
BuildPlatform: 'x64'
23-
arm:
24-
BuildPlatform: 'arm'
2523
arm64:
2624
BuildPlatform: 'arm64'
2725

.pipelines/jobs/OneBranchNuGet.yml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,6 @@ jobs:
4343
artifactName: 'drop_build_x64'
4444
targetPath: '$(Build.SourcesDirectory)/x64'
4545

46-
- task: DownloadPipelineArtifact@1
47-
displayName: 'Download arm artifacts'
48-
inputs:
49-
artifactName: 'drop_build_arm'
50-
targetPath: '$(Build.SourcesDirectory)/arm'
51-
5246
- task: DownloadPipelineArtifact@1
5347
displayName: 'Download arm64 artifacts'
5448
inputs:
@@ -59,7 +53,7 @@ jobs:
5953
displayName: 'Build NuGet package'
6054
inputs:
6155
command: 'custom'
62-
arguments: 'pack nuget/Microsoft.Windows.CppWinRT.nuspec -NonInteractive -OutputDirectory $(ob_outputDirectory)\packages -Properties Configuration=release;cppwinrt_exe=$(Build.SourcesDirectory)\x86\cppwinrt\cppwinrt.exe;cppwinrt_fast_fwd_x86=$(Build.SourcesDirectory)\x86\cppwinrt_fast_forwarder.lib;cppwinrt_fast_fwd_x64=$(Build.SourcesDirectory)\x64\cppwinrt_fast_forwarder.lib;cppwinrt_fast_fwd_arm=$(Build.SourcesDirectory)\arm\cppwinrt_fast_forwarder.lib;cppwinrt_fast_fwd_arm64=$(Build.SourcesDirectory)\arm64\cppwinrt_fast_forwarder.lib;target_version=$(PackageVersion) -Version $(PackageVersion) -Verbosity Detailed'
56+
arguments: 'pack nuget/Microsoft.Windows.CppWinRT.nuspec -NonInteractive -OutputDirectory $(ob_outputDirectory)\packages -Properties Configuration=release;cppwinrt_exe=$(Build.SourcesDirectory)\x86\cppwinrt\cppwinrt.exe;cppwinrt_fast_fwd_x86=$(Build.SourcesDirectory)\x86\cppwinrt_fast_forwarder.lib;cppwinrt_fast_fwd_x64=$(Build.SourcesDirectory)\x64\cppwinrt_fast_forwarder.lib;cppwinrt_fast_fwd_arm64=$(Build.SourcesDirectory)\arm64\cppwinrt_fast_forwarder.lib;target_version=$(PackageVersion) -Version $(PackageVersion) -Verbosity Detailed'
6357

6458
- task: onebranch.pipeline.signing@1
6559
displayName: '🔒 Onebranch Signing for NuGet package'

.pipelines/jobs/OneBranchVsix.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -71,12 +71,6 @@ jobs:
7171
artifactName: 'drop_build_x64'
7272
targetPath: '$(Build.SourcesDirectory)\x64'
7373

74-
- task: DownloadPipelineArtifact@2
75-
displayName: 'Download arm binaries'
76-
inputs:
77-
artifactName: 'drop_build_arm'
78-
targetPath: '$(Build.SourcesDirectory)\arm'
79-
8074
- task: DownloadPipelineArtifact@2
8175
displayName: 'Download arm64 binaries'
8276
inputs:

Directory.Build.Props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
<CppWinRTPlatform Condition="'$(Platform)'=='Win32'">x86</CppWinRTPlatform>
4343
<OutDir>$(SolutionDir)_build\$(CppWinRTPlatform)\$(Configuration)\</OutDir>
4444
<CppWinRTDir>$(OutDir)</CppWinRTDir>
45-
<CppWinRTDir Condition="'$(Platform)'=='ARM' or '$(Platform)'=='ARM64'">$(SolutionDir)_build\x86\$(Configuration)\</CppWinRTDir>
45+
<CppWinRTDir Condition="'$(Platform)'=='ARM64'">$(SolutionDir)_build\x86\$(Configuration)\</CppWinRTDir>
4646
</PropertyGroup>
4747

4848
<ItemDefinitionGroup>

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ If you really want to build it yourself, the simplest way to do so is to run the
1919
* Open the `cppwinrt.sln` solution.
2020
* Choose a configuration (x64, x86, Release, Debug) and build projects as needed.
2121

22-
If you are working on an ARM64 or ARM specific issue from an x64 or x86 host, you will need to instead:
22+
If you are working on an ARM64 specific issue from an x64 or x86 host, you will need to instead:
2323

2424
* Open the `cppwinrt.sln` solution
2525
* Build the x86 version of the "cppwinrt" project first

build_nuget.cmd

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@ if "%target_version%"=="" set target_version=3.0.0.0
55

66
call msbuild /m /p:Configuration=Release,Platform=x86,CppWinRTBuildVersion=%target_version% cppwinrt.sln /t:fast_fwd
77
call msbuild /m /p:Configuration=Release,Platform=x64,CppWinRTBuildVersion=%target_version% cppwinrt.sln /t:fast_fwd
8-
call msbuild /m /p:Configuration=Release,Platform=arm,CppWinRTBuildVersion=%target_version% cppwinrt.sln /t:fast_fwd
98
call msbuild /m /p:Configuration=Release,Platform=arm64,CppWinRTBuildVersion=%target_version% cppwinrt.sln /t:fast_fwd
109

1110
call msbuild /m /p:Configuration=Release,Platform=x86,CppWinRTBuildVersion=%target_version% cppwinrt.sln /t:cppwinrt
1211

13-
nuget pack nuget\Microsoft.Windows.CppWinRT.nuspec -Properties target_version=%target_version%;cppwinrt_exe=%cd%\_build\x86\Release\cppwinrt.exe;cppwinrt_fast_fwd_x86=%cd%\_build\x86\Release\cppwinrt_fast_forwarder.lib;cppwinrt_fast_fwd_x64=%cd%\_build\x64\Release\cppwinrt_fast_forwarder.lib;cppwinrt_fast_fwd_arm=%cd%\_build\arm\Release\cppwinrt_fast_forwarder.lib;cppwinrt_fast_fwd_arm64=%cd%\_build\arm64\Release\cppwinrt_fast_forwarder.lib
12+
nuget pack nuget\Microsoft.Windows.CppWinRT.nuspec -Properties target_version=%target_version%;cppwinrt_exe=%cd%\_build\x86\Release\cppwinrt.exe;cppwinrt_fast_fwd_x86=%cd%\_build\x86\Release\cppwinrt_fast_forwarder.lib;cppwinrt_fast_fwd_x64=%cd%\_build\x64\Release\cppwinrt_fast_forwarder.lib;cppwinrt_fast_fwd_arm64=%cd%\_build\arm64\Release\cppwinrt_fast_forwarder.lib

build_prior_projection.cmd

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ if /I "%target_platform%" equ "all" (
1212
)
1313
call %0 x86 !target_configuration!
1414
call %0 x64 !target_configuration!
15-
call %0 arm !target_configuration!
1615
call %0 arm64 !target_configuration!
1716
goto :eof
1817
)

build_projection.cmd

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ if /I "%target_platform%" equ "all" (
1212
)
1313
call %0 x86 !target_configuration!
1414
call %0 x64 !target_configuration!
15-
call %0 arm !target_configuration!
1615
call %0 arm64 !target_configuration!
1716
goto :eof
1817
)

0 commit comments

Comments
 (0)