Merged with viewer-development.

The reason was to manually resolve a couple of merge problems, as upstream has had several changes since this was applied, and some of the changes overlapped.

4 files changed, 16 insertions, 3 deletions

diff --git a/indra/tools/vstool/VSTool.csproj b/indra/tools/vstool/VSTool.csproj
index 24f1031f81..7f431e85c7 100644
--- a/indra/tools/vstool/VSTool.csproj
+++ b/indra/tools/vstool/VSTool.csproj
@@ -1,4 +1,5 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+<?xml version="1.0" encoding="utf-8"?>

+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">

   <PropertyGroup>

     <ProjectType>Local</ProjectType>

     <ProductVersion>8.0.50727</ProductVersion>

@@ -25,6 +26,8 @@
     </FileUpgradeFlags>

     <UpgradeBackupLocation>

     </UpgradeBackupLocation>

+    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>

+    <OldToolsVersion>2.0</OldToolsVersion>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

     <OutputPath>.\</OutputPath>

diff --git a/indra/tools/vstool/VSTool.exe b/indra/tools/vstool/VSTool.exe
index 6d1497d5e5..8be428614e 100755
--- a/indra/tools/vstool/VSTool.exe
+++ b/indra/tools/vstool/VSTool.exe
diff --git a/indra/tools/vstool/VSTool.sln b/indra/tools/vstool/VSTool.sln
index 8859671802..21e3d75971 100644
--- a/indra/tools/vstool/VSTool.sln
+++ b/indra/tools/vstool/VSTool.sln
@@ -1,5 +1,5 @@
-Microsoft Visual Studio Solution File, Format Version 9.00

-# Visual Studio 2005

+Microsoft Visual Studio Solution File, Format Version 11.00

+# Visual Studio 2010

 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VSTool", "VSTool.csproj", "{96943E2D-1373-4617-A117-D0F997A94919}"

 EndProject

 Global

diff --git a/indra/tools/vstool/main.cs b/indra/tools/vstool/main.cs
index cc268d59d9..cc73261e30 100644
--- a/indra/tools/vstool/main.cs
+++ b/indra/tools/vstool/main.cs
@@ -550,6 +550,11 @@ namespace VSTool
                     case "10.00":

                         version = "VC90";

                         break;

+

+                    case "11.00":

+                        version = "VC100";

+                        break;

+

                     default:

                         throw new ApplicationException("Unknown .sln version: " + format);

                 }

@@ -585,6 +590,11 @@ namespace VSTool
                 case "VC90":

                     progid = "VisualStudio.DTE.9.0";

                     break;

+

+                case "VC100":

+                    progid = "VisualStudio.DTE.10.0";

+                    break;

+

                 default:

                     throw new ApplicationException("Can't handle VS version: " + version);

             }