Commit 48116147 authored by Chuck Walbourn's avatar Chuck Walbourn
Browse files

Updated GamePad C++/WinRT for Spring 2017 v15.3 update

parent d92a26ec

UWPSamples/System/GamepadCppWinRT_UWP/GamepadCppWinRT_UWP.vcxproj

+4 −4
Original line number Diff line number Diff line 
<?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.2017.4.6.1\build\native\cppwinrt.props" Condition="Exists('packages\cppwinrt.2017.4.6.1\build\native\cppwinrt.props')" />

  <Import Project="packages\cppwinrt.2017.8.25.1\build\native\cppwinrt.props" Condition="Exists('packages\cppwinrt.2017.8.25.1\build\native\cppwinrt.props')" />

  <ItemGroup Label="ProjectConfigurations">

    <ProjectConfiguration Include="Debug|Win32">

      <Configuration>Debug</Configuration>
@@ -306,13 +306,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.2017.4.6.1\build\native\cppwinrt.targets" Condition="Exists('packages\cppwinrt.2017.4.6.1\build\native\cppwinrt.targets')" />

    <Import Project="packages\cppwinrt.2017.8.25.1\build\native\cppwinrt.targets" Condition="Exists('packages\cppwinrt.2017.8.25.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.2017.4.6.1\build\native\cppwinrt.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\cppwinrt.2017.4.6.1\build\native\cppwinrt.props'))" />

    <Error Condition="!Exists('packages\cppwinrt.2017.4.6.1\build\native\cppwinrt.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\cppwinrt.2017.4.6.1\build\native\cppwinrt.targets'))" />

    <Error Condition="!Exists('packages\cppwinrt.2017.8.25.1\build\native\cppwinrt.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\cppwinrt.2017.8.25.1\build\native\cppwinrt.props'))" />

    <Error Condition="!Exists('packages\cppwinrt.2017.8.25.1\build\native\cppwinrt.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\cppwinrt.2017.8.25.1\build\native\cppwinrt.targets'))" />

  </Target>

</Project>
 
 No newline at end of file

UWPSamples/System/GamepadCppWinRT_UWP/packages.config

+1 −1
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<packages>

  <package id="cppwinrt" version="2017.4.6.1" targetFramework="native" />

  <package id="cppwinrt" version="2017.8.25.1" targetFramework="native" />

</packages>
 
 No newline at end of file

UWPSamples/System/GamepadCppWinRT_UWP/pch.cpp

+2 −0
Original line number Diff line number Diff line
@@ -7,4 +7,6 @@ 
// Copyright (C) Microsoft Corporation. All rights reserved.

//--------------------------------------------------------------------------------------



#pragma warning(disable : 4996)



#include "pch.h"

UWPSamples/System/GamepadCppWinRT_UWP/pch.h

+0 −1
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ 
#include "SpriteFont.h"



#include <winrt/Windows.Gaming.Input.h>

#include <winrt/ppl.h>

#include <winrt/Windows.ApplicationModel.h>

#include <winrt/Windows.ApplicationModel.Core.h>

#include <winrt/Windows.ApplicationModel.Activation.h>