Skip to content

Commit 70c1ff3

Browse files
authored
Merge pull request #465 from microsoft/user/numform/gallery_pipeline_sdk
Fix Github Public Samples Build Pipeline
2 parents 12af7eb + 1eaba0f commit 70c1ff3

File tree

2 files changed

+6
-13
lines changed

2 files changed

+6
-13
lines changed

Samples/WinMLSamplesGallery/WinMLSamplesGalleryNative/WinMLSamplesGalleryNative.vcxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@
126126
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
127127
</ClCompile>
128128
<ResourceCompile>
129-
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(MSBuildThisFileDirectory)../WinMLSamplesGallery/Models/;$(MSBuildThisFileDirectory)../../build/native/include/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
129+
<AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)../WinMLSamplesGallery/Models/;$(MSBuildThisFileDirectory)../../build/native/include/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
130130
</ResourceCompile>
131131
</ItemDefinitionGroup>
132132
<ItemDefinitionGroup Condition="'$(Configuration)'=='Release'">
@@ -138,7 +138,7 @@
138138
<OptimizeReferences>true</OptimizeReferences>
139139
</Link>
140140
<ResourceCompile>
141-
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(MSBuildThisFileDirectory)../WinMLSamplesGallery/Models/;$(MSBuildThisFileDirectory)../../build/native/include/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
141+
<AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)../WinMLSamplesGallery/Models/;$(MSBuildThisFileDirectory)../../build/native/include/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
142142
</ResourceCompile>
143143
</ItemDefinitionGroup>
144144
<ItemGroup>

azure-pipelines-samples.yml

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ pool:
1010

1111
variables:
1212
SamplesBin: SamplesBin
13-
WINDOWS_WINMD: C:\Program Files (x86)\Windows Kits\10\UnionMetadata\10.0.18362.0\Windows.winmd
14-
WindowsTargetPlatformVersion: 10.0.18362.0
13+
WINDOWS_WINMD: C:\Program Files (x86)\Windows Kits\10\UnionMetadata\10.0.19041.0\Windows.winmd
14+
WindowsTargetPlatformVersion: 10.0.19041.0
1515

1616
# CI trigger
1717
trigger:
@@ -65,10 +65,10 @@ jobs:
6565
versionSpec: '5.11.0'
6666

6767
- task: PowerShell@2
68-
displayName: 'Install the win 10 sdk v18362 if necessary'
68+
displayName: 'Install the win 10 sdk v19041 if necessary'
6969
inputs:
7070
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 }
71+
script: choco install windows-sdk-10-version-2004-all -y
7272

7373
- task: PowerShell@1
7474
displayName: OpenCV - Configure CMake
@@ -219,13 +219,6 @@ jobs:
219219
script: 'mv Samples/WinMLSamplesGallery/"WinMLSamplesGallery (Package)"/AppPackages $(Build.ArtifactStagingDirectory)\$(BuildPlatform)\$(BuildConfiguration)\AppPackages'
220220
condition: and(succeededOrFailed(), eq(variables['BuildConfiguration'], 'Release'))
221221

222-
- task: CopyFiles@2
223-
inputs:
224-
targetFolder: '$(Build.ArtifactStagingDirectory)\$(BuildPlatform)\$(BuildConfiguration)\SharedContent'
225-
sourceFolder: 'SharedContent'
226-
contents: '**\*'
227-
condition: succeededOrFailed()
228-
229222
- task: PublishBuildArtifacts@1
230223
displayName: 'Publish Artifact: Samples'
231224
inputs:

0 commit comments

Comments
 (0)