Merge pull request cefsharp#2 from mwisnicki/patch/vs2012-merged

Undo VS2010/VS2012 project split and use conditional elements when neede...
mwisnicki · May 28, 2013 · 199641d · 199641d
2 parents 89fdc7d + 67a024e
commit 199641d
Show file tree

Hide file tree

Showing 27 changed files with 66 additions and 1,368 deletions.
diff --git a/CefSharp.Example/CefSharp.Example.2010.csproj b/CefSharp.Example/CefSharp.Example.2010.csproj
diff --git a/...harp.Example/CefSharp.Example.2012.csproj → CefSharp.Example/CefSharp.Example.csproj b/...harp.Example/CefSharp.Example.2012.csproj → CefSharp.Example/CefSharp.Example.csproj
@@ -75,9 +75,9 @@
     <Content Include="Resources\TooltipTest.html" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\CefSharp\CefSharp.2012.vcxproj">
+    <ProjectReference Include="..\CefSharp\CefSharp.vcxproj">
       <Project>{7b495581-2271-4f41-9476-acb86e8c864f}</Project>
-      <Name>CefSharp.2012</Name>
+      <Name>CefSharp</Name>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

diff --git a/CefSharp.Test/CefSharp.Test.2010.csproj b/CefSharp.Test/CefSharp.Test.2010.csproj
diff --git a/CefSharp.Test/CefSharp.Test.2012.csproj → CefSharp.Test/CefSharp.Test.csproj b/CefSharp.Test/CefSharp.Test.2012.csproj → CefSharp.Test/CefSharp.Test.csproj
@@ -53,13 +53,13 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\CefSharp.WinForms\CefSharp.WinForms.2012.vcxproj">
+    <ProjectReference Include="..\CefSharp.WinForms\CefSharp.WinForms.vcxproj">
       <Project>{978c9b2b-04b6-4359-a341-ca3fcbe98d32}</Project>
-      <Name>CefSharp.WinForms.2012</Name>
+      <Name>CefSharp.WinForms</Name>
     </ProjectReference>
-    <ProjectReference Include="..\CefSharp\CefSharp.2012.vcxproj">
+    <ProjectReference Include="..\CefSharp\CefSharp.vcxproj">
       <Project>{7b495581-2271-4f41-9476-acb86e8c864f}</Project>
-      <Name>CefSharp.2012</Name>
+      <Name>CefSharp</Name>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

diff --git a/CefSharp.WinForms.Example/CefSharp.WinForms.Example.2010.csproj b/CefSharp.WinForms.Example/CefSharp.WinForms.Example.2010.csproj
diff --git a/...ple/CefSharp.WinForms.Example.2012.csproj → ....Example/CefSharp.WinForms.Example.csproj b/...ple/CefSharp.WinForms.Example.2012.csproj → ....Example/CefSharp.WinForms.Example.csproj
@@ -108,17 +108,17 @@
     <None Include="Resources\chromium-256.png" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\CefSharp.Example\CefSharp.Example.2012.csproj">
+    <ProjectReference Include="..\CefSharp.Example\CefSharp.Example.csproj">
       <Project>{a4394e7b-1155-43a6-989e-8ab72dddc9e4}</Project>
-      <Name>CefSharp.Example.2012</Name>
+      <Name>CefSharp.Example</Name>
     </ProjectReference>
-    <ProjectReference Include="..\CefSharp.WinForms\CefSharp.WinForms.2012.vcxproj">
+    <ProjectReference Include="..\CefSharp.WinForms\CefSharp.WinForms.vcxproj">
       <Project>{978c9b2b-04b6-4359-a341-ca3fcbe98d32}</Project>
-      <Name>CefSharp.WinForms.2012</Name>
+      <Name>CefSharp.WinForms</Name>
     </ProjectReference>
-    <ProjectReference Include="..\CefSharp\CefSharp.2012.vcxproj">
+    <ProjectReference Include="..\CefSharp\CefSharp.vcxproj">
       <Project>{7b495581-2271-4f41-9476-acb86e8c864f}</Project>
-      <Name>CefSharp.2012</Name>
+      <Name>CefSharp</Name>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />