Menu
▾
▴
[WiX-commits] wix/src/WixTasks ResolveWixReferences.cs, NONE, 1.1 WixTasks.csproj, 1.17, 1.18 wix.targets, 1.38, 1.39 ResolveWixExtensionReference.cs, 1.1, NONE
|
From: Rob M. <ro...@us...> - 2009-05-08 09:34:29
|
Update of /cvsroot/wix/wix/src/WixTasks In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv11432/src/WixTasks Modified Files: WixTasks.csproj wix.targets Added Files: ResolveWixReferences.cs Removed Files: ResolveWixExtensionReference.cs Log Message: AaronSte: Adding more detailed WixUI customization information to the documentation. AaronSte: Updating product branding in setup UI, the start menu and the VS Help | About dialog. MiCarls: SFBUG:2782585 - Fix heap corruption in IIS custom action AaronSte: SFBUG:2786681 - Adding documentation annotations for some elements in wix.xsd that were missing them. MiCarls: Properly handle SQL database names that have already been escaped BriaRo: SFBUG:2783049 - Removed duplicate registry keys from the Component if they had been harvested. EricStJ: SFBUG: 2787116 - Move WixExtensionSearchPaths outside of the target BobArnso: Fix SFBug:2786736 - Use MSBuildToolsVersion to detect when we should use the .NET 3.5 MSBuild tasks for VC9. Note that this requires your .wixproj to be declared <Project ToolsVersion="3.5" ...> so MSBuild builds the .wixproj using v3.5 tools. BriaRo: SFBUG:2788210 - Removed additional Class/@Id elements that were being created from a logic error when adding elements to a component in the UtilFinalizeHarvesterMutator class when mutating registry entries. JasonGin: SFBUG:2380391 - Resolve wixlib references so msbuild dependency checking works properly EricStJ: SFBUG:2785180 - Adding attributes to help elements to support building Help2 MSMs. Must use redistributables when using MSMs to prevent 2 merging 2 instances of the same CAs. Index: WixTasks.csproj =================================================================== RCS file: /cvsroot/wix/wix/src/WixTasks/WixTasks.csproj,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** WixTasks.csproj 1 May 2009 08:14:42 -0000 1.17 --- WixTasks.csproj 8 May 2009 09:33:52 -0000 1.18 *************** *** 26,30 **** <Compile Include="heatfile.cs" /> <Compile Include="heatproject.cs" /> ! <Compile Include="ResolveWixExtensionReference.cs" /> <Compile Include="WixAssignCulture.cs" /> <Compile Include="Candle.cs" /> --- 26,30 ---- <Compile Include="heatfile.cs" /> <Compile Include="heatproject.cs" /> ! <Compile Include="ResolveWixReferences.cs" /> <Compile Include="WixAssignCulture.cs" /> <Compile Include="Candle.cs" /> --- NEW FILE: ResolveWixReferences.cs --- (This appears to be a binary file; contents omitted.) --- ResolveWixExtensionReference.cs DELETED --- Index: wix.targets =================================================================== RCS file: /cvsroot/wix/wix/src/WixTasks/wix.targets,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** wix.targets 1 May 2009 08:14:42 -0000 1.38 --- wix.targets 8 May 2009 09:33:52 -0000 1.39 *************** *** 94,110 **** <!-- These tasks are specific to the build process defined in this file, and are not considered general-purpose build tasks. --> ! <UsingTask TaskName="AssignProjectConfiguration" AssemblyName="Microsoft.Build.Tasks, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" Condition=" '$(Framework35Dir)' == '' " /> ! <UsingTask TaskName="AssignTargetPath" AssemblyName="Microsoft.Build.Tasks, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" Condition=" '$(Framework35Dir)' == '' " /> ! <UsingTask TaskName="ResolveNonMSBuildProjectOutput" AssemblyName="Microsoft.Build.Tasks, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" Condition=" '$(Framework35Dir)' == '' " /> ! <UsingTask TaskName="ResolveVCProjectOutput" AssemblyName="Microsoft.Build.Tasks, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" Condition=" '$(Framework35Dir)' == '' " /> ! <UsingTask TaskName="AssignProjectConfiguration" AssemblyName="Microsoft.Build.Tasks.v3.5, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" Condition=" '$(Framework35Dir)' != '' " /> ! <UsingTask TaskName="AssignTargetPath" AssemblyName="Microsoft.Build.Tasks.v3.5, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" Condition=" '$(Framework35Dir)' != '' " /> ! <UsingTask TaskName="ResolveNonMSBuildProjectOutput" AssemblyName="Microsoft.Build.Tasks.v3.5, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" Condition=" '$(Framework35Dir)' != '' " /> ! <UsingTask TaskName="ResolveVCProjectOutput" AssemblyName="Microsoft.Build.Tasks.v3.5, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" Condition=" '$(Framework35Dir)' != '' " /> <UsingTask TaskName="CreateProjectReferenceDefineConstants" AssemblyFile="$(WixTasksPath)" /> <UsingTask TaskName="WixAssignCulture" AssemblyFile="$(WixTasksPath)" /> ! <UsingTask TaskName="ResolveWixExtensionReference" AssemblyFile="$(WixTasksPath)"/> <!-- --- 94,110 ---- <!-- These tasks are specific to the build process defined in this file, and are not considered general-purpose build tasks. --> ! <UsingTask TaskName="AssignProjectConfiguration" AssemblyName="Microsoft.Build.Tasks, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" Condition=" '$(MSBuildToolsVersion)' == '' " /> ! <UsingTask TaskName="AssignTargetPath" AssemblyName="Microsoft.Build.Tasks, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" Condition=" '$(MSBuildToolsVersion)' == '' " /> ! <UsingTask TaskName="ResolveNonMSBuildProjectOutput" AssemblyName="Microsoft.Build.Tasks, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" Condition=" '$(MSBuildToolsVersion)' == '' " /> ! <UsingTask TaskName="ResolveVCProjectOutput" AssemblyName="Microsoft.Build.Tasks, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" Condition=" '$(MSBuildToolsVersion)' == '' " /> ! <UsingTask TaskName="AssignProjectConfiguration" AssemblyName="Microsoft.Build.Tasks.v3.5, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" Condition=" '$(MSBuildToolsVersion)' == '3.5' " /> ! <UsingTask TaskName="AssignTargetPath" AssemblyName="Microsoft.Build.Tasks.v3.5, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" Condition=" '$(MSBuildToolsVersion)' == '3.5' " /> ! <UsingTask TaskName="ResolveNonMSBuildProjectOutput" AssemblyName="Microsoft.Build.Tasks.v3.5, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" Condition=" '$(MSBuildToolsVersion)' == '3.5' " /> ! <UsingTask TaskName="ResolveVCProjectOutput" AssemblyName="Microsoft.Build.Tasks.v3.5, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" Condition=" '$(MSBuildToolsVersion)' == '3.5' " /> <UsingTask TaskName="CreateProjectReferenceDefineConstants" AssemblyFile="$(WixTasksPath)" /> <UsingTask TaskName="WixAssignCulture" AssemblyFile="$(WixTasksPath)" /> ! <UsingTask TaskName="ResolveWixReferences" AssemblyFile="$(WixTasksPath)"/> <!-- *************** *** 584,588 **** <!-- ================================================================================================== ! ResolveWixExtensionPaths Resolves WiX extension references to full paths. Any properties you use --- 584,588 ---- <!-- ================================================================================================== ! ResolveWixExtensionReferences Resolves WiX extension references to full paths. Any properties you use *************** *** 597,616 **** ================================================================================================== --> <Target ! Name="ResolveWixExtensionPaths"> ! <PropertyGroup> ! <WixExtensionSearchPaths> ! $(ReferencePaths); ! {HintPathFromItem}; ! {RawFileName}; ! $(WixExtDir) ! </WixExtensionSearchPaths> ! </PropertyGroup> ! ! <ResolveWixExtensionReference ! WixExtensions="@(WixExtension)" ! SearchPaths="$(WixExtensionSearchPaths)"> ! <Output TaskParameter="ResolvedWixExtensions" ItemName="_AllResolvedWixExtensionPaths" /> ! </ResolveWixExtensionReference> <!-- Normalize the paths to ensure remove duplicates catches everything --> --- 597,633 ---- ================================================================================================== --> + <PropertyGroup> + <ResolveWixExtensionReferencesDependsOn> + PrepareForBuild + </ResolveWixExtensionReferencesDependsOn> + </PropertyGroup> <Target ! Name="ResolveWixExtensionReferences" ! DependsOnTargets="$(ResolveWixExtensionReferencesDependsOn)" ! Condition=" '@(WixExtension)' != ''"> ! ! <!-- ! The WixExtensionSearchPaths property is set to find assemblies in the following order: ! ! (1) $(ReferencePaths) - the reference paths property, which comes from the .USER file. ! (2) The hintpath from the referenced item itself, indicated by {HintPathFromItem}. ! (3) Treat the reference's Include as if it were a real file name. ! (4) Path specified by the WixExtDir property. ! --> ! <CreateProperty Condition=" '$(WixExtensionSearchPaths)' == '' " Value=" ! $(ReferencePaths); ! {HintPathFromItem}; ! {RawFileName}; ! $(WixExtDir) ! "> ! <Output TaskParameter="Value" PropertyName="WixExtensionSearchPaths" /> ! </CreateProperty> ! ! <ResolveWixReferences ! WixReferences="@(WixExtension)" ! SearchPaths="$(WixExtensionSearchPaths)" ! SearchFilenameExtensions=".dll"> ! <Output TaskParameter="ResolvedWixReferences" ItemName="_AllResolvedWixExtensionPaths" /> ! </ResolveWixReferences> <!-- Normalize the paths to ensure remove duplicates catches everything --> *************** *** 663,666 **** --- 680,684 ---- ResolveVCProjectReferences; ResolveWixLibraryReferences; + ResolveWixExtensionReferences; AfterResolveReferences </ResolveReferencesDependsOn> *************** *** 937,967 **** ResolveWixLibraryReferences ! Resolve the library references by copying them to the local build directory. Used in Votive ! when CopyLocal = true on a wixlib or wix extension reference node. [IN] @(WixLibrary) - The list of .wixlib files. ! @(WixExtension) - The list of wix dll extension files. ================================================================================================ --> - <!-- Resolve the library references by copying them to the local build directory. Used in Votive when CopyLocal = true on a wixlib reference node. --> <PropertyGroup> <ResolveWixLibraryReferencesDependsOn> PrepareForBuild; - ResolveWixExtensionPaths </ResolveWixLibraryReferencesDependsOn> </PropertyGroup> <Target Name="ResolveWixLibraryReferences" - Inputs="@(WixLibrary); - @(_ResolvedWixExtensionPaths); - $(MSBuildAllProjects)" - Outputs="@(WixLibrary->'$(OutDir)%(Filename)%(Extension)'); - @(_ResolvedWixExtensionPaths->'$(OutDir)%(Filename)%(Extension)')" DependsOnTargets="$(ResolveWixLibraryReferencesDependsOn)" ! Condition=" '@(WixLibrary)@(_ResolvedWixExtensionPaths)' != ''"> - <!-- TODO: Recurse any project references that build wixlibs or wixext and add their outputs to WixLibrary or WixExtension --> - <!-- TODO: Copy the references marked with CopyLocal=true to the output directory --> </Target> --- 955,1011 ---- ResolveWixLibraryReferences ! Resolve the library references to full paths. [IN] @(WixLibrary) - The list of .wixlib files. ! ! [OUT] ! @(_ResolvedWixLibraryPaths) - Item group with full paths to libraries ================================================================================================ --> <PropertyGroup> <ResolveWixLibraryReferencesDependsOn> PrepareForBuild; </ResolveWixLibraryReferencesDependsOn> </PropertyGroup> <Target Name="ResolveWixLibraryReferences" DependsOnTargets="$(ResolveWixLibraryReferencesDependsOn)" ! Condition=" '@(WixLibrary)' != ''"> ! ! <!-- ! The WixLibrarySearchPaths property is set to find assemblies in the following order: ! ! (1) $(ReferencePaths) - the reference paths property, which comes from the .USER file. ! (2) The hintpath from the referenced item itself, indicated by {HintPathFromItem}. ! (3) Treat the reference's Include as if it were a real file name. ! (4) Path specified by the WixExtDir property. ! --> ! <CreateProperty Condition=" '$(WixLibrarySearchPaths)' == '' " Value=" ! $(ReferencePaths); ! {HintPathFromItem}; ! {RawFileName}; ! $(WixExtDir) ! "> ! <Output TaskParameter="Value" PropertyName="WixLibrarySearchPaths" /> ! </CreateProperty> ! ! <ResolveWixReferences ! WixReferences="@(WixLibrary)" ! SearchPaths="$(WixLibrarySearchPaths)" ! SearchFilenameExtensions=".wixlib"> ! <Output TaskParameter="ResolvedWixReferences" ItemName="_AllResolvedWixLibraryPaths" /> ! </ResolveWixReferences> ! ! <!-- Normalize the paths to ensure remove duplicates catches everything --> ! <ConvertToAbsolutePath Paths="@(_AllResolvedWixLibraryPaths)"> ! <Output TaskParameter="AbsolutePaths" ItemName="_AllResolvedWixLibraryFullPaths" /> ! </ConvertToAbsolutePath> ! ! <!-- Remove duplicate library items that would cause build errors --> ! <RemoveDuplicates Inputs="@(_AllResolvedWixLibraryFullPaths)"> ! <Output TaskParameter="Filtered" ItemName="_ResolvedWixLibraryPaths" /> ! </RemoveDuplicates> </Target> *************** *** 1223,1227 **** <CompileDependsOn> PrepareForBuild; ! ResolveWixExtensionPaths </CompileDependsOn> </PropertyGroup> --- 1267,1271 ---- <CompileDependsOn> PrepareForBuild; ! ResolveWixExtensionReferences </CompileDependsOn> </PropertyGroup> *************** *** 1288,1292 **** <LibDependsOn> PrepareForBuild; ! ResolveWixExtensionPaths </LibDependsOn> </PropertyGroup> --- 1332,1336 ---- <LibDependsOn> PrepareForBuild; ! ResolveWixExtensionReferences </LibDependsOn> </PropertyGroup> *************** *** 1422,1426 **** <LinkDependsOn> PrepareForBuild; ! ResolveWixExtensionPaths; AssignCultures; </LinkDependsOn> --- 1466,1470 ---- <LinkDependsOn> PrepareForBuild; ! ResolveReferences; AssignCultures; </LinkDependsOn> *************** *** 1432,1437 **** @(EmbeddedResource); @(WixObject); - @(WixLibrary); @(_ResolvedProjectReferencePaths); @(_ResolvedWixExtensionPaths); $(MSBuildAllProjects)" --- 1476,1481 ---- @(EmbeddedResource); @(WixObject); @(_ResolvedProjectReferencePaths); + @(_ResolvedWixLibraryPaths); @(_ResolvedWixExtensionPaths); $(MSBuildAllProjects)" *************** *** 1442,1446 **** <!-- Call light using the culture subdirectory for output --> <Light ! ObjectFiles="@(CompileObjOutput);@(WixObject);@(WixLibProjects);@(WixLibrary)" AdditionalOptions="$(LinkerAdditionalOptions)" AllowIdenticalRows="$(AllowIdenticalRows)" --- 1486,1490 ---- <!-- Call light using the culture subdirectory for output --> <Light ! ObjectFiles="@(CompileObjOutput);@(WixObject);@(WixLibProjects);@(_ResolvedWixLibraryPaths)" AdditionalOptions="$(LinkerAdditionalOptions)" AllowIdenticalRows="$(AllowIdenticalRows)" |
