Skip to content

Commit 3040137

Browse files
nums11nums11
authored
Merge pull request #496 from microsoft/user/nuform/gallery_release
Add Updates for New Samples Gallery Release
2 parents 5724223 + 09ead18 commit 3040137

File tree

6 files changed

+74
-161
lines changed

6 files changed

+74
-161
lines changed

‎Samples/WinMLSamplesGallery/WinMLSamplesGallery (Package)/Package.appxmanifest‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<Identity
1010
Name="MicrosoftCorporationII.WindowsMLSamplesGallery"
1111
Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US"
12-
Version="1.0.0.0" />
12+
Version="1.0.7.0" />
1313

1414
<Properties>
1515
<DisplayName>Windows ML Samples Gallery</DisplayName>

‎Samples/WinMLSamplesGallery/WinMLSamplesGallery (Package)/WinMLSamplesGallery (Package).wapproj‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,18 @@
3737
<PropertyGroup>
3838
<ProjectGuid>dea7791f-55cf-4ed5-bc99-3870997b1242</ProjectGuid>
3939
<TargetPlatformVersion>10.0.19041.0</TargetPlatformVersion>
40-
<AppxAutoIncrementPackageRevision>True</AppxAutoIncrementPackageRevision>
40+
<AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
4141
<AssetTargetFallback>net5.0-windows$(TargetPlatformVersion);$(AssetTargetFallback)</AssetTargetFallback>
4242
<TargetPlatformMinVersion>10.0.18362.0</TargetPlatformMinVersion>
4343
<DefaultLanguage>en-US</DefaultLanguage>
4444
<AppxPackageSigningEnabled>False</AppxPackageSigningEnabled>
4545
<EntryPointProjectUniqueName>..\WinMLSamplesGallery\WinMLSamplesGallery.csproj</EntryPointProjectUniqueName>
46+
<GenerateAppInstallerFile>False</GenerateAppInstallerFile>
47+
<PackageCertificateThumbprint>25067E5853327016828B1097611C6D97DAF9F5E8</PackageCertificateThumbprint>
48+
<AppxPackageSigningTimestampDigestAlgorithm>SHA256</AppxPackageSigningTimestampDigestAlgorithm>
49+
<GenerateTestArtifacts>True</GenerateTestArtifacts>
50+
<AppxBundlePlatforms>x86|x64|arm64</AppxBundlePlatforms>
51+
<HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
4652
</PropertyGroup>
4753
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|arm64'">
4854
<AppxBundle>Always</AppxBundle>

‎Samples/WinMLSamplesGallery/WinMLSamplesGalleryNative/TransformAsync.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ class TransformAsync:
220220
#pragma endregion IMFAsyncCallback
221221

222222
#pragma region IMFVideoSampleAllocatorNotify
223-
HRESULT NotifyRelease();
223+
HRESULT STDMETHODCALLTYPE NotifyRelease();
224224
#pragma endregion IMFVideoSampleAllocatorNotify
225225

226226
// Uses the next available StreamModelBase to run inference on pInputSample

‎Samples/WinMLSamplesGallery/WinMLSamplesGalleryNative/WinMLSamplesGalleryNative.vcxproj‎

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@
1818
<WindowsTargetPlatformVersion Condition=" '$(WindowsTargetPlatformVersion)' == '' ">10.0.19041.0</WindowsTargetPlatformVersion>
1919
<WindowsTargetPlatformMinVersion>10.0.17134.0</WindowsTargetPlatformMinVersion>
2020
</PropertyGroup>
21+
<PropertyGroup Label="Globals" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
22+
<Microsoft_AI_DirectML_SkipLink>false</Microsoft_AI_DirectML_SkipLink>
23+
<Microsoft_AI_DirectML_SkipIncludeDir>false</Microsoft_AI_DirectML_SkipIncludeDir>
24+
</PropertyGroup>
2125
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
2226
<ItemGroup Label="ProjectConfigurations">
2327
<ProjectConfiguration Include="Debug|arm64">
@@ -63,7 +67,10 @@
6367
<PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
6468
<UseDebugLibraries>false</UseDebugLibraries>
6569
<WholeProgramOptimization>true</WholeProgramOptimization>
66-
<LinkIncremental>false</LinkIncremental>
70+
<LinkIncremental>true</LinkIncremental>
71+
</PropertyGroup>
72+
<PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
73+
<PreferredToolArchitecture>x86</PreferredToolArchitecture>
6774
</PropertyGroup>
6875
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
6976
<ImportGroup Label="ExtensionSettings">
@@ -129,19 +136,21 @@
129136
<ConformanceMode Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ConformanceMode>
130137
<LanguageStandard Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">stdcpp20</LanguageStandard>
131138
<LanguageStandard_C Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Default</LanguageStandard_C>
139+
<ConformanceMode Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ConformanceMode>
140+
<OmitFramePointers Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</OmitFramePointers>
141+
<LanguageStandard Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">stdcpp20</LanguageStandard>
132142
</ClCompile>
133143
<ResourceCompile>
134144
<AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)../WinMLSamplesGallery/Models/;$(MSBuildThisFileDirectory)../../build/native/include/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
135145
</ResourceCompile>
136146
<Link>
137-
<AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">Comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
147+
<AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">Comctl32.lib;powrprof.lib;d3d11.lib;mf.lib;mfplat.lib;mfuuid.lib;shlwapi.lib;Gdi32.lib;Mfplat.lib;Mf.lib;Mfcore.lib;evr.lib;DXGI.lib;user32.lib;ole32.lib;d3d12.lib;dxgi.lib;d3dcompiler.lib;%(AdditionalDependencies)</AdditionalDependencies>
138148
</Link>
139149
<Link>
140-
<AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
150+
<AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Comctl32.lib;powrprof.lib;d3d11.lib;mf.lib;mfplat.lib;mfuuid.lib;shlwapi.lib;Gdi32.lib;Mfplat.lib;Mf.lib;Mfcore.lib;evr.lib;DXGI.lib;user32.lib;ole32.lib;d3d12.lib;dxgi.lib;d3dcompiler.lib;%(AdditionalDependencies)</AdditionalDependencies>
141151
</Link>
142152
<Link>
143153
<AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Comctl32.lib;powrprof.lib;d3d11.lib;mf.lib;mfplat.lib;mfuuid.lib;shlwapi.lib;Gdi32.lib;Mfplat.lib;Mf.lib;Mfcore.lib;evr.lib;DXGI.lib;user32.lib;ole32.lib;d3d12.lib;dxgi.lib;d3dcompiler.lib;%(AdditionalDependencies)</AdditionalDependencies>
144-
<!-- <AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">d3d12.lib;dxgi.lib;d3dcompiler.lib;%(AdditionalDependencies)</AdditionalDependencies> -->
145154
</Link>
146155
</ItemDefinitionGroup>
147156
<ItemDefinitionGroup Condition="'$(Configuration)'=='Release'">
@@ -154,9 +163,10 @@
154163
<Link>
155164
<EnableCOMDATFolding>true</EnableCOMDATFolding>
156165
<OptimizeReferences>true</OptimizeReferences>
157-
<AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">Comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
158-
<AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
159-
<AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Comctl32.lib;powrprof.lib;d3d11.lib;mf.lib;mfplat.lib;mfuuid.lib;shlwapi.lib;Gdi32.lib;Mfplat.lib;Mf.lib;Mfcore.lib;evr.lib;DXGI.lib;user32.lib;ole32.lib</AdditionalDependencies>
166+
<AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">Comctl32.lib;powrprof.lib;d3d11.lib;mf.lib;mfplat.lib;mfuuid.lib;shlwapi.lib;Gdi32.lib;Mfplat.lib;Mf.lib;Mfcore.lib;evr.lib;DXGI.lib;user32.lib;ole32.lib;d3d12.lib;dxgi.lib;d3dcompiler.lib;%(AdditionalDependencies)</AdditionalDependencies>
167+
<AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Comctl32.lib;powrprof.lib;d3d11.lib;mf.lib;mfplat.lib;mfuuid.lib;shlwapi.lib;Gdi32.lib;Mfplat.lib;Mf.lib;Mfcore.lib;evr.lib;DXGI.lib;user32.lib;ole32.lib;d3d12.lib;dxgi.lib;d3dcompiler.lib;%(AdditionalDependencies)</AdditionalDependencies>
168+
<AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Comctl32.lib;powrprof.lib;d3d11.lib;mf.lib;mfplat.lib;mfuuid.lib;shlwapi.lib;Gdi32.lib;Mfplat.lib;Mf.lib;Mfcore.lib;evr.lib;DXGI.lib;user32.lib;ole32.lib;d3d12.lib;dxgi.lib;d3dcompiler.lib;%(AdditionalDependencies)</AdditionalDependencies>
169+
<LinkTimeCodeGeneration Condition="'$(Configuration)|$(Platform)'=='Release|x64'">UseFastLinkTimeCodeGeneration</LinkTimeCodeGeneration>
160170
</Link>
161171
<ResourceCompile>
162172
<AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)../WinMLSamplesGallery/Models/;$(MSBuildThisFileDirectory)../../build/native/include/;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

‎Samples/WinMLSamplesGallery/WinMLSamplesGalleryNative/WinMLSamplesGalleryNative.vcxproj.filters‎

Lines changed: 48 additions & 150 deletions
Original file line numberDiff line numberDiff line change
@@ -1,181 +1,79 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup>
4+
<ClCompile Include="AdapterList.cpp" />
5+
<ClCompile Include="Capture.cpp" />
6+
<ClCompile Include="D3D12Quad.cpp" />
7+
<ClCompile Include="DXResourceBinding.cpp" />
8+
<ClCompile Include="EncryptedModels.cpp" />
9+
<ClCompile Include="External\CSampleQueue.cpp" />
10+
<ClCompile Include="External\utils.cpp" />
11+
<ClCompile Include="OpenCVImage.cpp" />
12+
<ClCompile Include="ORTHelpers.cpp" />
413
<ClCompile Include="pch.cpp" />
514
<ClCompile Include="$(GeneratedFilesDir)module.g.cpp" />
6-
<ClCompile Include="EncryptedModels.cpp">
7-
<Filter>EncryptedModels</Filter>
8-
</ClCompile>
9-
<ClCompile Include="OpenCVImage.cpp">
10-
<Filter>OpenCVInterop</Filter>
11-
</ClCompile>
12-
<ClCompile Include="StreamEffect.cpp">
13-
<Filter>StreamEffect</Filter>
14-
</ClCompile>
15-
<ClCompile Include="Capture.cpp">
16-
<Filter>StreamEffect</Filter>
17-
</ClCompile>
18-
<ClCompile Include="PreviewWnd.cpp">
19-
<Filter>StreamEffect</Filter>
20-
</ClCompile>
21-
<ClCompile Include="External\CSampleQueue.cpp" />
22-
<ClCompile Include="SegmentModel.cpp">
23-
<Filter>StreamEffect</Filter>
24-
</ClCompile>
25-
<ClCompile Include="TransformAsync_IMFAsyncCallback.cpp">
26-
<Filter>StreamEffect</Filter>
27-
</ClCompile>
28-
<ClCompile Include="TransformAsync_IMFMediaEventGenerator.cpp">
29-
<Filter>StreamEffect</Filter>
30-
</ClCompile>
31-
<ClCompile Include="TransformAsync_IMFShutdown.cpp">
32-
<Filter>StreamEffect</Filter>
33-
</ClCompile>
34-
<ClCompile Include="TransformAsync_IMFTransform.cpp">
35-
<Filter>StreamEffect</Filter>
36-
</ClCompile>
37-
<ClCompile Include="TransformAsync_IMFVideoSampleAllocatorNotify.cpp">
38-
<Filter>StreamEffect</Filter>
39-
</ClCompile>
40-
<ClCompile Include="TransformAsync.cpp">
41-
<Filter>StreamEffect</Filter>
42-
</ClCompile>
43-
<ClCompile Include="External\utils.cpp">
44-
<Filter>StreamEffect</Filter>
45-
</ClCompile>
46-
<ClCompile Include="AdapterList.cpp">
47-
<Filter>AdapterList</Filter>
48-
</ClCompile>
49-
<ClCompile Include="DXResourceBinding.cpp">
50-
<Filter>DXResourceBinding</Filter>
51-
</ClCompile>
52-
<ClCompile Include="ORTHelpers.cpp">
53-
<Filter>DXResourceBinding</Filter>
54-
</ClCompile>
55-
<ClCompile Include="D3D12Quad.cpp">
56-
<Filter>DXResourceBinding</Filter>
57-
</ClCompile>
58-
<ClCompile Include="Win32Application.cpp">
59-
<Filter>DXResourceBinding</Filter>
60-
</ClCompile>
15+
<ClCompile Include="PreviewWnd.cpp" />
16+
<ClCompile Include="SegmentModel.cpp" />
17+
<ClCompile Include="StreamEffect.cpp" />
18+
<ClCompile Include="TransformAsync.cpp" />
19+
<ClCompile Include="TransformAsync_IMFAsyncCallback.cpp" />
20+
<ClCompile Include="TransformAsync_IMFMediaEventGenerator.cpp" />
21+
<ClCompile Include="TransformAsync_IMFShutdown.cpp" />
22+
<ClCompile Include="TransformAsync_IMFTransform.cpp" />
23+
<ClCompile Include="TransformAsync_IMFVideoSampleAllocatorNotify.cpp" />
24+
<ClCompile Include="Win32Application.cpp" />
6125
</ItemGroup>
6226
<ItemGroup>
63-
<ClInclude Include="pch.h" />
64-
<ClInclude Include="EncryptedModels.h">
65-
<Filter>EncryptedModels</Filter>
66-
</ClInclude>
67-
<ClInclude Include="OpenCVImage.h">
68-
<Filter>OpenCVInterop</Filter>
69-
</ClInclude>
70-
<ClInclude Include="RandomAccessStream.h">
71-
<Filter>AbiHelpers</Filter>
72-
</ClInclude>
73-
<ClInclude Include="StreamEffect.h">
74-
<Filter>StreamEffect</Filter>
75-
</ClInclude>
76-
<ClInclude Include="Capture.h">
77-
<Filter>StreamEffect</Filter>
78-
</ClInclude>
79-
<ClInclude Include="common.h">
80-
<Filter>StreamEffect</Filter>
81-
</ClInclude>
82-
<ClInclude Include="resource.h" />
83-
<ClInclude Include="External\pch.h" />
27+
<ClInclude Include="AdapterList.h" />
28+
<ClInclude Include="Capture.h" />
29+
<ClInclude Include="common.h" />
30+
<ClInclude Include="D3D12Quad.h" />
31+
<ClInclude Include="d3dx12.h" />
32+
<ClInclude Include="DXResourceBinding.h" />
33+
<ClInclude Include="EncryptedModels.h" />
8434
<ClInclude Include="External\common.h" />
8535
<ClInclude Include="External\CSampleQueue.h" />
8636
<ClInclude Include="External\logging.h" />
8737
<ClInclude Include="External\logmediatype.h" />
38+
<ClInclude Include="External\pch.h" />
8839
<ClInclude Include="External\trace.h" />
89-
<ClInclude Include="SegmentModel.h">
90-
<Filter>StreamEffect</Filter>
91-
</ClInclude>
92-
<ClInclude Include="TransformAsync.h">
93-
<Filter>StreamEffect</Filter>
94-
</ClInclude>
95-
<ClInclude Include="AdapterList.h">
96-
<Filter>AdapterList</Filter>
97-
</ClInclude>
98-
<ClInclude Include="AdapterList.h">
99-
<Filter>AdapterList</Filter>
100-
</ClInclude>
101-
<ClInclude Include="DXResourceBinding.h">
102-
<Filter>DXResourceBinding</Filter>
103-
</ClInclude>
104-
<ClInclude Include="d3dx12.h">
105-
<Filter>DXResourceBinding</Filter>
106-
</ClInclude>
107-
<ClInclude Include="stdafx.h">
108-
<Filter>DXResourceBinding</Filter>
109-
</ClInclude>
110-
<ClInclude Include="ORTHelpers.h">
111-
<Filter>DXResourceBinding</Filter>
112-
</ClInclude>
113-
<ClInclude Include="D3D12Quad.h">
114-
<Filter>DXResourceBinding</Filter>
115-
</ClInclude>
116-
<ClInclude Include="Win32Application.h">
117-
<Filter>DXResourceBinding</Filter>
118-
</ClInclude>
119-
<<<<<<< HEAD
40+
<ClInclude Include="OpenCVImage.h" />
41+
<ClInclude Include="ORTHelpers.h" />
42+
<ClInclude Include="pch.h" />
43+
<ClInclude Include="RandomAccessStream.h" />
44+
<ClInclude Include="resource.h" />
45+
<ClInclude Include="SegmentModel.h" />
46+
<ClInclude Include="StreamEffect.h" />
47+
<ClInclude Include="TransformAsync.h" />
48+
<ClInclude Include="stdafx.h" />
12049
<ClInclude Include="WeakBuffer.h" />
121-
=======
122-
>>>>>>> master
50+
<ClInclude Include="Win32Application.h" />
51+
</ItemGroup>
52+
<ItemGroup>
53+
<CustomBuild Include="shaders.hlsl" />
12354
</ItemGroup>
12455
<ItemGroup>
12556
<ResourceCompile Include="Resource.rc" />
12657
</ItemGroup>
58+
<ItemGroup>
59+
<Image Include="cat.jpg" />
60+
<Image Include="hummingbird.jpg" />
61+
</ItemGroup>
12762
<ItemGroup>
12863
<Midl Include="WinMLSamplesGalleryNative.idl" />
12964
</ItemGroup>
13065
<ItemGroup>
13166
<None Include="datafile.bin" />
67+
<None Include="encrypted.onnx" />
68+
<None Include="dx_preprocessor_efficient_net.onnx" />
13269
<None Include="packages.config" />
13370
<None Include="squeezenet1.1-7-batched.onnx" />
71+
<None Include="squeezenet1.1-7.onnx" />
13472
<None Include="WinMLSamplesGalleryNative.def" />
13573
<None Include="PropertySheet.props" />
136-
<None Include="encrypted.onnx" />
137-
<None Include="squeezenet1.1-7.onnx">
138-
<Filter>DXResourceBinding</Filter>
139-
</None>
140-
<None Include="$(MSBuildThisFileDirectory)..\..\runtimes\win-x64\native\onnxruntime.dll" />
141-
<None Include="dx_preprocessor_efficient_net.onnx">
142-
<Filter>DXResourceBinding</Filter>
143-
</None>
74+
<None Include="$(MSBuildThisFileDirectory)..\..\runtimes\win-x86\native\onnxruntime.dll" />
14475
</ItemGroup>
14576
<ItemGroup>
14677
<Text Include="readme.txt" />
14778
</ItemGroup>
148-
<ItemGroup>
149-
<Filter Include="EncryptedModels">
150-
<UniqueIdentifier>{bacd2f7a-1e95-444f-9447-25f28f21effe}</UniqueIdentifier>
151-
</Filter>
152-
<Filter Include="OpenCVInterop">
153-
<UniqueIdentifier>{c4ac812b-72fd-49d8-891b-a5764f445fc8}</UniqueIdentifier>
154-
</Filter>
155-
<Filter Include="AbiHelpers">
156-
<UniqueIdentifier>{ed4f3871-4514-4b93-9ace-1315cad5491e}</UniqueIdentifier>
157-
</Filter>
158-
<Filter Include="AdapterList">
159-
<UniqueIdentifier>{9df6a233-c2c6-4062-b738-31f7ba631acd}</UniqueIdentifier>
160-
</Filter>
161-
<Filter Include="StreamEffect">
162-
<UniqueIdentifier>{91675ea9-10e7-4490-af40-762311cf5ba9}</UniqueIdentifier>
163-
</Filter>
164-
<Filter Include="DXResourceBinding">
165-
<UniqueIdentifier>{393a0b12-622a-4d4c-b4a6-ed0bb1b2e285}</UniqueIdentifier>
166-
</Filter>
167-
</ItemGroup>
168-
<ItemGroup>
169-
<Image Include="cat.jpg">
170-
<Filter>DXResourceBinding</Filter>
171-
</Image>
172-
<Image Include="hummingbird.jpg">
173-
<Filter>DXResourceBinding</Filter>
174-
</Image>
175-
</ItemGroup>
176-
<ItemGroup>
177-
<CustomBuild Include="shaders.hlsl">
178-
<Filter>DXResourceBinding</Filter>
179-
</CustomBuild>
180-
</ItemGroup>
18179
</Project>

‎Samples/WinMLSamplesGallery/WinMLSamplesGalleryNative/packages.config‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
<packages>
33
<package id="Microsoft.AI.DirectML" version="1.9.0" targetFramework="native" />
44
<package id="Microsoft.AI.MachineLearning" version="1.12.1" targetFramework="native" />
5-
<package id="Microsoft.Windows.CppWinRT" version="2.0.220608.4" targetFramework="native" />
65
<package id="directxtk12_desktop_2019" version="2022.5.10.1" targetFramework="native" />
76
<package id="Microsoft.ML.OnnxRuntime.DirectML" version="1.12.1" targetFramework="native" />
87
<package id="Microsoft.Windows.CppWinRT" version="2.0.210930.14" targetFramework="native" />

0 commit comments

Comments
 (0)