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

Use ProjectReference.TargetPath in installers (#6391)

This commit is contained in:
Pavel Krymets 2019-01-04 16:01:49 -08:00 committed by GitHub
parent 9003c3cd75
commit 47e8d56853
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 30 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV1/ancm_iis_express.wxs
View File

@ -161,7 +161,7 @@
<Component Id="AspNetCoreModule" Guid="A1D9FE60-0486-4ED9-AEC7-6544B827B1AE" Win64="$(var.IsWin64)">
<File Id="AspNetCoreModuleDll"
Name="aspnetcore.dll"
Source="$(var.AspNetCoreV1TargetPath)"
Source="$(var.AspNetCoreV1.TargetPath)"
DiskId="1"
Vital="yes">
</File>
@ -191,7 +191,7 @@
<Component Id="AspNetCoreModule.wow" Guid="F16FBAF7-4A51-4FB4-AB17-FE02548A6C7E" Win64="no">
<File Id="AspNetCoreModuleDll.wow"
Name="aspnetcore.dll"
Source="$(var.AspNetCoreV2WoW64TargetPath)"
Source="$(var.AspNetCoreV2WoW64.TargetPath)"
DiskId="1"
Vital="yes">
</File>

8
src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs
View File

@ -164,7 +164,7 @@
<Component Id="AspNetCoreModule" Guid="84ed6ce6-c8a3-4fa8-a872-c98a1d15dd4f" Win64="$(var.IsWin64)">
<File Id="AspNetCoreModuleDll"
Name="aspnetcorev2.dll"
Source="$(var.AspNetCoreV2TargetPath)"
Source="$(var.AspNetCoreV2.TargetPath)"
DiskId="1"
Vital="yes">
</File>
@ -177,7 +177,7 @@
<Component Id="AspNetCoreModuleHandler" Guid="559EF726-B25C-480F-AFA4-32D0BA8B2376" Win64="$(var.IsWin64)">
<File Id="AspNetCoreModuleHandlerDll"
Name="aspnetcorev2_outofprocess.dll"
Source="$(var.AspNetCoreV2HandlerTargetPath)"
Source="$(var.AspNetCoreV2Handler.TargetPath)"
DiskId="1"
Vital="yes">
</File>
@ -207,7 +207,7 @@
<Component Id="AspNetCoreModule.wow" Guid="45ba5011-a619-4d06-8a8d-155b1f9732b3" Win64="no">
<File Id="AspNetCoreModuleDll.wow"
Name="aspnetcorev2.dll"
Source="$(var.AspNetCoreV2WoW64TargetPath)"
Source="$(var.AspNetCoreV2WoW64.TargetPath)"
DiskId="1"
Vital="yes">
</File>
@ -220,7 +220,7 @@
<Component Id="AspNetCoreModuleHandler.wow" Guid="0A8EDB50-7D85-4825-8010-D27EFAF061B6" Win64="no">
<File Id="AspNetCoreModuleHandlerDll.wow"
Name="aspnetcorev2_outofprocess.dll"
Source="$(var.AspNetCoreV2HandlerWoW64TargetPath)"
Source="$(var.AspNetCoreV2HandlerWoW64.TargetPath)"
DiskId="1"
Vital="yes">
</File>

4
src/Installers/Windows/AspNetCoreModule-Setup/ANCMV1/aspnetcoremodule.wxs
View File

@ -123,7 +123,7 @@
<Component Id="AspNetCoreModule" Guid="A1D9FE60-0486-4ED9-AEC7-6544B827B1AE" Win64="$(var.IsWin64)">
<File Id="AspNetCoreModuleDll"
Name="aspnetcore.dll"
Source="$(var.AspNetCoreV2TargetPath)"
Source="$(var.AspNetCoreV2.TargetPath)"
DiskId="1"
Vital="yes">
</File>
@ -164,7 +164,7 @@
<Component Id="AspNetCoreModule.wow" Guid="F16FBAF7-4A51-4FB4-AB17-FE02548A6C7E" Win64="no">
<File Id="AspNetCoreModuleDll.wow"
Name="aspnetcore.dll"
Source="$(var.AspNetCoreV2WoW64TargetPath)"
Source="$(var.AspNetCoreV2WoW64.TargetPath)"
DiskId="1"
Vital="yes">
</File>

8
src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/aspnetcoremodulev2.wxs
View File

@ -138,7 +138,7 @@
<Component Id="AspNetCoreModuleV2" Guid="3a692941-59be-43cf-98a8-6ed01b12a519" Win64="$(var.IsWin64)">
<File Id="AspNetCoreModuleV2Dll"
Name="aspnetcorev2.dll"
Source="$(var.AspNetCoreV2TargetPath)"
Source="$(var.AspNetCoreV2.TargetPath)"
DiskId="1"
Vital="yes">
</File>
@ -152,7 +152,7 @@
<Component Id="AspNetCoreModuleHandler" Guid="4b62060a-deb8-4de3-9557-9c0be21dc844" Win64="$(var.IsWin64)">
<File Id="AspNetCoreModuleHandlerDll"
Name="aspnetcorev2_outofprocess.dll"
Source="$(var.AspNetCoreV2HandlerTargetPath)"
Source="$(var.AspNetCoreV2Handler.TargetPath)"
DiskId="1"
Vital="yes">
</File>
@ -181,7 +181,7 @@
<Component Id="AspNetCoreModuleV2.wow" Guid="1b8ecba0-c002-442a-92c0-0fa9c0f21df4" Win64="no">
<File Id="AspNetCoreModuleV2Dll.wow"
Name="aspnetcorev2.dll"
Source="$(var.AspNetCoreV2WoW64TargetPath)"
Source="$(var.AspNetCoreV2WoW64.TargetPath)"
DiskId="1"
Vital="yes">
</File>
@ -195,7 +195,7 @@
<Component Id="AspNetCoreModuleHandler.wow" Guid="d927e5d3-c8b2-400c-b85c-ae5c2772d6c3" Win64="no">
<File Id="AspNetCoreModuleHandlerDll.wow"
Name="aspnetcorev2_outofprocess.dll"
Source="$(var.AspNetCoreV2HandlerWoW64TargetPath)"
Source="$(var.AspNetCoreV2HandlerWoW64.TargetPath)"
DiskId="1"
Vital="yes">
</File>

28
src/Installers/Windows/AspNetCoreModule-Setup/Directory.Build.props
View File

@ -36,38 +36,46 @@
<DefineConstants>
AspNetCoreSchemaPath=$(_ServerIISBasePath)AspNetCoreModuleV2\AspNetCore\aspnetcore_schema_v2.xml;
AspNetCoreMofPath=$(_ServerIISBasePath)AspNetCoreModuleV2\AspNetCore\ancm.mof;
AspNetCoreV1TargetPath=$(_ServerIISBasePath)AspNetCoreModuleV1\AspNetCore\bin\$(Configuration)\Win32\aspnetcore.dll;
AspNetCoreV1WoW64TargetPath=$(_ServerIISBasePath)AspNetCoreModuleV1\AspNetCore\bin\$(Configuration)\x64\aspnetcore.dll;
AspNetCoreV2TargetPath=$(_ServerIISBasePath)AspNetCoreModuleV2\AspNetCore\bin\$(Configuration)\Win32\aspnetcorev2.dll;
AspNetCoreV2WoW64TargetPath=$(_ServerIISBasePath)AspNetCoreModuleV2\AspNetCore\bin\$(Configuration)\x64\aspnetcorev2.dll;
AspNetCoreV2HandlerTargetPath=$(_ServerIISBasePath)AspNetCoreModuleV2\OutOfProcessRequestHandler\bin\$(Configuration)\Win32\aspnetcorev2_outofprocess.dll;
AspNetCoreV2HandlerWoW64TargetPath=$(_ServerIISBasePath)AspNetCoreModuleV2\OutOfProcessRequestHandler\bin\$(Configuration)\x64\aspnetcorev2_outofprocess.dll;
$(DefineConstants)
</DefineConstants>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="$(_ServerIISBasePath)AspNetCoreModuleV1\AspNetCore\AspNetCore.vcxproj" Platform="x64">
<Name>AspNetCoreV1WoW64</Name>
<Private>True</Private>
<DoNotHarvest>True</DoNotHarvest>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
<ProjectReference Include="$(_ServerIISBasePath)AspNetCoreModuleV2\AspNetCore\AspNetCore.vcxproj" Platform="x64">
<Name>AspNetCoreV2WoW64</Name>
<Private>True</Private>
<DoNotHarvest>True</DoNotHarvest>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
<ProjectReference Include="$(_ServerIISBasePath)AspNetCoreModuleV2\OutOfProcessRequestHandler\OutOfProcessRequestHandler.vcxproj" Platform="x64">
<Name>AspNetCoreV2HandlerWoW64</Name>
<Private>True</Private>
<DoNotHarvest>True</DoNotHarvest>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
<ProjectReference Include="$(_ServerIISBasePath)AspNetCoreModuleV1\AspNetCore\AspNetCore.vcxproj" Platform="Win32">
<Name>AspNetCoreV1</Name>
<Private>True</Private>
<DoNotHarvest>True</DoNotHarvest>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
<ProjectReference Include="$(_ServerIISBasePath)AspNetCoreModuleV2\AspNetCore\AspNetCore.vcxproj" Platform="Win32">
<Name>AspNetCoreV2</Name>
<Private>True</Private>
<DoNotHarvest>True</DoNotHarvest>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
<ProjectReference Include="$(_ServerIISBasePath)AspNetCoreModuleV2\OutOfProcessRequestHandler\OutOfProcessRequestHandler.vcxproj" Platform="Win32">
<Name>AspNetCoreV2Handler</Name>
<Private>True</Private>
<DoNotHarvest>True</DoNotHarvest>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>