@@ -64,75 +64,75 @@ jobs:
6464 inputs :
6565 versionSpec : ' 5.11.0'
6666
67- # - task: PowerShell@2
68- # displayName: 'Install the win 10 sdk v18362 if necessary'
69- # inputs:
70- # targetType: inline
71- # script: if (-not (Test-Path "${ENV:programfiles(x86)}\windows Kits\10\include\10.0.18362.0\")) { choco install windows-sdk-10-version-1903-all -y }
67+ - task : PowerShell@2
68+ displayName : ' Install the win 10 sdk v18362 if necessary'
69+ inputs :
70+ targetType : inline
71+ script : if (-not (Test-Path "${ENV:programfiles(x86)}\windows Kits\10\include\10.0.18362.0\")) { choco install windows-sdk-10-version-1903-all -y }
7272
73- # - task: PowerShell@1
74- # displayName: OpenCV - Configure CMake
75- # inputs:
76- # scriptName: external/tools/CMakeConfigureOpenCV.ps1
77- # workingDirectory: $(System.ArtifactsDirectory)
78- # arguments: >
79- # -Architecture $(BuildPlatform)
73+ - task : PowerShell@1
74+ displayName : OpenCV - Configure CMake
75+ inputs :
76+ scriptName : external/tools/CMakeConfigureOpenCV.ps1
77+ workingDirectory : $(System.ArtifactsDirectory)
78+ arguments : >
79+ -Architecture $(BuildPlatform)
8080
81- # - task: VSBuild@1
82- # displayName: 'OpenCV - Build'
83- # inputs:
84- # solution: 'build/external/opencv/cmake_config/$(BuildPlatform)/OpenCV.sln"'
85- # vsVersion: "16.0"
86- # msbuildArgs: '/p:Configuration=$(BuildConfiguration) /t:Build /p:LinkIncremental=false /p:DebugSymbols=false /p:DebugType=None'
87- # configuration: '$(BuildConfiguration)'
88- # msbuildArchitecture: x64
89- # createLogFile: true
90- # condition: succeededOrFailed()
81+ - task : VSBuild@1
82+ displayName : ' OpenCV - Build'
83+ inputs :
84+ solution : ' build/external/opencv/cmake_config/$(BuildPlatform)/OpenCV.sln"'
85+ vsVersion : " 16.0"
86+ msbuildArgs : ' /p:Configuration=$(BuildConfiguration) /t:Build /p:LinkIncremental=false /p:DebugSymbols=false /p:DebugType=None'
87+ configuration : ' $(BuildConfiguration)'
88+ msbuildArchitecture : x64
89+ createLogFile : true
90+ condition : succeededOrFailed()
9191
92- # - task: VSBuild@1
93- # displayName: 'OpenCV - Install'
94- # inputs:
95- # solution: 'build/external/opencv/cmake_config/$(BuildPlatform)/INSTALL.vcxproj'
96- # vsVersion: "16.0"
97- # msbuildArgs: '/p:Configuration=$(BuildConfiguration) /p:LinkIncremental=false /p:DebugSymbols=false /p:DebugType=None'
98- # configuration: '$(BuildConfiguration)'
99- # msbuildArchitecture: x64
100- # createLogFile: true
101- # condition: succeededOrFailed()
92+ - task : VSBuild@1
93+ displayName : ' OpenCV - Install'
94+ inputs :
95+ solution : ' build/external/opencv/cmake_config/$(BuildPlatform)/INSTALL.vcxproj'
96+ vsVersion : " 16.0"
97+ msbuildArgs : ' /p:Configuration=$(BuildConfiguration) /p:LinkIncremental=false /p:DebugSymbols=false /p:DebugType=None'
98+ configuration : ' $(BuildConfiguration)'
99+ msbuildArchitecture : x64
100+ createLogFile : true
101+ condition : succeededOrFailed()
102102
103- # - task: PowerShell@2
104- # displayName: 'Restore WinMLSamplesGalleryNative Nuget Packages'
105- # inputs:
106- # targetType: 'inline'
107- # script: |
108- # $src_root_dir = $Env:BUILD_SOURCESDIRECTORY;
109- # $solution_dir = [System.IO.Path]::Combine($src_root_dir, 'Samples', 'WinMLSamplesGallery')
110- # $csproj = [System.IO.Path]::Combine($solution_dir, 'WinMLSamplesGalleryNative', 'WinMLSamplesGalleryNative.vcxproj')
111- # nuget restore $csproj -SolutionDirectory $solution_dir
103+ - task : PowerShell@2
104+ displayName : ' Restore WinMLSamplesGalleryNative Nuget Packages'
105+ inputs :
106+ targetType : ' inline'
107+ script : |
108+ $src_root_dir = $Env:BUILD_SOURCESDIRECTORY;
109+ $solution_dir = [System.IO.Path]::Combine($src_root_dir, 'Samples', 'WinMLSamplesGallery')
110+ $csproj = [System.IO.Path]::Combine($solution_dir, 'WinMLSamplesGalleryNative', 'WinMLSamplesGalleryNative.vcxproj')
111+ nuget restore $csproj -SolutionDirectory $solution_dir
112112
113- # - task: VSBuild@1
114- # displayName: 'Build WinMLSamplesGallery Debug'
115- # inputs:
116- # solution: 'Samples/WinMLSamplesGallery/WinMLSamplesGallery.sln'
117- # vsVersion: "16.0"
118- # msbuildArgs: '/p:WindowsTargetPlatformVersion=$(WindowsTargetPlatformVersion) /t:Restore,Clean,Build'
119- # platform: '$(BuildPlatform)'
120- # configuration: '$(BuildConfiguration)'
121- # msbuildArchitecture: x64
122- # createLogFile: true
123- # condition: and(succeededOrFailed(), eq(variables['BuildConfiguration'], 'Debug'))
113+ - task : VSBuild@1
114+ displayName : ' Build WinMLSamplesGallery Debug'
115+ inputs :
116+ solution : ' Samples/WinMLSamplesGallery/WinMLSamplesGallery.sln'
117+ vsVersion : " 16.0"
118+ msbuildArgs : ' /p:WindowsTargetPlatformVersion=$(WindowsTargetPlatformVersion) /t:Restore,Clean,Build'
119+ platform : ' $(BuildPlatform)'
120+ configuration : ' $(BuildConfiguration)'
121+ msbuildArchitecture : x64
122+ createLogFile : true
123+ condition : and(succeededOrFailed(), eq(variables['BuildConfiguration'], 'Debug'))
124124
125- # - task: VSBuild@1
126- # displayName: 'Build And Publish WinMLSamplesGallery Release'
127- # inputs:
128- # solution: 'Samples/WinMLSamplesGallery/WinMLSamplesGallery.sln'
129- # vsVersion: "16.0"
130- # msbuildArgs: '/p:UapAppxPackageBuildMode=SideloadOnly /p:AppxPackageSigningEnabled=false /p:AppxBundle=Always "/p:AppxBundlePlatforms=x86|x64|arm64" /p:WindowsTargetPlatformVersion=$(WindowsTargetPlatformVersion) /t:Restore,Clean,Build,Publish'
131- # platform: '$(BuildPlatform)'
132- # configuration: '$(BuildConfiguration)'
133- # msbuildArchitecture: x64
134- # createLogFile: true
135- # condition: and(succeededOrFailed(), eq(variables['BuildConfiguration'], 'Release'))
125+ - task : VSBuild@1
126+ displayName : ' Build And Publish WinMLSamplesGallery Release'
127+ inputs :
128+ solution : ' Samples/WinMLSamplesGallery/WinMLSamplesGallery.sln'
129+ vsVersion : " 16.0"
130+ msbuildArgs : ' /p:UapAppxPackageBuildMode=SideloadOnly /p:AppxPackageSigningEnabled=false /p:AppxBundle=Always "/p:AppxBundlePlatforms=x86|x64|arm64" /p:WindowsTargetPlatformVersion=$(WindowsTargetPlatformVersion) /t:Restore,Clean,Build,Publish'
131+ platform : ' $(BuildPlatform)'
132+ configuration : ' $(BuildConfiguration)'
133+ msbuildArchitecture : x64
134+ createLogFile : true
135+ condition : and(succeededOrFailed(), eq(variables['BuildConfiguration'], 'Release'))
136136
137137 - task : VSBuild@1
138138 displayName : ' Build UI test solution Testing/**/SamplesTest.sln'
@@ -158,17 +158,17 @@ jobs:
158158 createLogFile : true
159159 condition : succeededOrFailed()
160160
161- - task : VSBuild@1
162- displayName : ' Build MNIST-UWP-cs Sample'
163- inputs :
164- solution : ' Samples/MNIST/UWP/cs/mnist_demo.sln'
165- vsVersion : " 16.0"
166- msbuildArgs : ' -v:diag /p:OutDir=$(System.DefaultWorkingDirectory)\bin\$(BuildPlatform)\$(BuildConfiguration)\MNIST-cs\ /p:AppxBundle=Never /p:AppxPackageSigningEnabled=false /p:WindowsTargetPlatformVersion=$(WindowsTargetPlatformVersion) /t:Restore,Clean,Build'
167- platform : ' $(BuildPlatform)'
168- configuration : ' $(BuildConfiguration)_NuGet'
169- msbuildArchitecture : x64
170- createLogFile : true
171- condition : succeededOrFailed()
161+ # - task: VSBuild@1
162+ # displayName: 'Build MNIST-UWP-cs Sample'
163+ # inputs:
164+ # solution: 'Samples/MNIST/UWP/cs/mnist_demo.sln'
165+ # vsVersion: "16.0"
166+ # msbuildArgs: '-v:diag /p:OutDir=$(System.DefaultWorkingDirectory)\bin\$(BuildPlatform)\$(BuildConfiguration)\MNIST-cs\ /p:AppxBundle=Never /p:AppxPackageSigningEnabled=false /p:WindowsTargetPlatformVersion=$(WindowsTargetPlatformVersion) /t:Restore,Clean,Build'
167+ # platform: '$(BuildPlatform)'
168+ # configuration: '$(BuildConfiguration)_NuGet'
169+ # msbuildArchitecture: x64
170+ # createLogFile: true
171+ # condition: succeededOrFailed()
172172
173173 - task : VSBuild@1
174174 displayName : ' Build FNSCandyStyleTransfer-UWP-CS Sample'
@@ -194,41 +194,32 @@ jobs:
194194 createLogFile : true
195195 condition : succeededOrFailed()
196196
197- # - task: CopyFiles@2
198- # inputs:
199- # targetFolder: '$(Build.ArtifactStagingDirectory)\$(BuildPlatform)\$(BuildConfiguration)\'
200- # sourceFolder: 'Samples\WinMLSamplesGallery\WinMLSamplesGallery (Package)\bin\$(BuildPlatform)\$(BuildConfiguration)\'
201- # Contents: |
202- # **\SamplesTest\**
203- # **\AppPackages\**
204- # condition: succeededOrFailed()
205-
206- # - task: CopyFiles@2
207- # inputs:
208- # targetFolder: '$(Build.ArtifactStagingDirectory)\$(BuildPlatform)\$(BuildConfiguration)\'
209- # sourceFolder: 'Samples\WinMLSamplesGallery\WinMLSamplesGallery (Package)\bin\$(BuildPlatform)\$(BuildConfiguration)\'
210- # Contents: |
211- # ?(AdapterSelection|CustomOperator|CustomTensorization)**\*
212- # SqueezeNetObjectDetection\*
213- # condition: succeededOrFailed()
197+ - task : CopyFiles@2
198+ inputs :
199+ targetFolder : ' $(Build.ArtifactStagingDirectory)\$(BuildPlatform)\$(BuildConfiguration)\'
200+ sourceFolder : ' Samples\WinMLSamplesGallery\WinMLSamplesGallery (Package)\bin\$(BuildPlatform)\$(BuildConfiguration)\'
201+ Contents : |
202+ **\SamplesTest\**
203+ **\AppPackages\**
204+ condition : succeededOrFailed()
214205
215- # - task: PowerShell@2
216- # displayName: 'Move App Packages'
217- # inputs:
218- # targetType: 'inline'
219- # script: 'mv Samples/WinMLSamplesGallery/"WinMLSamplesGallery (Package)"/AppPackages $(Build.ArtifactStagingDirectory)\$(BuildPlatform)\$(BuildConfiguration)\AppPackages'
220- # condition: and(succeededOrFailed(), eq(variables['BuildConfiguration'], 'Release'))
206+ - task : PowerShell@2
207+ displayName : ' Move App Packages'
208+ inputs :
209+ targetType : ' inline'
210+ script : ' mv Samples/WinMLSamplesGallery/"WinMLSamplesGallery (Package)"/AppPackages $(Build.ArtifactStagingDirectory)\$(BuildPlatform)\$(BuildConfiguration)\AppPackages'
211+ condition : and(succeededOrFailed(), eq(variables['BuildConfiguration'], 'Release'))
221212
222- # - task: CopyFiles@2
223- # inputs:
224- # targetFolder: '$(Build.ArtifactStagingDirectory)\$(BuildPlatform)\$(BuildConfiguration)\SharedContent'
225- # sourceFolder: 'SharedContent'
226- # contents: '**\*'
227- # condition: succeededOrFailed()
213+ - task : CopyFiles@2
214+ inputs :
215+ targetFolder : ' $(Build.ArtifactStagingDirectory)\$(BuildPlatform)\$(BuildConfiguration)\SharedContent'
216+ sourceFolder : ' SharedContent'
217+ contents : ' **\*'
218+ condition : succeededOrFailed()
228219
229- # - task: PublishBuildArtifacts@1
230- # displayName: 'Publish Artifact: Samples'
231- # inputs:
232- # pathtoPublish: '$(Build.ArtifactStagingDirectory)'
233- # artifactName: WinMLPublicSamples
234- # condition: succeededOrFailed()
220+ - task : PublishBuildArtifacts@1
221+ displayName : ' Publish Artifact: Samples'
222+ inputs :
223+ pathtoPublish : ' $(Build.ArtifactStagingDirectory)'
224+ artifactName : WinMLPublicSamples
225+ condition : succeededOrFailed()
0 commit comments