housekeeping: Make ReactiveUI compile on VisualStudio for Mac (#1932)

* housekeeping: allow for vs4mac copilation * updated to use better target for fody * Update the main CI to do mac as well * fix syntax issues in azure yaml * go back to old version of visual studio * trying to get the proper mack version to compile * cleanup android generation
reactiveui · Jan 31, 2019 · 26ac371 · 26ac371
1 parent c8c07e9
commit 26ac371
Show file tree

Hide file tree

Showing 20 changed files with 882 additions and 404 deletions.
diff --git a/azure-pipelines-tests.yml b/azure-pipelines-tests.yml
@@ -8,46 +8,74 @@ pr:
 - rel/*
 - preview/*
 
-pool:
+jobs:
-  vmImage: vs2017-win2016
+- job: Windows
-
+  pool:
-steps:
+    name: Default
-- task: DotNetCoreInstaller@0
+
-  displayName: Install Dot Net Core v2.2.1
+  steps:
-  inputs:
+  - task: DotNetCoreInstaller@0
-    version: '2.2.103'
+    displayName: Install Dot Net Core v2.2.1
-
+    inputs:
-- task: BatchScript@1
+      version: '2.2.103'
-  inputs:
+
-    filename: "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Enterprise\\Common7\\Tools\\VsDevCmd.bat"
+  - task: BatchScript@1
-    arguments: -no_logo
+    inputs:
-    modifyEnvironment: true
+      filename: "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Community\\Common7\\Tools\\VsDevCmd.bat"
-  displayName: Setup Environment Variables
+      arguments: -no_logo
-
+      modifyEnvironment: true
-- task: DotNetCoreCLI@2  
+    displayName: Setup Environment Variables
-  inputs:
+
-    command: custom
+  - powershell: .\build.ps1 -Target UploadTestCoverage
-    custom: tool
+    displayName: Build 
-    arguments: install --tool-path . nbgv
+    env:
-  displayName: Install NBGV tool
+      CODECOV_TOKEN: $(CODECOV_TOKEN)
-
+      ArtifactDirectory: $(System.DefaultWorkingDirectory)\artifacts
-- script: nbgv cloud
+
-  displayName: Set Version
+  - task: CopyFiles@2
-
+    inputs:
-- powershell: .\build.ps1 -Target UploadTestCoverage
+      Contents: 'artifacts/tests/**/*'
-  displayName: Build 
+      TargetFolder: '$(build.artifactstagingdirectory)\Tests'
-  env:
+
-    CODECOV_TOKEN: $(CODECOV_TOKEN)
+  - task: PublishCodeCoverageResults@1
-    ArtifactDirectory: $(System.DefaultWorkingDirectory)\artifacts
+    displayName: Publish Coverage Results
-
+    inputs:
-- task: CopyFiles@2
+      codeCoverageTool: 'cobertura'
-  inputs:
+      summaryFileLocation: 'artifacts\tests\report\Cobertura.xml'
-    Contents: 'artifacts/tests/**/*'
+      reportDirectory: 'artifacts\tests\report'
-    TargetFolder: '$(build.artifactstagingdirectory)\Tests'
+
-
+  - task: PublishTestResults@2
-- task: PublishBuildArtifacts@1
+    displayName: Publish Test Results
-  displayName: Publish Test Data
+    inputs:
-  inputs:
+      testResultsFormat: 'VSTest'
-    pathToPublish: '$(build.artifactstagingdirectory)\Tests'
+      testResultsFiles: 'testresults-*.trx' 
-    artifactType: container
+      searchFolder: 'artifacts\tests'
-    artifactName: Tests
+
+- job: Mac
+  pool:
+    vmImage: 'macOS-10.13'
+  steps:
+  - task: DotNetCoreInstaller@0
+    displayName: Install Dot Net Core v2.2.1
+    inputs:
+      version: '2.2.103'
+
+  - bash: ./build.sh --target=RunUnitTests
+    displayName: Build 
+    env:
+      CODECOV_TOKEN: $(CODECOV_TOKEN)
+      ArtifactDirectory: $(System.DefaultWorkingDirectory)/artifacts
+
+  - task: PublishCodeCoverageResults@1
+    displayName: Publish Coverage Results
+    inputs:
+      codeCoverageTool: 'cobertura'
+      summaryFileLocation: 'artifacts\tests\report\Cobertura.xml'
+      reportDirectory: 'artifacts\tests\report'
+
+  - task: PublishTestResults@2
+    displayName: Publish Test Results
+    inputs:
+      testResultsFormat: 'VSTest'
+      testResultsFiles: 'testresults-*.trx' 
+      searchFolder: 'artifacts\tests'
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -8,65 +8,75 @@ pr:
 - rel/*
 - preview/*
 
-pool:
+jobs:
-  vmImage: vs2017-win2016
+- job: Windows
+  pool:
+    vmImage: vs2017-win2016
+  steps:
+  - task: DotNetCoreInstaller@0
+    displayName: Install Dot Net Core v2.2.1
+    inputs:
+      version: '2.2.103'
 
-steps:
+  - task: BatchScript@1
-- task: DotNetCoreInstaller@0
+    inputs:
-  displayName: Install Dot Net Core v2.2.1
+      filename: "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Enterprise\\Common7\\Tools\\VsDevCmd.bat"
-  inputs:
+      arguments: -no_logo
-    version: '2.2.103'
+      modifyEnvironment: true
+    displayName: Setup Environment Variables
 
-- task: BatchScript@1
+  - powershell: .\build.ps1
-  inputs:
+    displayName: Build 
-    filename: "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Enterprise\\Common7\\Tools\\VsDevCmd.bat"
+    env:
-    arguments: -no_logo
+      SIGNCLIENT_SECRET: $(SignClientSecret)
-    modifyEnvironment: true
+      SIGNCLIENT_USER: $(SignClientUser)
-  displayName: Setup Environment Variables
+      ArtifactDirectory: $(System.DefaultWorkingDirectory)\artifacts
 
-- powershell: .\build.ps1
+  - task: CopyFiles@2
-  displayName: Build 
+    inputs:
-  env:
+      Contents: 'artifacts/packages/*.nupkg'
-    SIGNCLIENT_SECRET: $(SignClientSecret)
+      TargetFolder: '$(build.artifactstagingdirectory)\packages'
-    SIGNCLIENT_USER: $(SignClientUser)
+      flattenFolders: true
-    VSTS_ACCESS_TOKEN: $(System.AccessToken)
-    COVERALLS_TOKEN: $(COVERALLS_TOKEN)
-    CODECOV_TOKEN: $(CODECOV_TOKEN)
-    ArtifactDirectory: $(System.DefaultWorkingDirectory)\artifacts
 
-- task: CopyFiles@2
+  - task: PublishBuildArtifacts@1
-  inputs:
+    displayName: Publish Package Artifacts
-    Contents: 'artifacts/packages/*.nupkg'
+    inputs:
-    TargetFolder: '$(build.artifactstagingdirectory)\packages'
+      pathToPublish: '$(build.artifactstagingdirectory)\packages'
-    flattenFolders: true
+      artifactType: container
+      artifactName: Packages
 
-- task: PublishBuildArtifacts@1
+  - task: CopyFiles@2
-  displayName: Publish Package Artifacts
+    inputs:
-  inputs:
+      Contents: 'artifacts/binaries/**/*'
-    pathToPublish: '$(build.artifactstagingdirectory)\packages'
+      TargetFolder: '$(build.artifactstagingdirectory)\binaries'
-    artifactType: container
-    artifactName: Packages
 
-- task: CopyFiles@2
+  - task: PublishBuildArtifacts@1
-  inputs:
+    displayName: Publish Binaries
-    Contents: 'artifacts/binaries/**/*'
+    inputs:
-    TargetFolder: '$(build.artifactstagingdirectory)\binaries'
+      pathToPublish: '$(build.artifactstagingdirectory)\binaries'
+      artifactType: container
+      artifactName: Binaries
 
-- task: PublishBuildArtifacts@1
+  - task: CopyFiles@2
-  displayName: Publish Binaries
+    inputs:
-  inputs:
+      Contents: 'artifacts/Events/*.cs'
-    pathToPublish: '$(build.artifactstagingdirectory)\binaries'
+      TargetFolder: '$(build.artifactstagingdirectory)\Events'
-    artifactType: container
-    artifactName: Binaries
 
-- task: CopyFiles@2
+  - task: PublishBuildArtifacts@1
-  inputs:
+    displayName: Publish Generated Events
-    Contents: 'artifacts/Events/*.cs'
+    inputs:
-    TargetFolder: '$(build.artifactstagingdirectory)\Events'
+      pathToPublish: '$(build.artifactstagingdirectory)\Events'
+      artifactType: container
+      artifactName: Events
 
-- task: PublishBuildArtifacts@1
+- job: Mac
-  displayName: Publish Generated Events
+  pool:
-  inputs:
+    vmImage: 'macOS-10.13'
-    pathToPublish: '$(build.artifactstagingdirectory)\Events'
+  steps:
-    artifactType: container
+  - task: DotNetCoreInstaller@0
-    artifactName: Events
+    displayName: Install Dot Net Core v2.2.1
+    inputs:
+        version: '2.2.103'
+
+  - bash: ./build.sh --target=Build
+    displayName: Build