Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

housekeeping: Make ReactiveUI compile on VisualStudio for Mac #1932

Merged
merged 10 commits into from Jan 31, 2019
114 changes: 71 additions & 43 deletions azure-pipelines-tests.yml
Expand Up @@ -8,46 +8,74 @@ pr:
- rel/*
- preview/*

pool:
vmImage: vs2017-win2016

steps:
- task: DotNetCoreInstaller@0
displayName: Install Dot Net Core v2.2.1
inputs:
version: '2.2.103'

- task: BatchScript@1
inputs:
filename: "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Enterprise\\Common7\\Tools\\VsDevCmd.bat"
arguments: -no_logo
modifyEnvironment: true
displayName: Setup Environment Variables

- task: DotNetCoreCLI@2
inputs:
command: custom
custom: tool
arguments: install --tool-path . nbgv
displayName: Install NBGV tool

- script: nbgv cloud
displayName: Set Version

- powershell: .\build.ps1 -Target UploadTestCoverage
displayName: Build
env:
CODECOV_TOKEN: $(CODECOV_TOKEN)
ArtifactDirectory: $(System.DefaultWorkingDirectory)\artifacts

- task: CopyFiles@2
inputs:
Contents: 'artifacts/tests/**/*'
TargetFolder: '$(build.artifactstagingdirectory)\Tests'

- task: PublishBuildArtifacts@1
displayName: Publish Test Data
inputs:
pathToPublish: '$(build.artifactstagingdirectory)\Tests'
artifactType: container
artifactName: Tests
jobs:
- job: Windows
pool:
name: Default

steps:
- task: DotNetCoreInstaller@0
displayName: Install Dot Net Core v2.2.1
inputs:
version: '2.2.103'

- task: BatchScript@1
inputs:
filename: "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Community\\Common7\\Tools\\VsDevCmd.bat"
arguments: -no_logo
modifyEnvironment: true
displayName: Setup Environment Variables

- powershell: .\build.ps1 -Target UploadTestCoverage
displayName: Build
env:
CODECOV_TOKEN: $(CODECOV_TOKEN)
ArtifactDirectory: $(System.DefaultWorkingDirectory)\artifacts

- task: CopyFiles@2
inputs:
Contents: 'artifacts/tests/**/*'
TargetFolder: '$(build.artifactstagingdirectory)\Tests'

- 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'

- 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'
116 changes: 63 additions & 53 deletions azure-pipelines.yml
Expand Up @@ -8,65 +8,75 @@ pr:
- rel/*
- preview/*

pool:
vmImage: vs2017-win2016
jobs:
- 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: DotNetCoreInstaller@0
displayName: Install Dot Net Core v2.2.1
inputs:
version: '2.2.103'
- task: BatchScript@1
inputs:
filename: "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Enterprise\\Common7\\Tools\\VsDevCmd.bat"
arguments: -no_logo
modifyEnvironment: true
displayName: Setup Environment Variables

- task: BatchScript@1
inputs:
filename: "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Enterprise\\Common7\\Tools\\VsDevCmd.bat"
arguments: -no_logo
modifyEnvironment: true
displayName: Setup Environment Variables
- powershell: .\build.ps1
displayName: Build
env:
SIGNCLIENT_SECRET: $(SignClientSecret)
SIGNCLIENT_USER: $(SignClientUser)
ArtifactDirectory: $(System.DefaultWorkingDirectory)\artifacts

- powershell: .\build.ps1
displayName: Build
env:
SIGNCLIENT_SECRET: $(SignClientSecret)
SIGNCLIENT_USER: $(SignClientUser)
VSTS_ACCESS_TOKEN: $(System.AccessToken)
COVERALLS_TOKEN: $(COVERALLS_TOKEN)
CODECOV_TOKEN: $(CODECOV_TOKEN)
ArtifactDirectory: $(System.DefaultWorkingDirectory)\artifacts
- task: CopyFiles@2
inputs:
Contents: 'artifacts/packages/*.nupkg'
TargetFolder: '$(build.artifactstagingdirectory)\packages'
flattenFolders: true

- task: CopyFiles@2
inputs:
Contents: 'artifacts/packages/*.nupkg'
TargetFolder: '$(build.artifactstagingdirectory)\packages'
flattenFolders: true
- task: PublishBuildArtifacts@1
displayName: Publish Package Artifacts
inputs:
pathToPublish: '$(build.artifactstagingdirectory)\packages'
artifactType: container
artifactName: Packages

- task: PublishBuildArtifacts@1
displayName: Publish Package Artifacts
inputs:
pathToPublish: '$(build.artifactstagingdirectory)\packages'
artifactType: container
artifactName: Packages
- task: CopyFiles@2
inputs:
Contents: 'artifacts/binaries/**/*'
TargetFolder: '$(build.artifactstagingdirectory)\binaries'

- task: CopyFiles@2
inputs:
Contents: 'artifacts/binaries/**/*'
TargetFolder: '$(build.artifactstagingdirectory)\binaries'
- task: PublishBuildArtifacts@1
displayName: Publish Binaries
inputs:
pathToPublish: '$(build.artifactstagingdirectory)\binaries'
artifactType: container
artifactName: Binaries

- task: PublishBuildArtifacts@1
displayName: Publish Binaries
inputs:
pathToPublish: '$(build.artifactstagingdirectory)\binaries'
artifactType: container
artifactName: Binaries
- task: CopyFiles@2
inputs:
Contents: 'artifacts/Events/*.cs'
TargetFolder: '$(build.artifactstagingdirectory)\Events'

- task: CopyFiles@2
inputs:
Contents: 'artifacts/Events/*.cs'
TargetFolder: '$(build.artifactstagingdirectory)\Events'
- task: PublishBuildArtifacts@1
displayName: Publish Generated Events
inputs:
pathToPublish: '$(build.artifactstagingdirectory)\Events'
artifactType: container
artifactName: Events

- task: PublishBuildArtifacts@1
displayName: Publish Generated Events
inputs:
pathToPublish: '$(build.artifactstagingdirectory)\Events'
artifactType: container
artifactName: Events
- 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=Build
displayName: Build