Skip to content

Commit c6351d2

Browse files
wtgodbewtgodbe
committed
More ordering stuff
1 parent 68871e0 commit c6351d2

File tree

3 files changed

+54
-53
lines changed

3 files changed

+54
-53
lines changed

‎eng/targets/BeforeWix.Common.targets‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
<!-- Targets for making .wixproj better. -->
2+
<Project>
3+
<ItemDefinitionGroup>
4+
<!-- Override the MicroBuild default certs which still uses MicrosoftSHA1 and Microsoft401 -->
5+
<SignCabs>
6+
<Authenticode>Microsoft400</Authenticode>
7+
</SignCabs>
8+
<SignMsi>
9+
<Authenticode>Microsoft400</Authenticode>
10+
</SignMsi>
11+
<SignBundle>
12+
<Authenticode>Microsoft400</Authenticode>
13+
</SignBundle>
14+
<SignBundleEngine>
15+
<Authenticode>Microsoft400</Authenticode>
16+
</SignBundleEngine>
17+
</ItemDefinitionGroup>
18+
19+
<PropertyGroup Condition="'$(OutputType)' == 'package'">
20+
<!-- Set package version for SharedFx & TargetingPack wixproj's -->
21+
<!-- Everything built in those projects _except_ the final package & MSI are shipping assets. -->
22+
<_GeneratedPackageVersion>$(PackageVersion)</_GeneratedPackageVersion>
23+
<_GeneratedPackageVersion
24+
Condition="! $(PackageVersion.Contains('$(_PreReleaseLabel)'))">$(PackageVersion)-$(_PreReleaseLabel)$(_BuildNumberLabels)</_GeneratedPackageVersion>
25+
<!-- Insert PackageVersion into OutputName for SharedFx & TargetingPack -->
26+
<OutputName Condition="'$(OutputNamePrefix)' != '' AND '$(OutputNameSuffix)' != ''">$(OutputNamePrefix)$(_GeneratedPackageVersion)$(OutputNameSuffix)</OutputName>
27+
28+
<EmbedCab Condition="'$(EmbedCab)' == ''">yes</EmbedCab>
29+
<InstallDir>$(ProductName)</InstallDir>
30+
31+
<DefineConstants Condition="'$(Configuration)' == 'Debug'">$(DefineConstants);Debug</DefineConstants>
32+
<DefineConstants>$(DefineConstants);EmbedCab=$(EmbedCab)</DefineConstants>
33+
</PropertyGroup>
34+
35+
<PropertyGroup Condition=" '$(OutputType)' == 'package' AND '$(Cabinet)' == '' ">
36+
<Cabinet>$(OutputName.Replace('-', '_')).cab</Cabinet>
37+
<Cabinet Condition=" '$(EmbedCab)' != 'yes' ">$(OutputName.Replace('_win', '')).cab</Cabinet>
38+
</PropertyGroup>
39+
40+
<PropertyGroup>
41+
<Culture Condition=" '$(Culture)' == '' ">en-US</Culture>
42+
<Cultures Condition=" '$(Cultures)' == '' ">$(Culture)</Cultures>
43+
<InstallerPlatform>$(Platform)</InstallerPlatform>
44+
<OutDir Condition=" '$(OutDir)' == '' ">$(OutputPath)</OutDir>
45+
46+
<DefineConstants>$(DefineConstants);Cabinet=$(Cabinet)</DefineConstants>
47+
<DefineConstants>$(DefineConstants);BinPath=$(OutputPath)$(Culture)\</DefineConstants>
48+
<DefineConstants>$(WixVariables);$(DefineConstants)</DefineConstants>
49+
</PropertyGroup>
50+
51+
<Import Project="$(NuGetRestoreTargets)" />
52+
<Import Project="$(MSBuildProjectExtensionsPath)$(MSBuildProjectFile).*.targets" />
53+
</Project>

‎eng/targets/Wix.Common.props‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
</PropertyGroup>
1111

1212
<PropertyGroup>
13+
<CustomBeforeWixTargets>$(MSBuildThisFileDirectory)BeforeWix.Common.targets</CustomBeforeWixTargets>
1314
<TargetFrameworkMoniker>Native,Version=v0.0</TargetFrameworkMoniker>
1415

1516
<MSBuildProjectExtensionsPath>$(BaseIntermediateOutputPath)</MSBuildProjectExtensionsPath>

‎eng/targets/Wix.Common.targets‎

Lines changed: 0 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,4 @@
1-
<!-- Targets for making .wixproj better. -->
21
<Project>
3-
4-
<ItemDefinitionGroup>
5-
<!-- Override the MicroBuild default certs which still uses MicrosoftSHA1 and Microsoft401 -->
6-
<SignCabs>
7-
<Authenticode>Microsoft400</Authenticode>
8-
</SignCabs>
9-
<SignMsi>
10-
<Authenticode>Microsoft400</Authenticode>
11-
</SignMsi>
12-
<SignBundle>
13-
<Authenticode>Microsoft400</Authenticode>
14-
</SignBundle>
15-
<SignBundleEngine>
16-
<Authenticode>Microsoft400</Authenticode>
17-
</SignBundleEngine>
18-
</ItemDefinitionGroup>
19-
20-
<PropertyGroup Condition="'$(OutputType)' == 'package'">
21-
<!-- Set package version for SharedFx & TargetingPack wixproj's -->
22-
<!-- Everything built in those projects _except_ the final package & MSI are shipping assets. -->
23-
<_GeneratedPackageVersion>$(PackageVersion)</_GeneratedPackageVersion>
24-
<_GeneratedPackageVersion
25-
Condition="! $(PackageVersion.Contains('$(_PreReleaseLabel)'))">$(PackageVersion)-$(_PreReleaseLabel)$(_BuildNumberLabels)</_GeneratedPackageVersion>
26-
<!-- Insert PackageVersion into OutputName for SharedFx & TargetingPack -->
27-
<OutputName Condition="'$(OutputNamePrefix)' != '' AND '$(OutputNameSuffix)' != ''">$(OutputNamePrefix)$(_GeneratedPackageVersion)$(OutputNameSuffix)</OutputName>
28-
29-
<EmbedCab Condition="'$(EmbedCab)' == ''">yes</EmbedCab>
30-
<InstallDir>$(ProductName)</InstallDir>
31-
32-
<DefineConstants Condition="'$(Configuration)' == 'Debug'">$(DefineConstants);Debug</DefineConstants>
33-
<DefineConstants>$(DefineConstants);EmbedCab=$(EmbedCab)</DefineConstants>
34-
</PropertyGroup>
35-
36-
<PropertyGroup Condition=" '$(OutputType)' == 'package' AND '$(Cabinet)' == '' ">
37-
<Cabinet>$(OutputName.Replace('-', '_')).cab</Cabinet>
38-
<Cabinet Condition=" '$(EmbedCab)' != 'yes' ">$(OutputName.Replace('_win', '')).cab</Cabinet>
39-
</PropertyGroup>
40-
41-
<PropertyGroup>
42-
<Culture Condition=" '$(Culture)' == '' ">en-US</Culture>
43-
<Cultures Condition=" '$(Cultures)' == '' ">$(Culture)</Cultures>
44-
<InstallerPlatform>$(Platform)</InstallerPlatform>
45-
<OutDir Condition=" '$(OutDir)' == '' ">$(OutputPath)</OutDir>
46-
47-
<DefineConstants>$(DefineConstants);Cabinet=$(Cabinet)</DefineConstants>
48-
<DefineConstants>$(DefineConstants);BinPath=$(OutputPath)$(Culture)\</DefineConstants>
49-
<DefineConstants>$(WixVariables);$(DefineConstants)</DefineConstants>
50-
</PropertyGroup>
51-
52-
<Import Project="$(NuGetRestoreTargets)" />
53-
<Import Project="$(MSBuildProjectExtensionsPath)$(MSBuildProjectFile).*.targets" />
54-
<Import Project="$(WixTargetsPath)" Condition="'$(WixTargetsPath)' != '' " />
552
<!-- Don't import the Microbuild signing targets when post build sign is enabled. They override the
563
standard Wix targets for signing, and call ESRP directly (rather than through SignTool). So without this,
574
ASPNetCore will sign even when PostbuildSign == true -->

0 commit comments

Comments
 (0)