Move the targets files into the top-level tools folder.
Sean Hall committed
May 28, 2020 at 23:00 UTC
ef0dbdc18c4335fef395fb954845031ea90503be
13 files changed
+32
-47
src/ThmViewerPackage/ThmViewerPackage.wixproj
+2
-1
@@ -6,6 +6,7 @@
6
<ProjectGuid>59c4b122-5167-445b-8fc4-09dcd4eced89</ProjectGuid>
7
<OutputName>thmviewer</OutputName>
8
<OutputType>Package</OutputType>
9
+ <WixBinDir>$(OutputPath)\net461\win-x86\</WixBinDir>
10
</PropertyGroup>
11
12
<ItemGroup>
@@ -23,7 +24,7 @@
24
</ProjectReference>
25
</ItemGroup>
26
26
- <Import Project="$(OutputPath)\net461\win-x86\wix.targets" />
27
+ <Import Project="..\WixToolset.MSBuild\wix.targets" />
28
29
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
30
<PropertyGroup>
src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj
-9
@@ -16,15 +16,6 @@
16
<NoWarn>NU1701</NoWarn>
17
</PropertyGroup>
18
19
- <ItemGroup>
20
- <Content Include="redirects\wix.targets" CopyToOutputDirectory="PreserveNewest" />
21
- <Content Include="redirects\wix.ca.targets" CopyToOutputDirectory="PreserveNewest" />
22
- <Content Include="wix.targets" CopyToOutputDirectory="PreserveNewest" />
23
- <Content Include="wix.ca.targets" CopyToOutputDirectory="PreserveNewest" />
24
- <Content Include="wix.harvest.targets" CopyToOutputDirectory="PreserveNewest" />
25
- <Content Include="wix.signing.targets" CopyToOutputDirectory="PreserveNewest" />
26
- </ItemGroup>
27
-
19
<ItemGroup>
20
<ProjectReference Include="..\WixToolset.Tools.Core\WixToolset.Tools.Core.csproj" />
21
</ItemGroup>
src/WixToolset.BuildTasks/redirects/wix.ca.targets
deleted
-10
@@ -1,10 +0,0 @@
1
-<?xml version="1.0" encoding="utf-8" ?>
2
-<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
3
-
4
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
5
- <PropertyGroup>
6
- <WixInstallFolder>$([MSBuild]::GetRegistryValueFromView('HKEY_LOCAL_MACHINE\SOFTWARE\WiX Toolset\v4', 'InstallFolder', null, RegistryView.Registry32))</WixInstallFolder>
7
- </PropertyGroup>
8
-
9
- <Import Project="$(WixInstallFolder)sdk\wix.ca.targets" />
10
-</Project>
src/WixToolset.BuildTasks/redirects/wix.targets
deleted
-10
@@ -1,10 +0,0 @@
1
-<?xml version="1.0" encoding="utf-8"?>
2
-<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
3
-
4
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
5
- <PropertyGroup>
6
- <WixInstallFolder>$([MSBuild]::GetRegistryValueFromView('HKEY_LOCAL_MACHINE\SOFTWARE\WiX Toolset\v4', 'InstallFolder', null, RegistryView.Registry32))</WixInstallFolder>
7
- </PropertyGroup>
8
-
9
- <Import Project="$(WixInstallFolder)bin\wix.targets" />
10
-</Project>
src/WixToolset.MSBuild/WixToolset.MSBuild.nuspec
+4
@@ -12,6 +12,10 @@
12
13
<files>
14
<file src="$projectFolder$$id$.props" target="build" />
15
+ <file src="$projectFolder$wix.ca.targets" target="tools" />
16
+ <file src="$projectFolder$wix.harvest.targets" target="tools" />
17
+ <file src="$projectFolder$wix.signing.targets" target="tools" />
18
+ <file src="$projectFolder$wix.targets" target="tools" />
19
<file src="net461\*" target="tools\net461" />
20
<file src="netcoreapp2.1\*" target="tools\netcoreapp2.1" />
21
</files>
src/WixToolset.MSBuild/WixToolset.MSBuild.props
+1
-2
@@ -3,7 +3,6 @@
3
4
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
5
<PropertyGroup>
6
- <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' and '$(MSBuildRuntimeType)' == 'Core' ">$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\tools\netcoreapp2.1\wix.targets'))</WixTargetsPath>
7
- <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\tools\net461\wix.targets'))</WixTargetsPath>
6
+ <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\tools\wix.targets'))</WixTargetsPath>
7
</PropertyGroup>
8
</Project>
src/WixToolset.MSBuild/wix.ca.targets
renamed
src/WixToolset.MSBuild/wix.harvest.targets
renamed
-6
@@ -4,12 +4,6 @@
4
5
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
6
7
- <!-- These properties can be overridden to support non-default installations. -->
8
- <PropertyGroup>
9
- <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildThisFileFullPath)</WixTargetsPath>
10
- <WixTasksPath Condition=" '$(WixTasksPath)' == '' ">$(WixTargetsPath)WixToolset.BuildTasks.dll</WixTasksPath>
11
- </PropertyGroup>
12
-
7
<!-- These tasks are extensions for harvesting WiX source code from other sources. -->
8
<UsingTask TaskName="HeatFile" AssemblyFile="$(WixTasksPath)" />
9
<UsingTask TaskName="HeatDirectory" AssemblyFile="$(WixTasksPath)" />
src/WixToolset.MSBuild/wix.signing.targets
renamed
src/WixToolset.MSBuild/wix.targets
renamed
+4
-7
@@ -19,12 +19,11 @@
19
20
<!-- These properties can be overridden to support non-default installations. -->
21
<PropertyGroup>
22
- <WixBinDir Condition=" '$(WixBinDir)' == ''">$(MSBuildThisFileDirectory)</WixBinDir>
22
+ <WixBinDir Condition=" '$(WixBinDir)' == '' and '$(MSBuildRuntimeType)' == 'Core' ">$(MSBuildThisFileDirectory)netcoreapp2.1\</WixBinDir>
23
+ <WixBinDir Condition=" '$(WixBinDir)' == '' ">$(MSBuildThisFileDirectory)net461\</WixBinDir>
24
<WixTasksPath Condition=" '$(WixTasksPath)' == '' ">$(WixBinDir)WixToolset.BuildTasks.dll</WixTasksPath>
24
- <WixHarvestTargetsPath Condition=" '$(WixHarvestTargetsPath)' == '' ">$(WixBinDir)wix.harvest.targets</WixHarvestTargetsPath>
25
- <WixSigningTargetsPath Condition=" '$(WixSigningTargetsPath)' == '' ">$(WixBinDir)wix.signing.targets</WixSigningTargetsPath>
26
- <LuxTargetsPath Condition=" '$(LuxTargetsPath)' == '' ">$(WixBinDir)lux.targets</LuxTargetsPath>
27
- <LuxTasksPath Condition=" '$(LuxTasksPath)' == '' ">$(WixBinDir)LuxTasks.dll</LuxTasksPath>
25
+ <WixHarvestTargetsPath Condition=" '$(WixHarvestTargetsPath)' == '' ">$(MSBuildThisFileDirectory)wix.harvest.targets</WixHarvestTargetsPath>
26
+ <WixSigningTargetsPath Condition=" '$(WixSigningTargetsPath)' == '' ">$(MSBuildThisFileDirectory)wix.signing.targets</WixSigningTargetsPath>
27
</PropertyGroup>
28
29
<!-- This makes the project files a dependency of all targets so that things rebuild if they change -->
@@ -32,7 +31,6 @@
31
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
32
<MSBuildAllProjects Condition="Exists('$(WixHarvestTargetsPath)')">$(MSBuildAllProjects);$(WixHarvestTargetsPath)</MSBuildAllProjects>
33
<MSBuildAllProjects Condition="Exists('$(WixSigningTargetsPath)')">$(MSBuildAllProjects);$(WixSigningTargetsPath)</MSBuildAllProjects>
35
- <MSBuildAllProjects Condition="Exists('$(LuxTargetsPath)')">$(MSBuildAllProjects);$(LuxTargetsPath)</MSBuildAllProjects>
34
<MSBuildAllProjects Condition="Exists('$(CustomBeforeWixTargets)')">$(MSBuildAllProjects);$(CustomBeforeWixTargets)</MSBuildAllProjects>
35
<MSBuildAllProjects Condition="Exists('$(CustomAfterWixTargets)')">$(MSBuildAllProjects);$(CustomAfterWixTargets)</MSBuildAllProjects>
36
</PropertyGroup>
@@ -1055,7 +1053,6 @@
1053
1054
<Import Project="$(WixHarvestTargetsPath)" Condition=" '$(WixHarvestTargetsPath)' != '' and Exists('$(WixHarvestTargetsPath)')" />
1055
<Import Project="$(WixSigningTargetsPath)" Condition=" '$(WixSigningTargetsPath)' != '' and Exists('$(WixSigningTargetsPath)')" />
1058
- <Import Project="$(LuxTargetsPath)" Condition=" '$(LuxTargetsPath)' != '' and Exists('$(LuxTargetsPath)')" />
1056
1057
<!-- Extension point: Define CustomAfterWixTargets to a .targets file that you want to include after this file. -->
1058
<Import Project="$(CustomAfterWixTargets)" Condition=" '$(CustomAfterWixTargets)' != '' and Exists('$(CustomAfterWixTargets)')" />
src/test/WixToolsetTest.BuildTasks/MsbuildFixture.cs
+11
-1
@@ -11,7 +11,8 @@ namespace WixToolsetTest.BuildTasks
11
12
public class MsbuildFixture
13
{
14
- private static readonly string WixTargetsPath = Path.Combine(Path.GetDirectoryName(new Uri(typeof(WixBuild).Assembly.CodeBase).AbsolutePath), "wix.targets");
14
+ private static readonly string WixBinPath = Path.GetDirectoryName(new Uri(typeof(WixBuild).Assembly.CodeBase).AbsolutePath) + "\\";
15
+ private static readonly string WixTargetsPath = Path.Combine(WixBinPath, "wix.targets");
16
17
[Fact]
18
public void CanBuildSimpleBundle()
@@ -27,6 +28,7 @@ namespace WixToolsetTest.BuildTasks
28
var result = MsbuildRunner.Execute(projectPath, new[]
29
{
30
$"-p:WixTargetsPath={WixTargetsPath}",
31
+ $"-p:WixBinDir={WixBinPath}",
32
$"-p:IntermediateOutputPath={intermediateFolder}",
33
$"-p:OutputPath={binFolder}"
34
});
@@ -64,6 +66,7 @@ namespace WixToolsetTest.BuildTasks
66
var result = MsbuildRunner.Execute(projectPath, new[]
67
{
68
$"-p:WixTargetsPath={WixTargetsPath}",
69
+ $"-p:WixBinDir={WixBinPath}",
70
$"-p:IntermediateOutputPath={intermediateFolder}",
71
$"-p:OutputPath={binFolder}"
72
});
@@ -126,6 +129,7 @@ namespace WixToolsetTest.BuildTasks
129
{
130
wixpdbType == null ? String.Empty : $"-p:WixPdbType={wixpdbType}",
131
$"-p:WixTargetsPath={WixTargetsPath}",
132
+ $"-p:WixBinDir={WixBinPath}",
133
$"-p:IntermediateOutputPath={intermediateFolder}",
134
$"-p:OutputPath={binFolder}",
135
});
@@ -153,6 +157,7 @@ namespace WixToolsetTest.BuildTasks
157
var result = MsbuildRunner.Execute(projectPath, new[]
158
{
159
$"-p:WixTargetsPath={WixTargetsPath}",
160
+ $"-p:WixBinDir={WixBinPath}",
161
$"-p:IntermediateOutputPath={intermediateFolder}",
162
$"-p:OutputPath={binFolder}",
163
$"-p:InstallerPlatform=x64",
@@ -178,6 +183,7 @@ namespace WixToolsetTest.BuildTasks
183
var result = MsbuildRunner.Execute(projectPath, new[]
184
{
185
$"-p:WixTargetsPath={WixTargetsPath}",
186
+ $"-p:WixBinDir={WixBinPath}",
187
$"-p:IntermediateOutputPath={intermediateFolder}",
188
$"-p:OutputPath={binFolder}",
189
"-p:SuppressIces=\"ICE45;ICE46\""
@@ -200,6 +206,7 @@ namespace WixToolsetTest.BuildTasks
206
var result = MsbuildRunner.Execute(projectPath, new[]
207
{
208
$"-p:WixTargetsPath={WixTargetsPath}",
209
+ $"-p:WixBinDir={WixBinPath}",
210
$"-p:IntermediateOutputPath={intermediateFolder}",
211
$"-p:OutputPath={binFolder}",
212
"-p:SuppressSpecificWarnings=\"1118;1102\""
@@ -225,6 +232,7 @@ namespace WixToolsetTest.BuildTasks
232
var result = MsbuildRunner.Execute(projectPath, new[]
233
{
234
$"-p:WixTargetsPath={WixTargetsPath}",
235
+ $"-p:WixBinDir={WixBinPath}",
236
$"-p:IntermediateOutputPath={intermediateFolder}",
237
$"-p:OutputPath={binFolder}",
238
"-p:OutputType=IntermediatePostLink"
@@ -253,6 +261,7 @@ namespace WixToolsetTest.BuildTasks
261
var result = MsbuildRunner.Execute(projectPath, new[]
262
{
263
$"-p:WixTargetsPath={WixTargetsPath}",
264
+ $"-p:WixBinDir={WixBinPath}",
265
$"-p:IntermediateOutputPath={intermediateFolder}",
266
$"-p:OutputPath={binFolder}",
267
"-v:diag"
@@ -271,6 +280,7 @@ namespace WixToolsetTest.BuildTasks
280
result = MsbuildRunner.Execute(projectPath, new[]
281
{
282
$"-p:WixTargetsPath={WixTargetsPath}",
283
+ $"-p:WixBinDir={WixBinPath}",
284
$"-p:IntermediateOutputPath={intermediateFolder}",
285
$"-p:OutputPath={binFolder}",
286
"-t:Clean",
src/test/WixToolsetTest.BuildTasks/MsbuildHeatFixture.cs
+4
-1
@@ -14,7 +14,8 @@ namespace WixToolsetTest.BuildTasks
14
15
public class MsbuildHeatFixture
16
{
17
- private static readonly string WixTargetsPath = Path.Combine(Path.GetDirectoryName(new Uri(typeof(HeatTask).Assembly.CodeBase).AbsolutePath), "wix.targets");
17
+ private static readonly string WixBinPath = Path.GetDirectoryName(new Uri(typeof(WixBuild).Assembly.CodeBase).AbsolutePath) + "\\";
18
+ private static readonly string WixTargetsPath = Path.Combine(WixBinPath, "wix.targets");
19
20
[Fact]
21
public void CanBuildHeatFilePackage()
@@ -30,6 +31,7 @@ namespace WixToolsetTest.BuildTasks
31
var result = MsbuildRunner.Execute(projectPath, new[]
32
{
33
$"-p:WixTargetsPath={WixTargetsPath}",
34
+ $"-p:WixBinDir={WixBinPath}",
35
$"-p:IntermediateOutputPath={intermediateFolder}",
36
$"-p:OutputPath={binFolder}"
37
});
@@ -86,6 +88,7 @@ namespace WixToolsetTest.BuildTasks
88
var result = MsbuildRunner.Execute(projectPath, new[]
89
{
90
$"-p:WixTargetsPath={WixTargetsPath}",
91
+ $"-p:WixBinDir={WixBinPath}",
92
$"-p:IntermediateOutputPath={intermediateFolder}",
93
$"-p:OutputPath={binFolder}"
94
});
src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj
+6
@@ -31,6 +31,12 @@
31
<Content Include="TestData\SimpleMsiPackage\SimpleBundle\SimpleBundle.wixproj" CopyToOutputDirectory="PreserveNewest" />
32
</ItemGroup>
33
34
+ <ItemGroup>
35
+ <Content Include="..\..\WixToolset.MSBuild\wix.harvest.targets" Link="wix.harvest.targets" CopyToOutputDirectory="PreserveNewest" />
36
+ <Content Include="..\..\WixToolset.MSBuild\wix.signing.targets" Link="wix.signing.targets" CopyToOutputDirectory="PreserveNewest" />
37
+ <Content Include="..\..\WixToolset.MSBuild\wix.targets" Link="wix.targets" CopyToOutputDirectory="PreserveNewest" />
38
+ </ItemGroup>
39
+
40
<ItemGroup>
41
<ProjectReference Include="..\..\WixToolset.BuildTasks\WixToolset.BuildTasks.csproj" />
42
</ItemGroup>