From 30f654164c9731b1d9c954a30a9af7ec324fbb6c Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Thu, 11 Mar 2021 15:11:18 -0500 Subject: [PATCH] Override the OS in msbuild, apparently it's easier than yaml --- eng/pipelines/libraries/helix.yml | 15 ++++----------- src/libraries/sendtohelix.proj | 5 +++++ 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/eng/pipelines/libraries/helix.yml b/eng/pipelines/libraries/helix.yml index 0be044d731a91..b96755482c7bb 100644 --- a/eng/pipelines/libraries/helix.yml +++ b/eng/pipelines/libraries/helix.yml @@ -4,8 +4,8 @@ parameters: buildConfig: '' creator: '' helixQueues: '' - osGroup: '${{ parameters.osGroup }}' - osSubGroup: '${{ parameters.osSubgroup }}' + osGroup: '' + osSubGroup: '' targetRid: '' testRunNamePrefixSuffix: '' testScope: 'innerloop' # innerloop | outerloop | all @@ -15,14 +15,6 @@ parameters: shouldContinueOnError: false scenarios: '' - osOverride: '/p:TargetOS=${{ parameters.osGroup }}' - ${{ if and(eq(parameters.osGroup, 'tvOS'),eq(parameters.osSubGroup, '_sim')) }}: - - name: osOverride - value: '/p:TargetOS=tvOS-sim' - ${{ if and(eq(parameters.osGroup, 'iOS'),eq(parameters.osSubGroup, '_sim')) }}: - - name: osOverride - value: '/p:TargetOS=iOS-sim' - steps: - script: $(_msbuildCommand) $(Build.SourcesDirectory)/src/libraries/sendtohelix.proj @@ -30,7 +22,8 @@ steps: /p:TargetArchitecture=${{ parameters.archType }} /p:TargetRuntimeIdentifier=${{ parameters.targetRid }} /p:Configuration=${{ parameters.buildConfig }} - ${{ osOverride }} + /p:TargetOS=${{ parameters.osGroup }} + /p:osSubGroup=${{ parameters.osSubGroup }} /p:MonoForceInterpreter=${{ parameters.interpreter }} /p:TestScope=${{ parameters.testScope }} /p:TestRunNamePrefixSuffix=${{ parameters.testRunNamePrefixSuffix }} diff --git a/src/libraries/sendtohelix.proj b/src/libraries/sendtohelix.proj index 4d113c917f7b5..308e46298867f 100644 --- a/src/libraries/sendtohelix.proj +++ b/src/libraries/sendtohelix.proj @@ -15,6 +15,11 @@ + + + $(TargetOS)-sim + +