Merge pull request #109 from bsara/master

Resolved Issue #108 (MSI lacks integration for Visual Studio 2013)

Author: pwelter34

Source/MSBuild.Community.Tasks.Setup/MSBuildTasks.wixproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <ProductVersion>3.5</ProductVersion>
+    <ProductVersion>3.8</ProductVersion>
     <ProjectGuid>{6e293db7-b1e3-4cea-ab94-79a979f91af5}</ProjectGuid>
     <SchemaVersion>2.0</SchemaVersion>
     <OutputName>MSBuild.Community.Tasks</OutputName>

Source/MSBuild.Community.Tasks.Setup/MSBuildTasks.wxs

@@ -154,10 +154,37 @@
       </RegistrySearch>
     </Property>
 
+    <Property Id="VS2013_SCHEMAS_MSBUILD_DIR">
+      <RegistrySearch Id="VS2013SearchForCommonPath" Root="HKLM"
+                      Key="Software\Microsoft\VisualStudio\SxS\VS7" Name="12.0" Type="raw">
+        <DirectorySearch Id="VS2013SearchForXmlPath" Path="Xml" Depth="1">
+          <DirectorySearch Id="VS2013SearchForXmlSchemasPath" Path="Schemas" Depth="1">
+            <DirectorySearch Id="VS2013SearchForXmlSchemasLangPath" Path="1033" Depth="1">
+              <DirectorySearch Id="VS2013SearchForXmlSchemasMSBuildPath" Path="MSBuild" Depth="1" />
+            </DirectorySearch>
+          </DirectorySearch>
+        </DirectorySearch>
+      </RegistrySearch>
+    </Property>
+
+    <Property Id="VS2013_MSBUILD_SCHEMA">
+      <RegistrySearch Id="VS2013SearchForCommonPath2" Root="HKLM"
+                      Key="Software\Microsoft\VisualStudio\SxS\VS7" Name="12.0" Type="raw">
+        <DirectorySearch Id="VS2013SearchForXmlPath2" Path="Xml" Depth="1">
+          <DirectorySearch Id="VS2013SearchForXmlSchemasPath2" Path="Schemas" Depth="1">
+            <DirectorySearch Id="VS2013SearchForXmlSchemasLangPath2" Path="1033" Depth="1">
+              <FileSearch Id ="VS2013SearchForMSBuildSchema" Name="Microsoft.Build.xsd"/>
+            </DirectorySearch>
+          </DirectorySearch>
+        </DirectorySearch>
+      </RegistrySearch>
+    </Property>
+
     <PropertyRef Id="VS2005DEVENV" />
     <PropertyRef Id="VS90DEVENV" />
     <PropertyRef Id="VS2010DEVENV" />
     <PropertyRef Id="VS2012DEVENV" />
+    <PropertyRef Id="VS2013DEVENV" />
 
     <Directory Id="TARGETDIR" Name="SourceDir">
       <Directory Id="ProgramFilesFolder">
@@ -310,6 +337,39 @@
                         Sequence="1">
         </util:XmlConfig>
       </Component>
+
+      <Component Id="MSBuildTasksVS2013" Guid="44D5E139-E47A-496c-A123-97D092760FA1">
+        <RegistryKey Root="HKLM" Key="Software\Microsoft\VisualStudio\12.0\MSBuild\SafeImports">
+          <RegistryValue Name="MSBuildCommunityTasks" Value="[MSBuildTasksDir]MSBuild.Community.Tasks.Targets" Type="string" KeyPath="yes" />
+        </RegistryKey>
+        <CopyFile Id="CopySchema2013"
+                  DestinationProperty="VS2013_SCHEMAS_MSBUILD_DIR"
+                  FileId="MSBuild.Community.Tasks.xsd" />
+        <util:XmlConfig Id="MSBuildTasksSchemaIncludeVS2013"
+                        File="[VS2013_MSBUILD_SCHEMA]"
+                        Action="create"
+                        On="install"
+                        ElementPath="//xs:schema"
+                        Name="xs:include"
+                        Node="element"
+                        VerifyPath="$(var.VerifyPath)"
+                        Sequence="1">
+          <util:XmlConfig Id="MSBuildTasksSchemaLocationVS2013"
+                          File="[VS2013_MSBUILD_SCHEMA]"
+                          ElementId="MSBuildTasksSchemaIncludeVS2013"
+                          Name="schemaLocation"
+                          Value="MSBuild\MSBuild.Community.Tasks.xsd" />
+        </util:XmlConfig>
+        <util:XmlConfig Id="MSBuildTasksSchemaRemoveVS2013"
+                        File="[VS2013_MSBUILD_SCHEMA]"
+                        Action="delete"
+                        On="uninstall"
+                        ElementPath="//xs:schema"
+                        Node="element"
+                        VerifyPath="$(var.VerifyPath)"
+                        Sequence="1">
+        </util:XmlConfig>
+      </Component>
     </DirectoryRef>
 
     <!-- Global Assembly Cache -->
@@ -369,6 +429,16 @@
         <ComponentRef Id="MSBuildTasksVS2012" />
       </Feature>
 
+      <Feature Id="MSBuildTasksVS2013Feature"
+         Title="Visual Studio 2013 Integration"
+         Description="Integrate MSBuild Community Tasks with Visual Studio 2013."
+         AllowAdvertise="no"
+         Display="expand"
+         Level="0">
+        <Condition Level="1">VS2013DEVENV</Condition>
+        <ComponentRef Id="MSBuildTasksVS2013" />
+      </Feature>
+
     </Feature>
 
     <!-- Install Sequences -->