Skip to content

Commit 8356baf

Browse files
jkotalikjkotalik
authored
Port ANCM installer changes to 2.1 (#3874)
1 parent a3baf40 commit 8356baf

File tree

200 files changed

+59594
-109
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

200 files changed

+59594
-109
lines changed

‎Directory.Build.props‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,6 @@
3535
</PropertyGroup>
3636

3737
<Import Project="eng\targets\Wix.Common.props" Condition="'$(MSBuildProjectExtension)' == '.wixproj'" />
38+
<Import Project="eng\targets\Cpp.Common.props" Condition="'$(MSBuildProjectExtension)' == '.vcxproj'" />
39+
3840
</Project>

‎Directory.Build.targets‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,5 @@
1414
</PropertyGroup>
1515

1616
<Import Project="eng\targets\Wix.Common.targets" Condition="'$(MSBuildProjectExtension)' == '.wixproj'" />
17+
<Import Project="eng\targets\Cpp.Common.targets" Condition="'$(MSBuildProjectExtension)' == '.vcxproj'" />
1718
</Project>

‎THIRD-PARTY-NOTICES‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,3 +35,52 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
3535
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
3636
SOFTWARE.
3737

38+
License notice for IIS-Common
39+
------------------------------------
40+
41+
MIT License
42+
43+
Copyright (c) Microsoft Corporation. All rights reserved.
44+
45+
Permission is hereby granted, free of charge, to any person obtaining a copy
46+
of this software and associated documentation files (the "Software"), to deal
47+
in the Software without restriction, including without limitation the rights
48+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
49+
copies of the Software, and to permit persons to whom the Software is
50+
furnished to do so, subject to the following conditions:
51+
52+
The above copyright notice and this permission notice shall be included in all
53+
copies or substantial portions of the Software.
54+
55+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
56+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
57+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
58+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
59+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
60+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
61+
SOFTWARE
62+
63+
License notice for IIS-Setup
64+
------------------------------------
65+
66+
MIT License
67+
68+
Copyright (c) Microsoft Corporation. All rights reserved.
69+
70+
Permission is hereby granted, free of charge, to any person obtaining a copy
71+
of this software and associated documentation files (the "Software"), to deal
72+
in the Software without restriction, including without limitation the rights
73+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
74+
copies of the Software, and to permit persons to whom the Software is
75+
furnished to do so, subject to the following conditions:
76+
77+
The above copyright notice and this permission notice shall be included in all
78+
copies or substantial portions of the Software.
79+
80+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
81+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
82+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
83+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
84+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
85+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
86+
SOFTWARE

‎eng/targets/Cpp.Common.props‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<!-- Targets for making .vcxproj better. -->
2+
<Project>
3+
4+
<PropertyGroup>
5+
<SignOutput Condition=" '$(SignType)' != '' ">true</SignOutput>
6+
</PropertyGroup>
7+
8+
<Import Project="MicroBuild.Plugin.props" Condition="'$(MicroBuildSentinelFile)' == ''" />
9+
<Import Project="$(MicroBuildPluginDirectory)\MicroBuild.Plugins.*\**\build\MicroBuild.Plugins.*.props" Condition=" '$(MicroBuildPluginDirectory)' != ''" />
10+
11+
</Project>

‎eng/targets/Cpp.Common.targets‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<!-- Targets for making .vcxproj better. -->
2+
<Project>
3+
4+
<Import Project="$(MicroBuildPluginDirectory)\MicroBuild.Plugins.*\**\build\MicroBuild.Plugins.*.targets" Condition="'$(DisableMicroBuild)' != 'true' AND '$(MicroBuildPluginDirectory)' != ''" />
5+
6+
</Project>

‎src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV1/AncmIISExpressV1.wixproj‎

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\Directory.Build.props" />
4+
5+
<PropertyGroup>
6+
<Name>AspNetCoreModuleIISExpress</Name>
7+
<ProjectGuid>2A6A4709-30D2-4716-A597-55DF0FB74D37</ProjectGuid>
8+
<OutputType>Package</OutputType>
9+
<SuppressIces>ICE03</SuppressIces>
10+
<DisableGuidGeneration>true</DisableGuidGeneration>
11+
</PropertyGroup>
12+
13+
<PropertyGroup Condition=" '$(Platform)' == 'x86'">
14+
<OutputName>ancm_iis_express_x86_en</OutputName>
15+
</PropertyGroup>
16+
<PropertyGroup Condition=" '$(Platform)' == 'x64'">
17+
<OutputName>ancm_iis_express_x64_en</OutputName>
18+
</PropertyGroup>
19+
<PropertyGroup Condition=" '$(SignType)' != '' ">
20+
<SignOutput>True</SignOutput>
21+
</PropertyGroup>
22+
23+
<ItemGroup>
24+
<Compile Include="$(IIS-Setup)iisca\wix3\iisca.wxs">
25+
<Link>iisca.wxs</Link>
26+
</Compile>
27+
</ItemGroup>
28+
<Target Name="BeforeBuild">
29+
<CreateProperty Condition="$(IIS-Setup) != ''" Value="IIS-Setup=$(IIS-Setup);$(DefineConstants)">
30+
<Output TaskParameter="Value" PropertyName="DefineConstants" />
31+
</CreateProperty>
32+
</Target>
33+
<Target Name="EnsureImportsExist" BeforeTargets="PrepareForBuild">
34+
<PropertyGroup>
35+
<ErrorText>This project is trying to import a missing file: {0}.</ErrorText>
36+
</PropertyGroup>
37+
<Error Condition="!Exists('..\build\settings.props')" Text="$([System.String]::Format('$(ErrorText)', '..\build\settings.props'))" />
38+
<Error Condition="!Exists('..\build\versions.props')" Text="$([System.String]::Format('$(ErrorText)', '..\build\versions.props'))" />
39+
</Target>
40+
41+
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
42+
43+
<ItemGroup>
44+
<WixExtension Include="WixUtilExtension">
45+
<HintPath>$(WixExtDir)\WixUtilExtension.dll</HintPath>
46+
<Name>WixUtilExtension</Name>
47+
</WixExtension>
48+
<WixExtension Include="WixDependencyExtension">
49+
<HintPath>$(WixExtDir)\WixDependencyExtension.dll</HintPath>
50+
<Name>WixDependencyExtension</Name>
51+
</WixExtension>
52+
<WixExtension Include="WixUIExtension">
53+
<HintPath>$(WixExtDir)\WixUIExtension.dll</HintPath>
54+
<Name>WixUIExtension</Name>
55+
</WixExtension>
56+
</ItemGroup>
57+
58+
<ItemGroup>
59+
<EmbeddedResource Include="..\setupstrings.wxl">
60+
<Link>setupstrings.wxl</Link>
61+
</EmbeddedResource>
62+
</ItemGroup>
63+
<ItemGroup>
64+
<Content Include="$(IIS-Setup)include.wxi">
65+
<Link>include.wxi</Link>
66+
</Content>
67+
</ItemGroup>
68+
69+
<Import Project="..\build\settings.props" Condition="Exists('..\build\settings.props')" />
70+
<Import Project="..\build\versions.props" Condition="Exists('..\build\versions.props')" />
71+
<!-- Overwrite standard versioning scheme -->
72+
</Project>

0 commit comments

Comments
 (0)