From 5f99f873afbc8e866ed8cc5e9b506da29b774d0a Mon Sep 17 00:00:00 2001
From: feodor_fitsner <devnull@localhost>
Date: Thu, 23 Aug 2012 17:06:48 -0700
Subject: [PATCH] AWStats.Viewer converted to support VS2012

---
 .../Tools/WebsitePanel.AWStats.Viewer.sln     |   4 ++--
 .../WebsitePanel.AWStats.Viewer.csproj        |  10 ++++++++--
 WebsitePanel/Tools/diff.exe                   | Bin 8704 -> 9216 bytes
 WebsitePanel/Tools/diff.exe.config            |   3 +++
 4 files changed, 13 insertions(+), 4 deletions(-)
 create mode 100644 WebsitePanel/Tools/diff.exe.config

diff --git a/WebsitePanel/Sources/Tools/WebsitePanel.AWStats.Viewer.sln b/WebsitePanel/Sources/Tools/WebsitePanel.AWStats.Viewer.sln
index 748189db..f6b955ff 100644
--- a/WebsitePanel/Sources/Tools/WebsitePanel.AWStats.Viewer.sln
+++ b/WebsitePanel/Sources/Tools/WebsitePanel.AWStats.Viewer.sln
@@ -1,5 +1,5 @@
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2012
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebsitePanel.AWStats.Viewer", "WebsitePanel.AWStats.Viewer\WebsitePanel.AWStats.Viewer.csproj", "{5F8C0079-C339-4590-BF10-DBA470329293}"
 EndProject
 Global
diff --git a/WebsitePanel/Sources/Tools/WebsitePanel.AWStats.Viewer/WebsitePanel.AWStats.Viewer.csproj b/WebsitePanel/Sources/Tools/WebsitePanel.AWStats.Viewer/WebsitePanel.AWStats.Viewer.csproj
index ba7f5487..d5c565e5 100644
--- a/WebsitePanel/Sources/Tools/WebsitePanel.AWStats.Viewer/WebsitePanel.AWStats.Viewer.csproj
+++ b/WebsitePanel/Sources/Tools/WebsitePanel.AWStats.Viewer/WebsitePanel.AWStats.Viewer.csproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <ProductVersion>9.0.30729</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
@@ -27,7 +28,7 @@
     </FileUpgradeFlags>
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
-    <OldToolsVersion>3.5</OldToolsVersion>
+    <OldToolsVersion>4.0</OldToolsVersion>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <TargetFrameworkProfile />
   </PropertyGroup>
@@ -149,6 +150,10 @@
     <Content Include="Web-v2.0.config" />
     <None Include="Web.config" />
   </ItemGroup>
+  <PropertyGroup>
+    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+  </PropertyGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PreBuildEvent>
@@ -175,5 +180,6 @@
       </FlavorProperties>
     </VisualStudio>
   </ProjectExtensions>
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" />
+  <Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" Condition="false" />
 </Project>
\ No newline at end of file
diff --git a/WebsitePanel/Tools/diff.exe b/WebsitePanel/Tools/diff.exe
index 12fbd242cbd2f2f5f6b48754c9ed9cce97c0a55a..af27fd05c9d0b7d32b94f06b76967297caa026c3 100644
GIT binary patch
delta 3886
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
Xw_=Vu@o6r}`QEM*BKQkC+F|_*wP9*s

delta 3197
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
N|D>4nPc~68{|BAj<=FrL

diff --git a/WebsitePanel/Tools/diff.exe.config b/WebsitePanel/Tools/diff.exe.config
new file mode 100644
index 00000000..cb2586be
--- /dev/null
+++ b/WebsitePanel/Tools/diff.exe.config
@@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup></configuration>