Skip to content

Commit 83bb184

Browse files
glennawatsonRLittlesII
authored andcommitted
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
1 parent b95fda7 commit 83bb184

20 files changed

+882
-404
lines changed

azure-pipelines-tests.yml

Lines changed: 71 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -8,46 +8,74 @@ pr:
88
- rel/*
99
- preview/*
1010

11-
pool:
12-
vmImage: vs2017-win2016
13-
14-
steps:
15-
- task: DotNetCoreInstaller@0
16-
displayName: Install Dot Net Core v2.2.1
17-
inputs:
18-
version: '2.2.103'
19-
20-
- task: BatchScript@1
21-
inputs:
22-
filename: "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Enterprise\\Common7\\Tools\\VsDevCmd.bat"
23-
arguments: -no_logo
24-
modifyEnvironment: true
25-
displayName: Setup Environment Variables
26-
27-
- task: DotNetCoreCLI@2
28-
inputs:
29-
command: custom
30-
custom: tool
31-
arguments: install --tool-path . nbgv
32-
displayName: Install NBGV tool
33-
34-
- script: nbgv cloud
35-
displayName: Set Version
36-
37-
- powershell: .\build.ps1 -Target UploadTestCoverage
38-
displayName: Build
39-
env:
40-
CODECOV_TOKEN: $(CODECOV_TOKEN)
41-
ArtifactDirectory: $(System.DefaultWorkingDirectory)\artifacts
42-
43-
- task: CopyFiles@2
44-
inputs:
45-
Contents: 'artifacts/tests/**/*'
46-
TargetFolder: '$(build.artifactstagingdirectory)\Tests'
47-
48-
- task: PublishBuildArtifacts@1
49-
displayName: Publish Test Data
50-
inputs:
51-
pathToPublish: '$(build.artifactstagingdirectory)\Tests'
52-
artifactType: container
53-
artifactName: Tests
11+
jobs:
12+
- job: Windows
13+
pool:
14+
name: Default
15+
16+
steps:
17+
- task: DotNetCoreInstaller@0
18+
displayName: Install Dot Net Core v2.2.1
19+
inputs:
20+
version: '2.2.103'
21+
22+
- task: BatchScript@1
23+
inputs:
24+
filename: "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Community\\Common7\\Tools\\VsDevCmd.bat"
25+
arguments: -no_logo
26+
modifyEnvironment: true
27+
displayName: Setup Environment Variables
28+
29+
- powershell: .\build.ps1 -Target UploadTestCoverage
30+
displayName: Build
31+
env:
32+
CODECOV_TOKEN: $(CODECOV_TOKEN)
33+
ArtifactDirectory: $(System.DefaultWorkingDirectory)\artifacts
34+
35+
- task: CopyFiles@2
36+
inputs:
37+
Contents: 'artifacts/tests/**/*'
38+
TargetFolder: '$(build.artifactstagingdirectory)\Tests'
39+
40+
- task: PublishCodeCoverageResults@1
41+
displayName: Publish Coverage Results
42+
inputs:
43+
codeCoverageTool: 'cobertura'
44+
summaryFileLocation: 'artifacts\tests\report\Cobertura.xml'
45+
reportDirectory: 'artifacts\tests\report'
46+
47+
- task: PublishTestResults@2
48+
displayName: Publish Test Results
49+
inputs:
50+
testResultsFormat: 'VSTest'
51+
testResultsFiles: 'testresults-*.trx'
52+
searchFolder: 'artifacts\tests'
53+
54+
- job: Mac
55+
pool:
56+
vmImage: 'macOS-10.13'
57+
steps:
58+
- task: DotNetCoreInstaller@0
59+
displayName: Install Dot Net Core v2.2.1
60+
inputs:
61+
version: '2.2.103'
62+
63+
- bash: ./build.sh --target=RunUnitTests
64+
displayName: Build
65+
env:
66+
CODECOV_TOKEN: $(CODECOV_TOKEN)
67+
ArtifactDirectory: $(System.DefaultWorkingDirectory)/artifacts
68+
69+
- task: PublishCodeCoverageResults@1
70+
displayName: Publish Coverage Results
71+
inputs:
72+
codeCoverageTool: 'cobertura'
73+
summaryFileLocation: 'artifacts\tests\report\Cobertura.xml'
74+
reportDirectory: 'artifacts\tests\report'
75+
76+
- task: PublishTestResults@2
77+
displayName: Publish Test Results
78+
inputs:
79+
testResultsFormat: 'VSTest'
80+
testResultsFiles: 'testresults-*.trx'
81+
searchFolder: 'artifacts\tests'

azure-pipelines.yml

Lines changed: 63 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -8,65 +8,75 @@ pr:
88
- rel/*
99
- preview/*
1010

11-
pool:
12-
vmImage: vs2017-win2016
11+
jobs:
12+
- job: Windows
13+
pool:
14+
vmImage: vs2017-win2016
15+
steps:
16+
- task: DotNetCoreInstaller@0
17+
displayName: Install Dot Net Core v2.2.1
18+
inputs:
19+
version: '2.2.103'
1320

14-
steps:
15-
- task: DotNetCoreInstaller@0
16-
displayName: Install Dot Net Core v2.2.1
17-
inputs:
18-
version: '2.2.103'
21+
- task: BatchScript@1
22+
inputs:
23+
filename: "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Enterprise\\Common7\\Tools\\VsDevCmd.bat"
24+
arguments: -no_logo
25+
modifyEnvironment: true
26+
displayName: Setup Environment Variables
1927

20-
- task: BatchScript@1
21-
inputs:
22-
filename: "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Enterprise\\Common7\\Tools\\VsDevCmd.bat"
23-
arguments: -no_logo
24-
modifyEnvironment: true
25-
displayName: Setup Environment Variables
28+
- powershell: .\build.ps1
29+
displayName: Build
30+
env:
31+
SIGNCLIENT_SECRET: $(SignClientSecret)
32+
SIGNCLIENT_USER: $(SignClientUser)
33+
ArtifactDirectory: $(System.DefaultWorkingDirectory)\artifacts
2634

27-
- powershell: .\build.ps1
28-
displayName: Build
29-
env:
30-
SIGNCLIENT_SECRET: $(SignClientSecret)
31-
SIGNCLIENT_USER: $(SignClientUser)
32-
VSTS_ACCESS_TOKEN: $(System.AccessToken)
33-
COVERALLS_TOKEN: $(COVERALLS_TOKEN)
34-
CODECOV_TOKEN: $(CODECOV_TOKEN)
35-
ArtifactDirectory: $(System.DefaultWorkingDirectory)\artifacts
35+
- task: CopyFiles@2
36+
inputs:
37+
Contents: 'artifacts/packages/*.nupkg'
38+
TargetFolder: '$(build.artifactstagingdirectory)\packages'
39+
flattenFolders: true
3640

37-
- task: CopyFiles@2
38-
inputs:
39-
Contents: 'artifacts/packages/*.nupkg'
40-
TargetFolder: '$(build.artifactstagingdirectory)\packages'
41-
flattenFolders: true
41+
- task: PublishBuildArtifacts@1
42+
displayName: Publish Package Artifacts
43+
inputs:
44+
pathToPublish: '$(build.artifactstagingdirectory)\packages'
45+
artifactType: container
46+
artifactName: Packages
4247

43-
- task: PublishBuildArtifacts@1
44-
displayName: Publish Package Artifacts
45-
inputs:
46-
pathToPublish: '$(build.artifactstagingdirectory)\packages'
47-
artifactType: container
48-
artifactName: Packages
48+
- task: CopyFiles@2
49+
inputs:
50+
Contents: 'artifacts/binaries/**/*'
51+
TargetFolder: '$(build.artifactstagingdirectory)\binaries'
4952

50-
- task: CopyFiles@2
51-
inputs:
52-
Contents: 'artifacts/binaries/**/*'
53-
TargetFolder: '$(build.artifactstagingdirectory)\binaries'
53+
- task: PublishBuildArtifacts@1
54+
displayName: Publish Binaries
55+
inputs:
56+
pathToPublish: '$(build.artifactstagingdirectory)\binaries'
57+
artifactType: container
58+
artifactName: Binaries
5459

55-
- task: PublishBuildArtifacts@1
56-
displayName: Publish Binaries
57-
inputs:
58-
pathToPublish: '$(build.artifactstagingdirectory)\binaries'
59-
artifactType: container
60-
artifactName: Binaries
60+
- task: CopyFiles@2
61+
inputs:
62+
Contents: 'artifacts/Events/*.cs'
63+
TargetFolder: '$(build.artifactstagingdirectory)\Events'
6164

62-
- task: CopyFiles@2
63-
inputs:
64-
Contents: 'artifacts/Events/*.cs'
65-
TargetFolder: '$(build.artifactstagingdirectory)\Events'
65+
- task: PublishBuildArtifacts@1
66+
displayName: Publish Generated Events
67+
inputs:
68+
pathToPublish: '$(build.artifactstagingdirectory)\Events'
69+
artifactType: container
70+
artifactName: Events
6671

67-
- task: PublishBuildArtifacts@1
68-
displayName: Publish Generated Events
69-
inputs:
70-
pathToPublish: '$(build.artifactstagingdirectory)\Events'
71-
artifactType: container
72-
artifactName: Events
72+
- job: Mac
73+
pool:
74+
vmImage: 'macOS-10.13'
75+
steps:
76+
- task: DotNetCoreInstaller@0
77+
displayName: Install Dot Net Core v2.2.1
78+
inputs:
79+
version: '2.2.103'
80+
81+
- bash: ./build.sh --target=Build
82+
displayName: Build

0 commit comments

Comments
 (0)