diff --git a/Samples/ControlMonitorApp/CameraControlMonitorAppSample.sln b/Samples/ControlMonitorApp/CameraControlMonitorAppSample.sln index 4c8251e..fe12830 100644 --- a/Samples/ControlMonitorApp/CameraControlMonitorAppSample.sln +++ b/Samples/ControlMonitorApp/CameraControlMonitorAppSample.sln @@ -1,11 +1,11 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.3.32811.315 +# Visual Studio Version 18 +VisualStudioVersion = 18.6.11828.311 oobstable MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CameraControlMonitorAppSample", "CameraControlMonitorAppSample\CameraControlMonitorAppSample.csproj", "{81D8C00C-5EEC-4F0B-8E36-FB4C18AD7460}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ControlMonitorHelperWinRT", "ControlMonitorHelper\ControlMonitorHelperWinRT.vcxproj", "{3AC253A5-A383-49D8-ACC0-102C1E46E42F}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ControlMonitorHelperWinRT", "ControlMonitorHelper\ControlMonitorHelperWinRT.vcxproj", "{5A835B38-9B32-43CE-90FA-EDC3E4FC8070}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CameraKsPropertyHelper", "..\Shared\CameraKsPropertyHelper\CameraKsPropertyHelper.vcxproj", "{3E174357-0294-40F1-BA11-7330617DDBB5}" EndProject @@ -29,14 +29,14 @@ Global {81D8C00C-5EEC-4F0B-8E36-FB4C18AD7460}.Release|x64.ActiveCfg = Release|x64 {81D8C00C-5EEC-4F0B-8E36-FB4C18AD7460}.Release|x64.Build.0 = Release|x64 {81D8C00C-5EEC-4F0B-8E36-FB4C18AD7460}.Release|x64.Deploy.0 = Release|x64 - {3AC253A5-A383-49D8-ACC0-102C1E46E42F}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {3AC253A5-A383-49D8-ACC0-102C1E46E42F}.Debug|ARM64.Build.0 = Debug|ARM64 - {3AC253A5-A383-49D8-ACC0-102C1E46E42F}.Debug|x64.ActiveCfg = Debug|x64 - {3AC253A5-A383-49D8-ACC0-102C1E46E42F}.Debug|x64.Build.0 = Debug|x64 - {3AC253A5-A383-49D8-ACC0-102C1E46E42F}.Release|ARM64.ActiveCfg = Release|ARM64 - {3AC253A5-A383-49D8-ACC0-102C1E46E42F}.Release|ARM64.Build.0 = Release|ARM64 - {3AC253A5-A383-49D8-ACC0-102C1E46E42F}.Release|x64.ActiveCfg = Release|x64 - {3AC253A5-A383-49D8-ACC0-102C1E46E42F}.Release|x64.Build.0 = Release|x64 + {5A835B38-9B32-43CE-90FA-EDC3E4FC8070}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {5A835B38-9B32-43CE-90FA-EDC3E4FC8070}.Debug|ARM64.Build.0 = Debug|ARM64 + {5A835B38-9B32-43CE-90FA-EDC3E4FC8070}.Debug|x64.ActiveCfg = Debug|x64 + {5A835B38-9B32-43CE-90FA-EDC3E4FC8070}.Debug|x64.Build.0 = Debug|x64 + {5A835B38-9B32-43CE-90FA-EDC3E4FC8070}.Release|ARM64.ActiveCfg = Release|ARM64 + {5A835B38-9B32-43CE-90FA-EDC3E4FC8070}.Release|ARM64.Build.0 = Release|ARM64 + {5A835B38-9B32-43CE-90FA-EDC3E4FC8070}.Release|x64.ActiveCfg = Release|x64 + {5A835B38-9B32-43CE-90FA-EDC3E4FC8070}.Release|x64.Build.0 = Release|x64 {3E174357-0294-40F1-BA11-7330617DDBB5}.Debug|ARM64.ActiveCfg = Debug|ARM64 {3E174357-0294-40F1-BA11-7330617DDBB5}.Debug|ARM64.Build.0 = Debug|ARM64 {3E174357-0294-40F1-BA11-7330617DDBB5}.Debug|x64.ActiveCfg = Debug|x64 diff --git a/Samples/ControlMonitorApp/CameraControlMonitorAppSample/CameraControlMonitorAppSample.csproj b/Samples/ControlMonitorApp/CameraControlMonitorAppSample/CameraControlMonitorAppSample.csproj index ea49283..1c589a9 100644 --- a/Samples/ControlMonitorApp/CameraControlMonitorAppSample/CameraControlMonitorAppSample.csproj +++ b/Samples/ControlMonitorApp/CameraControlMonitorAppSample/CameraControlMonitorAppSample.csproj @@ -115,7 +115,7 @@ - 6.2.12 + 6.2.14 diff --git a/Samples/ControlMonitorApp/ControlMonitorHelper/ControlMonitorHelperWinRT.vcxproj b/Samples/ControlMonitorApp/ControlMonitorHelper/ControlMonitorHelperWinRT.vcxproj index 515660f..98b3954 100644 --- a/Samples/ControlMonitorApp/ControlMonitorHelper/ControlMonitorHelperWinRT.vcxproj +++ b/Samples/ControlMonitorApp/ControlMonitorHelper/ControlMonitorHelperWinRT.vcxproj @@ -1,5 +1,6 @@ + true @@ -123,15 +124,15 @@ - - + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - + + + \ No newline at end of file diff --git a/Samples/ControlMonitorApp/ControlMonitorHelper/packages.config b/Samples/ControlMonitorApp/ControlMonitorHelper/packages.config index c5b542c..cb4ea72 100644 --- a/Samples/ControlMonitorApp/ControlMonitorHelper/packages.config +++ b/Samples/ControlMonitorApp/ControlMonitorHelper/packages.config @@ -1,5 +1,5 @@  - - + + \ No newline at end of file diff --git a/Samples/ExtendedControlAndMetadata/WinRT_ExtendedControlAndMetadataSample/ExtendedControlAndMetadataSampleApp/ExtendedControlAndMetadataSampleApp.csproj b/Samples/ExtendedControlAndMetadata/WinRT_ExtendedControlAndMetadataSample/ExtendedControlAndMetadataSampleApp/ExtendedControlAndMetadataSampleApp.csproj index 7b2c4f0..5c92f3b 100644 --- a/Samples/ExtendedControlAndMetadata/WinRT_ExtendedControlAndMetadataSample/ExtendedControlAndMetadataSampleApp/ExtendedControlAndMetadataSampleApp.csproj +++ b/Samples/ExtendedControlAndMetadata/WinRT_ExtendedControlAndMetadataSample/ExtendedControlAndMetadataSampleApp/ExtendedControlAndMetadataSampleApp.csproj @@ -160,7 +160,7 @@ - 6.2.12 + 6.2.14 diff --git a/Samples/MediaCaptureWinUI3/MediaCaptureWinUI3.sln b/Samples/MediaCaptureWinUI3/MediaCaptureWinUI3.sln index cf04e12..eab0fe4 100644 --- a/Samples/MediaCaptureWinUI3/MediaCaptureWinUI3.sln +++ b/Samples/MediaCaptureWinUI3/MediaCaptureWinUI3.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.10.35004.147 +# Visual Studio Version 18 +VisualStudioVersion = 18.6.11828.311 oobstable MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MediaCaptureWinUI3", "MediaCaptureWinUI3\MediaCaptureWinUI3.csproj", "{78442245-DA78-4EDB-8D80-C69314695E9C}" EndProject @@ -9,10 +9,8 @@ Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|ARM64 = Debug|ARM64 Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 Release|ARM64 = Release|ARM64 Release|x64 = Release|x64 - Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {78442245-DA78-4EDB-8D80-C69314695E9C}.Debug|ARM64.ActiveCfg = Debug|ARM64 @@ -21,18 +19,12 @@ Global {78442245-DA78-4EDB-8D80-C69314695E9C}.Debug|x64.ActiveCfg = Debug|x64 {78442245-DA78-4EDB-8D80-C69314695E9C}.Debug|x64.Build.0 = Debug|x64 {78442245-DA78-4EDB-8D80-C69314695E9C}.Debug|x64.Deploy.0 = Debug|x64 - {78442245-DA78-4EDB-8D80-C69314695E9C}.Debug|x86.ActiveCfg = Debug|x86 - {78442245-DA78-4EDB-8D80-C69314695E9C}.Debug|x86.Build.0 = Debug|x86 - {78442245-DA78-4EDB-8D80-C69314695E9C}.Debug|x86.Deploy.0 = Debug|x86 {78442245-DA78-4EDB-8D80-C69314695E9C}.Release|ARM64.ActiveCfg = Release|ARM64 {78442245-DA78-4EDB-8D80-C69314695E9C}.Release|ARM64.Build.0 = Release|ARM64 {78442245-DA78-4EDB-8D80-C69314695E9C}.Release|ARM64.Deploy.0 = Release|ARM64 {78442245-DA78-4EDB-8D80-C69314695E9C}.Release|x64.ActiveCfg = Release|x64 {78442245-DA78-4EDB-8D80-C69314695E9C}.Release|x64.Build.0 = Release|x64 {78442245-DA78-4EDB-8D80-C69314695E9C}.Release|x64.Deploy.0 = Release|x64 - {78442245-DA78-4EDB-8D80-C69314695E9C}.Release|x86.ActiveCfg = Release|x86 - {78442245-DA78-4EDB-8D80-C69314695E9C}.Release|x86.Build.0 = Release|x86 - {78442245-DA78-4EDB-8D80-C69314695E9C}.Release|x86.Deploy.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Samples/MediaCaptureWinUI3/MediaCaptureWinUI3/MediaCaptureWinUI3.csproj b/Samples/MediaCaptureWinUI3/MediaCaptureWinUI3/MediaCaptureWinUI3.csproj index 236696b..b3ceb67 100644 --- a/Samples/MediaCaptureWinUI3/MediaCaptureWinUI3/MediaCaptureWinUI3.csproj +++ b/Samples/MediaCaptureWinUI3/MediaCaptureWinUI3/MediaCaptureWinUI3.csproj @@ -1,13 +1,13 @@ - + WinExe - net8.0-windows10.0.19041.0 + net10.0-windows10.0.26100.0 10.0.17763.0 MediaCaptureWinUI3 app.manifest - x86;x64;ARM64 - win-x86;win-x64;win-arm64 - win10-x86;win10-x64;win10-arm64 + x64;ARM64 + win-x64;win-arm64 + win10-x64;win10-arm64 win-$(Platform).pubxml true true @@ -24,8 +24,8 @@ - - + + diff --git a/Samples/MediaCaptureWinUI3/MediaCaptureWinUI3/Properties/launchSettings.json b/Samples/MediaCaptureWinUI3/MediaCaptureWinUI3/Properties/launchSettings.json new file mode 100644 index 0000000..ddeccea --- /dev/null +++ b/Samples/MediaCaptureWinUI3/MediaCaptureWinUI3/Properties/launchSettings.json @@ -0,0 +1,8 @@ +{ + "profiles": { + "WindowsStudioSample_WinUI": { + "commandName": "MsixPackage", + "nativeDebugging": true + } + } +} \ No newline at end of file diff --git a/Samples/SensorActivityMonitorConsoleApp/SensorActivityMonitorConsoleApp/SensorActivityMonitorConsoleApp.vcxproj b/Samples/SensorActivityMonitorConsoleApp/SensorActivityMonitorConsoleApp/SensorActivityMonitorConsoleApp.vcxproj index 98b0f54..36a5a4a 100644 --- a/Samples/SensorActivityMonitorConsoleApp/SensorActivityMonitorConsoleApp/SensorActivityMonitorConsoleApp.vcxproj +++ b/Samples/SensorActivityMonitorConsoleApp/SensorActivityMonitorConsoleApp/SensorActivityMonitorConsoleApp.vcxproj @@ -1,6 +1,6 @@ - + true true @@ -126,15 +126,15 @@ - - + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - + + + \ No newline at end of file diff --git a/Samples/SensorActivityMonitorConsoleApp/SensorActivityMonitorConsoleApp/cameraActivityCallback.cpp b/Samples/SensorActivityMonitorConsoleApp/SensorActivityMonitorConsoleApp/cameraActivityCallback.cpp index 8ab2884..f10939e 100644 --- a/Samples/SensorActivityMonitorConsoleApp/SensorActivityMonitorConsoleApp/cameraActivityCallback.cpp +++ b/Samples/SensorActivityMonitorConsoleApp/SensorActivityMonitorConsoleApp/cameraActivityCallback.cpp @@ -16,6 +16,8 @@ namespace RETURN_IF_FAILED(processActivity->GetProcessId(&pid)); printf("\t Process %d [streaming:%s,mode:%s] \n", pid, (fStreaming ? "true" : "false"), ((mode == MFSensorDeviceMode_Controller) ? "controller" : "shared")); + + return S_OK; } } diff --git a/Samples/SensorActivityMonitorConsoleApp/SensorActivityMonitorConsoleApp/packages.config b/Samples/SensorActivityMonitorConsoleApp/SensorActivityMonitorConsoleApp/packages.config index edec5d3..cb4ea72 100644 --- a/Samples/SensorActivityMonitorConsoleApp/SensorActivityMonitorConsoleApp/packages.config +++ b/Samples/SensorActivityMonitorConsoleApp/SensorActivityMonitorConsoleApp/packages.config @@ -1,5 +1,5 @@  - - + + \ No newline at end of file diff --git a/Samples/Shared/CameraKsPropertyHelper/CameraKsPropertyHelper.vcxproj b/Samples/Shared/CameraKsPropertyHelper/CameraKsPropertyHelper.vcxproj index f1eba73..c21b016 100644 --- a/Samples/Shared/CameraKsPropertyHelper/CameraKsPropertyHelper.vcxproj +++ b/Samples/Shared/CameraKsPropertyHelper/CameraKsPropertyHelper.vcxproj @@ -1,5 +1,6 @@ + true @@ -166,15 +167,15 @@ - - + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - + + + \ No newline at end of file diff --git a/Samples/Shared/CameraKsPropertyHelper/packages.config b/Samples/Shared/CameraKsPropertyHelper/packages.config index c5b542c..cb4ea72 100644 --- a/Samples/Shared/CameraKsPropertyHelper/packages.config +++ b/Samples/Shared/CameraKsPropertyHelper/packages.config @@ -1,5 +1,5 @@  - - + + \ No newline at end of file diff --git a/Samples/VirtualCamera/VirtualCameraManager_App/VirtualCameraManager_App.csproj b/Samples/VirtualCamera/VirtualCameraManager_App/VirtualCameraManager_App.csproj index 66c0beb..5625701 100644 --- a/Samples/VirtualCamera/VirtualCameraManager_App/VirtualCameraManager_App.csproj +++ b/Samples/VirtualCamera/VirtualCameraManager_App/VirtualCameraManager_App.csproj @@ -11,7 +11,7 @@ VirtualCameraManager_App en-US UAP - 10.0.22000.0 + 10.0.26100.0 10.0.22000.0 14 512 @@ -181,7 +181,7 @@ - 6.2.12 + 6.2.14 @@ -198,7 +198,7 @@ - + Windows Desktop Extensions for the UWP diff --git a/Samples/VirtualCamera/VirtualCameraManager_WinRT/VirtualCameraManager_WinRT.vcxproj b/Samples/VirtualCamera/VirtualCameraManager_WinRT/VirtualCameraManager_WinRT.vcxproj index ae792d0..f6fa324 100644 --- a/Samples/VirtualCamera/VirtualCameraManager_WinRT/VirtualCameraManager_WinRT.vcxproj +++ b/Samples/VirtualCamera/VirtualCameraManager_WinRT/VirtualCameraManager_WinRT.vcxproj @@ -1,5 +1,6 @@ + true @@ -14,8 +15,8 @@ true Windows Store 10.0 - 10.0.22000.0 - 10.0.22000.0 + 10.0.26100.0 + 10.0.26100.0 @@ -54,7 +55,7 @@ DynamicLibrary - v142 + v143 v141 v142 Unicode @@ -149,15 +150,15 @@ - - + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - + + + \ No newline at end of file diff --git a/Samples/VirtualCamera/VirtualCameraManager_WinRT/packages.config b/Samples/VirtualCamera/VirtualCameraManager_WinRT/packages.config index 6802c80..cb4ea72 100644 --- a/Samples/VirtualCamera/VirtualCameraManager_WinRT/packages.config +++ b/Samples/VirtualCamera/VirtualCameraManager_WinRT/packages.config @@ -1,5 +1,5 @@  - - + + \ No newline at end of file diff --git a/Samples/VirtualCamera/VirtualCameraMediaSource/VirtualCameraMediaSource.h b/Samples/VirtualCamera/VirtualCameraMediaSource/VirtualCameraMediaSource.h index 96ef11e..01daeaa 100644 --- a/Samples/VirtualCamera/VirtualCameraMediaSource/VirtualCameraMediaSource.h +++ b/Samples/VirtualCamera/VirtualCameraMediaSource/VirtualCameraMediaSource.h @@ -18,11 +18,11 @@ static LPCWSTR VIRTUALCAMERAMEDIASOURCE_FRIENDLYNAME = L"VirtualCameraMediaSourc // The below 2 GUIDs are defined in Windows build 22621 and above only, // if targetting SDK for Windows 22621 or higher this would need to be commented out. // GUIDs for retrieving the device source instead of recreating it from within the vcam -DEFINE_GUID(MF_VIRTUALCAMERA_PROVIDE_ASSOCIATED_CAMERA_SOURCES, - 0xF0273718, 0x4A4D, 0x4AC5, 0xA1, 0x5D, 0x30, 0x5E, 0xB5, 0xE9, 0x06, 0x67); - -DEFINE_GUID(MF_VIRTUALCAMERA_ASSOCIATED_CAMERA_SOURCES, - 0x1BB79E7C, 0x5D83, 0x438C, 0x94, 0xD8, 0xE5, 0xF0, 0xDF, 0x6D, 0x32, 0x79); +//DEFINE_GUID(MF_VIRTUALCAMERA_PROVIDE_ASSOCIATED_CAMERA_SOURCES, +// 0xF0273718, 0x4A4D, 0x4AC5, 0xA1, 0x5D, 0x30, 0x5E, 0xB5, 0xE9, 0x06, 0x67); +// +//DEFINE_GUID(MF_VIRTUALCAMERA_ASSOCIATED_CAMERA_SOURCES, +// 0x1BB79E7C, 0x5D83, 0x438C, 0x94, 0xD8, 0xE5, 0xF0, 0xDF, 0x6D, 0x32, 0x79); // --> VirtualCameraMediaSource activation attributes: diff --git a/Samples/VirtualCamera/VirtualCameraMediaSource/VirtualCameraMediaSource.vcxproj b/Samples/VirtualCamera/VirtualCameraMediaSource/VirtualCameraMediaSource.vcxproj index 8e90aaa..987c46b 100644 --- a/Samples/VirtualCamera/VirtualCameraMediaSource/VirtualCameraMediaSource.vcxproj +++ b/Samples/VirtualCamera/VirtualCameraMediaSource/VirtualCameraMediaSource.vcxproj @@ -1,5 +1,6 @@  + @@ -75,14 +76,14 @@ Debug Win32 VirtualCameraMediaSource - 10.0.22000.0 + 10.0.26100.0 VirtualCameraMediaSource Windows10 true - v142 + v143 DynamicLibrary Universal Unicode @@ -91,7 +92,7 @@ Windows10 false - v142 + v143 DynamicLibrary Universal Unicode @@ -100,7 +101,7 @@ Windows10 true - v142 + v143 DynamicLibrary Universal Unicode @@ -109,7 +110,7 @@ Windows10 false - v142 + v143 DynamicLibrary Universal Unicode @@ -118,7 +119,7 @@ Windows10 true - v142 + v143 DynamicLibrary Universal Unicode @@ -126,7 +127,7 @@ Windows10 false - v142 + v143 DynamicLibrary Universal Unicode @@ -134,7 +135,7 @@ Windows10 true - v142 + v143 DynamicLibrary Universal Unicode @@ -143,7 +144,7 @@ Windows10 false - v142 + v143 DynamicLibrary Universal Unicode @@ -266,15 +267,15 @@ - - + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - + + + \ No newline at end of file diff --git a/Samples/VirtualCamera/VirtualCameraMediaSource/packages.config b/Samples/VirtualCamera/VirtualCameraMediaSource/packages.config index 6802c80..cb4ea72 100644 --- a/Samples/VirtualCamera/VirtualCameraMediaSource/packages.config +++ b/Samples/VirtualCamera/VirtualCameraMediaSource/packages.config @@ -1,5 +1,5 @@  - - + + \ No newline at end of file diff --git a/Samples/VirtualCamera/VirtualCameraSample.sln b/Samples/VirtualCamera/VirtualCameraSample.sln index a8723bc..d194ce5 100644 --- a/Samples/VirtualCamera/VirtualCameraSample.sln +++ b/Samples/VirtualCamera/VirtualCameraSample.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.32428.217 +# Visual Studio Version 18 +VisualStudioVersion = 18.6.11828.311 oobstable MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VirtualCamera_Installer", "VirtualCamera_Installer\VirtualCamera_Installer.vcxproj", "{B667F063-AE21-4A50-B233-DEBE044F2223}" EndProject @@ -49,177 +49,101 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU - Debug|ARM = Debug|ARM Debug|ARM64 = Debug|ARM64 Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 Release|Any CPU = Release|Any CPU - Release|ARM = Release|ARM Release|ARM64 = Release|ARM64 Release|x64 = Release|x64 - Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {B667F063-AE21-4A50-B233-DEBE044F2223}.Debug|Any CPU.ActiveCfg = Debug|Win32 - {B667F063-AE21-4A50-B233-DEBE044F2223}.Debug|ARM.ActiveCfg = Debug|Win32 {B667F063-AE21-4A50-B233-DEBE044F2223}.Debug|ARM64.ActiveCfg = Debug|Win32 {B667F063-AE21-4A50-B233-DEBE044F2223}.Debug|x64.ActiveCfg = Debug|x64 {B667F063-AE21-4A50-B233-DEBE044F2223}.Debug|x64.Build.0 = Debug|x64 - {B667F063-AE21-4A50-B233-DEBE044F2223}.Debug|x86.ActiveCfg = Debug|Win32 - {B667F063-AE21-4A50-B233-DEBE044F2223}.Debug|x86.Build.0 = Debug|Win32 {B667F063-AE21-4A50-B233-DEBE044F2223}.Release|Any CPU.ActiveCfg = Release|Win32 - {B667F063-AE21-4A50-B233-DEBE044F2223}.Release|ARM.ActiveCfg = Release|Win32 {B667F063-AE21-4A50-B233-DEBE044F2223}.Release|ARM64.ActiveCfg = Release|Win32 {B667F063-AE21-4A50-B233-DEBE044F2223}.Release|x64.ActiveCfg = Release|x64 {B667F063-AE21-4A50-B233-DEBE044F2223}.Release|x64.Build.0 = Release|x64 - {B667F063-AE21-4A50-B233-DEBE044F2223}.Release|x86.ActiveCfg = Release|Win32 - {B667F063-AE21-4A50-B233-DEBE044F2223}.Release|x86.Build.0 = Release|Win32 {37F6BEB5-ED2C-4071-AC71-FB45E8356492}.Debug|Any CPU.ActiveCfg = Debug - {37F6BEB5-ED2C-4071-AC71-FB45E8356492}.Debug|ARM.ActiveCfg = Debug - {37F6BEB5-ED2C-4071-AC71-FB45E8356492}.Debug|ARM.Build.0 = Debug {37F6BEB5-ED2C-4071-AC71-FB45E8356492}.Debug|ARM64.ActiveCfg = Debug {37F6BEB5-ED2C-4071-AC71-FB45E8356492}.Debug|x64.ActiveCfg = Debug {37F6BEB5-ED2C-4071-AC71-FB45E8356492}.Debug|x64.Build.0 = Debug - {37F6BEB5-ED2C-4071-AC71-FB45E8356492}.Debug|x86.ActiveCfg = Debug - {37F6BEB5-ED2C-4071-AC71-FB45E8356492}.Debug|x86.Build.0 = Debug {37F6BEB5-ED2C-4071-AC71-FB45E8356492}.Release|Any CPU.ActiveCfg = Release - {37F6BEB5-ED2C-4071-AC71-FB45E8356492}.Release|ARM.ActiveCfg = Release - {37F6BEB5-ED2C-4071-AC71-FB45E8356492}.Release|ARM.Build.0 = Release {37F6BEB5-ED2C-4071-AC71-FB45E8356492}.Release|ARM64.ActiveCfg = Release {37F6BEB5-ED2C-4071-AC71-FB45E8356492}.Release|x64.ActiveCfg = Release {37F6BEB5-ED2C-4071-AC71-FB45E8356492}.Release|x64.Build.0 = Release - {37F6BEB5-ED2C-4071-AC71-FB45E8356492}.Release|x86.ActiveCfg = Release - {37F6BEB5-ED2C-4071-AC71-FB45E8356492}.Release|x86.Build.0 = Release {347F4395-68F6-4936-AF83-2206F42557BF}.Debug|Any CPU.ActiveCfg = Debug|Win32 - {347F4395-68F6-4936-AF83-2206F42557BF}.Debug|ARM.ActiveCfg = Debug|Win32 {347F4395-68F6-4936-AF83-2206F42557BF}.Debug|ARM64.ActiveCfg = Debug|Win32 {347F4395-68F6-4936-AF83-2206F42557BF}.Debug|x64.ActiveCfg = Debug|x64 - {347F4395-68F6-4936-AF83-2206F42557BF}.Debug|x86.ActiveCfg = Debug|Win32 - {347F4395-68F6-4936-AF83-2206F42557BF}.Debug|x86.Build.0 = Debug|Win32 {347F4395-68F6-4936-AF83-2206F42557BF}.Release|Any CPU.ActiveCfg = Release|Win32 - {347F4395-68F6-4936-AF83-2206F42557BF}.Release|ARM.ActiveCfg = Release|Win32 {347F4395-68F6-4936-AF83-2206F42557BF}.Release|ARM64.ActiveCfg = Release|Win32 {347F4395-68F6-4936-AF83-2206F42557BF}.Release|x64.ActiveCfg = Release|x64 - {347F4395-68F6-4936-AF83-2206F42557BF}.Release|x86.ActiveCfg = Release|Win32 - {347F4395-68F6-4936-AF83-2206F42557BF}.Release|x86.Build.0 = Release|Win32 {5C0C46DA-5780-4224-99D0-06A4D5F84A5F}.Debug|Any CPU.ActiveCfg = Debug|Win32 - {5C0C46DA-5780-4224-99D0-06A4D5F84A5F}.Debug|ARM.ActiveCfg = Debug|ARM - {5C0C46DA-5780-4224-99D0-06A4D5F84A5F}.Debug|ARM.Build.0 = Debug|ARM {5C0C46DA-5780-4224-99D0-06A4D5F84A5F}.Debug|ARM64.ActiveCfg = Debug|ARM64 {5C0C46DA-5780-4224-99D0-06A4D5F84A5F}.Debug|ARM64.Build.0 = Debug|ARM64 {5C0C46DA-5780-4224-99D0-06A4D5F84A5F}.Debug|x64.ActiveCfg = Debug|x64 {5C0C46DA-5780-4224-99D0-06A4D5F84A5F}.Debug|x64.Build.0 = Debug|x64 - {5C0C46DA-5780-4224-99D0-06A4D5F84A5F}.Debug|x86.ActiveCfg = Debug|Win32 - {5C0C46DA-5780-4224-99D0-06A4D5F84A5F}.Debug|x86.Build.0 = Debug|Win32 {5C0C46DA-5780-4224-99D0-06A4D5F84A5F}.Release|Any CPU.ActiveCfg = Release|Win32 - {5C0C46DA-5780-4224-99D0-06A4D5F84A5F}.Release|ARM.ActiveCfg = Release|ARM - {5C0C46DA-5780-4224-99D0-06A4D5F84A5F}.Release|ARM.Build.0 = Release|ARM {5C0C46DA-5780-4224-99D0-06A4D5F84A5F}.Release|ARM64.ActiveCfg = Release|ARM64 {5C0C46DA-5780-4224-99D0-06A4D5F84A5F}.Release|ARM64.Build.0 = Release|ARM64 {5C0C46DA-5780-4224-99D0-06A4D5F84A5F}.Release|x64.ActiveCfg = Release|x64 {5C0C46DA-5780-4224-99D0-06A4D5F84A5F}.Release|x64.Build.0 = Release|x64 - {5C0C46DA-5780-4224-99D0-06A4D5F84A5F}.Release|x86.ActiveCfg = Release|Win32 - {5C0C46DA-5780-4224-99D0-06A4D5F84A5F}.Release|x86.Build.0 = Release|Win32 {11E3E0B4-99B5-405D-97A0-7D1B89788216}.Debug|Any CPU.ActiveCfg = Debug|Win32 - {11E3E0B4-99B5-405D-97A0-7D1B89788216}.Debug|ARM.ActiveCfg = Debug|ARM - {11E3E0B4-99B5-405D-97A0-7D1B89788216}.Debug|ARM.Build.0 = Debug|ARM {11E3E0B4-99B5-405D-97A0-7D1B89788216}.Debug|ARM64.ActiveCfg = Debug|ARM64 {11E3E0B4-99B5-405D-97A0-7D1B89788216}.Debug|ARM64.Build.0 = Debug|ARM64 {11E3E0B4-99B5-405D-97A0-7D1B89788216}.Debug|x64.ActiveCfg = Debug|x64 {11E3E0B4-99B5-405D-97A0-7D1B89788216}.Debug|x64.Build.0 = Debug|x64 - {11E3E0B4-99B5-405D-97A0-7D1B89788216}.Debug|x86.ActiveCfg = Debug|Win32 - {11E3E0B4-99B5-405D-97A0-7D1B89788216}.Debug|x86.Build.0 = Debug|Win32 {11E3E0B4-99B5-405D-97A0-7D1B89788216}.Release|Any CPU.ActiveCfg = Release|Win32 - {11E3E0B4-99B5-405D-97A0-7D1B89788216}.Release|ARM.ActiveCfg = Release|ARM - {11E3E0B4-99B5-405D-97A0-7D1B89788216}.Release|ARM.Build.0 = Release|ARM {11E3E0B4-99B5-405D-97A0-7D1B89788216}.Release|ARM64.ActiveCfg = Release|ARM64 {11E3E0B4-99B5-405D-97A0-7D1B89788216}.Release|ARM64.Build.0 = Release|ARM64 {11E3E0B4-99B5-405D-97A0-7D1B89788216}.Release|x64.ActiveCfg = Release|x64 {11E3E0B4-99B5-405D-97A0-7D1B89788216}.Release|x64.Build.0 = Release|x64 - {11E3E0B4-99B5-405D-97A0-7D1B89788216}.Release|x86.ActiveCfg = Release|Win32 - {11E3E0B4-99B5-405D-97A0-7D1B89788216}.Release|x86.Build.0 = Release|Win32 {6598BE67-3AFE-4B7A-928A-C022BE995EC8}.Debug|Any CPU.ActiveCfg = Debug|x86 - {6598BE67-3AFE-4B7A-928A-C022BE995EC8}.Debug|ARM.ActiveCfg = Debug|ARM - {6598BE67-3AFE-4B7A-928A-C022BE995EC8}.Debug|ARM.Build.0 = Debug|ARM - {6598BE67-3AFE-4B7A-928A-C022BE995EC8}.Debug|ARM.Deploy.0 = Debug|ARM {6598BE67-3AFE-4B7A-928A-C022BE995EC8}.Debug|ARM64.ActiveCfg = Debug|ARM64 {6598BE67-3AFE-4B7A-928A-C022BE995EC8}.Debug|ARM64.Build.0 = Debug|ARM64 {6598BE67-3AFE-4B7A-928A-C022BE995EC8}.Debug|ARM64.Deploy.0 = Debug|ARM64 {6598BE67-3AFE-4B7A-928A-C022BE995EC8}.Debug|x64.ActiveCfg = Debug|x64 {6598BE67-3AFE-4B7A-928A-C022BE995EC8}.Debug|x64.Build.0 = Debug|x64 {6598BE67-3AFE-4B7A-928A-C022BE995EC8}.Debug|x64.Deploy.0 = Debug|x64 - {6598BE67-3AFE-4B7A-928A-C022BE995EC8}.Debug|x86.ActiveCfg = Debug|x86 - {6598BE67-3AFE-4B7A-928A-C022BE995EC8}.Debug|x86.Build.0 = Debug|x86 - {6598BE67-3AFE-4B7A-928A-C022BE995EC8}.Debug|x86.Deploy.0 = Debug|x86 {6598BE67-3AFE-4B7A-928A-C022BE995EC8}.Release|Any CPU.ActiveCfg = Release|x86 - {6598BE67-3AFE-4B7A-928A-C022BE995EC8}.Release|ARM.ActiveCfg = Release|ARM - {6598BE67-3AFE-4B7A-928A-C022BE995EC8}.Release|ARM.Build.0 = Release|ARM - {6598BE67-3AFE-4B7A-928A-C022BE995EC8}.Release|ARM.Deploy.0 = Release|ARM {6598BE67-3AFE-4B7A-928A-C022BE995EC8}.Release|ARM64.ActiveCfg = Release|ARM64 {6598BE67-3AFE-4B7A-928A-C022BE995EC8}.Release|ARM64.Build.0 = Release|ARM64 {6598BE67-3AFE-4B7A-928A-C022BE995EC8}.Release|ARM64.Deploy.0 = Release|ARM64 {6598BE67-3AFE-4B7A-928A-C022BE995EC8}.Release|x64.ActiveCfg = Release|x64 {6598BE67-3AFE-4B7A-928A-C022BE995EC8}.Release|x64.Build.0 = Release|x64 {6598BE67-3AFE-4B7A-928A-C022BE995EC8}.Release|x64.Deploy.0 = Release|x64 - {6598BE67-3AFE-4B7A-928A-C022BE995EC8}.Release|x86.ActiveCfg = Release|x86 - {6598BE67-3AFE-4B7A-928A-C022BE995EC8}.Release|x86.Build.0 = Release|x86 - {6598BE67-3AFE-4B7A-928A-C022BE995EC8}.Release|x86.Deploy.0 = Release|x86 {A4359C5D-9835-4A0C-81BB-414F82902A32}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A4359C5D-9835-4A0C-81BB-414F82902A32}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A4359C5D-9835-4A0C-81BB-414F82902A32}.Debug|ARM.ActiveCfg = Debug|Any CPU - {A4359C5D-9835-4A0C-81BB-414F82902A32}.Debug|ARM.Build.0 = Debug|Any CPU {A4359C5D-9835-4A0C-81BB-414F82902A32}.Debug|ARM64.ActiveCfg = Debug|Any CPU {A4359C5D-9835-4A0C-81BB-414F82902A32}.Debug|ARM64.Build.0 = Debug|Any CPU {A4359C5D-9835-4A0C-81BB-414F82902A32}.Debug|x64.ActiveCfg = Debug|Any CPU {A4359C5D-9835-4A0C-81BB-414F82902A32}.Debug|x64.Build.0 = Debug|Any CPU - {A4359C5D-9835-4A0C-81BB-414F82902A32}.Debug|x86.ActiveCfg = Debug|Any CPU - {A4359C5D-9835-4A0C-81BB-414F82902A32}.Debug|x86.Build.0 = Debug|Any CPU {A4359C5D-9835-4A0C-81BB-414F82902A32}.Release|Any CPU.ActiveCfg = Release|Any CPU {A4359C5D-9835-4A0C-81BB-414F82902A32}.Release|Any CPU.Build.0 = Release|Any CPU - {A4359C5D-9835-4A0C-81BB-414F82902A32}.Release|ARM.ActiveCfg = Release|Any CPU - {A4359C5D-9835-4A0C-81BB-414F82902A32}.Release|ARM.Build.0 = Release|Any CPU {A4359C5D-9835-4A0C-81BB-414F82902A32}.Release|ARM64.ActiveCfg = Release|Any CPU {A4359C5D-9835-4A0C-81BB-414F82902A32}.Release|ARM64.Build.0 = Release|Any CPU {A4359C5D-9835-4A0C-81BB-414F82902A32}.Release|x64.ActiveCfg = Release|Any CPU {A4359C5D-9835-4A0C-81BB-414F82902A32}.Release|x64.Build.0 = Release|Any CPU - {A4359C5D-9835-4A0C-81BB-414F82902A32}.Release|x86.ActiveCfg = Release|Any CPU - {A4359C5D-9835-4A0C-81BB-414F82902A32}.Release|x86.Build.0 = Release|Any CPU {B58A2BF5-E47E-4C35-A084-B6D08C7330F6}.Debug|Any CPU.ActiveCfg = Debug {B58A2BF5-E47E-4C35-A084-B6D08C7330F6}.Debug|Any CPU.Build.0 = Debug - {B58A2BF5-E47E-4C35-A084-B6D08C7330F6}.Debug|ARM.ActiveCfg = Debug - {B58A2BF5-E47E-4C35-A084-B6D08C7330F6}.Debug|ARM.Build.0 = Debug {B58A2BF5-E47E-4C35-A084-B6D08C7330F6}.Debug|ARM64.ActiveCfg = Debug {B58A2BF5-E47E-4C35-A084-B6D08C7330F6}.Debug|ARM64.Build.0 = Debug {B58A2BF5-E47E-4C35-A084-B6D08C7330F6}.Debug|x64.ActiveCfg = Debug - {B58A2BF5-E47E-4C35-A084-B6D08C7330F6}.Debug|x86.ActiveCfg = Debug - {B58A2BF5-E47E-4C35-A084-B6D08C7330F6}.Debug|x86.Build.0 = Debug {B58A2BF5-E47E-4C35-A084-B6D08C7330F6}.Release|Any CPU.ActiveCfg = Release {B58A2BF5-E47E-4C35-A084-B6D08C7330F6}.Release|Any CPU.Build.0 = Release - {B58A2BF5-E47E-4C35-A084-B6D08C7330F6}.Release|ARM.ActiveCfg = Release - {B58A2BF5-E47E-4C35-A084-B6D08C7330F6}.Release|ARM.Build.0 = Release {B58A2BF5-E47E-4C35-A084-B6D08C7330F6}.Release|ARM64.ActiveCfg = Release {B58A2BF5-E47E-4C35-A084-B6D08C7330F6}.Release|ARM64.Build.0 = Release {B58A2BF5-E47E-4C35-A084-B6D08C7330F6}.Release|x64.ActiveCfg = Release - {B58A2BF5-E47E-4C35-A084-B6D08C7330F6}.Release|x86.ActiveCfg = Release - {B58A2BF5-E47E-4C35-A084-B6D08C7330F6}.Release|x86.Build.0 = Release {3E174357-0294-40F1-BA11-7330617DDBB5}.Debug|Any CPU.ActiveCfg = Debug|Win32 - {3E174357-0294-40F1-BA11-7330617DDBB5}.Debug|ARM.ActiveCfg = Debug|ARM - {3E174357-0294-40F1-BA11-7330617DDBB5}.Debug|ARM.Build.0 = Debug|ARM {3E174357-0294-40F1-BA11-7330617DDBB5}.Debug|ARM64.ActiveCfg = Debug|ARM64 {3E174357-0294-40F1-BA11-7330617DDBB5}.Debug|ARM64.Build.0 = Debug|ARM64 {3E174357-0294-40F1-BA11-7330617DDBB5}.Debug|x64.ActiveCfg = Debug|x64 {3E174357-0294-40F1-BA11-7330617DDBB5}.Debug|x64.Build.0 = Debug|x64 - {3E174357-0294-40F1-BA11-7330617DDBB5}.Debug|x86.ActiveCfg = Debug|Win32 - {3E174357-0294-40F1-BA11-7330617DDBB5}.Debug|x86.Build.0 = Debug|Win32 {3E174357-0294-40F1-BA11-7330617DDBB5}.Release|Any CPU.ActiveCfg = Release|Win32 - {3E174357-0294-40F1-BA11-7330617DDBB5}.Release|ARM.ActiveCfg = Release|ARM - {3E174357-0294-40F1-BA11-7330617DDBB5}.Release|ARM.Build.0 = Release|ARM {3E174357-0294-40F1-BA11-7330617DDBB5}.Release|ARM64.ActiveCfg = Release|ARM64 {3E174357-0294-40F1-BA11-7330617DDBB5}.Release|ARM64.Build.0 = Release|ARM64 {3E174357-0294-40F1-BA11-7330617DDBB5}.Release|x64.ActiveCfg = Release|x64 {3E174357-0294-40F1-BA11-7330617DDBB5}.Release|x64.Build.0 = Release|x64 - {3E174357-0294-40F1-BA11-7330617DDBB5}.Release|x86.ActiveCfg = Release|Win32 - {3E174357-0294-40F1-BA11-7330617DDBB5}.Release|x86.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Samples/VirtualCamera/VirtualCameraSystray/VirtualCameraSystray.csproj b/Samples/VirtualCamera/VirtualCameraSystray/VirtualCameraSystray.csproj index 977b38a..4ec7b8c 100644 --- a/Samples/VirtualCamera/VirtualCameraSystray/VirtualCameraSystray.csproj +++ b/Samples/VirtualCamera/VirtualCameraSystray/VirtualCameraSystray.csproj @@ -76,7 +76,7 @@ - 10.0.19041.1 + 10.0.26100.8249 diff --git a/Samples/VirtualCamera/VirtualCameraTest/VirtualCameraTest.vcxproj b/Samples/VirtualCamera/VirtualCameraTest/VirtualCameraTest.vcxproj index bc8ffa7..61eb9ba 100644 --- a/Samples/VirtualCamera/VirtualCameraTest/VirtualCameraTest.vcxproj +++ b/Samples/VirtualCamera/VirtualCameraTest/VirtualCameraTest.vcxproj @@ -1,5 +1,6 @@ + true @@ -10,7 +11,7 @@ {347f4395-68f6-4936-af83-2206f42557bf} Win32Proj VirtualCameraTest - 10.0.22000.0 + 10.0.26100.0 10.0.21361.0 VirtualCameraTest @@ -160,17 +161,17 @@ - - - + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/Samples/VirtualCamera/VirtualCameraTest/packages.config b/Samples/VirtualCamera/VirtualCameraTest/packages.config index 4b5e9dc..186e88f 100644 --- a/Samples/VirtualCamera/VirtualCameraTest/packages.config +++ b/Samples/VirtualCamera/VirtualCameraTest/packages.config @@ -1,6 +1,6 @@  - - - + + + \ No newline at end of file diff --git a/Samples/VirtualCamera/VirtualCamera_Installer/VirtualCamera_Installer.vcxproj b/Samples/VirtualCamera/VirtualCamera_Installer/VirtualCamera_Installer.vcxproj index c25e6aa..bb8470a 100644 --- a/Samples/VirtualCamera/VirtualCamera_Installer/VirtualCamera_Installer.vcxproj +++ b/Samples/VirtualCamera/VirtualCamera_Installer/VirtualCamera_Installer.vcxproj @@ -1,5 +1,6 @@ + true @@ -10,7 +11,7 @@ {b667f063-ae21-4a50-b233-debe044f2223} Win32Proj VirtualCamera_Installer - 10.0.22000.0 + 10.0.26100.0 10.0.22000.0 VirtualCamera_Installer @@ -35,7 +36,7 @@ Application - v142 + v143 Unicode @@ -160,17 +161,17 @@ - - - + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + + + \ No newline at end of file diff --git a/Samples/VirtualCamera/VirtualCamera_Installer/packages.config b/Samples/VirtualCamera/VirtualCamera_Installer/packages.config index fbc9962..e9d1245 100644 --- a/Samples/VirtualCamera/VirtualCamera_Installer/packages.config +++ b/Samples/VirtualCamera/VirtualCamera_Installer/packages.config @@ -1,6 +1,6 @@  - - - + + + \ No newline at end of file diff --git a/Samples/WindowsStudio/WindowsStudioSample.sln b/Samples/WindowsStudio/WindowsStudioSample.sln index 710f8f1..2f7a94a 100644 --- a/Samples/WindowsStudio/WindowsStudioSample.sln +++ b/Samples/WindowsStudio/WindowsStudioSample.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 18 -VisualStudioVersion = 18.1.11304.174 d18.0 +VisualStudioVersion = 18.1.11304.174 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ControlMonitorHelperWinRT", "..\ControlMonitorApp\ControlMonitorHelper\ControlMonitorHelperWinRT.vcxproj", "{5A835B38-9B32-43CE-90FA-EDC3E4FC8070}" EndProject @@ -12,11 +12,9 @@ Global Debug|Any CPU = Debug|Any CPU Debug|ARM64 = Debug|ARM64 Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 Release|Any CPU = Release|Any CPU Release|ARM64 = Release|ARM64 Release|x64 = Release|x64 - Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {5A835B38-9B32-43CE-90FA-EDC3E4FC8070}.Debug|Any CPU.ActiveCfg = Debug|x64 @@ -24,15 +22,11 @@ Global {5A835B38-9B32-43CE-90FA-EDC3E4FC8070}.Debug|ARM64.Build.0 = Debug|ARM64 {5A835B38-9B32-43CE-90FA-EDC3E4FC8070}.Debug|x64.ActiveCfg = Debug|x64 {5A835B38-9B32-43CE-90FA-EDC3E4FC8070}.Debug|x64.Build.0 = Debug|x64 - {5A835B38-9B32-43CE-90FA-EDC3E4FC8070}.Debug|x86.ActiveCfg = Debug|x64 - {5A835B38-9B32-43CE-90FA-EDC3E4FC8070}.Debug|x86.Build.0 = Debug|x64 {5A835B38-9B32-43CE-90FA-EDC3E4FC8070}.Release|Any CPU.ActiveCfg = Release|x64 {5A835B38-9B32-43CE-90FA-EDC3E4FC8070}.Release|ARM64.ActiveCfg = Release|ARM64 {5A835B38-9B32-43CE-90FA-EDC3E4FC8070}.Release|ARM64.Build.0 = Release|ARM64 {5A835B38-9B32-43CE-90FA-EDC3E4FC8070}.Release|x64.ActiveCfg = Release|x64 {5A835B38-9B32-43CE-90FA-EDC3E4FC8070}.Release|x64.Build.0 = Release|x64 - {5A835B38-9B32-43CE-90FA-EDC3E4FC8070}.Release|x86.ActiveCfg = Release|x64 - {5A835B38-9B32-43CE-90FA-EDC3E4FC8070}.Release|x86.Build.0 = Release|x64 {80DC76D0-9378-4D68-A097-998F601F0F18}.Debug|Any CPU.ActiveCfg = Debug|x64 {80DC76D0-9378-4D68-A097-998F601F0F18}.Debug|Any CPU.Build.0 = Debug|x64 {80DC76D0-9378-4D68-A097-998F601F0F18}.Debug|Any CPU.Deploy.0 = Debug|x64 @@ -42,9 +36,6 @@ Global {80DC76D0-9378-4D68-A097-998F601F0F18}.Debug|x64.ActiveCfg = Debug|x64 {80DC76D0-9378-4D68-A097-998F601F0F18}.Debug|x64.Build.0 = Debug|x64 {80DC76D0-9378-4D68-A097-998F601F0F18}.Debug|x64.Deploy.0 = Debug|x64 - {80DC76D0-9378-4D68-A097-998F601F0F18}.Debug|x86.ActiveCfg = Debug|x86 - {80DC76D0-9378-4D68-A097-998F601F0F18}.Debug|x86.Build.0 = Debug|x86 - {80DC76D0-9378-4D68-A097-998F601F0F18}.Debug|x86.Deploy.0 = Debug|x86 {80DC76D0-9378-4D68-A097-998F601F0F18}.Release|Any CPU.ActiveCfg = Release|x64 {80DC76D0-9378-4D68-A097-998F601F0F18}.Release|Any CPU.Build.0 = Release|x64 {80DC76D0-9378-4D68-A097-998F601F0F18}.Release|Any CPU.Deploy.0 = Release|x64 @@ -54,9 +45,6 @@ Global {80DC76D0-9378-4D68-A097-998F601F0F18}.Release|x64.ActiveCfg = Release|x64 {80DC76D0-9378-4D68-A097-998F601F0F18}.Release|x64.Build.0 = Release|x64 {80DC76D0-9378-4D68-A097-998F601F0F18}.Release|x64.Deploy.0 = Release|x64 - {80DC76D0-9378-4D68-A097-998F601F0F18}.Release|x86.ActiveCfg = Release|x86 - {80DC76D0-9378-4D68-A097-998F601F0F18}.Release|x86.Build.0 = Release|x86 - {80DC76D0-9378-4D68-A097-998F601F0F18}.Release|x86.Deploy.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Samples/WindowsStudio/WindowsStudioSample_WinUI/KsHelper.cs b/Samples/WindowsStudio/WindowsStudioSample_WinUI/KsHelper.cs index 9b5c70d..284b097 100644 --- a/Samples/WindowsStudio/WindowsStudioSample_WinUI/KsHelper.cs +++ b/Samples/WindowsStudio/WindowsStudioSample_WinUI/KsHelper.cs @@ -120,12 +120,24 @@ public struct MF_FLOAT2 { public float x; public float y; + + public MF_FLOAT2() + { + x = 0.0f; + y = 0.0f; + } }; struct WSEFaceMetadataHeader { public uint Count; public uint Size; + + public WSEFaceMetadataHeader() + { + Count = 0; + Size = 0; + } }; public struct WSEFaceTrackingMetadata @@ -134,6 +146,14 @@ public struct WSEFaceTrackingMetadata public MF_FLOAT2 BoxSize; // Width and Height of the bounding box of face in image relative coordinates [0, 1] public float Confidence; // Confidence of this region being an actual face (0..1) public uint TrackId; // Corresponding track id + + public WSEFaceTrackingMetadata() + { + TopLeft = new MF_FLOAT2(); + BoxSize = new MF_FLOAT2(); + Confidence = 0.0f; + TrackId = 0; + } }; public const int MAX_NUM_LANDMARKS = 70; @@ -143,6 +163,11 @@ public unsafe struct WSEFaceLandmarksMetadata public fixed float Landmarks2D[MAX_NUM_LANDMARKS * 2]; // landmark location of faces in image relative coordinates [0, 1]. public fixed float Confidence[MAX_NUM_LANDMARKS]; // individual confidence for each landmark (0..1) public uint TrackId; // corresponding track id + + public WSEFaceLandmarksMetadata() + { + TrackId = 0; + } }; const int EULER_ANGLE_COUNT = 3; // number of angles in pose @@ -151,7 +176,14 @@ public unsafe struct WSEFacePoseMetadata public fixed float Pose[EULER_ANGLE_COUNT]; // yaw, pitch, roll public float Confidence; // overall confidence of pose detection results (0..1) public uint TrackId; // corresponding track id + + public WSEFacePoseMetadata() + { + Confidence = 0.0f; + TrackId = 0; + } } + // <-- Windows Studio Effects custom KsProperties [StructLayout(LayoutKind.Sequential)] diff --git a/Samples/WindowsStudio/WindowsStudioSample_WinUI/MainWindow.xaml.cs b/Samples/WindowsStudio/WindowsStudioSample_WinUI/MainWindow.xaml.cs index eaf2348..e98dc83 100644 --- a/Samples/WindowsStudio/WindowsStudioSample_WinUI/MainWindow.xaml.cs +++ b/Samples/WindowsStudio/WindowsStudioSample_WinUI/MainWindow.xaml.cs @@ -1019,12 +1019,12 @@ private async void UIFormatsAvailable_SelectionChanged(object sender, SelectionC } } - private void UIProfilesAvailable_SelectionChanged(object sender, SelectionChangedEventArgs e) + private async void UIProfilesAvailable_SelectionChanged(object sender, SelectionChangedEventArgs e) { if (UIProfilesAvailable.IsEnabled) { m_initLock.Wait(); - UninitializeCamera(); + await UninitializeCamera(); m_initLock.Release(); var t = InitializeCameraAndUI(); // fire-forget } diff --git a/Samples/WindowsStudio/WindowsStudioSample_WinUI/Package.appxmanifest b/Samples/WindowsStudio/WindowsStudioSample_WinUI/Package.appxmanifest index 667892f..db7134f 100644 --- a/Samples/WindowsStudio/WindowsStudioSample_WinUI/Package.appxmanifest +++ b/Samples/WindowsStudio/WindowsStudioSample_WinUI/Package.appxmanifest @@ -10,7 +10,7 @@ + Version="1.0.3.0" /> diff --git a/Samples/WindowsStudio/WindowsStudioSample_WinUI/Properties/launchSettings.json b/Samples/WindowsStudio/WindowsStudioSample_WinUI/Properties/launchSettings.json new file mode 100644 index 0000000..ddeccea --- /dev/null +++ b/Samples/WindowsStudio/WindowsStudioSample_WinUI/Properties/launchSettings.json @@ -0,0 +1,8 @@ +{ + "profiles": { + "WindowsStudioSample_WinUI": { + "commandName": "MsixPackage", + "nativeDebugging": true + } + } +} \ No newline at end of file diff --git a/Samples/WindowsStudio/WindowsStudioSample_WinUI/WindowsStudioSample_WinUI.csproj b/Samples/WindowsStudio/WindowsStudioSample_WinUI/WindowsStudioSample_WinUI.csproj index ae098ac..b706429 100644 --- a/Samples/WindowsStudio/WindowsStudioSample_WinUI/WindowsStudioSample_WinUI.csproj +++ b/Samples/WindowsStudio/WindowsStudioSample_WinUI/WindowsStudioSample_WinUI.csproj @@ -1,16 +1,16 @@  WinExe - net8.0-windows10.0.26100.0 - 10.0.17763.0 + net10.0-windows10.0.26100.0 + 10.0.26100.0 WindowsStudioSample_WinUI app.manifest - x86;x64;ARM64 - win-x86;win-x64;win-arm64 + x64;ARM64 + win-x64;win-arm64 true true Properties\PublishProfiles\win10-$(Platform).pubxml - 10.0.22621.0 + 10.0.26100.0 WindowsStudioSample_WinUI_TemporaryKey.pfx True true @@ -34,8 +34,12 @@ - - + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + +