Move from sdk-provided cppwinrt-1.x to cppwinrt-2.x nuget package (#2246)

2026-04-06 19:26:39 +02:00 · 2020-04-29 13:02:18 -07:00
parent ee0420188c
commit d16ebba9e0
131 changed files with 543 additions and 227 deletions
--- a/src/modules/imageresizer/dll/ContextMenuHandler.cpp
+++ b/src/modules/imageresizer/dll/ContextMenuHandler.cpp
@@ -1,6 +1,6 @@
 // ContextMenuHandler.cpp : Implementation of CContextMenuHandler

-#include "stdafx.h"
+#include "pch.h"
 #include "ContextMenuHandler.h"
 #include "HDropIterator.h"
 #include "Settings.h"
--- a/src/modules/imageresizer/dll/ContextMenuHandler.h
+++ b/src/modules/imageresizer/dll/ContextMenuHandler.h
@@ -2,7 +2,7 @@

 #define ID_RESIZE_PICTURES 0
 #define RESIZE_PICTURES_VERBW L"resize"
-#include "stdafx.h"
+#include "pch.h"
 #include "resource.h"
 #include "ImageResizerExt_i.h"

--- a/src/modules/imageresizer/dll/HDropIterator.cpp
+++ b/src/modules/imageresizer/dll/HDropIterator.cpp
@@ -1,4 +1,4 @@
-#include "StdAfx.h"
+#include "pch.h"
 #include "HDropIterator.h"

 HDropIterator::HDropIterator(IDataObject* pdtobj)
--- a/src/modules/imageresizer/dll/ImageResizerExt.cpp
+++ b/src/modules/imageresizer/dll/ImageResizerExt.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "pch.h"
 #include "resource.h"
 #include "ImageResizerExt_i.h"
 #include "dllmain.h"
--- a/src/modules/imageresizer/dll/ImageResizerExt.vcxproj
+++ b/src/modules/imageresizer/dll/ImageResizerExt.vcxproj
@@ -1,5 +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.200316.3\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.200316.3\build\native\Microsoft.Windows.CppWinRT.props')" />
  <ItemGroup Label="ProjectConfigurations">
    <ProjectConfiguration Include="Debug|Win32">
      <Configuration>Debug</Configuration>
@@ -20,8 +21,9 @@
  </ItemGroup>
  <PropertyGroup Label="Globals">
    <ProjectGuid>{0B43679E-EDFA-4DA0-AD30-F4628B308B1B}</ProjectGuid>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
    <Keyword>AtlProj</Keyword>
+    <CppWinRTModernIDL>false</CppWinRTModernIDL>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -269,7 +271,7 @@
      </PrecompiledHeader>
    </ClCompile>
    <ClCompile Include="Settings.cpp" />
-    <ClCompile Include="stdafx.cpp">
+    <ClCompile Include="pch.cpp">
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
@@ -284,7 +286,7 @@
    <ClInclude Include="Settings.h" />
    <ClInclude Include="Resource.h" />
    <ClInclude Include="ImageResizerExt_i.h" />
-    <ClInclude Include="stdafx.h" />
+    <ClInclude Include="pch.h" />
    <ClInclude Include="targetver.h" />
    <ClInclude Include="trace.h" />
  </ItemGroup>
@@ -295,6 +297,7 @@
    <None Include="ContextMenuHandler.rgs" />
    <None Include="ImageResizerExt.def" />
    <None Include="ImageResizerExt.rgs" />
+    <None Include="packages.config" />
  </ItemGroup>
  <ItemGroup>
    <Midl Include="ImageResizerExt.idl" />
@@ -309,5 +312,13 @@
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
+    <Import Project="..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.200316.3\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.200316.3\build\native\Microsoft.Windows.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\Microsoft.Windows.CppWinRT.2.0.200316.3\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.200316.3\build\native\Microsoft.Windows.CppWinRT.props'))" />
+    <Error Condition="!Exists('..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.200316.3\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Microsoft.Windows.CppWinRT.2.0.200316.3\build\native\Microsoft.Windows.CppWinRT.targets'))" />
+  </Target>
 </Project>
--- a/src/modules/imageresizer/dll/ImageResizerExt.vcxproj.filters
+++ b/src/modules/imageresizer/dll/ImageResizerExt.vcxproj.filters
@@ -19,18 +19,12 @@
    </Filter>
  </ItemGroup>
  <ItemGroup>
-    <ClCompile Include="stdafx.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
    <ClCompile Include="ImageResizerExt.cpp">
      <Filter>Source Files</Filter>
    </ClCompile>
    <ClCompile Include="dllmain.cpp">
      <Filter>Source Files</Filter>
    </ClCompile>
-    <ClCompile Include="ImageResizerExt_i.c">
-      <Filter>Generated Files</Filter>
-    </ClCompile>
    <ClCompile Include="ContextMenuHandler.cpp">
      <Filter>Source Files</Filter>
    </ClCompile>
@@ -46,11 +40,14 @@
    <ClInclude Include="trace.h">
      <Filter>Header Files</Filter>
    </ClInclude>
+    <ClCompile Include="ImageResizerExt_i.c">
+      <Filter>Generated Files</Filter>
+    </ClCompile>
+    <ClCompile Include="pch.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
  </ItemGroup>
  <ItemGroup>
-    <ClInclude Include="stdafx.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
    <ClInclude Include="targetver.h">
      <Filter>Header Files</Filter>
    </ClInclude>
@@ -60,9 +57,6 @@
    <ClInclude Include="dllmain.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="ImageResizerExt_i.h">
-      <Filter>Generated Files</Filter>
-    </ClInclude>
    <ClInclude Include="ContextMenuHandler.h">
      <Filter>Header Files</Filter>
    </ClInclude>
@@ -72,6 +66,12 @@
    <ClInclude Include="Settings.h">
      <Filter>Header Files</Filter>
    </ClInclude>
+    <ClInclude Include="ImageResizerExt_i.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="pch.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
  </ItemGroup>
  <ItemGroup>
    <ResourceCompile Include="ImageResizerExt.rc">
@@ -88,15 +88,16 @@
    <None Include="ContextMenuHandler.rgs">
      <Filter>Resource Files</Filter>
    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <Midl Include="ImageResizerExt.idl">
-      <Filter>Source Files</Filter>
-    </Midl>
+    <None Include="packages.config" />
  </ItemGroup>
  <ItemGroup>
    <Image Include="..\ui\Resources\ImageResizer.ico">
      <Filter>Resource Files</Filter>
    </Image>
  </ItemGroup>
+  <ItemGroup>
+    <Midl Include="ImageResizerExt.idl">
+      <Filter>Source Files</Filter>
+    </Midl>
+  </ItemGroup>
 </Project>
--- a/src/modules/imageresizer/dll/Settings.cpp
+++ b/src/modules/imageresizer/dll/Settings.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "pch.h"
 #include <commctrl.h>
 #include "Settings.h"

--- a/src/modules/imageresizer/dll/dllmain.cpp
+++ b/src/modules/imageresizer/dll/dllmain.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "pch.h"
 #include "resource.h"
 #include "ImageResizerExt_i.h"
 #include "dllmain.h"
--- a/src/modules/imageresizer/dll/packages.config
+++ b/src/modules/imageresizer/dll/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Microsoft.Windows.CppWinRT" version="2.0.200316.3" targetFramework="native" />
+</packages>
--- a/src/modules/imageresizer/dll/stdafx.cpp
+++ b/src/modules/imageresizer/dll/stdafx.cpp
@@ -1,2 +1,2 @@
-#include "stdafx.h"
+#include "pch.h"
 #pragma comment(lib, "windowsapp")
--- a/src/modules/imageresizer/dll/stdafx.h
+++ b/src/modules/imageresizer/dll/stdafx.h
@@ -13,6 +13,8 @@
 #include "resource.h"

 #include <winrt/base.h>
+#include <winrt/Windows.Foundation.h>
+#include <winrt/Windows.Foundation.Collections.h>
 #include <atlbase.h>
 #include <atlcom.h>
 #include <atlfile.h>
--- a/src/modules/imageresizer/dll/trace.cpp
+++ b/src/modules/imageresizer/dll/trace.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "pch.h"
 #include "trace.h"

 TRACELOGGING_DEFINE_PROVIDER(