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

Allows installing packages outside of the source directory.

This commit is contained in:
Steve Dower 2017-02-15 10:43:31 -08:00
Родитель 6fca5c9876
Коммит ac8c14f0bb
4 изменённых файлов: 7 добавлений и 7 удалений
Показать статистику Скачать 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>

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

@ -5,7 +5,7 @@
<BuildRoot Condition="!HasTrailingSlash($(BuildRoot))">$(BuildRoot)\</BuildRoot>
</PropertyGroup>
<Import Project="$(BuildRoot)Build\Common.Build.settings" />
<Import Project="..\packages\WiX.3.10.3\build\wix.props" Condition="Exists('..\packages\WiX.3.10.3\build\wix.props')" />
<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>