From 9d33562d6ad316534c2bcbdef8988a9901e08a0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= Date: Fri, 5 Apr 2024 13:04:22 +0200 Subject: [PATCH 1/2] [VMR] Pass target architecture on Windows We didn't pass an explicit architecture so it always used the host one, even for arm64/x86 builds. Contributes to https://github.com/dotnet/source-build/issues/4292 --- eng/pipelines/templates/jobs/vmr-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/templates/jobs/vmr-build.yml b/eng/pipelines/templates/jobs/vmr-build.yml index 46c450ca8411..1c462ca9c08e 100644 --- a/eng/pipelines/templates/jobs/vmr-build.yml +++ b/eng/pipelines/templates/jobs/vmr-build.yml @@ -238,7 +238,7 @@ jobs: - ${{ if eq(parameters.targetOS, 'windows') }}: - script: | - call $(sourcesPath)\build.cmd -ci -cleanWhileBuilding -prepareMachine ${{ parameters.extraProperties }} + call $(sourcesPath)\build.cmd -ci -cleanWhileBuilding -prepareMachine /p:TargetArchitecture=${{ parameters.targetArchitecture }} ${{ parameters.extraProperties }} displayName: Build - ${{ else }}: From e1b7716de32dd7e7cde946b8eb181187d9116606 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= Date: Fri, 5 Apr 2024 13:26:30 +0200 Subject: [PATCH 2/2] Add TargetOS --- eng/pipelines/templates/jobs/vmr-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/templates/jobs/vmr-build.yml b/eng/pipelines/templates/jobs/vmr-build.yml index 1c462ca9c08e..6e5be4b4a502 100644 --- a/eng/pipelines/templates/jobs/vmr-build.yml +++ b/eng/pipelines/templates/jobs/vmr-build.yml @@ -238,7 +238,7 @@ jobs: - ${{ if eq(parameters.targetOS, 'windows') }}: - script: | - call $(sourcesPath)\build.cmd -ci -cleanWhileBuilding -prepareMachine /p:TargetArchitecture=${{ parameters.targetArchitecture }} ${{ parameters.extraProperties }} + call $(sourcesPath)\build.cmd -ci -cleanWhileBuilding -prepareMachine /p:TargetOS=${{ parameters.targetOS }} /p:TargetArchitecture=${{ parameters.targetArchitecture }} ${{ parameters.extraProperties }} displayName: Build - ${{ else }}: