diff --git a/Samples/WinMLSamplesGallery/WinMLSamplesGallery (Package)/Package.appxmanifest b/Samples/WinMLSamplesGallery/WinMLSamplesGallery (Package)/Package.appxmanifest
index 18594122..b6ea0c1e 100644
--- a/Samples/WinMLSamplesGallery/WinMLSamplesGallery (Package)/Package.appxmanifest
+++ b/Samples/WinMLSamplesGallery/WinMLSamplesGallery (Package)/Package.appxmanifest
@@ -9,7 +9,7 @@
+ Version="1.0.7.0" />
Windows ML Samples Gallery
diff --git a/Samples/WinMLSamplesGallery/WinMLSamplesGallery (Package)/WinMLSamplesGallery (Package).wapproj b/Samples/WinMLSamplesGallery/WinMLSamplesGallery (Package)/WinMLSamplesGallery (Package).wapproj
index d00279de..9c2201ad 100644
--- a/Samples/WinMLSamplesGallery/WinMLSamplesGallery (Package)/WinMLSamplesGallery (Package).wapproj
+++ b/Samples/WinMLSamplesGallery/WinMLSamplesGallery (Package)/WinMLSamplesGallery (Package).wapproj
@@ -37,12 +37,18 @@
dea7791f-55cf-4ed5-bc99-3870997b1242
10.0.19041.0
- True
+ False
net5.0-windows$(TargetPlatformVersion);$(AssetTargetFallback)
10.0.18362.0
en-US
False
..\WinMLSamplesGallery\WinMLSamplesGallery.csproj
+ False
+ 25067E5853327016828B1097611C6D97DAF9F5E8
+ SHA256
+ True
+ x86|x64|arm64
+ 0
Always
diff --git a/Samples/WinMLSamplesGallery/WinMLSamplesGalleryNative/TransformAsync.h b/Samples/WinMLSamplesGallery/WinMLSamplesGalleryNative/TransformAsync.h
index 2d14decb..6a2db1ba 100644
--- a/Samples/WinMLSamplesGallery/WinMLSamplesGalleryNative/TransformAsync.h
+++ b/Samples/WinMLSamplesGallery/WinMLSamplesGalleryNative/TransformAsync.h
@@ -220,7 +220,7 @@ public:
#pragma endregion IMFAsyncCallback
#pragma region IMFVideoSampleAllocatorNotify
- HRESULT NotifyRelease();
+ HRESULT STDMETHODCALLTYPE NotifyRelease();
#pragma endregion IMFVideoSampleAllocatorNotify
// Uses the next available StreamModelBase to run inference on pInputSample
diff --git a/Samples/WinMLSamplesGallery/WinMLSamplesGalleryNative/WinMLSamplesGalleryNative.vcxproj b/Samples/WinMLSamplesGallery/WinMLSamplesGalleryNative/WinMLSamplesGalleryNative.vcxproj
index f7b012f8..706fa1e9 100644
--- a/Samples/WinMLSamplesGallery/WinMLSamplesGalleryNative/WinMLSamplesGalleryNative.vcxproj
+++ b/Samples/WinMLSamplesGallery/WinMLSamplesGalleryNative/WinMLSamplesGalleryNative.vcxproj
@@ -18,6 +18,10 @@
10.0.19041.0
10.0.17134.0
+
+ false
+ false
+
@@ -63,7 +67,10 @@
false
true
- false
+ true
+
+
+ x86
@@ -129,19 +136,21 @@
false
stdcpp20
Default
+ false
+ false
+ stdcpp20
$(MSBuildThisFileDirectory)../WinMLSamplesGallery/Models/;$(MSBuildThisFileDirectory)../../build/native/include/;%(AdditionalIncludeDirectories)
- Comctl32.lib;%(AdditionalDependencies)
+ 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)
- Comctl32.lib;%(AdditionalDependencies)
+ 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)
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)
-
@@ -154,9 +163,10 @@
true
true
- Comctl32.lib;%(AdditionalDependencies)
- Comctl32.lib;%(AdditionalDependencies)
- 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
+ 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)
+ 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)
+ 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)
+ UseFastLinkTimeCodeGeneration
$(MSBuildThisFileDirectory)../WinMLSamplesGallery/Models/;$(MSBuildThisFileDirectory)../../build/native/include/;%(AdditionalIncludeDirectories)
diff --git a/Samples/WinMLSamplesGallery/WinMLSamplesGalleryNative/WinMLSamplesGalleryNative.vcxproj.filters b/Samples/WinMLSamplesGallery/WinMLSamplesGalleryNative/WinMLSamplesGalleryNative.vcxproj.filters
index d4288f0e..aaffeb46 100644
--- a/Samples/WinMLSamplesGallery/WinMLSamplesGalleryNative/WinMLSamplesGalleryNative.vcxproj.filters
+++ b/Samples/WinMLSamplesGallery/WinMLSamplesGalleryNative/WinMLSamplesGalleryNative.vcxproj.filters
@@ -1,181 +1,79 @@
+
+
+
+
+
+
+
+
+
-
- EncryptedModels
-
-
- OpenCVInterop
-
-
- StreamEffect
-
-
- StreamEffect
-
-
- StreamEffect
-
-
-
- StreamEffect
-
-
- StreamEffect
-
-
- StreamEffect
-
-
- StreamEffect
-
-
- StreamEffect
-
-
- StreamEffect
-
-
- StreamEffect
-
-
- StreamEffect
-
-
- AdapterList
-
-
- DXResourceBinding
-
-
- DXResourceBinding
-
-
- DXResourceBinding
-
-
- DXResourceBinding
-
+
+
+
+
+
+
+
+
+
+
-
-
- EncryptedModels
-
-
- OpenCVInterop
-
-
- AbiHelpers
-
-
- StreamEffect
-
-
- StreamEffect
-
-
- StreamEffect
-
-
-
+
+
+
+
+
+
+
+
-
- StreamEffect
-
-
- StreamEffect
-
-
- AdapterList
-
-
- AdapterList
-
-
- DXResourceBinding
-
-
- DXResourceBinding
-
-
- DXResourceBinding
-
-
- DXResourceBinding
-
-
- DXResourceBinding
-
-
- DXResourceBinding
-
-<<<<<<< HEAD
+
+
+
+
+
+
+
+
+
-=======
->>>>>>> master
+
+
+
+
+
+
+
+
+
+
+
-
-
- DXResourceBinding
-
-
-
- DXResourceBinding
-
+
-
-
- {bacd2f7a-1e95-444f-9447-25f28f21effe}
-
-
- {c4ac812b-72fd-49d8-891b-a5764f445fc8}
-
-
- {ed4f3871-4514-4b93-9ace-1315cad5491e}
-
-
- {9df6a233-c2c6-4062-b738-31f7ba631acd}
-
-
- {91675ea9-10e7-4490-af40-762311cf5ba9}
-
-
- {393a0b12-622a-4d4c-b4a6-ed0bb1b2e285}
-
-
-
-
- DXResourceBinding
-
-
- DXResourceBinding
-
-
-
-
- DXResourceBinding
-
-
\ No newline at end of file
diff --git a/Samples/WinMLSamplesGallery/WinMLSamplesGalleryNative/packages.config b/Samples/WinMLSamplesGallery/WinMLSamplesGalleryNative/packages.config
index 9fd85e19..68a7bb27 100644
--- a/Samples/WinMLSamplesGallery/WinMLSamplesGalleryNative/packages.config
+++ b/Samples/WinMLSamplesGallery/WinMLSamplesGalleryNative/packages.config
@@ -2,7 +2,6 @@
-