@@ -23,14 +23,18 @@ phases:
23
23
- agent.os -equals linux
24
24
container : CentosContainer
25
25
steps :
26
+ - script : ./restore.sh
27
+ displayName : restore all projects
28
+ - script : ./build.sh -configuration $(BuildConfig) /p:SkipRIDAgnosticAssets=true -projects $(Build.SourcesDirectory)/src/Redist/Microsoft.ML.DnnImageFeaturizer.ModelRedist/Microsoft.ML.DnnImageFeaturizer.ModelRedist.proj
29
+ displayName : build redist
26
30
# Only build native assets to avoid conflicts.
27
- - script : ./build.sh -buildNative - $(BuildConfig) -skipRIDAgnosticAssets
31
+ - script : ./build.sh -configuration $(BuildConfig) -projects $(Build.SourcesDirectory)/src/Native/Native.proj /p:TargetArchitecture=x64
28
32
displayName : Build
29
33
30
34
- task : PublishBuildArtifacts@1
31
35
displayName : Publish Linux package assets
32
36
inputs :
33
- pathToPublish : $(Build.SourcesDirectory)/bin/obj/packages
37
+ pathToPublish : $(Build.SourcesDirectory)/artifacts/pkgassets
34
38
artifactName : PackageAssets
35
39
artifactType : container
36
40
@@ -46,16 +50,26 @@ phases:
46
50
queue :
47
51
name : Hosted macOS
48
52
steps :
49
- - script : brew update && brew install $(Build.SourcesDirectory)/build/libomp.rb && brew link libomp --force
53
+ - script : |
54
+ brew uninstall [email protected] |
55
+ brew uninstall [email protected] |
56
+ brew untap local/openssl |
57
+ brew untap local/python2
58
+ displayName: MacOS Homebrew bug Workaround
59
+ -
script :
brew update && brew unlink [email protected] && brew install mono-libgdiplus && brew install $(Build.SourcesDirectory)/build/libomp.rb && brew link libomp --force
50
60
displayName : Install build dependencies
61
+ - script : ./restore.sh
62
+ displayName : restore all projects
63
+ - script : ./build.sh -configuration $(BuildConfig) /p:SkipRIDAgnosticAssets=true -projects $(Build.SourcesDirectory)/src/Redist/Microsoft.ML.DnnImageFeaturizer.ModelRedist/Microsoft.ML.DnnImageFeaturizer.ModelRedist.proj
64
+ displayName : build redist
51
65
# Only build native assets to avoid conflicts.
52
- - script : ./build.sh -buildNative - $(BuildConfig) -skipRIDAgnosticAssets
66
+ - script : ./build.sh -projects $(Build.SourcesDirectory)/src/Native/Native.proj -configuration $(BuildConfig) /p:TargetArchitecture=x64
53
67
displayName : Build
54
68
55
69
- task : PublishBuildArtifacts@1
56
70
displayName : Publish macOS package assets
57
71
inputs :
58
- pathToPublish : $(Build.SourcesDirectory)/bin/obj/packages
72
+ pathToPublish : $(Build.SourcesDirectory)/artifacts/pkgassets
59
73
artifactName : PackageAssets
60
74
artifactType : container
61
75
@@ -88,27 +102,26 @@ phases:
88
102
continueOnError : false
89
103
condition : and(succeeded(), in(variables._SignType, 'real', 'test'))
90
104
105
+ - script : ./restore.cmd
106
+ displayName : restore all projects
107
+ - script : ./build.cmd -configuration $(BuildConfig) /p:SkipRIDAgnosticAssets=true -projects $(Build.SourcesDirectory)/src/Redist/Microsoft.ML.DnnImageFeaturizer.ModelRedist/Microsoft.ML.DnnImageFeaturizer.ModelRedist.proj
108
+ displayName : build redist
91
109
# Only build native assets to avoid conflicts.
92
- - script : ./build.cmd -buildNative - $(BuildConfig) -buildArch =x86 -skipRIDAgnosticAssets
110
+ - script : ./build.cmd -projects $(Build.SourcesDirectory)/src/Native/Native.proj -configuration $(BuildConfig) /p:TargetArchitecture =x86
93
111
displayName : Build
94
112
95
- - task : MSBuild@1
96
- displayName : Sign Windows_x86 Binaries
97
- inputs :
98
- solution : build/sign.proj
99
- msbuildArguments : /p:SignType=$(_SignType)
100
- msbuildVersion : 15.0
101
- continueOnError : false
113
+ - script : ./sign.cmd -configuration $(BuildConfig) /p:TargetArchitecture=x86 /p:SignBinaries=true
114
+ displayName : sign binaries
102
115
103
116
- task : PublishBuildArtifacts@1
104
117
displayName : Publish Windows_x86 package assets
105
118
inputs :
106
- pathToPublish : $(Build.SourcesDirectory)/bin/obj/packages
119
+ pathToPublish : $(Build.SourcesDirectory)/artifacts/pkgassets
107
120
artifactName : PackageAssets
108
121
artifactType : container
109
122
110
123
# Terminate all dotnet build processes.
111
- - script : $(Build.SourcesDirectory)/Tools/dotnetcli /dotnet.exe build-server shutdown
124
+ - script : $(Build.SourcesDirectory)/.dotnet /dotnet.exe build-server shutdown
112
125
displayName : Dotnet Server Shutdown
113
126
114
127
# ###############################################################################
@@ -141,7 +154,7 @@ phases:
141
154
condition : and(succeeded(), in(variables._SignType, 'real', 'test'))
142
155
143
156
# Build both native and managed assets.
144
- - script : ./build.cmd -$(BuildConfig)
157
+ - script : ./build.cmd -configuration $(BuildConfig) /p:TargetArchitecture=x64
145
158
displayName : Build
146
159
147
160
- task : ComponentGovernanceComponentDetection@0
@@ -151,23 +164,18 @@ phases:
151
164
alertWarningLevel : ' High'
152
165
153
166
154
- - task : MSBuild@1
155
- displayName : Sign Windows_x64 Binaries
156
- inputs :
157
- solution : build/sign.proj
158
- msbuildArguments : /p:SignType=$(_SignType)
159
- msbuildVersion : 15.0
160
- continueOnError : false
167
+ - script : ./sign.cmd -configuration $(BuildConfig) /p:TargetArchitecture=x64 /p:SignBinaries=true
168
+ displayName : sign binaries
161
169
162
170
- task : PublishBuildArtifacts@1
163
171
displayName : Publish Windows_x64 package assets
164
172
inputs :
165
- pathToPublish : $(Build.SourcesDirectory)/bin/obj/packages
173
+ pathToPublish : $(Build.SourcesDirectory)/artifacts/pkgassets
166
174
artifactName : PackageAssets
167
175
artifactType : container
168
176
169
177
# Terminate all dotnet build processes.
170
- - script : $(Build.SourcesDirectory)/Tools/dotnetcli /dotnet.exe build-server shutdown
178
+ - script : $(Build.SourcesDirectory)/.dotnet /dotnet.exe build-server shutdown
171
179
displayName : Dotnet Server Shutdown
172
180
173
181
# ###############################################################################
@@ -213,31 +221,27 @@ phases:
213
221
displayName : Download package assets
214
222
inputs :
215
223
artifactName : PackageAssets
216
- downloadPath : $(Build.SourcesDirectory)/bin/obj/packages
224
+ downloadPath : $(Build.SourcesDirectory)/artifacts/pkgassets
217
225
218
226
# Workaround https://github.com/Microsoft/vsts-tasks/issues/6739
219
227
- task : CopyFiles@2
220
228
displayName : Copy package assets to correct folder
221
229
inputs :
222
- sourceFolder : $(Build.SourcesDirectory)/bin/obj/packages /PackageAssets
223
- targetFolder : $(Build.SourcesDirectory)/bin/obj/packages
230
+ sourceFolder : $(Build.SourcesDirectory)/artifacts/pkgassets /PackageAssets
231
+ targetFolder : $(Build.SourcesDirectory)/artifacts/pkgassets
224
232
225
- - script : ./build.cmd -buildPackages
226
- displayName : Create Packages
233
+ - script : ./build.cmd -pack -configuration $(BuildConfig)
234
+ displayName : Build Packages
227
235
228
- - task : MSBuild@1
229
- displayName : Sign Packages
230
- inputs :
231
- solution : build/sign.proj
232
- msbuildArguments : /p:SignType=$(_SignType) /p:SignNugetPackages=true
233
- msbuildVersion : 15.0
236
+ - script : ./sign.cmd /p:SignNugetPackages=true
237
+ displayName : sign packages
234
238
continueOnError : false
235
239
236
240
- task : NuGetAuthenticate@0
237
241
inputs :
238
242
nuGetServiceConnections : machinelearning-dnceng-public-feed # To allow publishing to a feed of another organization
239
243
240
- - script : Tools\dotnetcli \dotnet msbuild build\publish.proj /t:PublishPackages /p:NuGetFeedUrl=$(_AzureDevopsFeedUrl) /p:NuGetApiKey=AzureArtifacts
244
+ - script : $(Build.SourcesDirectory)\.dotnet \dotnet.exe msbuild build\publish.proj /t:PublishPackages /p:NuGetFeedUrl=$(_AzureDevopsFeedUrl) /p:NuGetApiKey=AzureArtifacts
241
245
displayName : Publish Packages to AzureDevOps Feed
242
246
243
247
- task : MSBuild@1
@@ -257,5 +261,5 @@ phases:
257
261
continueOnError : true
258
262
259
263
# Terminate all dotnet build processes.
260
- - script : $(Build.SourcesDirectory)/Tools/dotnetcli /dotnet.exe build-server shutdown
264
+ - script : $(Build.SourcesDirectory)/.dotnet /dotnet.exe build-server shutdown
261
265
displayName : Dotnet Server Shutdown
0 commit comments