diff --git a/Win32CaptureSample/App.cpp b/Win32CaptureSample/App.cpp
index d56ecf6..9c46d42 100644
--- a/Win32CaptureSample/App.cpp
+++ b/Win32CaptureSample/App.cpp
@@ -102,7 +102,7 @@ winrt::IAsyncOperation<winrt::GraphicsCaptureItem> App::StartCaptureWithPickerAs
         // a DispatcherQueue. See CaptureSnapshot for an example that uses 
         // Direct3D11CaptureFramePool::CreateFreeThreaded, which doesn't now have this
         // requirement. See the README if you're unsure of which version of 'Create' to use.
-        co_await m_mainThread;
+        co_await wil::resume_foreground(m_mainThread);
         StartCaptureFromItem(item);
     }
 
@@ -158,7 +158,7 @@ winrt::IAsyncOperation<winrt::StorageFile> App::TakeSnapshotAsync()
     else
     {
         // Unsupported
-        co_await m_mainThread;
+        co_await wil::resume_foreground(m_mainThread);
         MessageBoxW(nullptr,
             L"Unsupported file format!",
             L"Win32CaptureSample",
diff --git a/Win32CaptureSample/Win32CaptureSample.vcxproj b/Win32CaptureSample/Win32CaptureSample.vcxproj
index 44564fc..ead304e 100644
--- a/Win32CaptureSample/Win32CaptureSample.vcxproj
+++ b/Win32CaptureSample/Win32CaptureSample.vcxproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\Microsoft.Windows.CppWinRT.2.0.220418.1\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.220418.1\build\native\Microsoft.Windows.CppWinRT.props')" />
+  <Import Project="..\packages\Microsoft.Windows.CppWinRT.2.0.230706.1\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.230706.1\build\native\Microsoft.Windows.CppWinRT.props')" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM64">
       <Configuration>Debug</Configuration>
@@ -152,6 +152,7 @@
   <ItemGroup>
     <ClInclude Include="App.h" />
     <ClInclude Include="CaptureSnapshot.h" />
+    <ClInclude Include="dispatcherqueue.desktop.interop.h" />
     <ClInclude Include="MonitorList.h" />
     <ClInclude Include="pch.h" />
     <ClInclude Include="SampleWindow.h" />
@@ -163,17 +164,17 @@
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="..\packages\Microsoft.Windows.CppWinRT.2.0.220418.1\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.220418.1\build\native\Microsoft.Windows.CppWinRT.targets')" />
-    <Import Project="..\packages\Microsoft.Windows.ImplementationLibrary.1.0.220201.1\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('..\packages\Microsoft.Windows.ImplementationLibrary.1.0.220201.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
-    <Import Project="..\packages\robmikh.common.0.0.15-beta\build\native\robmikh.common.targets" Condition="Exists('..\packages\robmikh.common.0.0.15-beta\build\native\robmikh.common.targets')" />
+    <Import Project="..\packages\Microsoft.Windows.CppWinRT.2.0.230706.1\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.230706.1\build\native\Microsoft.Windows.CppWinRT.targets')" />
+    <Import Project="..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets" Condition="Exists('..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" />
+    <Import Project="..\packages\robmikh.common.0.0.22-beta\build\native\robmikh.common.targets" Condition="Exists('..\packages\robmikh.common.0.0.22-beta\build\native\robmikh.common.targets')" />
   </ImportGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>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}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.220418.1\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.CppWinRT.2.0.220418.1\build\native\Microsoft.Windows.CppWinRT.props'))" />
-    <Error Condition="!Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.220418.1\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.CppWinRT.2.0.220418.1\build\native\Microsoft.Windows.CppWinRT.targets'))" />
-    <Error Condition="!Exists('..\packages\Microsoft.Windows.ImplementationLibrary.1.0.220201.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.ImplementationLibrary.1.0.220201.1\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
-    <Error Condition="!Exists('..\packages\robmikh.common.0.0.15-beta\build\native\robmikh.common.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\robmikh.common.0.0.15-beta\build\native\robmikh.common.targets'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.230706.1\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.CppWinRT.2.0.230706.1\build\native\Microsoft.Windows.CppWinRT.props'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.230706.1\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.CppWinRT.2.0.230706.1\build\native\Microsoft.Windows.CppWinRT.targets'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.ImplementationLibrary.1.0.231216.1\build\native\Microsoft.Windows.ImplementationLibrary.targets'))" />
+    <Error Condition="!Exists('..\packages\robmikh.common.0.0.22-beta\build\native\robmikh.common.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\robmikh.common.0.0.22-beta\build\native\robmikh.common.targets'))" />
   </Target>
 </Project>
\ No newline at end of file
diff --git a/Win32CaptureSample/dispatcherqueue.desktop.interop.h b/Win32CaptureSample/dispatcherqueue.desktop.interop.h
new file mode 100644
index 0000000..f968ee2
--- /dev/null
+++ b/Win32CaptureSample/dispatcherqueue.desktop.interop.h
@@ -0,0 +1,47 @@
+#pragma once
+#include <winrt/Windows.Foundation.h>
+#include <winrt/Windows.System.h>
+#include <dispatcherqueue.h>
+
+namespace robmikh::common::desktop
+{
+    namespace impl
+    {
+        inline void ShutdownAndThenPostQuitMessage(winrt::Windows::System::DispatcherQueueController const& controller, int exitCode)
+        {
+            auto action = controller.ShutdownQueueAsync();
+            action.Completed([exitCode](auto&&, auto&&)
+                {
+                    PostQuitMessage(exitCode);
+                });
+        }
+    }
+
+    inline auto CreateDispatcherQueueControllerForCurrentThread()
+    {
+        namespace abi = ABI::Windows::System;
+
+        DispatcherQueueOptions options
+        {
+            sizeof(DispatcherQueueOptions),
+            DQTYPE_THREAD_CURRENT,
+            DQTAT_COM_NONE
+        };
+
+        winrt::Windows::System::DispatcherQueueController controller{ nullptr };
+        winrt::check_hresult(CreateDispatcherQueueController(options, reinterpret_cast<abi::IDispatcherQueueController**>(winrt::put_abi(controller))));
+        return controller;
+    }
+
+    inline int ShutdownDispatcherQueueControllerAndWait(winrt::Windows::System::DispatcherQueueController const& controller, int exitCode)
+    {
+        impl::ShutdownAndThenPostQuitMessage(controller, exitCode);
+        MSG msg = {};
+        while (GetMessageW(&msg, nullptr, 0, 0))
+        {
+            TranslateMessage(&msg);
+            DispatchMessageW(&msg);
+        }
+        return static_cast<int>(msg.wParam);
+    }
+}
\ No newline at end of file
diff --git a/Win32CaptureSample/packages.config b/Win32CaptureSample/packages.config
index 4b0a8ab..2509606 100644
--- a/Win32CaptureSample/packages.config
+++ b/Win32CaptureSample/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.Windows.CppWinRT" version="2.0.220418.1" targetFramework="native" />
-  <package id="Microsoft.Windows.ImplementationLibrary" version="1.0.220201.1" targetFramework="native" />
-  <package id="robmikh.common" version="0.0.15-beta" targetFramework="native" />
+  <package id="Microsoft.Windows.CppWinRT" version="2.0.230706.1" targetFramework="native" />
+  <package id="Microsoft.Windows.ImplementationLibrary" version="1.0.231216.1" targetFramework="native" />
+  <package id="robmikh.common" version="0.0.22-beta" targetFramework="native" />
 </packages>
\ No newline at end of file
diff --git a/Win32CaptureSample/pch.h b/Win32CaptureSample/pch.h
index 3fef2cf..588fb97 100644
--- a/Win32CaptureSample/pch.h
+++ b/Win32CaptureSample/pch.h
@@ -46,6 +46,7 @@
 
 // WIL
 #include <wil/resource.h>
+#include <wil/cppwinrt_helpers.h>
 
 // Helpers
 #include <robmikh.common/composition.interop.h>
@@ -54,7 +55,9 @@
 #include <robmikh.common/d3dHelpers.desktop.h>
 #include <robmikh.common/direct3d11.interop.h>
 #include <robmikh.common/capture.desktop.interop.h>
-#include <robmikh.common/dispatcherqueue.desktop.interop.h>
+// robmikh.common needs to be updated to support newer versions of C++/WinRT
+//#include <robmikh.common/dispatcherqueue.desktop.interop.h>
+#include "dispatcherqueue.desktop.interop.h"
 #include <robmikh.common/stream.interop.h>
 #include <robmikh.common/hwnd.interop.h>
 #include <robmikh.common/ControlsHelper.h>