Skip to content
This repository was archived by the owner on Jul 15, 2023. It is now read-only.

Updated the setup to support installing to Visual Studio 2015. #36

Closed
billings7 wants to merge 3 commits into from
Closed

Updated the setup to support installing to Visual Studio 2015. #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e555e5e
Updated the setup to support installing to Visual Studio 2015.
billings7 Apr 28, 2015
7729068
Fixed CodeContractReSign target for MsBuild v14.0 to use the correct …
billings7 Apr 29, 2015
c5ff99d
Fixed Microsoft.CodeContracts.targets to use the correct targets path.
billings7 May 27, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified Microsoft.Research/ImportedCodeTools/CodeTools.msm
View file
Open in desktop
Binary file not shown.
Binary file modified Microsoft.Research/ImportedCodeTools/CodeToolsUpdate.exe
View file
Open in desktop
Binary file not shown.
254 changes: 254 additions & 0 deletions ...osoft.Research/ManagedContract.Setup/MSBuild/v14.0/Microsoft.CodeContractAnalysis.targets
View file
Open in desktop

Large diffs are not rendered by default.

654 changes: 654 additions & 0 deletions Microsoft.Research/ManagedContract.Setup/MSBuild/v14.0/Microsoft.CodeContracts.targets
View file
Open in desktop

Large diffs are not rendered by default.

60 changes: 60 additions & 0 deletions Microsoft.Research/ManagedContract.Setup/ManagedContracts.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@
<?define var.VS10RegistryCompGuid = "{990ACAF6-1AAE-4fa6-A178-9BF28206012F}" ?>
<?define var.VS11RegistryCompGuid = "{990ACAF7-1AAE-4fa6-A178-9BF28206012F}" ?>
<?define var.VS12RegistryCompGuid = "{990ACAF8-1AAE-4fa6-A178-9BF28206012F}" ?>
<?define var.VS14RegistryCompGuid = "{990ACB0A-1AAE-4fa6-A178-9BF28206012F}" ?>
<?define var.ContractsTargets40CompGuid = "{990ACAF9-1AAE-4fa6-A178-9BF28206012F}" ?>
<?define var.SandcastleCompGuid = "{990ACAFA-1AAE-4fa6-A178-9BF28206012F}" ?>
<?define var.EnvironmentVariablesCompGuid = "{990ACAFB-1AAE-4fa6-A178-9BF28206012F}" ?>
Expand All @@ -80,8 +81,10 @@
<?define var.VS10VsixManifestCompGuid = "{990ACB05-1AAE-4fa6-A178-9BF28206012F}" ?>
<?define var.VS11VsixManifestCompGuid = "{990ACB06-1AAE-4fa6-A178-9BF28206012F}" ?>
<?define var.VS12VsixManifestCompGuid = "{990ACB07-1AAE-4fa6-A178-9BF28206012F}" ?>
<?define var.VS14VsixManifestCompGuid = "{990ACB0B-1AAE-4fa6-A178-9BF28206012F}" ?>
<?define var.VSCloseCheckCompGuid = "{990ACB08-1AAE-4fa6-A178-9BF28206012F}" ?>
<?define var.ContractsTargets120CompGuid = "{990ACB09-1AAE-4fa6-A178-9BF28206012F}" ?>
<?define var.ContractsTargets140CompGuid = "{990ACB0C-1AAE-4fa6-A178-9BF28206012F}" ?>


<!--=====================================================================
Expand Down Expand Up @@ -212,6 +215,7 @@
<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.">
Expand All @@ -224,6 +228,7 @@
<util:RestartResource Path="[VS10DEVENV]" />
<util:RestartResource Path="[VS11DEVENV]" />
<util:RestartResource Path="[VS12DEVENV]" />
<util:RestartResource Path="[VS14DEVENV]" />
</Component>
</DirectoryRef>

Expand Down Expand Up @@ -302,6 +307,27 @@
</Directory>
</Directory>
</Directory>
<Directory Id="VS14_ROOT_FOLDER" Name="VS14Root">
<Directory Id="VS14_Common7" Name="Common7">
<Directory Id="VS14_IDE" Name="IDE">
<Directory Id="VS14_Extensions" Name="Extensions">
<Directory Id="VS14_ExtensionsMicrosoft" Name="Microsoft">
<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'/>
<File Id='VS14codecontracts_license.rtf' Name='license.rtf' Source='$(var.License)' Vital='yes'/>
</Component>
</Directory>
</Directory>
</Directory>
</Directory>
</Directory>
</Directory>
</Directory>
</DirectoryRef>

<DirectoryRef Id="TARGETDIR">
Expand Down Expand Up @@ -976,6 +1002,16 @@
<?endif?>
</Component>
</Directory>
<Directory Id='MsBuildv140' Name='v14.0'>
<Component Id='ContractsTargets140' Guid='$(var.ContractsTargets140CompGuid)'>
<File Id='ContractsTargets140' Name="$(var.CodeContractsTargets)"
Source="MsBuild\v14.0\$(var.CodeContractsTargets)" Vital='yes' />
<?if $(var.Feature_CCCheck) = true ?>
<File Id='ContractsAnalysisTargets140' Name="$(var.CodeContractsTargets2)"
Source="MsBuild\v14.0\$(var.CodeContractsTargets2)" Vital='yes' />
<?endif?>
</Component>
</Directory>
</Directory>

<!--=====================================================================
Expand Down Expand Up @@ -1177,12 +1213,14 @@
<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' />
<ComponentRef Id='ContractsTargets35' />
<ComponentRef Id='ContractsTargets40' />
<ComponentRef Id='ContractsTargets120' />
<ComponentRef Id='ContractsTargets140' />
<ComponentRef Id='ContractsPropertyPane' />
<ComponentRef Id='CodeContractTools' />
<ComponentRef Id='OutOfBandContracts35' />
Expand All @@ -1204,6 +1242,7 @@
<ComponentRef Id='VS10PackageRegistryComponent' />
<ComponentRef Id='VS11PackageRegistryComponent' />
<ComponentRef Id='VS12PackageRegistryComponent' />
<ComponentRef Id='VS14PackageRegistryComponent' />
<!-- <ComponentRef Id='VS10ExpressPackageRegistryComponent' /> -->
<ComponentRef Id='EnvironmentVariables' />
</Feature>
Expand Down Expand Up @@ -1337,6 +1376,26 @@
</Component>
</DirectoryRef>

<!-- regsitry entries for the packages -->
<DirectoryRef Id="TARGETDIR">
<!-- 14.0 hive (VS14) -->
<Component
Id="VS14PackageRegistryComponent"
Guid="$(var.VS14RegistryCompGuid)" Transitive="yes"
Win64="no">
<RegistryKey
Root="HKLM"
Key="Software\Microsoft\VisualStudio\14.0"
Action="none">
<?include vsregistrykeys.wxs?>
<RegistryKey Key="$(var.CodeToolsKey)\CodeContracts\CommonTargets\After" >
<RegistryValue Name="TargetsFile" Value="$$(CodeContractsInstallDir)MsBuild\v14.0\Microsoft.CodeContracts.targets" Type="string" />
<RegistryValue Name="MSBuildVersions" Value="14.0" Type="string" /> <!-- semicolon seperated list of versions -->
</RegistryKey>
</RegistryKey>
</Component>
</DirectoryRef>

<!--=====================================================================
The user interface: link in "UI.wxs" (which is a generic reusable module)
======================================================================-->
Expand Down Expand Up @@ -1372,6 +1431,7 @@
-->
<CustomActionRef Id="VS2012Setup" />
<CustomActionRef Id="VS2013Setup" />
<CustomActionRef Id="VS2015Setup" />

</Product>

Expand Down
26 changes: 26 additions & 0 deletions Microsoft.Research/ManagedContract.Setup/VSIX/VS14.extension.vsixmanifest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<?xml version="1.0" encoding="utf-8"?>
<PackageManifest Version="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
<Metadata>
<Identity Version="1.8.10107.10" Id="CodeContractsVSIX.MicrosoftResearch.990ACB05-1AAE-4fa6-A178-9BF28206012F" Language="en" Publisher="Microsoft Research" />
<DisplayName>Code Contracts Tools</DisplayName>
<Description xml:space="preserve">Tools to instrument and statically analyze .NET code with CodeContracts</Description>
<MoreInfo>http://visualstudiogallery.msdn.microsoft.com/1ec7db13-3363-46c9-851f-1ce455f66970</MoreInfo>
<License>License.rtf</License>
<Icon>codecontracts_SM.png</Icon>
<PreviewImage>codecontracts_project.png</PreviewImage>
</Metadata>
<Installation InstalledByMsi="true" AllUsers="true" SystemComponent="false">
<InstallationTarget Version="[14.0,15.0)" Id="Microsoft.VisualStudio.IntegratedShell" />
<InstallationTarget Version="[14.0,15.0)" Id="Microsoft.VisualStudio.Pro" />
<InstallationTarget Version="[14.0,15.0)" Id="Microsoft.VisualStudio.Premium" />
<InstallationTarget Version="[14.0,15.0)" Id="Microsoft.VisualStudio.Ultimate" />
<InstallationTarget Version="[14.0,15.0)" Id="Microsoft.VisualStudio.VSWinExpress" />
<InstallationTarget Version="[14.0,15.0)" Id="Microsoft.VisualStudio.VPDExpress" />
<InstallationTarget Version="[14.0,15.0)" Id="Microsoft.VisualStudio.VWDExpress" />
<InstallationTarget Version="[14.0,15.0)" Id="Microsoft.VisualStudio.VSLS" />
<InstallationTarget Version="[14.0,15.0)" Id="Microsoft.VisualStudio.VSWinDesktopExpress" />
</Installation>
<Assets />
</PackageManifest>


4 changes: 4 additions & 0 deletions Microsoft.Research/ManagedContract.Setup/buildMSI10.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,9 @@
<Exec
WorkingDirectory="."
Command="&quot;..\common\bin\UpdateManifestVersion.exe&quot; $(CCNetLabel) VSIX\VS12.extension.vsixmanifest" />
<Exec
WorkingDirectory="."
Command="&quot;..\common\bin\UpdateManifestVersion.exe&quot; $(CCNetLabel) VSIX\VS14.extension.vsixmanifest" />
</Target>

<!--==========================================================
Expand Down Expand Up @@ -820,6 +823,7 @@
ManagedContracts.wxs;
dev10.wxs;
dev12.wxs;
dev14.wxs;
UI.wxs;
"/>
<WixBaseDirs Include="
Expand Down
137 changes: 137 additions & 0 deletions Microsoft.Research/ManagedContract.Setup/dev14.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,137 @@
<?xml version="1.0" encoding="utf-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Fragment>
<Property Id="VS14DEVENV" Secure="yes">
<RegistrySearch
Id="VS14DevEnvSearch"
Root="HKLM"
Key="SOFTWARE\Microsoft\VisualStudio\14.0\Setup\VS"
Name="EnvironmentPath"
Type="raw" />
</Property>
</Fragment>

<Fragment>
<Property Id="VS14EXPRESSDEVENV" Secure="yes">
<RegistrySearch
Id="VS10ExpressDevEnvSearch"
Root="HKLM"
Key="SOFTWARE\Microsoft\VCSExpress\14.0\Setup\VS"
Name="ProductDir"
Type="raw" />
</Property>
</Fragment>

<Fragment>
<Property Id="VS2015DEVENV" Secure="yes">
<RegistrySearch Id="VS2015DevEnvSearch" Root="HKLM" Key="SOFTWARE\Microsoft\VisualStudio\14.0\Setup\VS" Name="EnvironmentPath" Type="raw" />
</Property>
</Fragment>

<Fragment>
<CustomAction Id="VS2015Setup" Property="VS2015DEVENV" ExeCommand="/setup" Execute="deferred" Return="ignore" Impersonate="no" />
<PropertyRef Id="VS2015DEVENV" />

<InstallExecuteSequence>
<Custom Action="VS2015Setup" Before="InstallFinalize" Overridable="yes">VS2015DEVENV</Custom>
</InstallExecuteSequence>
</Fragment>

<!--
<Fragment>
<CustomAction Id="VS10Setup" Property="VS10DEVENV" ExeCommand="/setup" Execute="deferred" Return="ignore" Impersonate="no" />
<PropertyRef Id="VS10DEVENV" />
<InstallExecuteSequence>
<Custom Action="VS10Setup" Before="InstallFinalize" Overridable="yes">VS10DEVENV</Custom>
</InstallExecuteSequence>
</Fragment>
-->
<Fragment>
<Property Id="VS14_ITEMTEMPLATES_DIR" Secure="yes">
<RegistrySearch Id="VS14DevEnvForItemTemplatesSearch" Root="HKLM" Key="SOFTWARE\Microsoft\VisualStudio\14.0\Setup\VS" Name="EnvironmentPath" Type="raw">
<DirectorySearch Id="VS14ItemTemplatesPathSearch" Path="ItemTemplates" Depth="1" />
</RegistrySearch>
</Property>
</Fragment>

<Fragment>
<Property Id="VS14_PROJECTTEMPLATES_DIR" Secure="yes">
<RegistrySearch Id="VS14DevEnvForProjectTemplatesSearch" Root="HKLM" Key="SOFTWARE\Microsoft\VisualStudio\14.0\Setup\VS" Name="EnvironmentPath" Type="raw">
<DirectorySearch Id="VS14ProjectTemplatesPathSearch" Path="ProjectTemplates" Depth="1" />
</RegistrySearch>
</Property>
</Fragment>

<Fragment>
<Property Id="VS14_SCHEMAS_DIR" Secure="yes">
<RegistrySearch Id="VS14ProductPathSearch" Root="HKLM" Key="Software\Microsoft\VisualStudio\SxS\VS7" Name="14.0" Type="raw">
<DirectorySearch Id="VS14XmlPathSearch" Path="Xml" Depth="1">
<DirectorySearch Id="VS14XmlSchemasPathSearch" Path="Schemas" Depth="1" />
</DirectorySearch>
</RegistrySearch>
</Property>
</Fragment>

<!-- Indicates whether the Visual C# project system is installed as a part of -->
<!-- Visual Studio 2008 standard or higher. If this property is set, that -->
<!-- means Visual Studio 2008 standard or higher is installed and the Visual -->
<!-- C# language tools were installed as a part of VS 2008 setup. -->
<Fragment>
<Property Id="VS14_IDE_VCSHARP_PROJECTSYSTEM_INSTALLED" Secure="yes">
<RegistrySearch Id="SearchForVCS11ProjectSystemUnderVSSetup" Root="HKLM" Key="SOFTWARE\Microsoft\VisualStudio\14.0\Projects\{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}" Name="DefaultProjectExtension" Type="raw" />
</Property>
</Fragment>

<!-- Indicates whether the Visual Studio Team Test project system is installed -->
<Fragment>
<Property Id="VS14_IDE_VSTS_TESTSYSTEM_INSTALLED" Secure="yes">
<RegistrySearch Id="SearchForVSTS11TestSystemUnderVSSetup" Root="HKLM" Key="SOFTWARE\Microsoft\VisualStudio\14.0\Projects\{3AC096D0-A1C2-E14C-1390-A8335801FDAB}" Name="Package" Type="raw" />
</Property>
</Fragment>

<!-- Indicates whether the Visual Studio Team Dev Tools is installed -->
<!-- -->
<!-- twepoiuadidasjgfksjdfnmncxzbxiuwpaituaqskg -->
<!-- old: doesn't work for contracts
<Fragment>
<Property Id="VS14_IDE_VSTS_DEVTOOLS_INSTALLED" Secure="yes">
<RegistrySearch
Id="SearchForVSTS11DevToolsUnderVSSetup"
Root="HKLM"
Key="SOFTWARE\Microsoft\VisualStudio\14.0\Licenses\02990959-292B-4b46-BCF1-0E31989AEEB4"
Type="raw"
/>
</Property>
</Fragment>

<Fragment>
<Property Id="VS90_IDE_VSTS_DEVTOOLS_INSTALLED" Secure="yes">
<RegistrySearch
Id="SearchForVSTS90DevToolsUnderVSSetup"
Root="HKLM"
Key="SOFTWARE\Microsoft\VisualStudio\9.0\Licenses\02990959-292B-4b46-BCF1-0E31989AEEB4"
Type="raw"
/>
</Property>
</Fragment>
-->
<Fragment>
<CustomAction Id="VS14InstallVSTemplates" Property="VS14DEVENV" ExeCommand="/InstallVSTemplates" Execute="deferred" Return="ignore" Impersonate="no" />
<PropertyRef Id="VS14DEVENV" />
<InstallExecuteSequence>
<Custom Action="VS14InstallVSTemplates" Before="InstallFinalize" Overridable="yes">VS14DEVENV</Custom>
</InstallExecuteSequence>
</Fragment>

<!-- Location of the Visual Studio 2015 root installation directory. -->
<Fragment>
<Property Id="VS14_ROOT_FOLDER_EXISTS" Secure="yes">
<RegistrySearch Id="SearchForVS14RootPath" Root="HKLM" Key="Software\Microsoft\VisualStudio\SxS\VS7" Name="14.0" Type="raw" />
</Property>
<CustomAction Id="SetVS14_ROOT_FOLDER" Directory="VS14_ROOT_FOLDER" Value="[VS14_ROOT_FOLDER_EXISTS]" />
<InstallExecuteSequence>
<Custom Action="SetVS14_ROOT_FOLDER" Before="InstallFiles" Overridable="yes">VS14_ROOT_FOLDER_EXISTS</Custom>
</InstallExecuteSequence>
</Fragment>

</Wix>
16 changes: 16 additions & 0 deletions Microsoft.VisualStudio.CodeTools/CodeToolsSetup/CodeTools.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@
<?define var.VS10RegistryCompGuid = "{DAA2CAF6-1AAE-4fa6-A178-9BF28206012F}" ?>
<?define var.VS11RegistryCompGuid = "{DAA2CAF7-1AAE-4fa6-A178-9BF28206012F}" ?>
<?define var.VS12RegistryCompGuid = "{DAA2CAF8-1AAE-4fa6-A178-9BF28206012F}" ?>
<?define var.VS14RegistryCompGuid = "{DAA2CAF9-1AAE-4fa6-A178-9BF28206012F}" ?>

<!--=====================================================================
Product information
Expand All @@ -90,6 +91,7 @@
<?define var.Vs10RootKey ="Software\Microsoft\VisualStudio\10.0" ?>
<?define var.Vs11RootKey ="Software\Microsoft\VisualStudio\11.0" ?>
<?define var.Vs12RootKey ="Software\Microsoft\VisualStudio\12.0" ?>
<?define var.Vs14RootKey ="Software\Microsoft\VisualStudio\14.0" ?>

<!-- Derived -->
<?define var.TaskManagerPackageKey ="Packages\$(var.TaskManagerGuid)" ?>
Expand Down Expand Up @@ -300,6 +302,20 @@
</Component>
</DirectoryRef>

<DirectoryRef Id="TARGETDIR">
<!-- 14.0 hive (VS14) -->
<Component Id="VS14RegistryComponent" Guid="$(var.VS14RegistryCompGuid)" Transitive="yes" Win64="no">
<!--
<Condition>
<![CDATA[VS14]]>
</Condition>
-->
<RegistryKey Root="HKLM" Key="$(var.Vs14RootKey)" Action="none">
<?include VsRegistryKeys.wxs?>
</RegistryKey>
</Component>
</DirectoryRef>


<!--=====================================================================
Custom action to register any installed proper pages
Expand Down