fix for broken project file compatibility in VS2019 16.6.0

4 files changed, 102 insertions, 20 deletions

diff --git a/plugins/PluginUpdater/PluginUpdater.vcxproj b/plugins/PluginUpdater/PluginUpdater.vcxproj
index 4722fed6f1..7c83aa1f5b 100644
--- a/plugins/PluginUpdater/PluginUpdater.vcxproj
+++ b/plugins/PluginUpdater/PluginUpdater.vcxproj
@@ -26,6 +26,25 @@
     <Import Project="$(ProjectDir)..\..\build\vc.common\plugin.props" />

   </ImportGroup>

   <ItemGroup>

+    <ClCompile Include="src\checksum.cpp" />

+    <ClCompile Include="src\DlgListNew.cpp" />

+    <ClCompile Include="src\DlgUpdate.cpp" />

+    <ClCompile Include="src\Events.cpp" />

+    <ClCompile Include="src\Notifications.cpp" />

+    <ClCompile Include="src\Options.cpp" />

+    <ClCompile Include="src\PluginUpdater.cpp" />

+    <ClCompile Include="src\Services.cpp" />

+    <ClCompile Include="src\stdafx.cxx">

+      <PrecompiledHeader>Create</PrecompiledHeader>

+    </ClCompile>

+    <ClCompile Include="src\unzipfile.cpp" />

+    <ClCompile Include="src\Utils.cpp" />

+    <ClInclude Include="src\Notifications.h" />

+    <ClInclude Include="src\resource.h" />

+    <ClInclude Include="src\stdafx.h" />

+    <ClInclude Include="src\version.h" />

+  </ItemGroup>

+  <ItemGroup>

     <ProjectReference Include="..\..\libs\zlib\zlib.vcxproj">

       <Project>{e2a369cd-eda3-414f-8ad0-e732cd7ee68c}</Project>

     </ProjectReference>

@@ -37,4 +56,8 @@
     <Image Include="res\menu.ico" />

     <Image Include="res\PlgList.ico" />

   </ItemGroup>

+  <ItemGroup>

+    <ResourceCompile Include="res\Resource.rc" />

+    <ResourceCompile Include="res\Version.rc" />

+  </ItemGroup>

 </Project>
\ No newline at end of file
diff --git a/plugins/PluginUpdater/PluginUpdater.vcxproj.filters b/plugins/PluginUpdater/PluginUpdater.vcxproj.filters
index 902edc4d65..fa518e6a97 100644
--- a/plugins/PluginUpdater/PluginUpdater.vcxproj.filters
+++ b/plugins/PluginUpdater/PluginUpdater.vcxproj.filters
@@ -2,17 +2,77 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

   <Import Project="$(ProjectDir)..\..\build\vc.common\common.filters" />

   <ItemGroup>

-    <ClInclude Include="src\*.h">

-      <Filter>Header Files</Filter>

-    </ClInclude>

-    <ClCompile Include="src\*.cpp;src\*.cxx">

+    <ClCompile Include="src\checksum.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\DlgListNew.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\DlgUpdate.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\Events.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\Notifications.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\Options.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\PluginUpdater.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\Services.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\stdafx.cxx">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\unzipfile.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\Utils.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ResourceCompile Include="res\*.rc">

+  </ItemGroup>

+  <ItemGroup>

+    <ClInclude Include="src\Notifications.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\resource.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\stdafx.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\version.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+  </ItemGroup>

+  <ItemGroup>

+    <ResourceCompile Include="res\Resource.rc">

       <Filter>Resource Files</Filter>

     </ResourceCompile>

-    <None Include="res\*.ico;res\*.bmp;res\*.cur">

+    <ResourceCompile Include="res\Version.rc">

+      <Filter>Resource Files</Filter>

+    </ResourceCompile>

+  </ItemGroup>

+  <ItemGroup>

+    <Image Include="res\btnClose.ico">

+      <Filter>Resource Files</Filter>

+    </Image>

+    <Image Include="res\btnOk.ico">

+      <Filter>Resource Files</Filter>

+    </Image>

+    <Image Include="res\info.ico">

+      <Filter>Resource Files</Filter>

+    </Image>

+    <Image Include="res\menu.ico">

+      <Filter>Resource Files</Filter>

+    </Image>

+    <Image Include="res\PlgList.ico">

       <Filter>Resource Files</Filter>

-    </None>

+    </Image>

   </ItemGroup>

 </Project>
\ No newline at end of file
diff --git a/plugins/PluginUpdater/pu_stub/pu_stub.vcxproj b/plugins/PluginUpdater/pu_stub/pu_stub.vcxproj
index 4501f5dae8..60d57d7df3 100644
--- a/plugins/PluginUpdater/pu_stub/pu_stub.vcxproj
+++ b/plugins/PluginUpdater/pu_stub/pu_stub.vcxproj
@@ -27,6 +27,13 @@
   <ImportGroup Label="PropertySheets">
     <Import Project="$(ProjectDir)..\..\..\build\vc.common\app.props" />
   </ImportGroup>
+  <ItemGroup>
+    <ClCompile Include="src\pu_stub.cpp" />
+    <ClCompile Include="src\stdafx.cxx">
+      <PrecompiledHeader>Create</PrecompiledHeader>
+    </ClCompile>
+    <ClInclude Include="src\stdafx.h" />
+  </ItemGroup>
   <ItemDefinitionGroup>
     <Link>
       <SubSystem>Windows</SubSystem>
diff --git a/plugins/PluginUpdater/pu_stub/pu_stub.vcxproj.filters b/plugins/PluginUpdater/pu_stub/pu_stub.vcxproj.filters
index 83cffdb711..d7e0785d8f 100644
--- a/plugins/PluginUpdater/pu_stub/pu_stub.vcxproj.filters
+++ b/plugins/PluginUpdater/pu_stub/pu_stub.vcxproj.filters
@@ -1,18 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(ProjectDir)..\..\build\vc.common\common.filters" />
   <ItemGroup>
-    <ClInclude Include="src\*.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClCompile Include="src\*.cpp;src\*.cxx">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ResourceCompile Include="res\*.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
-    <None Include="res\*.ico;res\*.bmp;res\*.cur">
-      <Filter>Resource Files</Filter>
-    </None>
+    <ClCompile Include="src\pu_stub.cpp" />
+    <ClCompile Include="src\stdafx.cxx" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="src\stdafx.h" />
   </ItemGroup>
 </Project>
\ No newline at end of file