Updating for shared projects for 140 toolset solution file.

microsoft · Nov 22, 2014 · cfd845f · cfd845f
1 parent 5510bc1
commit cfd845f
Show file tree

Hide file tree

Showing 8 changed files with 165 additions and 287 deletions.
diff --git a/Release/samples/BingRequest/BingRequest140.xp/BingRequest140.xp.vcxproj b/Release/samples/BingRequest/BingRequest140.xp/BingRequest140.xp.vcxproj
diff --git a/Release/samples/BingRequest/BingRequest140/BingRequest140.vcxproj.filters b/Release/samples/BingRequest/BingRequest140/BingRequest140.vcxproj.filters
@@ -6,6 +6,8 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\bingrequest.cpp" />
+    <ClCompile Include="..\bingrequest.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>
diff --git a/Release/samples/SearchFile/SearchFile140/SearchFile140.vcxproj.filters b/Release/samples/SearchFile/SearchFile140/SearchFile140.vcxproj.filters
@@ -6,6 +6,8 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\searchfile.cpp" />
+    <ClCompile Include="..\searchfile.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>
diff --git a/Release/src/build/vs14.winrt/casablanca140.winrt.vcxproj.filters b/Release/src/build/vs14.winrt/casablanca140.winrt.vcxproj.filters
diff --git a/Release/src/build/vs14.wp81/casablanca140.wp81.vcxproj.filters b/Release/src/build/vs14.wp81/casablanca140.wp81.vcxproj.filters
diff --git a/Release/src/build/vs14/casablanca140.vcxproj b/Release/src/build/vs14/casablanca140.vcxproj
@@ -4,7 +4,6 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>{1014C621-BC2D-4813-B8C1-6D83AD6F9249}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
-    <RootNamespace>casablanca</RootNamespace>
     <SccProjectName>SAK</SccProjectName>
     <SccAuxPath>SAK</SccAuxPath>
     <SccLocalPath>SAK</SccLocalPath>
@@ -13,6 +12,7 @@
     <PlatformToolset>v140</PlatformToolset>
     <WinRTProject>false</WinRTProject>
     <TargetXP>false</TargetXP>
+    <ProjectName>cpprestsdk140</ProjectName>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.root))\Build\Config.Definitions.props" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -50,6 +50,7 @@
       <AdditionalDependencies>Winhttp.lib;httpapi.lib;bcrypt.lib;crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
-  <Import Project="../sources.proj" />
+  <Import Project="..\common.vcxitems" Label="Shared" Condition="Exists('..\common.vcxitems')" />
+  <Import Project="..\win32.vcxitems" Label="Shared" Condition="Exists('..\win32.vcxitems')" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
 </Project>
diff --git a/Release/src/build/vs14/casablanca140.vcxproj.filters b/Release/src/build/vs14/casablanca140.vcxproj.filters