huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull-request aspnet/Universe#1513

This commit is contained in:
Nate McMaster 2018-10-17 08:20:36 -07:00
parent 1b970fe272 3c44d27974
commit cc858cf7e1
No known key found for this signature in database
GPG Key ID: A778D9601BD78810
3 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Installers/Windows/AspNetCoreModule-Setup/CustomAction/aspnetcoreCA.vcxproj
View File

@ -12,8 +12,8 @@
<Import Condition="$(IIS-Setup) == '' AND Exists('$(_IIS-SetupExportsPath)')" Project="$(_IIS-SetupExportsPath)" />
<!-- Build error if submodule dependencies could not be found. -->
<Import Project="$(MSBuildThisprojectdirectory)..\build\versions.props" Condition="Exists('$(MSBuildThisprojectdirectory)..\build\versions.props')" />
<Import Project="$(MSBuildThisprojectdirectory)..\build\settings.props" Condition="Exists('$(MSBuildThisprojectdirectory)..\build\settings.props')" />
<Import Project="$(MSBuildProjectDirectory)\..\build\versions.props" Condition="Exists('$(MSBuildProjectDirectory)\..\build\versions.props')" />
<Import Project="$(MSBuildProjectDirectory)\..\build\settings.props" Condition="Exists('$(MSBuildProjectDirectory)\..\build\settings.props')" />
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@ -82,7 +82,7 @@
<ProjectReference Include="$(IIS-Common)lib\CommonLib.vcxproj">
<Project>{b54a8f61-60de-4ad9-87ca-d102f230678e}</Project>
</ProjectReference>
<FilesToSign Include="$(OutDir)$(TargetName)$(TargetExt)" Authenticode="Microsoft400" />
<FilesToSign Include="$(MSBuildProjectDirectory)\$(OutDir)$(TargetName)$(TargetExt)" Authenticode="Microsoft400" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
@ -90,9 +90,9 @@
<PropertyGroup>
<ErrorText>This project is trying to import a missing file: {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('$(MSBuildThisprojectdirectory)..\build\versions.props')" Text="$([System.String]::Format('$(ErrorText)', '$(MSBuildThisprojectdirectory)..\build\versions.props'))" />
<Error Condition="!Exists('$(MSBuildThisprojectdirectory)..\build\settings.props')" Text="$([System.String]::Format('$(ErrorText)', '$(MSBuildThisprojectdirectory)..\build\settings.props'))" />
<Error Condition="!Exists('$(MSBuildThisprojectdirectory)..\build\copy-outputs.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(MSBuildThisprojectdirectory)..\build\copy-outputs.targets'))" />
<Error Condition="!Exists('$(MSBuildProjectDirectory)\..\build\versions.props')" Text="$([System.String]::Format('$(ErrorText)', '$(MSBuildProjectDirectory)\..\build\versions.props'))" />
<Error Condition="!Exists('$(MSBuildProjectDirectory)\..\build\settings.props')" Text="$([System.String]::Format('$(ErrorText)', '$(MSBuildProjectDirectory)\..\build\settings.props'))" />
<Error Condition="!Exists('$(MSBuildProjectDirectory)\..\build\copy-outputs.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(MSBuildProjectDirectory)\..\build\copy-outputs.targets'))" />
</Target>
<Import Project="$(MSBuildThisprojectdirectory)..\build\copy-outputs.targets" Condition="Exists('$(MSBuildThisprojectdirectory)..\build\copy-outputs.targets')" />
<Import Project="$(MSBuildProjectDirectory)\..\build\copy-outputs.targets" Condition="Exists('$(MSBuildProjectDirectory)\..\build\copy-outputs.targets')" />
</Project>

12
src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/lib/CommonLib.vcxproj
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildThisProjectDirectory)..\..\..\build\submodule.props" Condition="Exists('$(MSBuildThisProjectDirectory)..\..\..\build\submodule.props')" />
<Import Project="$(MSBuildThisProjectDirectory)..\..\..\build\versions.props" Condition="Exists('$(MSBuildThisProjectDirectory)..\..\..\build\versions.props')" />
<Import Project="$(MSBuildThisProjectDirectory)..\..\..\build\settings.props" Condition="Exists('$(MSBuildThisProjectDirectory)..\..\..\build\settings.props')" />
<Import Project="$(MSBuildProjectDirectory)\..\..\..\build\submodule.props" Condition="Exists('$(MSBuildProjectDirectory)\..\..\..\build\submodule.props')" />
<Import Project="$(MSBuildProjectDirectory)\..\..\..\build\versions.props" Condition="Exists('$(MSBuildProjectDirectory)\..\..\..\build\versions.props')" />
<Import Project="$(MSBuildProjectDirectory)\..\..\..\build\settings.props" Condition="Exists('$(MSBuildProjectDirectory)\..\..\..\build\settings.props')" />
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
@ -72,8 +72,8 @@
<PropertyGroup>
<ErrorText>This project is trying to import a missing file: {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('$(MSBuildThisProjectDirectory)..\..\..\build\submodule.props')" Text="$([System.String]::Format('$(ErrorText)', '$(MSBuildThisProjectDirectory)..\..\..\build\submodule.props'))" />
<Error Condition="!Exists('$(MSBuildThisProjectDirectory)..\..\..\build\versions.props')" Text="$([System.String]::Format('$(ErrorText)', '$(MSBuildThisProjectDirectory)..\..\..\build\versions.props'))" />
<Error Condition="!Exists('$(MSBuildThisProjectDirectory)..\..\..\build\settings.props')" Text="$([System.String]::Format('$(ErrorText)', '$(MSBuildThisProjectDirectory)..\..\..\build\settings.props'))" />
<Error Condition="!Exists('$(MSBuildProjectDirectory)\..\..\..\build\submodule.props')" Text="$([System.String]::Format('$(ErrorText)', '$(MSBuildProjectDirectory)\..\..\..\build\submodule.props'))" />
<Error Condition="!Exists('$(MSBuildProjectDirectory)\..\..\..\build\versions.props')" Text="$([System.String]::Format('$(ErrorText)', '$(MSBuildProjectDirectory)\..\..\..\build\versions.props'))" />
<Error Condition="!Exists('$(MSBuildProjectDirectory)\..\..\..\build\settings.props')" Text="$([System.String]::Format('$(ErrorText)', '$(MSBuildProjectDirectory)\..\..\..\build\settings.props'))" />
</Target>
</Project>

12
src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/lib/iisca.vcxproj
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildThisProjectDirectory)..\..\..\build\submodule.props" Condition="Exists('$(MSBuildThisProjectDirectory)..\..\..\build\build\submodule.props')" />
<Import Project="$(MSBuildThisProjectDirectory)..\..\..\build\settings.props" Condition="Exists('$(MSBuildThisProjectDirectory)..\..\..\build\settings.props')" />
<Import Project="$(MSBuildThisProjectDirectory)..\..\..\build\versions.props" Condition="Exists('$(MSBuildThisProjectDirectory)..\..\..\build\versions.props')" />
<Import Project="$(MSBuildProjectDirectory)\..\..\..\build\submodule.props" Condition="Exists('$(MSBuildProjectDirectory)\..\..\..\build\build\submodule.props')" />
<Import Project="$(MSBuildProjectDirectory)\..\..\..\build\settings.props" Condition="Exists('$(MSBuildProjectDirectory)\..\..\..\build\settings.props')" />
<Import Project="$(MSBuildProjectDirectory)\..\..\..\build\versions.props" Condition="Exists('$(MSBuildProjectDirectory)\..\..\..\build\versions.props')" />
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@ -124,8 +124,8 @@
<PropertyGroup>
<ErrorText>This project is trying to import a missing file: {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('$(MSBuildThisProjectDirectory)..\..\..\build\submodule.props')" Text="$([System.String]::Format('$(ErrorText)', '$(MSBuildThisProjectDirectory)..\..\..\build\submodule.props'))" />
<Error Condition="!Exists('$(MSBuildThisProjectDirectory)..\..\..\build\settings.props')" Text="$([System.String]::Format('$(ErrorText)', '$(MSBuildThisProjectDirectory)..\..\..\build\settings.props'))" />
<Error Condition="!Exists('$(MSBuildThisProjectDirectory)..\..\..\build\versions.props')" Text="$([System.String]::Format('$(ErrorText)', '$(MSBuildThisProjectDirectory)..\..\..\build\versions.props'))" />
<Error Condition="!Exists('$(MSBuildProjectDirectory)\..\..\..\build\submodule.props')" Text="$([System.String]::Format('$(ErrorText)', '$(MSBuildProjectDirectory)\..\..\..\build\submodule.props'))" />
<Error Condition="!Exists('$(MSBuildProjectDirectory)\..\..\..\build\settings.props')" Text="$([System.String]::Format('$(ErrorText)', '$(MSBuildProjectDirectory)\..\..\..\build\settings.props'))" />
<Error Condition="!Exists('$(MSBuildProjectDirectory)\..\..\..\build\versions.props')" Text="$([System.String]::Format('$(ErrorText)', '$(MSBuildProjectDirectory)\..\..\..\build\versions.props'))" />
</Target>
</Project>