Fix issues with the install/uninstall process

Fixes microsoft#7 Fixes microsoft#8
sharwell · Jul 27, 2015 · caf5242 · caf5242
1 parent f9b2f18
commit caf5242
Showing 1 changed file with 76 additions and 31 deletions.
diff --git a/Microsoft.Research/ManagedContract.Setup/ManagedContracts.wxs b/Microsoft.Research/ManagedContract.Setup/ManagedContracts.wxs
@@ -208,29 +208,22 @@
     <PropertyRef Id="VS90_ROOT_FOLDER" />
 
     <PropertyRef Id="VS90DEVENV"/>
-    <PropertyRef Id="VS10DEVENV"/>
-    <PropertyRef Id="VS10EXPRESSDEVENV"/>
-    <PropertyRef Id="VS10_ROOT_FOLDER"/>
-    <PropertyRef Id="VS11_ROOT_FOLDER"/>
-    <PropertyRef Id="VS12_ROOT_FOLDER_EXISTS"/>
-    <PropertyRef Id="VS14_ROOT_FOLDER_EXISTS"/>
-
-<!--
-    <Condition Message="This installer requires Visual Studio 2008 or 2010.">
-      <![CDATA[Installed OR VS90DEVENV OR VS10DEVENV]]>
-    </Condition>
--->
+    <PropertyRef Id="VS2010DEVENV"/>
+    <!--<PropertyRef Id="VS10EXPRESSDEVENV"/>-->
+    <PropertyRef Id="VS2010_ROOT_FOLDER"/>
+    <PropertyRef Id="VS2012_ROOT_FOLDER"/>
+    <PropertyRef Id="VS2013_ROOT_FOLDER"/>
+    <PropertyRef Id="VS14_ROOT_FOLDER"/>
 
     <DirectoryRef Id="TARGETDIR">
-      <Directory Id="VS10_ROOT_FOLDER" Name="VS10Root">
+      <Directory Id="VS2010_ROOT_FOLDER" Name="VS10Root">
         <Directory Id="VS10_Common7" Name="Common7">
           <Directory Id="VS10_IDE" Name="IDE">
             <Directory Id="VS10_Extensions" Name="Extensions">
               <Directory Id="VS10_ExtensionsMicrosoft" Name="Microsoft">
                 <Directory Id="VS10_ExtensionsMicrosoftContracts" Name="CodeContracts">
                   <Directory Id="VS10_ExtensionsMicrosoftContractsVersion" Name="$(var.Version)">
                     <Component Id='VS10extension.manifestComp' Guid='$(var.VS10VsixManifestCompGuid)'>
-                      <Condition>VS10_ROOT_FOLDER</Condition>
                       <File Id='VS10extension.manifest' Name='extension.vsixmanifest' Source='VS10.extension.vsixmanifest' Vital='yes'/>
                       <File Id='VS10codecontracts_SM.png' Name='codecontracts_SM.png' Source='codecontracts_SM.png' Vital='yes'/>
                     </Component>            
@@ -241,15 +234,14 @@
           </Directory>
         </Directory>
       </Directory>
-      <Directory Id="VS11_ROOT_FOLDER" Name="VS11Root">
+      <Directory Id="VS2012_ROOT_FOLDER" Name="VS11Root">
         <Directory Id="VS11_Common7" Name="Common7">
           <Directory Id="VS11_IDE" Name="IDE">
             <Directory Id="VS11_Extensions" Name="Extensions">
               <Directory Id="VS11_ExtensionsMicrosoft" Name="Microsoft">
                 <Directory Id="VS11_ExtensionsMicrosoftContracts" Name="CodeContracts">
                   <Directory Id="VS11_ExtensionsMicrosoftContractsVersion" Name="$(var.Version)">
                     <Component Id='VS11extension.manifestComp' Guid='$(var.VS11VsixManifestCompGuid)'>
-                      <Condition>VS11_ROOT_FOLDER</Condition>
                       <File Id='VS11extension.manifest' Name='extension.vsixmanifest' Source='VS11.extension.vsixmanifest' Vital='yes'/>
                       <File Id='VS11codecontracts_SM.png' Name='codecontracts_SM.png' Source='codecontracts_SM.png' Vital='yes'/>
                       <File Id='VS11codecontracts_project.png' Name='codecontracts_project.png' Source='codecontracts_project.png' Vital='yes'/>
@@ -262,15 +254,14 @@
           </Directory>
         </Directory>
       </Directory>
-      <Directory Id="VS12_ROOT_FOLDER" Name="VS12Root">
+      <Directory Id="VS2013_ROOT_FOLDER" Name="VS12Root">
         <Directory Id="VS12_Common7" Name="Common7">
           <Directory Id="VS12_IDE" Name="IDE">
             <Directory Id="VS12_Extensions" Name="Extensions">
               <Directory Id="VS12_ExtensionsMicrosoft" Name="Microsoft">
                 <Directory Id="VS12_ExtensionsMicrosoftContracts" Name="CodeContracts">
                   <Directory Id="VS12_ExtensionsMicrosoftContractsVersion" Name="$(var.Version)">
                     <Component Id='VS12extension.manifestComp' Guid='$(var.VS12VsixManifestCompGuid)'>
-                      <Condition><![CDATA[Installed OR VS12_ROOT_FOLDER_EXISTS]]></Condition>
                       <File Id='VS12extension.manifest' Name='extension.vsixmanifest' Source='VS12.extension.vsixmanifest' Vital='yes'/>
                       <File Id='VS12codecontracts_SM.png' Name='codecontracts_SM.png' Source='codecontracts_SM.png' Vital='yes'/>
                       <File Id='VS12codecontracts_project.png' Name='codecontracts_project.png' Source='codecontracts_project.png' Vital='yes'/>
@@ -291,7 +282,6 @@
                 <Directory Id="VS14_ExtensionsMicrosoftContracts" Name="CodeContracts">
                   <Directory Id="VS14_ExtensionsMicrosoftContractsVersion" Name="$(var.Version)">
                     <Component Id='VS14extension.manifestComp' Guid='$(var.VS14VsixManifestCompGuid)'>
-                      <Condition><![CDATA[Installed OR VS14_ROOT_FOLDER_EXISTS]]></Condition>
                       <File Id='VS14extension.manifest' Name='extension.vsixmanifest' Source='VS14.extension.vsixmanifest' Vital='yes'/>
                       <File Id='VS14codecontracts_SM.png' Name='codecontracts_SM.png' Source='codecontracts_SM.png' Vital='yes'/>
                       <File Id='VS14codecontracts_project.png' Name='codecontracts_project.png' Source='codecontracts_project.png' Vital='yes'/>
@@ -1185,10 +1175,6 @@
         <?if $(var.Feature_Pex) = true ?>
           <MergeRef Id="ExtendedReflectionModule"/>
         <?endif?>
-        <ComponentRef Id='VS10extension.manifestComp' />
-        <ComponentRef Id='VS11extension.manifestComp' />
-        <ComponentRef Id='VS12extension.manifestComp' />
-        <ComponentRef Id='VS14extension.manifestComp' />
         <ComponentRef Id='Microsoft.Contracts' />
         <ComponentRef Id='Microsoft.ContractsSL3' />
         <ComponentRef Id='Microsoft.ContractsWP71' />
@@ -1213,16 +1199,75 @@
         <ComponentRef Id='CSharpSourceDirectoryId' />
         <ComponentRef Id='VBSourceDirectoryId' />
         <ComponentRef Id='LicenseCompId' />
-        <ComponentRef Id='VS90PackageRegistryComponent' />
-        <ComponentRef Id='VS10PackageRegistryComponent' />
-        <ComponentRef Id='VS11PackageRegistryComponent' />
-        <ComponentRef Id='VS12PackageRegistryComponent' />
-        <ComponentRef Id='VS14PackageRegistryComponent' />
-<!--        <ComponentRef Id='VS10ExpressPackageRegistryComponent' /> -->
         <ComponentRef Id='EnvironmentVariables' />
       </Feature>
     </Feature>
 
+    <Feature Id="Feature_VS2008"
+             Title="Visual Studio 2008 Support"
+             Description="Visual Studio 2008 Support"
+             AllowAdvertise="no"
+             Display="expand"
+             InstallDefault="local"
+             Level="0"
+             TypicalDefault="install">
+      <Condition Level="1">VS90DEVENV OR VS90_ROOT_FOLDER OR REMOVE</Condition>
+      <ComponentRef Id='VS90PackageRegistryComponent' />
+    </Feature>
+
+    <Feature Id="Feature_VS2010"
+             Title="Visual Studio 2010 Support"
+             Description="Visual Studio 2010 Support"
+             AllowAdvertise="no"
+             Display="expand"
+             InstallDefault="local"
+             Level="0"
+             TypicalDefault="install">
+      <Condition Level="1">VS2010DEVENV OR VS2010_ROOT_FOLDER OR REMOVE</Condition>
+      <ComponentRef Id='VS10extension.manifestComp' />
+      <ComponentRef Id='VS10PackageRegistryComponent' />
+<!--        <ComponentRef Id='VS10ExpressPackageRegistryComponent' /> -->
+    </Feature>
+
+    <Feature Id="Feature_VS2012"
+             Title="Visual Studio 2012 Support"
+             Description="Visual Studio 2012 Support"
+             AllowAdvertise="no"
+             Display="expand"
+             InstallDefault="local"
+             Level="0"
+             TypicalDefault="install">
+      <Condition Level="1">VS2012DEVENV OR VS2012_ROOT_FOLDER OR REMOVE</Condition>
+      <ComponentRef Id='VS11extension.manifestComp' />
+      <ComponentRef Id='VS11PackageRegistryComponent' />
+    </Feature>
+
+    <Feature Id="Feature_VS2013"
+             Title="Visual Studio 2013 Support"
+             Description="Visual Studio 2013 Support"
+             AllowAdvertise="no"
+             Display="expand"
+             InstallDefault="local"
+             Level="0"
+             TypicalDefault="install">
+      <Condition Level="1">VS2013DEVENV OR VS2013_ROOT_FOLDER OR REMOVE</Condition>
+      <ComponentRef Id='VS12extension.manifestComp' />
+      <ComponentRef Id='VS12PackageRegistryComponent' />
+    </Feature>
+
+    <Feature Id="Feature_VS2015"
+             Title="Visual Studio 2015 Support"
+             Description="Visual Studio 2015 Support"
+             AllowAdvertise="no"
+             Display="expand"
+             InstallDefault="local"
+             Level="0"
+             TypicalDefault="install">
+      <Condition Level="1">VS14DEVENV OR VS14_ROOT_FOLDER OR REMOVE</Condition>
+      <ComponentRef Id='VS14extension.manifestComp' />
+      <ComponentRef Id='VS14PackageRegistryComponent' />
+    </Feature>
+
     <!-- Documentation -->
     <DirectoryRef Id='INSTALLDIR'>
       <Directory Id='Documentation' Name='Documentation'>
@@ -1279,7 +1324,7 @@
         Win64="no">
 <!-- Always write these registry entries, otherwise Daan's CodeTools won't put the msbuild hook in
         <Condition>
-          <![CDATA[VS10DEVENV]]>
+          <![CDATA[VS2010DEVENV]]>
         </Condition>
 -->
         <RegistryKey
@@ -1406,7 +1451,7 @@
     -->
     <CustomActionRef Id="VS2012Setup" />
     <CustomActionRef Id="VS2013Setup" />
-    <CustomActionRef Id="VS2015Setup" />
+    <CustomActionRef Id="VS14Setup" />
 
   </Product>