From 75f9d73f30e1a3f7d3702623945e9c02e5391fd3 Mon Sep 17 00:00:00 2001
From: Alekhya Reddy <reddykalekhya@gmail.com>
Date: Fri, 8 May 2020 08:59:05 -0700
Subject: [PATCH] Modified project files

---
 src/common/common.vcxproj         | 2 --
 src/common/common.vcxproj.filters | 6 ------
 src/runner/runner.vcxproj         | 7 +++++--
 src/runner/runner.vcxproj.filters | 3 +++
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/common/common.vcxproj b/src/common/common.vcxproj
index 3a3dcde253..7ab6c2b0a1 100644
--- a/src/common/common.vcxproj
+++ b/src/common/common.vcxproj
@@ -121,7 +121,6 @@
     <ClInclude Include="keyboard_layout.h" />
     <ClInclude Include="keyboard_layout_impl.h" />
     <ClInclude Include="notifications.h" />
-    <ClInclude Include="OS_Detection.h" />
     <ClInclude Include="shared_constants.h" />
     <ClInclude Include="timeutil.h" />
     <ClInclude Include="two_way_pipe_message_ipc.h" />
@@ -155,7 +154,6 @@
     <ClCompile Include="monitors.cpp" />
     <ClCompile Include="notifications.cpp" />
     <ClCompile Include="on_thread_executor.cpp" />
-    <ClCompile Include="OS_Detection.cpp" />
     <ClCompile Include="pch.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
diff --git a/src/common/common.vcxproj.filters b/src/common/common.vcxproj.filters
index 1d161075f2..941683584f 100644
--- a/src/common/common.vcxproj.filters
+++ b/src/common/common.vcxproj.filters
@@ -111,9 +111,6 @@
     <ClInclude Include="two_way_pipe_message_ipc.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="OS_Detection.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="d2d_svg.cpp">
@@ -183,9 +180,6 @@
     <ClCompile Include="two_way_pipe_message_ipc.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="OS_Detection.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
diff --git a/src/runner/runner.vcxproj b/src/runner/runner.vcxproj
index 25734015a1..a8dc27b250 100644
--- a/src/runner/runner.vcxproj
+++ b/src/runner/runner.vcxproj
@@ -62,7 +62,7 @@
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <AdditionalIncludeDirectories>..\common\inc;..\common\Telemetry;..;..\modules;..\..\deps\cpprestsdk\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\common\os-detection;..\common\inc;..\common\Telemetry;..;..\modules;..\..\deps\cpprestsdk\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalOptions>/await %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
@@ -235,6 +235,9 @@
     <ProjectReference Include="..\common\common.vcxproj">
       <Project>{74485049-c722-400f-abe5-86ac52d929b3}</Project>
     </ProjectReference>
+    <ProjectReference Include="..\common\os-detection\os-detection.vcxproj">
+      <Project>{e6410bfc-b341-498c-8c67-312c20cdd8d5}</Project>
+    </ProjectReference>
     <ProjectReference Include="..\common\updating\updating.vcxproj">
       <Project>{17da04df-e393-4397-9cf0-84dabe11032e}</Project>
     </ProjectReference>
@@ -242,7 +245,7 @@
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
-   <ItemGroup>
+  <ItemGroup>
     <Manifest Include="PowerToys.exe.manifest" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/src/runner/runner.vcxproj.filters b/src/runner/runner.vcxproj.filters
index 2359edf1f6..9b2b29e304 100644
--- a/src/runner/runner.vcxproj.filters
+++ b/src/runner/runner.vcxproj.filters
@@ -157,4 +157,7 @@
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
+  <ItemGroup>
+    <Manifest Include="PowerToys.exe.manifest" />
+  </ItemGroup>
 </Project>
\ No newline at end of file