From 23c2fa447d7f5d577171778ae1a663d680a8635b Mon Sep 17 00:00:00 2001
From: Alexander Riccio <test35965@gmail.com>
Date: Wed, 1 Apr 2020 18:44:25 -0400
Subject: [PATCH 1/7] Tweak pcbuild settings to reduce the size of the
 pyshellext shell extension

pyshellext.dll 32 bit size reduction:  -17KB
pyshellext_d.dll 32 bit size reduction:  -53KB
pyshellext.dll 64 bit size reduction:  -22KB
pyshellext_d.dll 64 bit size reduction:  -67KB
---
 .../2020-04-01-18-44-11.bpo-40145.oG7AzX.rst  |   4 +
 PCbuild/pyshellext.vcxproj                    | 160 ++++++++++++++++++
 2 files changed, 164 insertions(+)
 create mode 100644 Misc/NEWS.d/next/Windows/2020-04-01-18-44-11.bpo-40145.oG7AzX.rst

diff --git a/Misc/NEWS.d/next/Windows/2020-04-01-18-44-11.bpo-40145.oG7AzX.rst b/Misc/NEWS.d/next/Windows/2020-04-01-18-44-11.bpo-40145.oG7AzX.rst
new file mode 100644
index 000000000000000..0f4fd2fbd501971
--- /dev/null
+++ b/Misc/NEWS.d/next/Windows/2020-04-01-18-44-11.bpo-40145.oG7AzX.rst
@@ -0,0 +1,4 @@
+Tweaked the pcbuild options for pyshellext to reduce the size of the binary.
+Since this is a very simple component, there really isn't much benefit of
+optimizing for speed, likely the slowest part of this component's lifetime
+is simply loading it. Total size reduction is approx 40% in release builds.
diff --git a/PCbuild/pyshellext.vcxproj b/PCbuild/pyshellext.vcxproj
index 655054e3723b431..87b0314c718080f 100644
--- a/PCbuild/pyshellext.vcxproj
+++ b/PCbuild/pyshellext.vcxproj
@@ -78,12 +78,66 @@
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='PGInstrument|ARM'">
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='PGUpdate|ARM'">
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'">
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'">
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='PGInstrument|x64'">
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='PGUpdate|x64'">
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <PropertyGroup>
     <MakeVersionInfoBeforeTarget>ClCompile</MakeVersionInfoBeforeTarget>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='PGInstrument|ARM'">
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='PGUpdate|ARM'">
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='PGInstrument|x64'">
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='PGUpdate|x64'">
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
   <ImportGroup Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="pyproject.props" />
@@ -92,11 +146,117 @@
   <ItemDefinitionGroup>
     <ClCompile>
       <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='PGInstrument|ARM'">MinSpace</Optimization>
+      <InlineFunctionExpansion Condition="'$(Configuration)|$(Platform)'=='PGInstrument|ARM'">AnySuitable</InlineFunctionExpansion>
+      <FavorSizeOrSpeed Condition="'$(Configuration)|$(Platform)'=='PGInstrument|ARM'">Size</FavorSizeOrSpeed>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='PGUpdate|ARM'">MinSpace</Optimization>
+      <InlineFunctionExpansion Condition="'$(Configuration)|$(Platform)'=='PGUpdate|ARM'">AnySuitable</InlineFunctionExpansion>
+      <FavorSizeOrSpeed Condition="'$(Configuration)|$(Platform)'=='PGUpdate|ARM'">Size</FavorSizeOrSpeed>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">MinSpace</Optimization>
+      <InlineFunctionExpansion Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">AnySuitable</InlineFunctionExpansion>
+      <FavorSizeOrSpeed Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">Size</FavorSizeOrSpeed>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'">MinSpace</Optimization>
+      <InlineFunctionExpansion Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'">AnySuitable</InlineFunctionExpansion>
+      <FavorSizeOrSpeed Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'">Size</FavorSizeOrSpeed>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'">MinSpace</Optimization>
+      <InlineFunctionExpansion Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'">AnySuitable</InlineFunctionExpansion>
+      <FavorSizeOrSpeed Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'">Size</FavorSizeOrSpeed>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MinSpace</Optimization>
+      <InlineFunctionExpansion Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AnySuitable</InlineFunctionExpansion>
+      <FavorSizeOrSpeed Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Size</FavorSizeOrSpeed>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='PGInstrument|x64'">MinSpace</Optimization>
+      <InlineFunctionExpansion Condition="'$(Configuration)|$(Platform)'=='PGInstrument|x64'">AnySuitable</InlineFunctionExpansion>
+      <FavorSizeOrSpeed Condition="'$(Configuration)|$(Platform)'=='PGInstrument|x64'">Size</FavorSizeOrSpeed>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='PGUpdate|x64'">MinSpace</Optimization>
+      <InlineFunctionExpansion Condition="'$(Configuration)|$(Platform)'=='PGUpdate|x64'">AnySuitable</InlineFunctionExpansion>
+      <FavorSizeOrSpeed Condition="'$(Configuration)|$(Platform)'=='PGUpdate|x64'">Size</FavorSizeOrSpeed>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MinSpace</Optimization>
+      <InlineFunctionExpansion Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AnySuitable</InlineFunctionExpansion>
+      <FavorSizeOrSpeed Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Size</FavorSizeOrSpeed>
+      <RuntimeTypeInfo Condition="'$(Configuration)|$(Platform)'=='PGInstrument|ARM'">false</RuntimeTypeInfo>
+      <RuntimeTypeInfo Condition="'$(Configuration)|$(Platform)'=='PGUpdate|ARM'">false</RuntimeTypeInfo>
+      <RuntimeTypeInfo Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</RuntimeTypeInfo>
+      <RuntimeTypeInfo Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'">false</RuntimeTypeInfo>
+      <RuntimeTypeInfo Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'">false</RuntimeTypeInfo>
+      <RuntimeTypeInfo Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</RuntimeTypeInfo>
+      <RuntimeTypeInfo Condition="'$(Configuration)|$(Platform)'=='PGInstrument|x64'">false</RuntimeTypeInfo>
+      <RuntimeTypeInfo Condition="'$(Configuration)|$(Platform)'=='PGUpdate|x64'">false</RuntimeTypeInfo>
+      <RuntimeTypeInfo Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</RuntimeTypeInfo>
+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">/Zo</AdditionalOptions>
+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='PGInstrument|ARM'">/Zo</AdditionalOptions>
+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='PGUpdate|ARM'">/Zo</AdditionalOptions>
+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">/Zo</AdditionalOptions>
+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">/Zo</AdditionalOptions>
+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'">/Zo</AdditionalOptions>
+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'">/Zo</AdditionalOptions>
+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">/Zo</AdditionalOptions>
+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">/Zo</AdditionalOptions>
+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='PGInstrument|x64'">/Zo</AdditionalOptions>
+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='PGUpdate|x64'">/Zo</AdditionalOptions>
+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">/Zo</AdditionalOptions>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">MinSpace</Optimization>
+      <InlineFunctionExpansion Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">AnySuitable</InlineFunctionExpansion>
+      <FavorSizeOrSpeed Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">Size</FavorSizeOrSpeed>
+      <WholeProgramOptimization Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</WholeProgramOptimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">MinSpace</Optimization>
+      <InlineFunctionExpansion Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AnySuitable</InlineFunctionExpansion>
+      <FavorSizeOrSpeed Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Size</FavorSizeOrSpeed>
+      <WholeProgramOptimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</WholeProgramOptimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">MinSpace</Optimization>
+      <InlineFunctionExpansion Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AnySuitable</InlineFunctionExpansion>
+      <FavorSizeOrSpeed Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Size</FavorSizeOrSpeed>
+      <WholeProgramOptimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</WholeProgramOptimization>
+      <RuntimeTypeInfo Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</RuntimeTypeInfo>
+      <RuntimeTypeInfo Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</RuntimeTypeInfo>
+      <RuntimeTypeInfo Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</RuntimeTypeInfo>
     </ClCompile>
     <Link>
       <AdditionalDependencies>version.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SubSystem>Console</SubSystem>
       <ModuleDefinitionFile>..\PC\pyshellext$(PyDebugExt).def</ModuleDefinitionFile>
+      <OptimizeReferences Condition="'$(Configuration)|$(Platform)'=='PGInstrument|ARM'">true</OptimizeReferences>
+      <EnableCOMDATFolding Condition="'$(Configuration)|$(Platform)'=='PGInstrument|ARM'">true</EnableCOMDATFolding>
+      <OptimizeReferences Condition="'$(Configuration)|$(Platform)'=='PGUpdate|ARM'">true</OptimizeReferences>
+      <EnableCOMDATFolding Condition="'$(Configuration)|$(Platform)'=='PGUpdate|ARM'">true</EnableCOMDATFolding>
+      <OptimizeReferences Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</OptimizeReferences>
+      <EnableCOMDATFolding Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</EnableCOMDATFolding>
+      <OptimizeReferences Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'">true</OptimizeReferences>
+      <EnableCOMDATFolding Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'">true</EnableCOMDATFolding>
+      <LinkTimeCodeGeneration Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'">UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
+      <OptimizeReferences Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'">true</OptimizeReferences>
+      <EnableCOMDATFolding Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'">true</EnableCOMDATFolding>
+      <LinkTimeCodeGeneration Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'">UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
+      <OptimizeReferences Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</OptimizeReferences>
+      <EnableCOMDATFolding Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</EnableCOMDATFolding>
+      <OptimizeReferences Condition="'$(Configuration)|$(Platform)'=='PGInstrument|x64'">true</OptimizeReferences>
+      <EnableCOMDATFolding Condition="'$(Configuration)|$(Platform)'=='PGInstrument|x64'">true</EnableCOMDATFolding>
+      <LinkTimeCodeGeneration Condition="'$(Configuration)|$(Platform)'=='PGInstrument|x64'">UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
+      <OptimizeReferences Condition="'$(Configuration)|$(Platform)'=='PGUpdate|x64'">true</OptimizeReferences>
+      <EnableCOMDATFolding Condition="'$(Configuration)|$(Platform)'=='PGUpdate|x64'">true</EnableCOMDATFolding>
+      <LinkTimeCodeGeneration Condition="'$(Configuration)|$(Platform)'=='PGUpdate|x64'">UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
+      <OptimizeReferences Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</OptimizeReferences>
+      <EnableCOMDATFolding Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</EnableCOMDATFolding>
+      <GenerateDebugInformation Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">DebugFull</GenerateDebugInformation>
+      <GenerateDebugInformation Condition="'$(Configuration)|$(Platform)'=='PGInstrument|ARM'">DebugFull</GenerateDebugInformation>
+      <GenerateDebugInformation Condition="'$(Configuration)|$(Platform)'=='PGUpdate|ARM'">DebugFull</GenerateDebugInformation>
+      <GenerateDebugInformation Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">DebugFull</GenerateDebugInformation>
+      <GenerateDebugInformation Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">DebugFull</GenerateDebugInformation>
+      <GenerateDebugInformation Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'">DebugFull</GenerateDebugInformation>
+      <GenerateDebugInformation Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'">DebugFull</GenerateDebugInformation>
+      <GenerateDebugInformation Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">DebugFull</GenerateDebugInformation>
+      <GenerateDebugInformation Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">DebugFull</GenerateDebugInformation>
+      <GenerateDebugInformation Condition="'$(Configuration)|$(Platform)'=='PGInstrument|x64'">DebugFull</GenerateDebugInformation>
+      <GenerateDebugInformation Condition="'$(Configuration)|$(Platform)'=='PGUpdate|x64'">DebugFull</GenerateDebugInformation>
+      <GenerateDebugInformation Condition="'$(Configuration)|$(Platform)'=='Release|x64'">DebugFull</GenerateDebugInformation>
+      <OptimizeReferences Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</OptimizeReferences>
+      <EnableCOMDATFolding Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</EnableCOMDATFolding>
+      <LinkTimeCodeGeneration Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
+      <OptimizeReferences Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</OptimizeReferences>
+      <EnableCOMDATFolding Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EnableCOMDATFolding>
+      <LinkTimeCodeGeneration Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
+      <OptimizeReferences Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</OptimizeReferences>
+      <EnableCOMDATFolding Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EnableCOMDATFolding>
+      <LinkTimeCodeGeneration Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
     </Link>
     <Midl>
       <CompileInterface>true</CompileInterface>

From 1a7a4d1a8bbbc650d99b730988b4f5709e1242fb Mon Sep 17 00:00:00 2001
From: Alexander Riccio <test35965@gmail.com>
Date: Tue, 16 Jun 2020 17:00:35 -0400
Subject: [PATCH 2/7] resuming work on patch after two month hiatus

some changes uncommitted since last commit. committing now.
---
 PCbuild/pyshellext.vcxproj | 218 ++++++++++++++++++++++---------------
 1 file changed, 128 insertions(+), 90 deletions(-)

diff --git a/PCbuild/pyshellext.vcxproj b/PCbuild/pyshellext.vcxproj
index 87b0314c718080f..422ebf19f8fe3ce 100644
--- a/PCbuild/pyshellext.vcxproj
+++ b/PCbuild/pyshellext.vcxproj
@@ -78,66 +78,85 @@
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='PGInstrument|ARM'">
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='PGUpdate|ARM'">
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'">
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'">
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='PGInstrument|x64'">
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='PGUpdate|x64'">
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
+  <When Condition="'$(Configuration)|$(Platform)'=='PGInstrument|ARM'">
+    <PropertyGroup Label="Configuration">
+      <WholeProgramOptimization>true</WholeProgramOptimization>
+    </PropertyGroup>
+    <PropertyGroup>
+      <LinkIncremental>false</LinkIncremental>
+    </PropertyGroup>
+  </When>
+
+  <When Condition="'$(Configuration)|$(Platform)'=='PGUpdate|ARM'">
+    <PropertyGroup Label="Configuration">
+      <WholeProgramOptimization>true</WholeProgramOptimization>
+    </PropertyGroup>
+    <PropertyGroup>
+      <LinkIncremental>false</LinkIncremental>
+    </PropertyGroup>
+  </When>
+  <When Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
+    <PropertyGroup Label="Configuration">
+      <WholeProgramOptimization>true</WholeProgramOptimization>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
+      <LinkIncremental>false</LinkIncremental>
+    </PropertyGroup>
+  </When>
+  <When Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'">
+    <PropertyGroup Label="Configuration">
+      <WholeProgramOptimization>true</WholeProgramOptimization>
+    </PropertyGroup>
+    <PropertyGroup>
+      <LinkIncremental>false</LinkIncremental>
+    </PropertyGroup>
+  </When>
+  <When Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'">
+    <PropertyGroup Label="Configuration">
+      <WholeProgramOptimization>true</WholeProgramOptimization>
+    </PropertyGroup>
+    <PropertyGroup>
+      <LinkIncremental>false</LinkIncremental>
+    </PropertyGroup>
+  </When>
+  <When Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <PropertyGroup Label="Configuration">
+      <WholeProgramOptimization>true</WholeProgramOptimization>
+    </PropertyGroup>
+    <PropertyGroup>
+      <LinkIncremental>false</LinkIncremental>
+    </PropertyGroup>
+  </When>
+  <When Condition="'$(Configuration)|$(Platform)'=='PGInstrument|x64'">
+    <PropertyGroup Label="Configuration">
+      <WholeProgramOptimization>true</WholeProgramOptimization>
+    </PropertyGroup>
+    <PropertyGroup>
+      <LinkIncremental>false</LinkIncremental>
+    </PropertyGroup>
+  </When>
+  <When Condition="'$(Configuration)|$(Platform)'=='PGUpdate|x64'">
+    <PropertyGroup Label="Configuration">
+      <WholeProgramOptimization>true</WholeProgramOptimization>
+    </PropertyGroup>
+    <PropertyGroup>
+      <LinkIncremental>false</LinkIncremental>
+    </PropertyGroup>
+  </When>
+  <When Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <PropertyGroup Label="Configuration">
+      <WholeProgramOptimization>true</WholeProgramOptimization>
+    </PropertyGroup>
+    <PropertyGroup>
+      <LinkIncremental>false</LinkIncremental>
+    </PropertyGroup>
+  </When>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <PropertyGroup>
     <MakeVersionInfoBeforeTarget>ClCompile</MakeVersionInfoBeforeTarget>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='PGInstrument|ARM'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='PGUpdate|ARM'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='PGInstrument|x64'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='PGUpdate|x64'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
   <ImportGroup Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="pyproject.props" />
@@ -146,42 +165,60 @@
   <ItemDefinitionGroup>
     <ClCompile>
       <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='PGInstrument|ARM'">MinSpace</Optimization>
-      <InlineFunctionExpansion Condition="'$(Configuration)|$(Platform)'=='PGInstrument|ARM'">AnySuitable</InlineFunctionExpansion>
-      <FavorSizeOrSpeed Condition="'$(Configuration)|$(Platform)'=='PGInstrument|ARM'">Size</FavorSizeOrSpeed>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='PGUpdate|ARM'">MinSpace</Optimization>
-      <InlineFunctionExpansion Condition="'$(Configuration)|$(Platform)'=='PGUpdate|ARM'">AnySuitable</InlineFunctionExpansion>
-      <FavorSizeOrSpeed Condition="'$(Configuration)|$(Platform)'=='PGUpdate|ARM'">Size</FavorSizeOrSpeed>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">MinSpace</Optimization>
-      <InlineFunctionExpansion Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">AnySuitable</InlineFunctionExpansion>
-      <FavorSizeOrSpeed Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">Size</FavorSizeOrSpeed>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'">MinSpace</Optimization>
-      <InlineFunctionExpansion Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'">AnySuitable</InlineFunctionExpansion>
-      <FavorSizeOrSpeed Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'">Size</FavorSizeOrSpeed>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'">MinSpace</Optimization>
-      <InlineFunctionExpansion Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'">AnySuitable</InlineFunctionExpansion>
-      <FavorSizeOrSpeed Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'">Size</FavorSizeOrSpeed>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MinSpace</Optimization>
-      <InlineFunctionExpansion Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AnySuitable</InlineFunctionExpansion>
-      <FavorSizeOrSpeed Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Size</FavorSizeOrSpeed>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='PGInstrument|x64'">MinSpace</Optimization>
-      <InlineFunctionExpansion Condition="'$(Configuration)|$(Platform)'=='PGInstrument|x64'">AnySuitable</InlineFunctionExpansion>
-      <FavorSizeOrSpeed Condition="'$(Configuration)|$(Platform)'=='PGInstrument|x64'">Size</FavorSizeOrSpeed>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='PGUpdate|x64'">MinSpace</Optimization>
-      <InlineFunctionExpansion Condition="'$(Configuration)|$(Platform)'=='PGUpdate|x64'">AnySuitable</InlineFunctionExpansion>
-      <FavorSizeOrSpeed Condition="'$(Configuration)|$(Platform)'=='PGUpdate|x64'">Size</FavorSizeOrSpeed>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MinSpace</Optimization>
-      <InlineFunctionExpansion Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AnySuitable</InlineFunctionExpansion>
-      <FavorSizeOrSpeed Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Size</FavorSizeOrSpeed>
-      <RuntimeTypeInfo Condition="'$(Configuration)|$(Platform)'=='PGInstrument|ARM'">false</RuntimeTypeInfo>
-      <RuntimeTypeInfo Condition="'$(Configuration)|$(Platform)'=='PGUpdate|ARM'">false</RuntimeTypeInfo>
-      <RuntimeTypeInfo Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</RuntimeTypeInfo>
-      <RuntimeTypeInfo Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'">false</RuntimeTypeInfo>
-      <RuntimeTypeInfo Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'">false</RuntimeTypeInfo>
-      <RuntimeTypeInfo Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</RuntimeTypeInfo>
-      <RuntimeTypeInfo Condition="'$(Configuration)|$(Platform)'=='PGInstrument|x64'">false</RuntimeTypeInfo>
-      <RuntimeTypeInfo Condition="'$(Configuration)|$(Platform)'=='PGUpdate|x64'">false</RuntimeTypeInfo>
-      <RuntimeTypeInfo Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</RuntimeTypeInfo>
+      <When Condition="'$(Configuration)|$(Platform)'=='PGInstrument|ARM'">
+        <Optimization>MinSpace</Optimization>
+        <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+        <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
+        <RuntimeTypeInfo>false</RuntimeTypeInfo>
+      </When>
+      <When Condition="'$(Configuration)|$(Platform)'=='PGUpdate|ARM'">
+        <Optimization>MinSpace</Optimization>
+        <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+        <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
+        <RuntimeTypeInfo>false</RuntimeTypeInfo>
+      </When>
+      <When Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
+        <Optimization>MinSpace</Optimization>
+        <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+        <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
+        <RuntimeTypeInfo>false</RuntimeTypeInfo>
+      </When>
+      <When Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'">
+        <Optimization>MinSpace</Optimization>
+        <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+        <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
+        <RuntimeTypeInfo>false</RuntimeTypeInfo>
+      </When>
+      <When Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'">
+        <Optimization>MinSpace</Optimization>
+        <InlineFunctionExpansionAnySuitable</InlineFunctionExpansion>
+        <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
+        <RuntimeTypeInfo>false</RuntimeTypeInfo>
+      </When>
+      <When Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+        <Optimization>MinSpace</Optimization>
+        <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+        <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
+        <RuntimeTypeInfo>false</RuntimeTypeInfo>
+      </When>
+      <When Condition="'$(Configuration)|$(Platform)'=='PGInstrument|x64'">
+        <Optimization>MinSpace</Optimization>
+        <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+        <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
+        <RuntimeTypeInfo>false</RuntimeTypeInfo>
+      </When>
+      <When Condition="'$(Configuration)|$(Platform)'=='PGUpdate|x64'">
+        <Optimization>MinSpace</Optimization>
+        <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+        <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
+        <RuntimeTypeInfo>false</RuntimeTypeInfo>
+      </When>
+      <When Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+        <Optimization>MinSpace</Optimization>
+        <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+        <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
+        <RuntimeTypeInfo>false</RuntimeTypeInfo>
+      </When>
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">/Zo</AdditionalOptions>
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='PGInstrument|ARM'">/Zo</AdditionalOptions>
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='PGUpdate|ARM'">/Zo</AdditionalOptions>
@@ -194,6 +231,7 @@
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='PGInstrument|x64'">/Zo</AdditionalOptions>
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='PGUpdate|x64'">/Zo</AdditionalOptions>
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">/Zo</AdditionalOptions>
+
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">MinSpace</Optimization>
       <InlineFunctionExpansion Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">AnySuitable</InlineFunctionExpansion>
       <FavorSizeOrSpeed Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">Size</FavorSizeOrSpeed>

From 16f909de73e3fdd3054228bbece426b4d0a8bdfd Mon Sep 17 00:00:00 2001
From: Alexander Riccio <test35965@gmail.com>
Date: Fri, 19 Jun 2020 20:26:59 -0400
Subject: [PATCH 3/7] didnt work

was gonna finish this this week, but now my grandma is dying.
---
 PCbuild/pyshellext.vcxproj | 306 ++++++++++++++-----------------------
 1 file changed, 112 insertions(+), 194 deletions(-)

diff --git a/PCbuild/pyshellext.vcxproj b/PCbuild/pyshellext.vcxproj
index 422ebf19f8fe3ce..aaabd1024cc9eb2 100644
--- a/PCbuild/pyshellext.vcxproj
+++ b/PCbuild/pyshellext.vcxproj
@@ -77,224 +77,142 @@
   <PropertyGroup Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <When Condition="'$(Configuration)|$(Platform)'=='PGInstrument|ARM'">
-    <PropertyGroup Label="Configuration">
-      <WholeProgramOptimization>true</WholeProgramOptimization>
-    </PropertyGroup>
-    <PropertyGroup>
-      <LinkIncremental>false</LinkIncremental>
-    </PropertyGroup>
-  </When>
-
-  <When Condition="'$(Configuration)|$(Platform)'=='PGUpdate|ARM'">
-    <PropertyGroup Label="Configuration">
-      <WholeProgramOptimization>true</WholeProgramOptimization>
-    </PropertyGroup>
-    <PropertyGroup>
-      <LinkIncremental>false</LinkIncremental>
-    </PropertyGroup>
-  </When>
-  <When Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
-    <PropertyGroup Label="Configuration">
-      <WholeProgramOptimization>true</WholeProgramOptimization>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
-      <LinkIncremental>false</LinkIncremental>
-    </PropertyGroup>
-  </When>
-  <When Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'">
-    <PropertyGroup Label="Configuration">
-      <WholeProgramOptimization>true</WholeProgramOptimization>
-    </PropertyGroup>
-    <PropertyGroup>
-      <LinkIncremental>false</LinkIncremental>
-    </PropertyGroup>
-  </When>
-  <When Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'">
-    <PropertyGroup Label="Configuration">
-      <WholeProgramOptimization>true</WholeProgramOptimization>
-    </PropertyGroup>
-    <PropertyGroup>
-      <LinkIncremental>false</LinkIncremental>
-    </PropertyGroup>
-  </When>
-  <When Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <PropertyGroup Label="Configuration">
-      <WholeProgramOptimization>true</WholeProgramOptimization>
-    </PropertyGroup>
-    <PropertyGroup>
-      <LinkIncremental>false</LinkIncremental>
-    </PropertyGroup>
-  </When>
-  <When Condition="'$(Configuration)|$(Platform)'=='PGInstrument|x64'">
-    <PropertyGroup Label="Configuration">
-      <WholeProgramOptimization>true</WholeProgramOptimization>
-    </PropertyGroup>
-    <PropertyGroup>
-      <LinkIncremental>false</LinkIncremental>
-    </PropertyGroup>
-  </When>
-  <When Condition="'$(Configuration)|$(Platform)'=='PGUpdate|x64'">
-    <PropertyGroup Label="Configuration">
-      <WholeProgramOptimization>true</WholeProgramOptimization>
-    </PropertyGroup>
-    <PropertyGroup>
-      <LinkIncremental>false</LinkIncremental>
-    </PropertyGroup>
-  </When>
-  <When Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <PropertyGroup Label="Configuration">
-      <WholeProgramOptimization>true</WholeProgramOptimization>
-    </PropertyGroup>
-    <PropertyGroup>
-      <LinkIncremental>false</LinkIncremental>
-    </PropertyGroup>
-  </When>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <PropertyGroup>
-    <MakeVersionInfoBeforeTarget>ClCompile</MakeVersionInfoBeforeTarget>
-  </PropertyGroup>
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="pyproject.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    <Choose>
       <When Condition="'$(Configuration)|$(Platform)'=='PGInstrument|ARM'">
-        <Optimization>MinSpace</Optimization>
-        <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-        <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
-        <RuntimeTypeInfo>false</RuntimeTypeInfo>
+        <PropertyGroup Label="Configuration">
+          <WholeProgramOptimization>true</WholeProgramOptimization>
+        </PropertyGroup>
       </When>
+
       <When Condition="'$(Configuration)|$(Platform)'=='PGUpdate|ARM'">
-        <Optimization>MinSpace</Optimization>
-        <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-        <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
-        <RuntimeTypeInfo>false</RuntimeTypeInfo>
+        <PropertyGroup Label="Configuration">
+          <WholeProgramOptimization>true</WholeProgramOptimization>
+        </PropertyGroup>
       </When>
       <When Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
-        <Optimization>MinSpace</Optimization>
-        <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-        <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
-        <RuntimeTypeInfo>false</RuntimeTypeInfo>
+        <PropertyGroup Label="Configuration">
+          <WholeProgramOptimization>true</WholeProgramOptimization>
+        </PropertyGroup>
       </When>
       <When Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'">
-        <Optimization>MinSpace</Optimization>
-        <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-        <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
-        <RuntimeTypeInfo>false</RuntimeTypeInfo>
+        <PropertyGroup Label="Configuration">
+          <WholeProgramOptimization>true</WholeProgramOptimization>
+        </PropertyGroup>
       </When>
       <When Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'">
-        <Optimization>MinSpace</Optimization>
-        <InlineFunctionExpansionAnySuitable</InlineFunctionExpansion>
-        <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
-        <RuntimeTypeInfo>false</RuntimeTypeInfo>
+        <PropertyGroup Label="Configuration">
+          <WholeProgramOptimization>true</WholeProgramOptimization>
+        </PropertyGroup>
       </When>
       <When Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-        <Optimization>MinSpace</Optimization>
-        <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-        <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
-        <RuntimeTypeInfo>false</RuntimeTypeInfo>
+        <PropertyGroup Label="Configuration">
+          <WholeProgramOptimization>true</WholeProgramOptimization>
+        </PropertyGroup>
       </When>
       <When Condition="'$(Configuration)|$(Platform)'=='PGInstrument|x64'">
-        <Optimization>MinSpace</Optimization>
-        <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-        <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
-        <RuntimeTypeInfo>false</RuntimeTypeInfo>
+        <PropertyGroup Label="Configuration">
+          <WholeProgramOptimization>true</WholeProgramOptimization>
+        </PropertyGroup>
       </When>
       <When Condition="'$(Configuration)|$(Platform)'=='PGUpdate|x64'">
-        <Optimization>MinSpace</Optimization>
-        <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-        <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
-        <RuntimeTypeInfo>false</RuntimeTypeInfo>
+        <PropertyGroup Label="Configuration">
+          <WholeProgramOptimization>true</WholeProgramOptimization>
+        </PropertyGroup>
       </When>
       <When Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-        <Optimization>MinSpace</Optimization>
-        <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-        <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
-        <RuntimeTypeInfo>false</RuntimeTypeInfo>
+        <PropertyGroup Label="Configuration">
+          <WholeProgramOptimization>true</WholeProgramOptimization>
+        </PropertyGroup>
       </When>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">/Zo</AdditionalOptions>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='PGInstrument|ARM'">/Zo</AdditionalOptions>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='PGUpdate|ARM'">/Zo</AdditionalOptions>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">/Zo</AdditionalOptions>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">/Zo</AdditionalOptions>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'">/Zo</AdditionalOptions>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'">/Zo</AdditionalOptions>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">/Zo</AdditionalOptions>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">/Zo</AdditionalOptions>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='PGInstrument|x64'">/Zo</AdditionalOptions>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='PGUpdate|x64'">/Zo</AdditionalOptions>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">/Zo</AdditionalOptions>
+    </Choose>
+  </PropertyGroup>
 
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">MinSpace</Optimization>
-      <InlineFunctionExpansion Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">AnySuitable</InlineFunctionExpansion>
-      <FavorSizeOrSpeed Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">Size</FavorSizeOrSpeed>
-      <WholeProgramOptimization Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</WholeProgramOptimization>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">MinSpace</Optimization>
-      <InlineFunctionExpansion Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AnySuitable</InlineFunctionExpansion>
-      <FavorSizeOrSpeed Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Size</FavorSizeOrSpeed>
-      <WholeProgramOptimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</WholeProgramOptimization>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">MinSpace</Optimization>
-      <InlineFunctionExpansion Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AnySuitable</InlineFunctionExpansion>
-      <FavorSizeOrSpeed Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Size</FavorSizeOrSpeed>
-      <WholeProgramOptimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</WholeProgramOptimization>
-      <RuntimeTypeInfo Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</RuntimeTypeInfo>
-      <RuntimeTypeInfo Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</RuntimeTypeInfo>
-      <RuntimeTypeInfo Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</RuntimeTypeInfo>
+  <PropertyGroup>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+
+  
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <PropertyGroup>
+    <MakeVersionInfoBeforeTarget>ClCompile</MakeVersionInfoBeforeTarget>
+  </PropertyGroup>
+  <ImportGroup Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="pyproject.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Optimization>MinSpace</Optimization>
+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
+      <RuntimeTypeInfo>false</RuntimeTypeInfo>
+      <AdditionalOptions>/Zo</AdditionalOptions>
+      <Choose>
+        <When Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
+          <WholeProgramOptimization>true</WholeProgramOptimization>
+        </When>
+        <When Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+          <WholeProgramOptimization>true</WholeProgramOptimization>
+        </When>
+        <When Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+          <WholeProgramOptimization>true</WholeProgramOptimization>
+        </When>
+      </Choose>
     </ClCompile>
     <Link>
       <AdditionalDependencies>version.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SubSystem>Console</SubSystem>
       <ModuleDefinitionFile>..\PC\pyshellext$(PyDebugExt).def</ModuleDefinitionFile>
-      <OptimizeReferences Condition="'$(Configuration)|$(Platform)'=='PGInstrument|ARM'">true</OptimizeReferences>
-      <EnableCOMDATFolding Condition="'$(Configuration)|$(Platform)'=='PGInstrument|ARM'">true</EnableCOMDATFolding>
-      <OptimizeReferences Condition="'$(Configuration)|$(Platform)'=='PGUpdate|ARM'">true</OptimizeReferences>
-      <EnableCOMDATFolding Condition="'$(Configuration)|$(Platform)'=='PGUpdate|ARM'">true</EnableCOMDATFolding>
-      <OptimizeReferences Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</OptimizeReferences>
-      <EnableCOMDATFolding Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</EnableCOMDATFolding>
-      <OptimizeReferences Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'">true</OptimizeReferences>
-      <EnableCOMDATFolding Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'">true</EnableCOMDATFolding>
-      <LinkTimeCodeGeneration Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'">UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
-      <OptimizeReferences Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'">true</OptimizeReferences>
-      <EnableCOMDATFolding Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'">true</EnableCOMDATFolding>
-      <LinkTimeCodeGeneration Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'">UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
-      <OptimizeReferences Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</OptimizeReferences>
-      <EnableCOMDATFolding Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</EnableCOMDATFolding>
-      <OptimizeReferences Condition="'$(Configuration)|$(Platform)'=='PGInstrument|x64'">true</OptimizeReferences>
-      <EnableCOMDATFolding Condition="'$(Configuration)|$(Platform)'=='PGInstrument|x64'">true</EnableCOMDATFolding>
-      <LinkTimeCodeGeneration Condition="'$(Configuration)|$(Platform)'=='PGInstrument|x64'">UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
-      <OptimizeReferences Condition="'$(Configuration)|$(Platform)'=='PGUpdate|x64'">true</OptimizeReferences>
-      <EnableCOMDATFolding Condition="'$(Configuration)|$(Platform)'=='PGUpdate|x64'">true</EnableCOMDATFolding>
-      <LinkTimeCodeGeneration Condition="'$(Configuration)|$(Platform)'=='PGUpdate|x64'">UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
-      <OptimizeReferences Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</OptimizeReferences>
-      <EnableCOMDATFolding Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</EnableCOMDATFolding>
-      <GenerateDebugInformation Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">DebugFull</GenerateDebugInformation>
-      <GenerateDebugInformation Condition="'$(Configuration)|$(Platform)'=='PGInstrument|ARM'">DebugFull</GenerateDebugInformation>
-      <GenerateDebugInformation Condition="'$(Configuration)|$(Platform)'=='PGUpdate|ARM'">DebugFull</GenerateDebugInformation>
-      <GenerateDebugInformation Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">DebugFull</GenerateDebugInformation>
-      <GenerateDebugInformation Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">DebugFull</GenerateDebugInformation>
-      <GenerateDebugInformation Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'">DebugFull</GenerateDebugInformation>
-      <GenerateDebugInformation Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'">DebugFull</GenerateDebugInformation>
-      <GenerateDebugInformation Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">DebugFull</GenerateDebugInformation>
-      <GenerateDebugInformation Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">DebugFull</GenerateDebugInformation>
-      <GenerateDebugInformation Condition="'$(Configuration)|$(Platform)'=='PGInstrument|x64'">DebugFull</GenerateDebugInformation>
-      <GenerateDebugInformation Condition="'$(Configuration)|$(Platform)'=='PGUpdate|x64'">DebugFull</GenerateDebugInformation>
-      <GenerateDebugInformation Condition="'$(Configuration)|$(Platform)'=='Release|x64'">DebugFull</GenerateDebugInformation>
-      <OptimizeReferences Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</OptimizeReferences>
-      <EnableCOMDATFolding Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</EnableCOMDATFolding>
-      <LinkTimeCodeGeneration Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
-      <OptimizeReferences Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</OptimizeReferences>
-      <EnableCOMDATFolding Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EnableCOMDATFolding>
-      <LinkTimeCodeGeneration Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
-      <OptimizeReferences Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</OptimizeReferences>
-      <EnableCOMDATFolding Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EnableCOMDATFolding>
-      <LinkTimeCodeGeneration Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <GenerateDebugInformation>DebugFull</GenerateDebugInformation>
+      <PropertyGroup>
+        <Choose>
+          <When Condition="'$(Configuration)|$(Platform)'=='PGUpdate|ARM'">
+            <OptimizeReferences>true</OptimizeReferences>
+          </When>
+          <When Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
+            <OptimizeReferences>true</OptimizeReferences>
+          </When>
+          <When Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'">
+            <OptimizeReferences>true</OptimizeReferences>
+            <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
+          </When>
+          <When Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'">
+            <OptimizeReferences>true</OptimizeReferences>
+            <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
+          </When>
+          <When Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+            <OptimizeReferences>true</OptimizeReferences>
+          </When>
+          <When Condition="'$(Configuration)|$(Platform)'=='PGInstrument|x64'">
+            <OptimizeReferences>true</OptimizeReferences>
+            <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
+          </When>
+          <When Condition="'$(Configuration)|$(Platform)'=='PGUpdate|x64'">
+            <OptimizeReferences>true</OptimizeReferences>
+            <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
+          </When>
+          <When Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+            <OptimizeReferences>true</OptimizeReferences>
+          </When>
+          <When Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
+            <OptimizeReferences>true</OptimizeReferences>
+            <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
+          </When>
+          <When Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+            <OptimizeReferences>true</OptimizeReferences>
+            <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
+          </When>
+          <When Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+            <OptimizeReferences>true</OptimizeReferences>
+            <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
+          </When>
+        </Choose>
+      </PropertyGroup>
     </Link>
     <Midl>
       <CompileInterface>true</CompileInterface>

From 641dc793899737838f9c49ffc658ecb5387bf4a1 Mon Sep 17 00:00:00 2001
From: Alexander Riccio <test35965@gmail.com>
Date: Fri, 19 Jun 2020 20:27:27 -0400
Subject: [PATCH 4/7] didnt work

was gonna finish this this week, but now my grandma is dying.
---
 PCbuild/pyshellext.vcxproj | 127 +++++++++++++++++++++++++++++++++++++
 1 file changed, 127 insertions(+)

diff --git a/PCbuild/pyshellext.vcxproj b/PCbuild/pyshellext.vcxproj
index aaabd1024cc9eb2..30b589302d29c7e 100644
--- a/PCbuild/pyshellext.vcxproj
+++ b/PCbuild/pyshellext.vcxproj
@@ -77,6 +77,7 @@
   <PropertyGroup Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
+<<<<<<< HEAD
     <Choose>
       <When Condition="'$(Configuration)|$(Platform)'=='PGInstrument|ARM'">
         <PropertyGroup Label="Configuration">
@@ -132,12 +133,72 @@
   </PropertyGroup>
 
   
+=======
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='PGInstrument|ARM'">
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='PGUpdate|ARM'">
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'">
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'">
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='PGInstrument|x64'">
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='PGUpdate|x64'">
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+>>>>>>> parent of 1a7a4d1a8b... resuming work on patch after two month hiatus
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <PropertyGroup>
     <MakeVersionInfoBeforeTarget>ClCompile</MakeVersionInfoBeforeTarget>
   </PropertyGroup>
+<<<<<<< HEAD
+=======
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='PGInstrument|ARM'">
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='PGUpdate|ARM'">
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='PGInstrument|x64'">
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='PGUpdate|x64'">
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+>>>>>>> parent of 1a7a4d1a8b... resuming work on patch after two month hiatus
   <ImportGroup Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="pyproject.props" />
@@ -146,6 +207,7 @@
   <ItemDefinitionGroup>
     <ClCompile>
       <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+<<<<<<< HEAD
       <Optimization>MinSpace</Optimization>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
@@ -162,6 +224,71 @@
           <WholeProgramOptimization>true</WholeProgramOptimization>
         </When>
       </Choose>
+=======
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='PGInstrument|ARM'">MinSpace</Optimization>
+      <InlineFunctionExpansion Condition="'$(Configuration)|$(Platform)'=='PGInstrument|ARM'">AnySuitable</InlineFunctionExpansion>
+      <FavorSizeOrSpeed Condition="'$(Configuration)|$(Platform)'=='PGInstrument|ARM'">Size</FavorSizeOrSpeed>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='PGUpdate|ARM'">MinSpace</Optimization>
+      <InlineFunctionExpansion Condition="'$(Configuration)|$(Platform)'=='PGUpdate|ARM'">AnySuitable</InlineFunctionExpansion>
+      <FavorSizeOrSpeed Condition="'$(Configuration)|$(Platform)'=='PGUpdate|ARM'">Size</FavorSizeOrSpeed>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">MinSpace</Optimization>
+      <InlineFunctionExpansion Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">AnySuitable</InlineFunctionExpansion>
+      <FavorSizeOrSpeed Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">Size</FavorSizeOrSpeed>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'">MinSpace</Optimization>
+      <InlineFunctionExpansion Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'">AnySuitable</InlineFunctionExpansion>
+      <FavorSizeOrSpeed Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'">Size</FavorSizeOrSpeed>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'">MinSpace</Optimization>
+      <InlineFunctionExpansion Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'">AnySuitable</InlineFunctionExpansion>
+      <FavorSizeOrSpeed Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'">Size</FavorSizeOrSpeed>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MinSpace</Optimization>
+      <InlineFunctionExpansion Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AnySuitable</InlineFunctionExpansion>
+      <FavorSizeOrSpeed Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Size</FavorSizeOrSpeed>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='PGInstrument|x64'">MinSpace</Optimization>
+      <InlineFunctionExpansion Condition="'$(Configuration)|$(Platform)'=='PGInstrument|x64'">AnySuitable</InlineFunctionExpansion>
+      <FavorSizeOrSpeed Condition="'$(Configuration)|$(Platform)'=='PGInstrument|x64'">Size</FavorSizeOrSpeed>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='PGUpdate|x64'">MinSpace</Optimization>
+      <InlineFunctionExpansion Condition="'$(Configuration)|$(Platform)'=='PGUpdate|x64'">AnySuitable</InlineFunctionExpansion>
+      <FavorSizeOrSpeed Condition="'$(Configuration)|$(Platform)'=='PGUpdate|x64'">Size</FavorSizeOrSpeed>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MinSpace</Optimization>
+      <InlineFunctionExpansion Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AnySuitable</InlineFunctionExpansion>
+      <FavorSizeOrSpeed Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Size</FavorSizeOrSpeed>
+      <RuntimeTypeInfo Condition="'$(Configuration)|$(Platform)'=='PGInstrument|ARM'">false</RuntimeTypeInfo>
+      <RuntimeTypeInfo Condition="'$(Configuration)|$(Platform)'=='PGUpdate|ARM'">false</RuntimeTypeInfo>
+      <RuntimeTypeInfo Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</RuntimeTypeInfo>
+      <RuntimeTypeInfo Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'">false</RuntimeTypeInfo>
+      <RuntimeTypeInfo Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'">false</RuntimeTypeInfo>
+      <RuntimeTypeInfo Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</RuntimeTypeInfo>
+      <RuntimeTypeInfo Condition="'$(Configuration)|$(Platform)'=='PGInstrument|x64'">false</RuntimeTypeInfo>
+      <RuntimeTypeInfo Condition="'$(Configuration)|$(Platform)'=='PGUpdate|x64'">false</RuntimeTypeInfo>
+      <RuntimeTypeInfo Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</RuntimeTypeInfo>
+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">/Zo</AdditionalOptions>
+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='PGInstrument|ARM'">/Zo</AdditionalOptions>
+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='PGUpdate|ARM'">/Zo</AdditionalOptions>
+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">/Zo</AdditionalOptions>
+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">/Zo</AdditionalOptions>
+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'">/Zo</AdditionalOptions>
+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'">/Zo</AdditionalOptions>
+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">/Zo</AdditionalOptions>
+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">/Zo</AdditionalOptions>
+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='PGInstrument|x64'">/Zo</AdditionalOptions>
+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='PGUpdate|x64'">/Zo</AdditionalOptions>
+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">/Zo</AdditionalOptions>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">MinSpace</Optimization>
+      <InlineFunctionExpansion Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">AnySuitable</InlineFunctionExpansion>
+      <FavorSizeOrSpeed Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">Size</FavorSizeOrSpeed>
+      <WholeProgramOptimization Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</WholeProgramOptimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">MinSpace</Optimization>
+      <InlineFunctionExpansion Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AnySuitable</InlineFunctionExpansion>
+      <FavorSizeOrSpeed Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Size</FavorSizeOrSpeed>
+      <WholeProgramOptimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</WholeProgramOptimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">MinSpace</Optimization>
+      <InlineFunctionExpansion Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AnySuitable</InlineFunctionExpansion>
+      <FavorSizeOrSpeed Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Size</FavorSizeOrSpeed>
+      <WholeProgramOptimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</WholeProgramOptimization>
+      <RuntimeTypeInfo Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</RuntimeTypeInfo>
+      <RuntimeTypeInfo Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</RuntimeTypeInfo>
+      <RuntimeTypeInfo Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</RuntimeTypeInfo>
+>>>>>>> parent of 1a7a4d1a8b... resuming work on patch after two month hiatus
     </ClCompile>
     <Link>
       <AdditionalDependencies>version.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>

From c4a5a0eeab275b4531bc6c421fe0db264ca2d54c Mon Sep 17 00:00:00 2001
From: Alexander Riccio <test35965@gmail.com>
Date: Fri, 19 Jun 2020 20:27:38 -0400
Subject: [PATCH 5/7] Revert "didnt work"

This reverts commit 641dc793899737838f9c49ffc658ecb5387bf4a1.
---
 PCbuild/pyshellext.vcxproj | 127 -------------------------------------
 1 file changed, 127 deletions(-)

diff --git a/PCbuild/pyshellext.vcxproj b/PCbuild/pyshellext.vcxproj
index 30b589302d29c7e..aaabd1024cc9eb2 100644
--- a/PCbuild/pyshellext.vcxproj
+++ b/PCbuild/pyshellext.vcxproj
@@ -77,7 +77,6 @@
   <PropertyGroup Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
-<<<<<<< HEAD
     <Choose>
       <When Condition="'$(Configuration)|$(Platform)'=='PGInstrument|ARM'">
         <PropertyGroup Label="Configuration">
@@ -133,72 +132,12 @@
   </PropertyGroup>
 
   
-=======
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='PGInstrument|ARM'">
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='PGUpdate|ARM'">
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'">
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'">
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='PGInstrument|x64'">
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='PGUpdate|x64'">
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
->>>>>>> parent of 1a7a4d1a8b... resuming work on patch after two month hiatus
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <PropertyGroup>
     <MakeVersionInfoBeforeTarget>ClCompile</MakeVersionInfoBeforeTarget>
   </PropertyGroup>
-<<<<<<< HEAD
-=======
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='PGInstrument|ARM'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='PGUpdate|ARM'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='PGInstrument|x64'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='PGUpdate|x64'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
->>>>>>> parent of 1a7a4d1a8b... resuming work on patch after two month hiatus
   <ImportGroup Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="pyproject.props" />
@@ -207,7 +146,6 @@
   <ItemDefinitionGroup>
     <ClCompile>
       <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-<<<<<<< HEAD
       <Optimization>MinSpace</Optimization>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
@@ -224,71 +162,6 @@
           <WholeProgramOptimization>true</WholeProgramOptimization>
         </When>
       </Choose>
-=======
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='PGInstrument|ARM'">MinSpace</Optimization>
-      <InlineFunctionExpansion Condition="'$(Configuration)|$(Platform)'=='PGInstrument|ARM'">AnySuitable</InlineFunctionExpansion>
-      <FavorSizeOrSpeed Condition="'$(Configuration)|$(Platform)'=='PGInstrument|ARM'">Size</FavorSizeOrSpeed>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='PGUpdate|ARM'">MinSpace</Optimization>
-      <InlineFunctionExpansion Condition="'$(Configuration)|$(Platform)'=='PGUpdate|ARM'">AnySuitable</InlineFunctionExpansion>
-      <FavorSizeOrSpeed Condition="'$(Configuration)|$(Platform)'=='PGUpdate|ARM'">Size</FavorSizeOrSpeed>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">MinSpace</Optimization>
-      <InlineFunctionExpansion Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">AnySuitable</InlineFunctionExpansion>
-      <FavorSizeOrSpeed Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">Size</FavorSizeOrSpeed>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'">MinSpace</Optimization>
-      <InlineFunctionExpansion Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'">AnySuitable</InlineFunctionExpansion>
-      <FavorSizeOrSpeed Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'">Size</FavorSizeOrSpeed>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'">MinSpace</Optimization>
-      <InlineFunctionExpansion Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'">AnySuitable</InlineFunctionExpansion>
-      <FavorSizeOrSpeed Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'">Size</FavorSizeOrSpeed>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MinSpace</Optimization>
-      <InlineFunctionExpansion Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AnySuitable</InlineFunctionExpansion>
-      <FavorSizeOrSpeed Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Size</FavorSizeOrSpeed>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='PGInstrument|x64'">MinSpace</Optimization>
-      <InlineFunctionExpansion Condition="'$(Configuration)|$(Platform)'=='PGInstrument|x64'">AnySuitable</InlineFunctionExpansion>
-      <FavorSizeOrSpeed Condition="'$(Configuration)|$(Platform)'=='PGInstrument|x64'">Size</FavorSizeOrSpeed>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='PGUpdate|x64'">MinSpace</Optimization>
-      <InlineFunctionExpansion Condition="'$(Configuration)|$(Platform)'=='PGUpdate|x64'">AnySuitable</InlineFunctionExpansion>
-      <FavorSizeOrSpeed Condition="'$(Configuration)|$(Platform)'=='PGUpdate|x64'">Size</FavorSizeOrSpeed>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MinSpace</Optimization>
-      <InlineFunctionExpansion Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AnySuitable</InlineFunctionExpansion>
-      <FavorSizeOrSpeed Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Size</FavorSizeOrSpeed>
-      <RuntimeTypeInfo Condition="'$(Configuration)|$(Platform)'=='PGInstrument|ARM'">false</RuntimeTypeInfo>
-      <RuntimeTypeInfo Condition="'$(Configuration)|$(Platform)'=='PGUpdate|ARM'">false</RuntimeTypeInfo>
-      <RuntimeTypeInfo Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</RuntimeTypeInfo>
-      <RuntimeTypeInfo Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'">false</RuntimeTypeInfo>
-      <RuntimeTypeInfo Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'">false</RuntimeTypeInfo>
-      <RuntimeTypeInfo Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</RuntimeTypeInfo>
-      <RuntimeTypeInfo Condition="'$(Configuration)|$(Platform)'=='PGInstrument|x64'">false</RuntimeTypeInfo>
-      <RuntimeTypeInfo Condition="'$(Configuration)|$(Platform)'=='PGUpdate|x64'">false</RuntimeTypeInfo>
-      <RuntimeTypeInfo Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</RuntimeTypeInfo>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">/Zo</AdditionalOptions>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='PGInstrument|ARM'">/Zo</AdditionalOptions>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='PGUpdate|ARM'">/Zo</AdditionalOptions>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">/Zo</AdditionalOptions>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">/Zo</AdditionalOptions>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'">/Zo</AdditionalOptions>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'">/Zo</AdditionalOptions>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">/Zo</AdditionalOptions>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">/Zo</AdditionalOptions>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='PGInstrument|x64'">/Zo</AdditionalOptions>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='PGUpdate|x64'">/Zo</AdditionalOptions>
-      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">/Zo</AdditionalOptions>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">MinSpace</Optimization>
-      <InlineFunctionExpansion Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">AnySuitable</InlineFunctionExpansion>
-      <FavorSizeOrSpeed Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">Size</FavorSizeOrSpeed>
-      <WholeProgramOptimization Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</WholeProgramOptimization>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">MinSpace</Optimization>
-      <InlineFunctionExpansion Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AnySuitable</InlineFunctionExpansion>
-      <FavorSizeOrSpeed Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Size</FavorSizeOrSpeed>
-      <WholeProgramOptimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</WholeProgramOptimization>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">MinSpace</Optimization>
-      <InlineFunctionExpansion Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AnySuitable</InlineFunctionExpansion>
-      <FavorSizeOrSpeed Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Size</FavorSizeOrSpeed>
-      <WholeProgramOptimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</WholeProgramOptimization>
-      <RuntimeTypeInfo Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</RuntimeTypeInfo>
-      <RuntimeTypeInfo Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</RuntimeTypeInfo>
-      <RuntimeTypeInfo Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</RuntimeTypeInfo>
->>>>>>> parent of 1a7a4d1a8b... resuming work on patch after two month hiatus
     </ClCompile>
     <Link>
       <AdditionalDependencies>version.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>

From 7c6152f632a050f9e628c81b356771dac6004bcc Mon Sep 17 00:00:00 2001
From: Alexander Riccio <test35965@gmail.com>
Date: Fri, 19 Jun 2020 20:27:42 -0400
Subject: [PATCH 6/7] Revert "didnt work"

This reverts commit 16f909de73e3fdd3054228bbece426b4d0a8bdfd.
---
 PCbuild/pyshellext.vcxproj | 306 +++++++++++++++++++++++--------------
 1 file changed, 194 insertions(+), 112 deletions(-)

diff --git a/PCbuild/pyshellext.vcxproj b/PCbuild/pyshellext.vcxproj
index aaabd1024cc9eb2..422ebf19f8fe3ce 100644
--- a/PCbuild/pyshellext.vcxproj
+++ b/PCbuild/pyshellext.vcxproj
@@ -77,142 +77,224 @@
   <PropertyGroup Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
-    <Choose>
+  </PropertyGroup>
+  <When Condition="'$(Configuration)|$(Platform)'=='PGInstrument|ARM'">
+    <PropertyGroup Label="Configuration">
+      <WholeProgramOptimization>true</WholeProgramOptimization>
+    </PropertyGroup>
+    <PropertyGroup>
+      <LinkIncremental>false</LinkIncremental>
+    </PropertyGroup>
+  </When>
+
+  <When Condition="'$(Configuration)|$(Platform)'=='PGUpdate|ARM'">
+    <PropertyGroup Label="Configuration">
+      <WholeProgramOptimization>true</WholeProgramOptimization>
+    </PropertyGroup>
+    <PropertyGroup>
+      <LinkIncremental>false</LinkIncremental>
+    </PropertyGroup>
+  </When>
+  <When Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
+    <PropertyGroup Label="Configuration">
+      <WholeProgramOptimization>true</WholeProgramOptimization>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
+      <LinkIncremental>false</LinkIncremental>
+    </PropertyGroup>
+  </When>
+  <When Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'">
+    <PropertyGroup Label="Configuration">
+      <WholeProgramOptimization>true</WholeProgramOptimization>
+    </PropertyGroup>
+    <PropertyGroup>
+      <LinkIncremental>false</LinkIncremental>
+    </PropertyGroup>
+  </When>
+  <When Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'">
+    <PropertyGroup Label="Configuration">
+      <WholeProgramOptimization>true</WholeProgramOptimization>
+    </PropertyGroup>
+    <PropertyGroup>
+      <LinkIncremental>false</LinkIncremental>
+    </PropertyGroup>
+  </When>
+  <When Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <PropertyGroup Label="Configuration">
+      <WholeProgramOptimization>true</WholeProgramOptimization>
+    </PropertyGroup>
+    <PropertyGroup>
+      <LinkIncremental>false</LinkIncremental>
+    </PropertyGroup>
+  </When>
+  <When Condition="'$(Configuration)|$(Platform)'=='PGInstrument|x64'">
+    <PropertyGroup Label="Configuration">
+      <WholeProgramOptimization>true</WholeProgramOptimization>
+    </PropertyGroup>
+    <PropertyGroup>
+      <LinkIncremental>false</LinkIncremental>
+    </PropertyGroup>
+  </When>
+  <When Condition="'$(Configuration)|$(Platform)'=='PGUpdate|x64'">
+    <PropertyGroup Label="Configuration">
+      <WholeProgramOptimization>true</WholeProgramOptimization>
+    </PropertyGroup>
+    <PropertyGroup>
+      <LinkIncremental>false</LinkIncremental>
+    </PropertyGroup>
+  </When>
+  <When Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <PropertyGroup Label="Configuration">
+      <WholeProgramOptimization>true</WholeProgramOptimization>
+    </PropertyGroup>
+    <PropertyGroup>
+      <LinkIncremental>false</LinkIncremental>
+    </PropertyGroup>
+  </When>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <PropertyGroup>
+    <MakeVersionInfoBeforeTarget>ClCompile</MakeVersionInfoBeforeTarget>
+  </PropertyGroup>
+  <ImportGroup Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="pyproject.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <When Condition="'$(Configuration)|$(Platform)'=='PGInstrument|ARM'">
-        <PropertyGroup Label="Configuration">
-          <WholeProgramOptimization>true</WholeProgramOptimization>
-        </PropertyGroup>
+        <Optimization>MinSpace</Optimization>
+        <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+        <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
+        <RuntimeTypeInfo>false</RuntimeTypeInfo>
       </When>
-
       <When Condition="'$(Configuration)|$(Platform)'=='PGUpdate|ARM'">
-        <PropertyGroup Label="Configuration">
-          <WholeProgramOptimization>true</WholeProgramOptimization>
-        </PropertyGroup>
+        <Optimization>MinSpace</Optimization>
+        <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+        <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
+        <RuntimeTypeInfo>false</RuntimeTypeInfo>
       </When>
       <When Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
-        <PropertyGroup Label="Configuration">
-          <WholeProgramOptimization>true</WholeProgramOptimization>
-        </PropertyGroup>
+        <Optimization>MinSpace</Optimization>
+        <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+        <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
+        <RuntimeTypeInfo>false</RuntimeTypeInfo>
       </When>
       <When Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'">
-        <PropertyGroup Label="Configuration">
-          <WholeProgramOptimization>true</WholeProgramOptimization>
-        </PropertyGroup>
+        <Optimization>MinSpace</Optimization>
+        <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+        <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
+        <RuntimeTypeInfo>false</RuntimeTypeInfo>
       </When>
       <When Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'">
-        <PropertyGroup Label="Configuration">
-          <WholeProgramOptimization>true</WholeProgramOptimization>
-        </PropertyGroup>
+        <Optimization>MinSpace</Optimization>
+        <InlineFunctionExpansionAnySuitable</InlineFunctionExpansion>
+        <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
+        <RuntimeTypeInfo>false</RuntimeTypeInfo>
       </When>
       <When Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-        <PropertyGroup Label="Configuration">
-          <WholeProgramOptimization>true</WholeProgramOptimization>
-        </PropertyGroup>
+        <Optimization>MinSpace</Optimization>
+        <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+        <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
+        <RuntimeTypeInfo>false</RuntimeTypeInfo>
       </When>
       <When Condition="'$(Configuration)|$(Platform)'=='PGInstrument|x64'">
-        <PropertyGroup Label="Configuration">
-          <WholeProgramOptimization>true</WholeProgramOptimization>
-        </PropertyGroup>
+        <Optimization>MinSpace</Optimization>
+        <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+        <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
+        <RuntimeTypeInfo>false</RuntimeTypeInfo>
       </When>
       <When Condition="'$(Configuration)|$(Platform)'=='PGUpdate|x64'">
-        <PropertyGroup Label="Configuration">
-          <WholeProgramOptimization>true</WholeProgramOptimization>
-        </PropertyGroup>
+        <Optimization>MinSpace</Optimization>
+        <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+        <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
+        <RuntimeTypeInfo>false</RuntimeTypeInfo>
       </When>
       <When Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-        <PropertyGroup Label="Configuration">
-          <WholeProgramOptimization>true</WholeProgramOptimization>
-        </PropertyGroup>
+        <Optimization>MinSpace</Optimization>
+        <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+        <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
+        <RuntimeTypeInfo>false</RuntimeTypeInfo>
       </When>
-    </Choose>
-  </PropertyGroup>
+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">/Zo</AdditionalOptions>
+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='PGInstrument|ARM'">/Zo</AdditionalOptions>
+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='PGUpdate|ARM'">/Zo</AdditionalOptions>
+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">/Zo</AdditionalOptions>
+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">/Zo</AdditionalOptions>
+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'">/Zo</AdditionalOptions>
+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'">/Zo</AdditionalOptions>
+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">/Zo</AdditionalOptions>
+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">/Zo</AdditionalOptions>
+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='PGInstrument|x64'">/Zo</AdditionalOptions>
+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='PGUpdate|x64'">/Zo</AdditionalOptions>
+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">/Zo</AdditionalOptions>
 
-  <PropertyGroup>
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-
-  
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <PropertyGroup>
-    <MakeVersionInfoBeforeTarget>ClCompile</MakeVersionInfoBeforeTarget>
-  </PropertyGroup>
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="pyproject.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Optimization>MinSpace</Optimization>
-      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <AdditionalOptions>/Zo</AdditionalOptions>
-      <Choose>
-        <When Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
-          <WholeProgramOptimization>true</WholeProgramOptimization>
-        </When>
-        <When Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-          <WholeProgramOptimization>true</WholeProgramOptimization>
-        </When>
-        <When Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-          <WholeProgramOptimization>true</WholeProgramOptimization>
-        </When>
-      </Choose>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">MinSpace</Optimization>
+      <InlineFunctionExpansion Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">AnySuitable</InlineFunctionExpansion>
+      <FavorSizeOrSpeed Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">Size</FavorSizeOrSpeed>
+      <WholeProgramOptimization Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</WholeProgramOptimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">MinSpace</Optimization>
+      <InlineFunctionExpansion Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AnySuitable</InlineFunctionExpansion>
+      <FavorSizeOrSpeed Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Size</FavorSizeOrSpeed>
+      <WholeProgramOptimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</WholeProgramOptimization>
+      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">MinSpace</Optimization>
+      <InlineFunctionExpansion Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AnySuitable</InlineFunctionExpansion>
+      <FavorSizeOrSpeed Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Size</FavorSizeOrSpeed>
+      <WholeProgramOptimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</WholeProgramOptimization>
+      <RuntimeTypeInfo Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</RuntimeTypeInfo>
+      <RuntimeTypeInfo Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</RuntimeTypeInfo>
+      <RuntimeTypeInfo Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</RuntimeTypeInfo>
     </ClCompile>
     <Link>
       <AdditionalDependencies>version.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SubSystem>Console</SubSystem>
       <ModuleDefinitionFile>..\PC\pyshellext$(PyDebugExt).def</ModuleDefinitionFile>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <GenerateDebugInformation>DebugFull</GenerateDebugInformation>
-      <PropertyGroup>
-        <Choose>
-          <When Condition="'$(Configuration)|$(Platform)'=='PGUpdate|ARM'">
-            <OptimizeReferences>true</OptimizeReferences>
-          </When>
-          <When Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
-            <OptimizeReferences>true</OptimizeReferences>
-          </When>
-          <When Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'">
-            <OptimizeReferences>true</OptimizeReferences>
-            <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
-          </When>
-          <When Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'">
-            <OptimizeReferences>true</OptimizeReferences>
-            <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
-          </When>
-          <When Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-            <OptimizeReferences>true</OptimizeReferences>
-          </When>
-          <When Condition="'$(Configuration)|$(Platform)'=='PGInstrument|x64'">
-            <OptimizeReferences>true</OptimizeReferences>
-            <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
-          </When>
-          <When Condition="'$(Configuration)|$(Platform)'=='PGUpdate|x64'">
-            <OptimizeReferences>true</OptimizeReferences>
-            <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
-          </When>
-          <When Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-            <OptimizeReferences>true</OptimizeReferences>
-          </When>
-          <When Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
-            <OptimizeReferences>true</OptimizeReferences>
-            <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
-          </When>
-          <When Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-            <OptimizeReferences>true</OptimizeReferences>
-            <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
-          </When>
-          <When Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-            <OptimizeReferences>true</OptimizeReferences>
-            <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
-          </When>
-        </Choose>
-      </PropertyGroup>
+      <OptimizeReferences Condition="'$(Configuration)|$(Platform)'=='PGInstrument|ARM'">true</OptimizeReferences>
+      <EnableCOMDATFolding Condition="'$(Configuration)|$(Platform)'=='PGInstrument|ARM'">true</EnableCOMDATFolding>
+      <OptimizeReferences Condition="'$(Configuration)|$(Platform)'=='PGUpdate|ARM'">true</OptimizeReferences>
+      <EnableCOMDATFolding Condition="'$(Configuration)|$(Platform)'=='PGUpdate|ARM'">true</EnableCOMDATFolding>
+      <OptimizeReferences Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</OptimizeReferences>
+      <EnableCOMDATFolding Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</EnableCOMDATFolding>
+      <OptimizeReferences Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'">true</OptimizeReferences>
+      <EnableCOMDATFolding Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'">true</EnableCOMDATFolding>
+      <LinkTimeCodeGeneration Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'">UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
+      <OptimizeReferences Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'">true</OptimizeReferences>
+      <EnableCOMDATFolding Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'">true</EnableCOMDATFolding>
+      <LinkTimeCodeGeneration Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'">UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
+      <OptimizeReferences Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</OptimizeReferences>
+      <EnableCOMDATFolding Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</EnableCOMDATFolding>
+      <OptimizeReferences Condition="'$(Configuration)|$(Platform)'=='PGInstrument|x64'">true</OptimizeReferences>
+      <EnableCOMDATFolding Condition="'$(Configuration)|$(Platform)'=='PGInstrument|x64'">true</EnableCOMDATFolding>
+      <LinkTimeCodeGeneration Condition="'$(Configuration)|$(Platform)'=='PGInstrument|x64'">UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
+      <OptimizeReferences Condition="'$(Configuration)|$(Platform)'=='PGUpdate|x64'">true</OptimizeReferences>
+      <EnableCOMDATFolding Condition="'$(Configuration)|$(Platform)'=='PGUpdate|x64'">true</EnableCOMDATFolding>
+      <LinkTimeCodeGeneration Condition="'$(Configuration)|$(Platform)'=='PGUpdate|x64'">UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
+      <OptimizeReferences Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</OptimizeReferences>
+      <EnableCOMDATFolding Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</EnableCOMDATFolding>
+      <GenerateDebugInformation Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">DebugFull</GenerateDebugInformation>
+      <GenerateDebugInformation Condition="'$(Configuration)|$(Platform)'=='PGInstrument|ARM'">DebugFull</GenerateDebugInformation>
+      <GenerateDebugInformation Condition="'$(Configuration)|$(Platform)'=='PGUpdate|ARM'">DebugFull</GenerateDebugInformation>
+      <GenerateDebugInformation Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">DebugFull</GenerateDebugInformation>
+      <GenerateDebugInformation Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">DebugFull</GenerateDebugInformation>
+      <GenerateDebugInformation Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'">DebugFull</GenerateDebugInformation>
+      <GenerateDebugInformation Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'">DebugFull</GenerateDebugInformation>
+      <GenerateDebugInformation Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">DebugFull</GenerateDebugInformation>
+      <GenerateDebugInformation Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">DebugFull</GenerateDebugInformation>
+      <GenerateDebugInformation Condition="'$(Configuration)|$(Platform)'=='PGInstrument|x64'">DebugFull</GenerateDebugInformation>
+      <GenerateDebugInformation Condition="'$(Configuration)|$(Platform)'=='PGUpdate|x64'">DebugFull</GenerateDebugInformation>
+      <GenerateDebugInformation Condition="'$(Configuration)|$(Platform)'=='Release|x64'">DebugFull</GenerateDebugInformation>
+      <OptimizeReferences Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</OptimizeReferences>
+      <EnableCOMDATFolding Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</EnableCOMDATFolding>
+      <LinkTimeCodeGeneration Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
+      <OptimizeReferences Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</OptimizeReferences>
+      <EnableCOMDATFolding Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EnableCOMDATFolding>
+      <LinkTimeCodeGeneration Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
+      <OptimizeReferences Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</OptimizeReferences>
+      <EnableCOMDATFolding Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EnableCOMDATFolding>
+      <LinkTimeCodeGeneration Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
     </Link>
     <Midl>
       <CompileInterface>true</CompileInterface>

From 6bb0b2801aeb90fa2657ef5d3b5fb89c45357fda Mon Sep 17 00:00:00 2001
From: Alexander Riccio <test35965@gmail.com>
Date: Tue, 1 Dec 2020 15:53:27 -0500
Subject: [PATCH 7/7] trash changes, store for records

---
 PCbuild/pcbuild.sln        |  32 +++++
 PCbuild/pyshellext.vcxproj | 274 ++++++++++++++++++++-----------------
 2 files changed, 180 insertions(+), 126 deletions(-)

diff --git a/PCbuild/pcbuild.sln b/PCbuild/pcbuild.sln
index 61db4e02ad38370..4b6dc1e6771dc3d 100644
--- a/PCbuild/pcbuild.sln
+++ b/PCbuild/pcbuild.sln
@@ -1267,6 +1267,38 @@ Global
 		{384C224A-7474-476E-A01B-750EA7DE918C}.Release|Win32.Build.0 = Release|Win32
 		{384C224A-7474-476E-A01B-750EA7DE918C}.Release|x64.ActiveCfg = Release|x64
 		{384C224A-7474-476E-A01B-750EA7DE918C}.Release|x64.Build.0 = Release|x64
+		{FCBE1EF2-E0F0-40B1-88B5-00A35D378742}.Debug|ARM.ActiveCfg = Debug|ARM
+		{FCBE1EF2-E0F0-40B1-88B5-00A35D378742}.Debug|ARM.Build.0 = Debug|ARM
+		{FCBE1EF2-E0F0-40B1-88B5-00A35D378742}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{FCBE1EF2-E0F0-40B1-88B5-00A35D378742}.Debug|ARM64.Build.0 = Debug|ARM64
+		{FCBE1EF2-E0F0-40B1-88B5-00A35D378742}.Debug|Win32.ActiveCfg = Debug|Win32
+		{FCBE1EF2-E0F0-40B1-88B5-00A35D378742}.Debug|Win32.Build.0 = Debug|Win32
+		{FCBE1EF2-E0F0-40B1-88B5-00A35D378742}.Debug|x64.ActiveCfg = Debug|x64
+		{FCBE1EF2-E0F0-40B1-88B5-00A35D378742}.Debug|x64.Build.0 = Debug|x64
+		{FCBE1EF2-E0F0-40B1-88B5-00A35D378742}.PGInstrument|ARM.ActiveCfg = PGInstrument|ARM
+		{FCBE1EF2-E0F0-40B1-88B5-00A35D378742}.PGInstrument|ARM.Build.0 = PGInstrument|ARM
+		{FCBE1EF2-E0F0-40B1-88B5-00A35D378742}.PGInstrument|ARM64.ActiveCfg = PGInstrument|ARM64
+		{FCBE1EF2-E0F0-40B1-88B5-00A35D378742}.PGInstrument|ARM64.Build.0 = PGInstrument|ARM64
+		{FCBE1EF2-E0F0-40B1-88B5-00A35D378742}.PGInstrument|Win32.ActiveCfg = PGInstrument|Win32
+		{FCBE1EF2-E0F0-40B1-88B5-00A35D378742}.PGInstrument|Win32.Build.0 = PGInstrument|Win32
+		{FCBE1EF2-E0F0-40B1-88B5-00A35D378742}.PGInstrument|x64.ActiveCfg = PGInstrument|x64
+		{FCBE1EF2-E0F0-40B1-88B5-00A35D378742}.PGInstrument|x64.Build.0 = PGInstrument|x64
+		{FCBE1EF2-E0F0-40B1-88B5-00A35D378742}.PGUpdate|ARM.ActiveCfg = PGUpdate|ARM
+		{FCBE1EF2-E0F0-40B1-88B5-00A35D378742}.PGUpdate|ARM.Build.0 = PGUpdate|ARM
+		{FCBE1EF2-E0F0-40B1-88B5-00A35D378742}.PGUpdate|ARM64.ActiveCfg = PGUpdate|ARM64
+		{FCBE1EF2-E0F0-40B1-88B5-00A35D378742}.PGUpdate|ARM64.Build.0 = PGUpdate|ARM64
+		{FCBE1EF2-E0F0-40B1-88B5-00A35D378742}.PGUpdate|Win32.ActiveCfg = PGUpdate|Win32
+		{FCBE1EF2-E0F0-40B1-88B5-00A35D378742}.PGUpdate|Win32.Build.0 = PGUpdate|Win32
+		{FCBE1EF2-E0F0-40B1-88B5-00A35D378742}.PGUpdate|x64.ActiveCfg = PGUpdate|x64
+		{FCBE1EF2-E0F0-40B1-88B5-00A35D378742}.PGUpdate|x64.Build.0 = PGUpdate|x64
+		{FCBE1EF2-E0F0-40B1-88B5-00A35D378742}.Release|ARM.ActiveCfg = Release|ARM
+		{FCBE1EF2-E0F0-40B1-88B5-00A35D378742}.Release|ARM.Build.0 = Release|ARM
+		{FCBE1EF2-E0F0-40B1-88B5-00A35D378742}.Release|ARM64.ActiveCfg = Release|ARM64
+		{FCBE1EF2-E0F0-40B1-88B5-00A35D378742}.Release|ARM64.Build.0 = Release|ARM64
+		{FCBE1EF2-E0F0-40B1-88B5-00A35D378742}.Release|Win32.ActiveCfg = Release|Win32
+		{FCBE1EF2-E0F0-40B1-88B5-00A35D378742}.Release|Win32.Build.0 = Release|Win32
+		{FCBE1EF2-E0F0-40B1-88B5-00A35D378742}.Release|x64.ActiveCfg = Release|x64
+		{FCBE1EF2-E0F0-40B1-88B5-00A35D378742}.Release|x64.Build.0 = Release|x64
 		{78D80A15-BD8C-44E2-B49E-1F05B0A0A687}.Debug|ARM.ActiveCfg = Debug|ARM
 		{78D80A15-BD8C-44E2-B49E-1F05B0A0A687}.Debug|ARM.Build.0 = Debug|ARM
 		{78D80A15-BD8C-44E2-B49E-1F05B0A0A687}.Debug|ARM64.ActiveCfg = Debug|ARM64
diff --git a/PCbuild/pyshellext.vcxproj b/PCbuild/pyshellext.vcxproj
index 422ebf19f8fe3ce..d31caf153457ecf 100644
--- a/PCbuild/pyshellext.vcxproj
+++ b/PCbuild/pyshellext.vcxproj
@@ -78,79 +78,81 @@
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
-  <When Condition="'$(Configuration)|$(Platform)'=='PGInstrument|ARM'">
-    <PropertyGroup Label="Configuration">
-      <WholeProgramOptimization>true</WholeProgramOptimization>
-    </PropertyGroup>
-    <PropertyGroup>
-      <LinkIncremental>false</LinkIncremental>
-    </PropertyGroup>
-  </When>
+  <Choose>
+    <When Condition="'$(Configuration)|$(Platform)'=='PGInstrument|ARM'">
+      <PropertyGroup>
+        <WholeProgramOptimization>true</WholeProgramOptimization>
+      </PropertyGroup>
+      <PropertyGroup>
+        <LinkIncremental>false</LinkIncremental>
+      </PropertyGroup>
+    </When>
 
-  <When Condition="'$(Configuration)|$(Platform)'=='PGUpdate|ARM'">
-    <PropertyGroup Label="Configuration">
-      <WholeProgramOptimization>true</WholeProgramOptimization>
-    </PropertyGroup>
-    <PropertyGroup>
-      <LinkIncremental>false</LinkIncremental>
-    </PropertyGroup>
-  </When>
-  <When Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
-    <PropertyGroup Label="Configuration">
-      <WholeProgramOptimization>true</WholeProgramOptimization>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
-      <LinkIncremental>false</LinkIncremental>
-    </PropertyGroup>
-  </When>
-  <When Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'">
-    <PropertyGroup Label="Configuration">
-      <WholeProgramOptimization>true</WholeProgramOptimization>
-    </PropertyGroup>
-    <PropertyGroup>
-      <LinkIncremental>false</LinkIncremental>
-    </PropertyGroup>
-  </When>
-  <When Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'">
-    <PropertyGroup Label="Configuration">
-      <WholeProgramOptimization>true</WholeProgramOptimization>
-    </PropertyGroup>
-    <PropertyGroup>
-      <LinkIncremental>false</LinkIncremental>
-    </PropertyGroup>
-  </When>
-  <When Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <PropertyGroup Label="Configuration">
-      <WholeProgramOptimization>true</WholeProgramOptimization>
-    </PropertyGroup>
-    <PropertyGroup>
-      <LinkIncremental>false</LinkIncremental>
-    </PropertyGroup>
-  </When>
-  <When Condition="'$(Configuration)|$(Platform)'=='PGInstrument|x64'">
-    <PropertyGroup Label="Configuration">
-      <WholeProgramOptimization>true</WholeProgramOptimization>
-    </PropertyGroup>
-    <PropertyGroup>
-      <LinkIncremental>false</LinkIncremental>
-    </PropertyGroup>
-  </When>
-  <When Condition="'$(Configuration)|$(Platform)'=='PGUpdate|x64'">
-    <PropertyGroup Label="Configuration">
-      <WholeProgramOptimization>true</WholeProgramOptimization>
-    </PropertyGroup>
-    <PropertyGroup>
-      <LinkIncremental>false</LinkIncremental>
-    </PropertyGroup>
-  </When>
-  <When Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <PropertyGroup Label="Configuration">
-      <WholeProgramOptimization>true</WholeProgramOptimization>
-    </PropertyGroup>
-    <PropertyGroup>
-      <LinkIncremental>false</LinkIncremental>
-    </PropertyGroup>
-  </When>
+    <When Condition="'$(Configuration)|$(Platform)'=='PGUpdate|ARM'">
+      <PropertyGroup>
+        <WholeProgramOptimization>true</WholeProgramOptimization>
+      </PropertyGroup>
+      <PropertyGroup>
+        <LinkIncremental>false</LinkIncremental>
+      </PropertyGroup>
+    </When>
+    <When Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
+      <PropertyGroup>
+        <WholeProgramOptimization>true</WholeProgramOptimization>
+      </PropertyGroup>
+      <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
+        <LinkIncremental>false</LinkIncremental>
+      </PropertyGroup>
+    </When>
+    <When Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'">
+      <PropertyGroup>
+        <WholeProgramOptimization>true</WholeProgramOptimization>
+      </PropertyGroup>
+      <PropertyGroup>
+        <LinkIncremental>false</LinkIncremental>
+      </PropertyGroup>
+    </When>
+    <When Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'">
+      <PropertyGroup>
+        <WholeProgramOptimization>true</WholeProgramOptimization>
+      </PropertyGroup>
+      <PropertyGroup>
+        <LinkIncremental>false</LinkIncremental>
+      </PropertyGroup>
+    </When>
+    <When Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+      <PropertyGroup>
+        <WholeProgramOptimization>true</WholeProgramOptimization>
+      </PropertyGroup>
+      <PropertyGroup>
+        <LinkIncremental>false</LinkIncremental>
+      </PropertyGroup>
+    </When>
+    <When Condition="'$(Configuration)|$(Platform)'=='PGInstrument|x64'">
+      <PropertyGroup>
+        <WholeProgramOptimization>true</WholeProgramOptimization>
+      </PropertyGroup>
+      <PropertyGroup>
+        <LinkIncremental>false</LinkIncremental>
+      </PropertyGroup>
+    </When>
+    <When Condition="'$(Configuration)|$(Platform)'=='PGUpdate|x64'">
+      <PropertyGroup>
+        <WholeProgramOptimization>true</WholeProgramOptimization>
+      </PropertyGroup>
+      <PropertyGroup>
+        <LinkIncremental>false</LinkIncremental>
+      </PropertyGroup>
+    </When>
+    <When Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+      <PropertyGroup>
+        <WholeProgramOptimization>true</WholeProgramOptimization>
+      </PropertyGroup>
+      <PropertyGroup>
+        <LinkIncremental>false</LinkIncremental>
+      </PropertyGroup>
+    </When>
+  </Choose>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
@@ -165,60 +167,80 @@
   <ItemDefinitionGroup>
     <ClCompile>
       <PreprocessorDefinitions>_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <When Condition="'$(Configuration)|$(Platform)'=='PGInstrument|ARM'">
-        <Optimization>MinSpace</Optimization>
-        <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-        <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
-        <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      </When>
-      <When Condition="'$(Configuration)|$(Platform)'=='PGUpdate|ARM'">
-        <Optimization>MinSpace</Optimization>
-        <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-        <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
-        <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      </When>
-      <When Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
-        <Optimization>MinSpace</Optimization>
-        <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-        <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
-        <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      </When>
-      <When Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'">
-        <Optimization>MinSpace</Optimization>
-        <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-        <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
-        <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      </When>
-      <When Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'">
-        <Optimization>MinSpace</Optimization>
-        <InlineFunctionExpansionAnySuitable</InlineFunctionExpansion>
-        <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
-        <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      </When>
-      <When Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-        <Optimization>MinSpace</Optimization>
-        <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-        <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
-        <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      </When>
-      <When Condition="'$(Configuration)|$(Platform)'=='PGInstrument|x64'">
-        <Optimization>MinSpace</Optimization>
-        <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-        <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
-        <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      </When>
-      <When Condition="'$(Configuration)|$(Platform)'=='PGUpdate|x64'">
-        <Optimization>MinSpace</Optimization>
-        <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-        <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
-        <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      </When>
-      <When Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-        <Optimization>MinSpace</Optimization>
-        <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
-        <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
-        <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      </When>
+      <Choose>
+        <When Condition="'$(Configuration)|$(Platform)'=='PGInstrument|ARM'">
+          <PropertyGroup>
+            <Optimization>MinSpace</Optimization>
+            <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+            <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
+            <RuntimeTypeInfo>false</RuntimeTypeInfo>
+          </PropertyGroup>
+        </When>
+        <When Condition="'$(Configuration)|$(Platform)'=='PGUpdate|ARM'">
+          <PropertyGroup>
+            <Optimization>MinSpace</Optimization>
+            <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+            <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
+            <RuntimeTypeInfo>false</RuntimeTypeInfo>
+          </PropertyGroup>
+        </When>
+        <When Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
+          <PropertyGroup>
+            <Optimization>MinSpace</Optimization>
+            <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+            <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
+            <RuntimeTypeInfo>false</RuntimeTypeInfo>
+          </PropertyGroup>
+        </When>
+        <When Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'">
+          <PropertyGroup>
+            <Optimization>MinSpace</Optimization>
+            <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+            <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
+            <RuntimeTypeInfo>false</RuntimeTypeInfo>
+          </PropertyGroup>
+        </When>
+        <When Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'">
+          <PropertyGroup>
+            <Optimization>MinSpace</Optimization>
+            <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+            <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
+            <RuntimeTypeInfo>false</RuntimeTypeInfo>
+          </PropertyGroup>
+        </When>
+        <When Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+          <PropertyGroup>
+            <Optimization>MinSpace</Optimization>
+            <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+            <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
+            <RuntimeTypeInfo>false</RuntimeTypeInfo>
+          </PropertyGroup>
+        </When>
+        <When Condition="'$(Configuration)|$(Platform)'=='PGInstrument|x64'">
+          <PropertyGroup>
+            <Optimization>MinSpace</Optimization>
+            <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+            <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
+            <RuntimeTypeInfo>false</RuntimeTypeInfo>
+          </PropertyGroup>
+        </When>
+        <When Condition="'$(Configuration)|$(Platform)'=='PGUpdate|x64'">
+          <PropertyGroup>
+            <Optimization>MinSpace</Optimization>
+            <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+            <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
+            <RuntimeTypeInfo>false</RuntimeTypeInfo>
+          </PropertyGroup>
+        </When>
+        <When Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+          <PropertyGroup>
+            <Optimization>MinSpace</Optimization>
+            <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+            <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
+            <RuntimeTypeInfo>false</RuntimeTypeInfo>
+          </PropertyGroup>
+        </When>
+      </Choose>
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">/Zo</AdditionalOptions>
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='PGInstrument|ARM'">/Zo</AdditionalOptions>
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='PGUpdate|ARM'">/Zo</AdditionalOptions>