Override the OS in msbuild, apparently it's easier than yaml

directhex · Mar 11, 2021 · 30f6541 · 30f6541
1 parent 5e4a69e
commit 30f6541
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git 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,22 +15,15 @@ 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
             /p:RuntimeFlavor=${{ parameters.runtimeFlavor }}
             /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
@@ -15,6 +15,11 @@
 
 <Project DefaultTargets="RunInParallelForEachScenario">
 
+  <!-- Override Target OS for iOS/tvOS simulators -->
+  <PropertyGroup Condition="('$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'tvOS') and '$(osSubGroup)' == '_sim'">
+    <TargetOS>$(TargetOS)-sim</TargetOS>
+  </PropertyGroup>
+
   <!-- Helix auto-magically imports local *.props files. We're not going to import the Helix Sdk,
        so we need to import those files manually so we can reference the properties defined there.
   -->