microsoft
/
VisualStudio-TestHost
зеркало из https://github.com/microsoft/VisualStudio-TestHost.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Merge from dev14 branch

This commit is contained in:
Steve Dower 2017-02-15 10:47:28 -08:00
Родитель 1692d57898 ac8c14f0bb
Коммит 1bd73e259c
12 изменённых файлов: 26 добавлений и 209 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
Build/Common.Build.CSharp.targets
Просмотреть файл

@ -21,6 +21,4 @@
<StrongName>StrongName</StrongName>
</FilesToSign>
</ItemGroup>
<Import Project="$(BuildRoot)\packages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.targets" Condition="Exists('$(BuildRoot)\packages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.targets')" />
</Project>

8
Build/Common.Build.settings
Просмотреть файл

@ -12,8 +12,6 @@
<BuildRoot>$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.root))</BuildRoot>
</PropertyGroup>
<Import Project="$(BuildRoot)\packages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.props" Condition="Exists('$(BuildRoot)\packages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.props')" />
<PropertyGroup>
<Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
@ -96,6 +94,10 @@
<UnsignedOutputPath Condition="'$(UnsignedOutputPath)' == ''">$(BuildOutputRoot)raw\unsigned\</UnsignedOutputPath>
<UnsignedOutputPath Condition="!HasTrailingSlash($(UnsignedOutputPath))">$(UnsignedOutputPath)\</UnsignedOutputPath>
<PackagesPath Condition="'$(PackagesPath)' == '' and Exists('$(BuildRoot)packages')">$(BuildRoot)packages\</PackagesPath>
<PackagesPath Condition="'$(PackagesPath)' == ''">$(BuildOutputRoot)packages\</PackagesPath>
<PackagesPath Condition="!HasTrailingSlash($(PackagesPath))">$(PackagesPath)\</PackagesPath>
<IntermediateOutputRoot Condition="'$(IntermediateOutputRoot)' == ''">$(BuildOutputRoot)raw\obj\</IntermediateOutputRoot>
<IntermediateOutputRoot Condition="!HasTrailingSlash($(IntermediateOutputRoot))">$(IntermediateOutputRoot)\</IntermediateOutputRoot>
<IntermediateOutputPath Condition="'$(IntermediateOutputPath)' == ''">$(IntermediateOutputRoot)$(IntermediateOutputPathSuffix)</IntermediateOutputPath>
@ -128,7 +130,7 @@
<CopyLocalReferenceVsixItems Condition="'$(CopyLocalReferenceVsixItems)' == ''">false</CopyLocalReferenceVsixItems>
</PropertyGroup>
<Import Project="$(PackagesPath)MicroBuild.Core.0.2.0\build\MicroBuild.Core.props" Condition="Exists('$(PackagesPath)MicroBuild.Core.0.2.0\build\MicroBuild.Core.props')" />
<PropertyGroup>
<ErrorReport>prompt</ErrorReport>

2
Build/Common.Build.targets
Просмотреть файл

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Target Name="GetNativeManifest" />
<Import Project="$(BuildRoot)\packages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.targets" Condition="Exists('$(BuildRoot)\packages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.targets')" />
<Import Project="$(PackagesPath)MicroBuild.Core.0.2.0\build\MicroBuild.Core.targets" Condition="Exists('$(PackagesPath)MicroBuild.Core.0.2.0\build\MicroBuild.Core.targets')" />
</Project>

36
Installer/Installer.wixproj
Просмотреть файл

@ -1,29 +1,28 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\WiX.3.9.2.1\build\wix.props" Condition="Exists('..\packages\WiX.3.9.2.1\build\wix.props')" />
<PropertyGroup>
<BuildRoot>$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.root))</BuildRoot>
<BuildRoot Condition="!HasTrailingSlash($(BuildRoot))">$(BuildRoot)\</BuildRoot>
</PropertyGroup>
<Import Project="$(BuildRoot)Build\Common.Build.settings" />
<Import Project="$(PackagesPath)WiX.3.10.3\build\wix.props" Condition="Exists('$(PackagesPath)WiX.3.10.3\build\wix.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
<ProductVersion>3.8</ProductVersion>
<ProductVersion>3.10</ProductVersion>
<ProjectGuid>19b3ef60-2d4b-4598-9f31-bcd75751b244</ProjectGuid>
<SchemaVersion>2.0</SchemaVersion>
<OutputName>VSTestHost</OutputName>
<OutputType>Package</OutputType>
<DefineSolutionProperties>false</DefineSolutionProperties>
<VSTestHostTarget Condition="'$(VSTestHostTarget)' == ''">Build</VSTestHostTarget>
<VSTargetVersions Condition="'$(VSTargetVersions)' == ''">11;12;14;15</VSTargetVersions>
<VSTargetVersions Condition="'$(VSTargetVersions)' == ''">14</VSTargetVersions>
<OutputPath>$(ReleaseOutputPath)</OutputPath>
<OutDir>$(OutputPath)</OutDir>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<OutputPath>bin\$(Configuration)\</OutputPath>
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
<DefineConstants>Debug</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
<OutputPath>bin\$(Configuration)\</OutputPath>
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
</PropertyGroup>
<ItemGroup>
<Compile Include="Product.wxs" />
</ItemGroup>
@ -35,8 +34,8 @@
</ItemGroup>
<!-- No signed binaries provided, so rebuild VSTestHost from source. -->
<ItemGroup Condition="'$(VSTestHostSignedBinariesPath)' == ''">
<_VSTestHost Include="@(_VSVersions->'$(BuildRoot)BuildOutput\$(Configuration)%(Identity).0\raw\Microsoft.VisualStudioTools.VSTestHost.%(Identity).0.dll')">
<PkgDefFullPath>$(BuildRoot)BuildOutput\$(Configuration)%(Identity).0\raw\Microsoft.VisualStudioTools.VSTestHost.%(Identity).0.pkgdef</PkgDefFullPath>
<_VSTestHost Include="@(_VSVersions->'$(BuildRoot)BuildOutput\$(Configuration)%(Identity).0\raw\binaries\Microsoft.VisualStudioTools.VSTestHost.%(Identity).0.dll')">
<PkgDefFullPath>$(BuildRoot)BuildOutput\$(Configuration)%(Identity).0\raw\binaries\Microsoft.VisualStudioTools.VSTestHost.%(Identity).0.pkgdef</PkgDefFullPath>
<Project>$(MSBuildThisFileDirectory)\..\VSTestHost\VSTestHost.csproj</Project>
<Properties>Platform=AnyCPU;Configuration=$(Configuration);DeployExtension=false;VSTarget=%(Identity).0</Properties>
<VSVersion>%(Identity)</VSVersion>
@ -46,7 +45,7 @@
<!-- We have signed binaries, so use those instead of rebuilding. -->
<ItemGroup Condition="'$(VSTestHostSignedBinariesPath)' != ''">
<_VSTestHost Include="@(_VSVersions->'$(VSTestHostSignedBinariesPath)\Microsoft.VisualStudioTools.VSTestHost.%(Identity).0.dll')">
<PkgDefFullPath>$(BuildRoot)BuildOutput\$(Configuration)%(Identity).0\raw\Microsoft.VisualStudioTools.VSTestHost.%(Identity).0.pkgdef</PkgDefFullPath>
<PkgDefFullPath>$(VSTestHostSignedBinariesPath)\Microsoft.VisualStudioTools.VSTestHost.%(Identity).0.pkgdef</PkgDefFullPath>
<VSVersion>%(Identity)</VSVersion>
</_VSTestHost>
</ItemGroup>
@ -81,10 +80,11 @@
</PropertyGroup>
</Target>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\WiX.3.9.2.1\build\wix.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\WiX.3.9.2.1\build\wix.props'))" />
</Target>
<ItemGroup>
<FilesToSign Include="$(TargetPath)">
<Authenticode>Microsoft</Authenticode>
</FilesToSign>
</ItemGroup>
<Import Project="$(BuildRoot)Build\Common.Build.targets" />
</Project>

21
Installer/Microsoft.VisualStudioTools.VSTestHost.swixproj
Просмотреть файл

@ -1,21 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<OutputPathSuffix>setup</OutputPathSuffix>
</PropertyGroup>
<Import Project="..\Build\Common.Build.settings" />
<PropertyGroup>
<OutputName>$(MSBuildThisFileName).$(VSTarget)</OutputName>
<OutputType>vsix</OutputType>
<OutputArchitecture>x86</OutputArchitecture>
<PackagePreprocessorDefinitions>FileVersion=$(FileVersion);BuildSource=$(BinariesOutputPath);VSTarget=$(VSTarget)</PackagePreprocessorDefinitions>
</PropertyGroup>
<ItemGroup>
<Package Include="vstesthost.swr" />
</ItemGroup>
<Import Project="$(TargetsPath)\Common.Build.targets" />
</Project>

21
Installer/Microsoft.VisualStudioTools.VSTestHost.vsmanproj
Просмотреть файл

@ -1,21 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<OutputPathSuffix>setup</OutputPathSuffix>
</PropertyGroup>
<Import Project="..\Build\Common.Build.settings" />
<PropertyGroup>
<!-- Define properties that drive the manifest creation here. -->
<FinalizeManifest>true</FinalizeManifest>
<FinalizeSkipLayout>true</FinalizeSkipLayout>
<BuildNumber>$(FileVersion)</BuildNumber>
</PropertyGroup>
<ItemGroup>
<MergeManifest Include="$(OutputPath)Microsoft.VisualStudioTools*.json" />
</ItemGroup>
<Import Project="$(TargetsPath)\Common.Build.targets" />
</Project>

28
Installer/Microsoft.VisualStudioTools.VSTestHost_Sideload.vsmanproj
Просмотреть файл

@ -1,28 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<OutputPathSuffix>setup</OutputPathSuffix>
</PropertyGroup>
<Import Project="..\Build\Common.Build.settings" />
<PropertyGroup>
<!-- Define properties that drive the manifest creation here. -->
<FinalizeManifest>true</FinalizeManifest>
<FinalizeSkipLayout>true</FinalizeSkipLayout>
<BuildNumber>$(FileVersion)</BuildNumber>
</PropertyGroup>
<ItemGroup>
<MergeManifest Include="sideload.json" />
<MergeManifest Include="$(OutputPath)Microsoft.VisualStudioTools*.json" />
<Content Include="install.ps1" />
</ItemGroup>
<Target Name="_CopyContent" AfterTargets="Build" Inputs="@(Content)" Outputs="$(OutputPath)\%(Filename)%(Extension)">
<Copy SourceFiles="%(Content.FullPath)" DestinationFiles="$(OutputPath)%(Filename)%(Extension)" />
</Target>
<Import Project="$(TargetsPath)\Common.Build.targets" />
</Project>

16
Installer/Product.wxs
Просмотреть файл

@ -3,7 +3,7 @@
<Product Id="*"
Name="VS Test Host Adapter"
Language="1033"
Version="1.0.4.0"
Version="1.0.5.0"
Manufacturer="Microsoft Corporation"
UpgradeCode="4ff73677-1aed-4738-8ac7-ffc843e1cbd0">
<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" Platform="x86" />
@ -63,20 +63,6 @@
</Feature>
<?endif?>
<?ifdef VSTestHostDLLSource14 ?>
<Feature Id="VSTestHost_15" Title="Visual Studio vNext Support">
<Condition Level="0">NOT VS15TARGET</Condition>
<Component Id="VSTestHost_15" Directory="GAC" Guid="{143379F2-0ED8-4EA2-87DA-AE604C7DC59D}">
<File Name="$(var.VSTestHostName15).dll" Source="$(var.VSTestHostDLLSource15)" KeyPath="yes" Assembly=".net" />
</Component>
<Component Id="Pkgdef_15" Directory="VS15Target" Guid="{A84C4FA7-7CBD-4CF7-AA28-B296D931D50C}">
<File Name="$(var.VSTestHostName15).pkgdef" Source="$(var.VSTestHostPkgdefSource15)" KeyPath="yes" />
</Component>
<ComponentRef Id="Host_VisualStudio_15" />
</Feature>
<?endif?>
<InstallExecuteSequence>
<InstallExecute After="PublishProduct" />
</InstallExecuteSequence>

53
Installer/install.ps1
Просмотреть файл

@ -1,53 +0,0 @@
param($vs, $vsdrop, [switch] $uninstall)
$install_dirs = @(
"Common7\IDE\PublicAssemblies\Microsoft.VisualStudioTools.VSTestHost.15.0.dll",
"Common7\IDE\CommonExtensions\Platform\Microsoft.VisualStudioTools.VSTestHost.15.0.pkgdef"
)
$to_delete = $install_dirs | ?{ Test-Path "$vs\$_" } | %{ gi "$vs\$_" }
if ($to_delete) {
"Cleaning old install..."
$to_delete | ?{ 'Directory' -in $_.Attributes } | rmdir -Recurse -Force
$to_delete | ?{ -not ('Directory' -in $_.Attributes) } | del -Force
if ($uninstall) {
# Only uninstalling, so run devenv /setup now
Start-Process -Wait "$vs\Common7\IDE\devenv.exe" "/setup"
}
}
if (-not $uninstall) {
$source = $MyInvocation.MyCommand.Definition | Split-Path -Parent
copy -Recurse -Force $vsdrop\engine ${env:Temp}\engine
"Enabling use of mstest.exe"
$regroot = mkdir -Force "HKLM:\Software\WOW6432Node\Microsoft\VisualStudio\15.0\EnterpriseTools\QualityTools\HostAdapters\VSTestHost";
$regsupporttest = mkdir -Force "HKLM:$regroot\SupportedTestTypes";
$regunittest = mkdir -Force "HKLM:\Software\WOW6432Node\Microsoft\VisualStudio\15.0\EnterpriseTools\QualityTools\TestTypes\{13cdc9d9-ddb5-4fa4-a97d-d965ccfc6d4b}";
$regextensions = mkdir -Force "HKLM:$regunittest\Extensions";
$regsupporthost = mkdir -Force "HKLM:$regunittest\SupportedHostAdapters";
Set-ItemProperty HKLM:$regroot -Name "EditorType" -Value "Microsoft.VisualStudioTools.VSTestHost.TesterTestControl, Microsoft.VisualStudioTools.VSTestHost.15.0, Version=15.0.4.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A";
Set-ItemProperty HKLM:$regroot -Name "Type" -Value "Microsoft.VisualStudioTools.VSTestHost.TesterTestAdapter, Microsoft.VisualStudioTools.VSTestHost.15.0, Version=15.0.4.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A";
Set-ItemProperty HKLM:$regsupporttest -Name "{13cdc9d9-ddb5-4fa4-a97d-d965ccfc6d4b}" -Value "Unit Test";
Set-ItemProperty HKLM:$regunittest -Name "ServiceType" -Value "Microsoft.VisualStudio.TestTools.TestTypes.Unit.SUnitTestService, Microsoft.VisualStudio.QualityTools.Vsip, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a";
Set-ItemProperty HKLM:$regunittest -Name "NameId" -Value "#212";
Set-ItemProperty HKLM:$regunittest -Name "SatelliteBasePath" -Value "%ExecutingAssemblyDirectory%";
Set-ItemProperty HKLM:$regunittest -Name "SatelliteDllName" -Value "Microsoft.VisualStudio.QualityTools.Tips.TuipPackageUI.dll";
Set-ItemProperty HKLM:$regunittest -Name "VsEditor" -Value "{00000000-0000-0000-0000-000000000000}";
Set-ItemProperty HKLM:$regunittest -Name "TipProvider" -Value "Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestTip, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.Tip, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a";
Set-ItemProperty HKLM:$regunittest -Name "RunConfigurationEditorType" -Value "Microsoft.VisualStudio.TestTools.Tips.TuipPackage.UnitTestRunConfigControl, Microsoft.VisualStudio.QualityTools.Tips.TuipPackage, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a";
Set-ItemProperty HKLM:$regextensions -Name ".dll" -Value 215;
Set-ItemProperty HKLM:$regextensions -Name ".exe" -Value 215;
Set-ItemProperty HKLM:$regsupporthost -Name "VSTestHost" -Value "VS Test Host Adapter";
$mstest = [xml](gc "$vs\Common7\IDE\MSTest.exe.config");
if (-not $mstest.configuration.runtime.assemblyBinding.probing.privatePath.Contains("CommonExtensions\Microsoft\Editor")) {
"Adding necessary entries to mstest.exe.config"
$mstest.configuration.runtime.assemblyBinding.probing.privatePath += ";..\..\MSBuild\15.0\Bin;CommonExtensions\Microsoft\Editor";
$mstest.Save("$vs\Common7\IDE\MSTest.exe.config");
}
& "${env:Temp}\engine\setup.exe" install --catalog "$source\Microsoft.VisualStudioTools.VSTestHost_Sideload.vsman" --installdir "$vs" --layoutdir "$source"
# devenv /setup is run by setup.exe
}

2
Installer/packages.config
Просмотреть файл

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="WiX" version="3.9.2.1" targetFramework="net45" />
<package id="WiX" version="3.10.3" targetFramework="net45" />
<package id="MicroBuild.Core" version="0.2.0" targetFramework="net45" />
</packages>

38
Installer/sideload.json
Просмотреть файл

@ -1,38 +0,0 @@
{
"manifestVersion": "1.0",
"info": {
"id": "Microsoft.VisualStudioTools.VSTestHost_Sideload,version=1.0.0.0"
},
"packages": [
{
"installParams": {
"fileName": "[InstallDir]\\Common7\\IDE\\devenv.exe",
"parameters": "/setup"
},
"repairParams": {
"fileName": "[InstallDir]\\Common7\\IDE\\devenv.exe",
"parameters": "/setup"
},
"uninstallParams": {
"fileName": "[InstallDir]\\Common7\\IDE\\devenv.exe",
"parameters": "/setup"
},
"language": "en-us",
"dependencies": {
"microsoft.VisualStudioTools.VSTestHost": {
"version": "[1.0.0.0)"
}
},
"localizedResources": [
{
"language": "en-us",
"title": "VSTestHost",
"description": "Run UI tests within VS."
}
],
"id": "Microsoft.VisualStudioTools.VSTestHost_Sideload",
"version": "1.0.0.0",
"type": "Product"
}
]
}

8
Installer/vstesthost.swr
Просмотреть файл

@ -1,8 +0,0 @@
use vs
package name=Microsoft.VisualStudioTools.VSTestHost version=$(FileVersion)
folder "InstallDir:\Common7\IDE\PublicAssemblies"
file source="$(BuildSource)Microsoft.VisualStudioTools.VSTestHost.$(VSTarget).dll"
folder "InstallDir:\Common7\IDE\CommonExtensions\Platform"
file source="$(BuildSource)Microsoft.VisualStudioTools.VSTestHost.$(VSTarget).pkgdef"