diff options
Diffstat (limited to 'src/WixToolset.BuildTasks')
-rw-r--r-- | src/WixToolset.BuildTasks/WixCommandLineBuilder.cs | 7 | ||||
-rw-r--r-- | src/WixToolset.BuildTasks/wix.targets | 28 |
2 files changed, 17 insertions, 18 deletions
diff --git a/src/WixToolset.BuildTasks/WixCommandLineBuilder.cs b/src/WixToolset.BuildTasks/WixCommandLineBuilder.cs index 3f3084a3..a979dbb0 100644 --- a/src/WixToolset.BuildTasks/WixCommandLineBuilder.cs +++ b/src/WixToolset.BuildTasks/WixCommandLineBuilder.cs | |||
@@ -3,10 +3,9 @@ | |||
3 | namespace WixToolset.BuildTasks | 3 | namespace WixToolset.BuildTasks |
4 | { | 4 | { |
5 | using System; | 5 | using System; |
6 | using System.Diagnostics; | 6 | using System.Collections.Generic; |
7 | using System.Globalization; | 7 | using System.Globalization; |
8 | using System.IO; | 8 | using System.IO; |
9 | using System.Text; | ||
10 | 9 | ||
11 | using Microsoft.Build.Framework; | 10 | using Microsoft.Build.Framework; |
12 | using Microsoft.Build.Utilities; | 11 | using Microsoft.Build.Utilities; |
@@ -17,7 +16,7 @@ namespace WixToolset.BuildTasks | |||
17 | public class WixCommandLineBuilder : CommandLineBuilder | 16 | public class WixCommandLineBuilder : CommandLineBuilder |
18 | { | 17 | { |
19 | internal const int Unspecified = -1; | 18 | internal const int Unspecified = -1; |
20 | 19 | ||
21 | /// <summary> | 20 | /// <summary> |
22 | /// Append a switch to the command line if the value has been specified. | 21 | /// Append a switch to the command line if the value has been specified. |
23 | /// </summary> | 22 | /// </summary> |
@@ -131,7 +130,7 @@ namespace WixToolset.BuildTasks | |||
131 | 130 | ||
132 | if (!File.Exists(resolvedPath)) | 131 | if (!File.Exists(resolvedPath)) |
133 | { | 132 | { |
134 | // Extesnion wasn't found, just set it to the extension name passed in | 133 | // Extension wasn't found, just set it to the extension name passed in |
135 | resolvedPath = extension.ItemSpec; | 134 | resolvedPath = extension.ItemSpec; |
136 | } | 135 | } |
137 | } | 136 | } |
diff --git a/src/WixToolset.BuildTasks/wix.targets b/src/WixToolset.BuildTasks/wix.targets index bcf0163b..4da03c6f 100644 --- a/src/WixToolset.BuildTasks/wix.targets +++ b/src/WixToolset.BuildTasks/wix.targets | |||
@@ -441,9 +441,9 @@ | |||
441 | <Output TaskParameter="TargetOutputs" ItemName="_BuiltProjectReferencePaths" /> | 441 | <Output TaskParameter="TargetOutputs" ItemName="_BuiltProjectReferencePaths" /> |
442 | </MSBuild> | 442 | </MSBuild> |
443 | 443 | ||
444 | <!-- | 444 | <!-- |
445 | VC project references must build GetNativeTargetPath because neither GetTargetPath nor the return of the default build | 445 | VC project references must build GetNativeTargetPath because neither GetTargetPath nor the return of the default build |
446 | target return the output for a native .vcxproj. | 446 | target return the output for a native .vcxproj. |
447 | --> | 447 | --> |
448 | <MSBuild | 448 | <MSBuild |
449 | Projects="@(_MSBuildProjectReferenceExistent)" | 449 | Projects="@(_MSBuildProjectReferenceExistent)" |
@@ -485,7 +485,7 @@ | |||
485 | 485 | ||
486 | [IN] | 486 | [IN] |
487 | @(WixLibrary) - The list of .wixlib files. | 487 | @(WixLibrary) - The list of .wixlib files. |
488 | 488 | ||
489 | [OUT] | 489 | [OUT] |
490 | @(_ResolvedWixLibraryPaths) - Item group with full paths to libraries | 490 | @(_ResolvedWixLibraryPaths) - Item group with full paths to libraries |
491 | ================================================================================================ | 491 | ================================================================================================ |
@@ -629,10 +629,10 @@ | |||
629 | AfterCompile | 629 | AfterCompile |
630 | </DoItDependsOn> | 630 | </DoItDependsOn> |
631 | </PropertyGroup> | 631 | </PropertyGroup> |
632 | <Target | 632 | <Target |
633 | Name="DoIt" | 633 | Name="DoIt" |
634 | DependsOnTargets="$(DoItDependsOn)" /> | 634 | DependsOnTargets="$(DoItDependsOn)" /> |
635 | 635 | ||
636 | <Target | 636 | <Target |
637 | Name="ActuallyDoIt" | 637 | Name="ActuallyDoIt" |
638 | 638 | ||
@@ -692,7 +692,7 @@ | |||
692 | 692 | ||
693 | UnreferencedSymbolsFile="$(UnreferencedSymbolsFile)" | 693 | UnreferencedSymbolsFile="$(UnreferencedSymbolsFile)" |
694 | WixProjectFile="$(ProjectPath)" | 694 | WixProjectFile="$(ProjectPath)" |
695 | WixVariables="$(WixVariables)" | 695 | WixVariables="$(WixVariables)" |
696 | 696 | ||
697 | SuppressValidation="$(SuppressValidation)" | 697 | SuppressValidation="$(SuppressValidation)" |
698 | SuppressIces="$(SuppressIces)" | 698 | SuppressIces="$(SuppressIces)" |
@@ -945,21 +945,21 @@ | |||
945 | AssignCultures | 945 | AssignCultures |
946 | 946 | ||
947 | Determines the final list of culture groups to build based on either the Cultures property or | 947 | Determines the final list of culture groups to build based on either the Cultures property or |
948 | those specified in .wxl files. | 948 | those specified in .wxl files. |
949 | 949 | ||
950 | Culture groups specified in the Cultures property must be specified as a semi-colon | 950 | Culture groups specified in the Cultures property must be specified as a semi-colon |
951 | delimited list of groups, with comma-delimited cultures within a group. | 951 | delimited list of groups, with comma-delimited cultures within a group. |
952 | For example: | 952 | For example: |
953 | <Cultures>en-US,en;en-GB,en</Cultures> | 953 | <Cultures>en-US,en;en-GB,en</Cultures> |
954 | This will build 2 targets, outputing to en-US and en-GB sub-folders. Light will first look | 954 | This will build 2 targets, outputing to en-US and en-GB sub-folders. Light will first look |
955 | for strings in the first culture (en-US or en-GB) then the second (en). | 955 | for strings in the first culture (en-US or en-GB) then the second (en). |
956 | 956 | ||
957 | Cultures of .wxl files will be used when the Culture property is not set. The culture of a | 957 | Cultures of .wxl files will be used when the Culture property is not set. The culture of a |
958 | .wxl file is determined by the Culture attribute in the WixLocalization element in the file | 958 | .wxl file is determined by the Culture attribute in the WixLocalization element in the file |
959 | 959 | ||
960 | Sets the OutputFolder metadata on each culture group. In most cases this is the same as the | 960 | Sets the OutputFolder metadata on each culture group. In most cases this is the same as the |
961 | first culture in the culture group. When the Culture's property is unspecified and no .wxl | 961 | first culture in the culture group. When the Culture's property is unspecified and no .wxl |
962 | files are provided this is the same as the output directory. When the Culture's property | 962 | files are provided this is the same as the output directory. When the Culture's property |
963 | specifies a single culture group and no .wxl files are provided this is the same as the output | 963 | specifies a single culture group and no .wxl files are provided this is the same as the output |
964 | directory. | 964 | directory. |
965 | 965 | ||
@@ -1206,7 +1206,7 @@ | |||
1206 | SourceFilesProjectOutputGroup; | 1206 | SourceFilesProjectOutputGroup; |
1207 | ContentFilesProjectOutputGroup" /> | 1207 | ContentFilesProjectOutputGroup" /> |
1208 | 1208 | ||
1209 | <!-- | 1209 | <!-- |
1210 | This is the key output for the BuiltProjectOutputGroup and is meant to be read directly from the IDE. | 1210 | This is the key output for the BuiltProjectOutputGroup and is meant to be read directly from the IDE. |
1211 | Reading an item is faster than invoking a target. | 1211 | Reading an item is faster than invoking a target. |
1212 | --> | 1212 | --> |