aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSean Hall <r.sean.hall@gmail.com>2020-05-28 21:21:24 +1000
committerSean Hall <r.sean.hall@gmail.com>2020-05-28 23:10:12 +1000
commit551f2a43de0465202e3a3aca24379481cc35733e (patch)
treed2d404b1341cd3eac390c98b4e64baf3ab9f6d19 /src
parentca37ac8d6a7a3bab2d5b33216e793760e7455bb9 (diff)
downloadwix-551f2a43de0465202e3a3aca24379481cc35733e.tar.gz
wix-551f2a43de0465202e3a3aca24379481cc35733e.tar.bz2
wix-551f2a43de0465202e3a3aca24379481cc35733e.zip
Rename DoIt to WixBuild.
Diffstat (limited to 'src')
-rw-r--r--src/WixToolset.BuildTasks/WixBuild.cs (renamed from src/WixToolset.BuildTasks/DoIt.cs)2
-rw-r--r--src/WixToolset.BuildTasks/wix.targets4
-rw-r--r--src/test/WixToolsetTest.BuildTasks/MsbuildFixture.cs2
-rw-r--r--src/test/WixToolsetTest.BuildTasks/WixBuildTaskFixture.cs4
4 files changed, 6 insertions, 6 deletions
diff --git a/src/WixToolset.BuildTasks/DoIt.cs b/src/WixToolset.BuildTasks/WixBuild.cs
index d95d6e3c..b8fb4136 100644
--- a/src/WixToolset.BuildTasks/DoIt.cs
+++ b/src/WixToolset.BuildTasks/WixBuild.cs
@@ -16,7 +16,7 @@ namespace WixToolset.BuildTasks
16 /// <summary> 16 /// <summary>
17 /// An MSBuild task to run the WiX compiler. 17 /// An MSBuild task to run the WiX compiler.
18 /// </summary> 18 /// </summary>
19 public sealed class DoIt : ToolsetTask 19 public sealed class WixBuild : ToolsetTask
20 { 20 {
21 public string[] Cultures { get; set; } 21 public string[] Cultures { get; set; }
22 22
diff --git a/src/WixToolset.BuildTasks/wix.targets b/src/WixToolset.BuildTasks/wix.targets
index eb0f815a..b8d6bb34 100644
--- a/src/WixToolset.BuildTasks/wix.targets
+++ b/src/WixToolset.BuildTasks/wix.targets
@@ -101,7 +101,7 @@
101 --> 101 -->
102 102
103 <!-- These tasks can be used as general-purpose build tasks. --> 103 <!-- These tasks can be used as general-purpose build tasks. -->
104 <UsingTask TaskName="DoIt" AssemblyFile="$(WixTasksPath)" /> 104 <UsingTask TaskName="WixBuild" AssemblyFile="$(WixTasksPath)" />
105 105
106 <!-- These tasks are specific to the build process defined in this file, and are not considered general-purpose build tasks. --> 106 <!-- These tasks are specific to the build process defined in this file, and are not considered general-purpose build tasks. -->
107 <UsingTask TaskName="CreateItemAvoidingInference" AssemblyFile="$(WixTasksPath)" /> 107 <UsingTask TaskName="CreateItemAvoidingInference" AssemblyFile="$(WixTasksPath)" />
@@ -629,7 +629,7 @@
629 <PdbOutputFile>$(IntermediateOutputPath)%(CultureGroup.OutputFolder)$(TargetPdbFileName)</PdbOutputFile> 629 <PdbOutputFile>$(IntermediateOutputPath)%(CultureGroup.OutputFolder)$(TargetPdbFileName)</PdbOutputFile>
630 </PropertyGroup> 630 </PropertyGroup>
631 631
632 <DoIt 632 <WixBuild
633 SourceFiles="@(_CompileWithObjectPath)" 633 SourceFiles="@(_CompileWithObjectPath)"
634 LibraryFiles="@(WixLibProjects);@(_ResolvedWixLibraryPaths)" 634 LibraryFiles="@(WixLibProjects);@(_ResolvedWixLibraryPaths)"
635 LocalizationFiles="@(EmbeddedResource)" 635 LocalizationFiles="@(EmbeddedResource)"
diff --git a/src/test/WixToolsetTest.BuildTasks/MsbuildFixture.cs b/src/test/WixToolsetTest.BuildTasks/MsbuildFixture.cs
index 17a669ef..0c225390 100644
--- a/src/test/WixToolsetTest.BuildTasks/MsbuildFixture.cs
+++ b/src/test/WixToolsetTest.BuildTasks/MsbuildFixture.cs
@@ -11,7 +11,7 @@ namespace WixToolsetTest.BuildTasks
11 11
12 public class MsbuildFixture 12 public class MsbuildFixture
13 { 13 {
14 private static readonly string WixTargetsPath = Path.Combine(Path.GetDirectoryName(new Uri(typeof(DoIt).Assembly.CodeBase).AbsolutePath), "wix.targets"); 14 private static readonly string WixTargetsPath = Path.Combine(Path.GetDirectoryName(new Uri(typeof(WixBuild).Assembly.CodeBase).AbsolutePath), "wix.targets");
15 15
16 [Fact] 16 [Fact]
17 public void CanBuildSimpleBundle() 17 public void CanBuildSimpleBundle()
diff --git a/src/test/WixToolsetTest.BuildTasks/WixBuildTaskFixture.cs b/src/test/WixToolsetTest.BuildTasks/WixBuildTaskFixture.cs
index aa44ba81..92033766 100644
--- a/src/test/WixToolsetTest.BuildTasks/WixBuildTaskFixture.cs
+++ b/src/test/WixToolsetTest.BuildTasks/WixBuildTaskFixture.cs
@@ -25,7 +25,7 @@ namespace WixToolsetTest.BuildTasks
25 var pdbPath = Path.Combine(baseFolder, @"bin\testpackage.wixpdb"); 25 var pdbPath = Path.Combine(baseFolder, @"bin\testpackage.wixpdb");
26 var engine = new FakeBuildEngine(); 26 var engine = new FakeBuildEngine();
27 27
28 var task = new DoIt 28 var task = new WixBuild
29 { 29 {
30 BuildEngine = engine, 30 BuildEngine = engine,
31 SourceFiles = new[] 31 SourceFiles = new[]
@@ -75,7 +75,7 @@ namespace WixToolsetTest.BuildTasks
75 var pdbPath = Path.Combine(baseFolder, @"bin\testpackage.wixpdb"); 75 var pdbPath = Path.Combine(baseFolder, @"bin\testpackage.wixpdb");
76 var engine = new FakeBuildEngine(); 76 var engine = new FakeBuildEngine();
77 77
78 var task = new DoIt 78 var task = new WixBuild
79 { 79 {
80 BuildEngine = engine, 80 BuildEngine = engine,
81 SourceFiles = new[] 81 SourceFiles = new[]