Updated Gamepad C++/WinRT sample for February 2017 release of C++/WinRT

Author: walbourn

.gitignore

@@ -17,6 +17,7 @@
 *.lastbuildstate
 *.ilk
 *.VC.db
+.vs
 ARM
 "Generated Files"
 Bin
@@ -25,6 +26,8 @@ Debug
 Profile
 Release
 x64
+Samples/Graphics/SimplePBR12/Compiled/
+Samples/Tools/errorlookup/errorlookup/project.lock.json
 /wiki
 packages
 !Kits/Telemetry/ARM

Samples/System/GamepadCppWinRT_UWP/GamepadCppWinRT_UWP.cpp

@@ -29,7 +29,7 @@ Sample::Sample() :
 }
 
 // Initialize the Direct3D resources required to run.
-void Sample::Initialize(IUnknown* window, int width, int height, DXGI_MODE_ROTATION rotation)
+void Sample::Initialize(::IUnknown* window, int width, int height, DXGI_MODE_ROTATION rotation)
 {
     m_deviceResources->SetWindow(window, width, height, rotation);
 
@@ -48,13 +48,13 @@ void Sample::Initialize(IUnknown* window, int width, int height, DXGI_MODE_ROTAT
     m_currentGamepadNeedsRefresh = false;
 }
 
-void Sample::OnGamepadAdded(winrt::Windows::IInspectable const &, Gamepad const & args)
+void Sample::OnGamepadAdded(winrt::Windows::Foundation::IInspectable const &, Gamepad const & args)
 {
     m_localCollection.push_back(args);
     m_currentGamepadNeedsRefresh = true;
 }
 
-void Sample::OnGamepadRemoved(winrt::Windows::IInspectable const &, Gamepad const & /*args*/)
+void Sample::OnGamepadRemoved(winrt::Windows::Foundation::IInspectable const &, Gamepad const & /*args*/)
 {
     RefreshCachedGamepads();
 }

Samples/System/GamepadCppWinRT_UWP/GamepadCppWinRT_UWP.h

@@ -21,7 +21,7 @@ class Sample : public DX::IDeviceNotify
     Sample();
 
     // Initialization and management
-    void Initialize(IUnknown* window, int width, int height, DXGI_MODE_ROTATION rotation);
+    void Initialize(::IUnknown* window, int width, int height, DXGI_MODE_ROTATION rotation);
 
     // Basic render loop
     void Tick();
@@ -47,8 +47,8 @@ class Sample : public DX::IDeviceNotify
     void Render();
     const winrt::Windows::Gaming::Input::Gamepad* GetLastGamepad();
 
-    void OnGamepadAdded(winrt::Windows::IInspectable const & sender, winrt::Windows::Gaming::Input::Gamepad const & args);
-    void OnGamepadRemoved(winrt::Windows::IInspectable const & sender, winrt::Windows::Gaming::Input::Gamepad const & args);
+    void OnGamepadAdded(winrt::Windows::Foundation::IInspectable const & sender, winrt::Windows::Gaming::Input::Gamepad const & args);
+    void OnGamepadRemoved(winrt::Windows::Foundation::IInspectable const & sender, winrt::Windows::Gaming::Input::Gamepad const & args);
     void RefreshCachedGamepads();
 
     void Clear();

Samples/System/GamepadCppWinRT_UWP/GamepadCppWinRT_UWP.vcxproj

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="packages\cppwinrt.2016.10.20.1\build\native\cppwinrt.props" Condition="Exists('packages\cppwinrt.2016.10.20.1\build\native\cppwinrt.props')" />
+  <Import Project="packages\cppwinrt.2017.2.28.1\build\native\cppwinrt.props" Condition="Exists('packages\cppwinrt.2017.2.28.1\build\native\cppwinrt.props')" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -305,13 +305,13 @@
     <Import Project="$(VSINSTALLDIR)\Common7\IDE\Extensions\Microsoft\VsGraphics\ImageContentTask.targets" />
     <Import Project="$(VSINSTALLDIR)\Common7\IDE\Extensions\Microsoft\VsGraphics\MeshContentTask.targets" />
     <Import Project="$(VSINSTALLDIR)\Common7\IDE\Extensions\Microsoft\VsGraphics\ShaderGraphContentTask.targets" />
-    <Import Project="packages\cppwinrt.2016.10.20.1\build\native\cppwinrt.targets" Condition="Exists('packages\cppwinrt.2016.10.20.1\build\native\cppwinrt.targets')" />
+    <Import Project="packages\cppwinrt.2017.2.28.1\build\native\cppwinrt.targets" Condition="Exists('packages\cppwinrt.2017.2.28.1\build\native\cppwinrt.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\cppwinrt.2016.10.20.1\build\native\cppwinrt.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\cppwinrt.2016.10.20.1\build\native\cppwinrt.props'))" />
-    <Error Condition="!Exists('packages\cppwinrt.2016.10.20.1\build\native\cppwinrt.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\cppwinrt.2016.10.20.1\build\native\cppwinrt.targets'))" />
+    <Error Condition="!Exists('packages\cppwinrt.2017.2.28.1\build\native\cppwinrt.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\cppwinrt.2017.2.28.1\build\native\cppwinrt.props'))" />
+    <Error Condition="!Exists('packages\cppwinrt.2017.2.28.1\build\native\cppwinrt.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\cppwinrt.2017.2.28.1\build\native\cppwinrt.targets'))" />
   </Target>
 </Project>

Samples/System/GamepadCppWinRT_UWP/Main.cpp

@@ -111,7 +111,7 @@ class ViewProvider final : public winrt::implements<ViewProvider, IFrameworkView
             std::swap(outputWidth, outputHeight);
         }
 
-        m_sample->Initialize(winrt::get(window), outputWidth, outputHeight, rotation);
+        m_sample->Initialize(winrt::get_abi(window), outputWidth, outputHeight, rotation);
     }
 
     void Load(winrt::hstring const &)

Samples/System/GamepadCppWinRT_UWP/packages.config

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="cppwinrt" version="2016.10.20.1" targetFramework="native" />
+  <package id="cppwinrt" version="2017.2.28.1" targetFramework="native" />
 </packages>