Fix publish pipeline and properly build universal binaries for macOS (#578)

* Initial commit

* Add Nuget Pack Job to PR Pipeline

* Fix NuSpec

* Change files

* Clean up to make PR worthy

* fix ios bug, add xcconfig manually

* Add comment and issue to macOS avatar implementation

* initial commit

* Force build static libs in publish to make sure parsing is correct

* Revert change to test building static libs

* Move xcconfig to own file, retest in PR pipeline

* Copy template from fluentui-apple as they mismatch

* move macOS steps sooner

* Simplify xcodebuild template

* remove manual testing from PR pipeline

.ado/templates/apple-xcode-build-static-libs.yml

@@ -14,46 +14,6 @@ steps:
     workingDirectory: apps/macOS
     displayName: 'pod install macOS'
 
-  # iPhone Simulator Debug
-  - template: apple-xcode-build.yml
-    parameters:
-      xcode_sdk: 'iphonesimulator'
-      xcode_workspacePath: 'apps/ios/src/FluentTester.xcworkspace'
-      xcode_actions: 'build'
-      xcode_scheme: 'FluentTester'
-      xcode_configuration: 'Debug'
-      xcode_extraArgs: '-xcconfig $(Build.Repository.LocalPath)/.ado/xcconfig/publish_overrides.xcconfig'
-
-  # iPhone Simulator Release
-  - template: apple-xcode-build.yml
-    parameters:
-      xcode_sdk: 'iphonesimulator'
-      xcode_workspacePath: 'apps/ios/src/FluentTester.xcworkspace'
-      xcode_actions: 'build'
-      xcode_scheme: 'FluentTester'
-      xcode_configuration: 'Release'
-      xcode_extraArgs: '-xcconfig $(Build.Repository.LocalPath)/.ado/xcconfig/publish_overrides.xcconfig'
-
-  # iPhone Device Debug
-  - template: apple-xcode-build.yml
-    parameters:
-      xcode_sdk: 'iphoneos'
-      xcode_workspacePath: 'apps/ios/src/FluentTester.xcworkspace'
-      xcode_actions: 'build'
-      xcode_scheme: 'FluentTester'
-      xcode_configuration: 'Debug'
-      xcode_extraArgs: '-xcconfig $(Build.Repository.LocalPath)/.ado/xcconfig/publish_overrides_ios_device.xcconfig'
-
-  # iPhone Device Release
-  - template: apple-xcode-build.yml
-    parameters:
-      xcode_sdk: 'iphoneos'
-      xcode_workspacePath: 'apps/ios/src/FluentTester.xcworkspace'
-      xcode_actions: 'build'
-      xcode_scheme: 'FluentTester'
-      xcode_configuration: 'Release'
-      xcode_extraArgs: '-xcconfig $(Build.Repository.LocalPath)/.ado/xcconfig/publish_overrides_ios_device.xcconfig'
-
   # macOS Debug
   - template: apple-xcode-build.yml
     parameters:
@@ -62,7 +22,7 @@ steps:
       xcode_actions: 'build'
       xcode_scheme: 'FluentTester'
       xcode_configuration: 'Debug'
-      xcode_extraArgs: '-xcconfig $(Build.Repository.LocalPath)/.ado/xcconfig/publish_overrides.xcconfig' ONLY_ACTIVE_ARCH=NO
+      xcode_extraArgs: '-xcconfig $(Build.Repository.LocalPath)/.ado/xcconfig/publish_overrides.xcconfig'
 
   # macOS Release
   - template: apple-xcode-build.yml
@@ -72,4 +32,44 @@ steps:
       xcode_actions: 'build'
       xcode_scheme: 'FluentTester'
       xcode_configuration: 'Release'
-      xcode_extraArgs: '-xcconfig $(Build.Repository.LocalPath)/.ado/xcconfig/publish_overrides.xcconfig' ONLY_ACTIVE_ARCH=NO
+      xcode_extraArgs: '-xcconfig $(Build.Repository.LocalPath)/.ado/xcconfig/publish_overrides.xcconfig'
+
+  # iPhone Simulator Debug
+  - template: apple-xcode-build.yml
+    parameters:
+      xcode_sdk: 'iphonesimulator'
+      xcode_workspacePath: 'apps/ios/src/FluentTester.xcworkspace'
+      xcode_actions: 'build'
+      xcode_scheme: 'FluentTester'
+      xcode_configuration: 'Debug'
+      xcode_extraArgs: ''
+
+  # iPhone Simulator Release
+  - template: apple-xcode-build.yml
+    parameters:
+      xcode_sdk: 'iphonesimulator'
+      xcode_workspacePath: 'apps/ios/src/FluentTester.xcworkspace'
+      xcode_actions: 'build'
+      xcode_scheme: 'FluentTester'
+      xcode_configuration: 'Release'
+      xcode_extraArgs: ''
+
+  # iPhone Device Debug
+  - template: apple-xcode-build.yml
+    parameters:
+      xcode_sdk: 'iphoneos'
+      xcode_workspacePath: 'apps/ios/src/FluentTester.xcworkspace'
+      xcode_actions: 'build'
+      xcode_scheme: 'FluentTester'
+      xcode_configuration: 'Debug'
+      xcode_extraArgs: ''
+
+  # iPhone Device Release
+  - template: apple-xcode-build.yml
+    parameters:
+      xcode_sdk: 'iphoneos'
+      xcode_workspacePath: 'apps/ios/src/FluentTester.xcworkspace'
+      xcode_actions: 'build'
+      xcode_scheme: 'FluentTester'
+      xcode_configuration: 'Release'
+      xcode_extraArgs: ''

.ado/templates/apple-xcode-build.yml

@@ -3,15 +3,17 @@ parameters:
   xcode_configuration: ''
   xcode_workspacePath: ''
   xcode_scheme: ''
+  xcode_actions: ''
   xcode_extraArgs: ''
 
 steps:
   - task: Xcode@5
     displayName: 'Xcode ${{ parameters.xcode_actions }} ${{ parameters.xcode_configuration }} ${{ parameters.xcode_sdk }} ${{ parameters.xcode_scheme }}'
     inputs:
+      actions: '${{ parameters.xcode_actions }}'
       sdk: ${{ parameters.xcode_sdk }}
       scheme: ${{ parameters.xcode_scheme }}
       configuration: ${{ parameters.xcode_configuration }}
       xcWorkspacePath: ${{ parameters.xcode_workspacePath }}
       signingOption: nosign
-      args: '-verbose -derivedDataPath DerivedData'
+      args: '-verbose -derivedDataPath DerivedData ${{ parameters.xcode_extraArgs }}'

.ado/xcconfig/publish_overrides.xcconfig

@@ -0,0 +1,2 @@
+// Build for all architectures, not just the active one
+ONLY_ACTIVE_ARCH=NO