From ef0dbdc18c4335fef395fb954845031ea90503be Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Thu, 28 May 2020 23:00:05 +1000 Subject: Move the targets files into the top-level tools folder. --- src/ThmViewerPackage/ThmViewerPackage.wixproj | 3 +- .../WixToolset.BuildTasks.csproj | 9 - src/WixToolset.BuildTasks/redirects/wix.ca.targets | 10 - src/WixToolset.BuildTasks/redirects/wix.targets | 10 - src/WixToolset.BuildTasks/wix.ca.targets | 123 --- src/WixToolset.BuildTasks/wix.harvest.targets | 505 ---------- src/WixToolset.BuildTasks/wix.signing.targets | 370 ------- src/WixToolset.BuildTasks/wix.targets | 1063 -------------------- src/WixToolset.MSBuild/WixToolset.MSBuild.nuspec | 4 + src/WixToolset.MSBuild/WixToolset.MSBuild.props | 3 +- src/WixToolset.MSBuild/wix.ca.targets | 123 +++ src/WixToolset.MSBuild/wix.harvest.targets | 499 +++++++++ src/WixToolset.MSBuild/wix.signing.targets | 370 +++++++ src/WixToolset.MSBuild/wix.targets | 1060 +++++++++++++++++++ .../WixToolsetTest.BuildTasks/MsbuildFixture.cs | 12 +- .../MsbuildHeatFixture.cs | 5 +- .../WixToolsetTest.BuildTasks.csproj | 6 + 17 files changed, 2080 insertions(+), 2095 deletions(-) delete mode 100644 src/WixToolset.BuildTasks/redirects/wix.ca.targets delete mode 100644 src/WixToolset.BuildTasks/redirects/wix.targets delete mode 100644 src/WixToolset.BuildTasks/wix.ca.targets delete mode 100644 src/WixToolset.BuildTasks/wix.harvest.targets delete mode 100644 src/WixToolset.BuildTasks/wix.signing.targets delete mode 100644 src/WixToolset.BuildTasks/wix.targets create mode 100644 src/WixToolset.MSBuild/wix.ca.targets create mode 100644 src/WixToolset.MSBuild/wix.harvest.targets create mode 100644 src/WixToolset.MSBuild/wix.signing.targets create mode 100644 src/WixToolset.MSBuild/wix.targets (limited to 'src') diff --git a/src/ThmViewerPackage/ThmViewerPackage.wixproj b/src/ThmViewerPackage/ThmViewerPackage.wixproj index a0351aca..07014065 100644 --- a/src/ThmViewerPackage/ThmViewerPackage.wixproj +++ b/src/ThmViewerPackage/ThmViewerPackage.wixproj @@ -6,6 +6,7 @@ 59c4b122-5167-445b-8fc4-09dcd4eced89 thmviewer Package + $(OutputPath)\net461\win-x86\ @@ -23,7 +24,7 @@ - + diff --git a/src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj b/src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj index 8724f2fc..a8363e7b 100644 --- a/src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj +++ b/src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj @@ -16,15 +16,6 @@ NU1701 - - - - - - - - - diff --git a/src/WixToolset.BuildTasks/redirects/wix.ca.targets b/src/WixToolset.BuildTasks/redirects/wix.ca.targets deleted file mode 100644 index ecb6e09f..00000000 --- a/src/WixToolset.BuildTasks/redirects/wix.ca.targets +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - $([MSBuild]::GetRegistryValueFromView('HKEY_LOCAL_MACHINE\SOFTWARE\WiX Toolset\v4', 'InstallFolder', null, RegistryView.Registry32)) - - - - diff --git a/src/WixToolset.BuildTasks/redirects/wix.targets b/src/WixToolset.BuildTasks/redirects/wix.targets deleted file mode 100644 index ba354b65..00000000 --- a/src/WixToolset.BuildTasks/redirects/wix.targets +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - $([MSBuild]::GetRegistryValueFromView('HKEY_LOCAL_MACHINE\SOFTWARE\WiX Toolset\v4', 'InstallFolder', null, RegistryView.Registry32)) - - - - diff --git a/src/WixToolset.BuildTasks/wix.ca.targets b/src/WixToolset.BuildTasks/wix.ca.targets deleted file mode 100644 index 4578c2d8..00000000 --- a/src/WixToolset.BuildTasks/wix.ca.targets +++ /dev/null @@ -1,123 +0,0 @@ - - - - - - - - - - true - - $(TargetName).CA$(TargetExt) - - $(MSBuildThisFileDirectory) - $(WixSdkPath)x86\ - $(WixSdkPath)x64\ - - $(WixSdkPath)MakeSfxCA.exe - $(WixSdkX64Path)SfxCA.dll - $(WixSdkX86Path)SfxCA.dll - - - - - - - - - - - - - - - - - - - @(CustomActionReferenceContents);@(Content->'%(FullPath)');$(CustomActionContents) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/WixToolset.BuildTasks/wix.harvest.targets b/src/WixToolset.BuildTasks/wix.harvest.targets deleted file mode 100644 index 5dd2f729..00000000 --- a/src/WixToolset.BuildTasks/wix.harvest.targets +++ /dev/null @@ -1,505 +0,0 @@ - - - - - - - - - $(MSBuildThisFileFullPath) - $(WixTargetsPath)WixToolset.BuildTasks.dll - - - - - - - - - - - - - $(NoLogo) - $(SuppressAllWarnings) - $(SuppressSpecificWarnings) - $(TreatWarningsAsErrors) - $(TreatSpecificWarningsAsErrors) - $(VerboseOutput) - true - false - true - false - - - - - - false - - $(HarvestNoLogo) - $(HarvestSuppressAllWarnings) - $(HarvestSuppressSpecificWarnings) - $(HarvestTreatWarningsAsErrors) - $(HarvestTreatSpecificWarningsAsErrors) - $(HarvestVerboseOutput) - $(HarvestAutogenerateGuids) - $(HarvestGenerateGuidsNow) - $(HarvestSuppressFragments) - $(HarvestSuppressUniqueIds) - $(HarvestTransforms) - $(IntermediateOutputPath)Product.Generated.wxs - $(IntermediateOutputPath)Bundle.Generated.wxs - - - - - $(HarvestNoLogo) - $(HarvestSuppressAllWarnings) - $(HarvestSuppressSpecificWarnings) - $(HarvestTreatWarningsAsErrors) - $(HarvestTreatSpecificWarningsAsErrors) - $(HarvestVerboseOutput) - $(HarvestAutogenerateGuids) - $(HarvestGenerateGuidsNow) - $(HarvestSuppressFragments) - $(HarvestSuppressUniqueIds) - $(HarvestTransforms) - - - - - $(HarvestNoLogo) - $(HarvestSuppressAllWarnings) - $(HarvestSuppressSpecificWarnings) - $(HarvestTreatWarningsAsErrors) - $(HarvestTreatSpecificWarningsAsErrors) - $(HarvestVerboseOutput) - $(HarvestAutogenerateGuids) - $(HarvestGenerateGuidsNow) - $(HarvestSuppressFragments) - $(HarvestSuppressUniqueIds) - $(HarvestTransforms) - - - - - - ConvertReferences; - ConvertBundleReferences; - HarvestProjects; - HarvestDirectory; - HarvestFile; - GenerateCode; - - - - - - - - RefreshGeneratedFile; - RefreshBundleGeneratedFile - - - - - - - - - <_HeatProjectReference Include="@(_MSBuildProjectReferenceExistent)" Condition=" '%(_MSBuildProjectReferenceExistent.DoNotHarvest)' == '' "> - %(_MSBuildProjectReferenceExistent.RefTargetDir) - Binaries;Symbols;Sources;Content;Satellites;Documents - %(_MSBuildProjectReferenceExistent.Name) - $(IntermediateOutputPath)_%(_MSBuildProjectReferenceExistent.Filename).wxs - - - - - - - - - - <_GeneratedFiles Include="$(HarvestProjectsGeneratedFile)" /> - - - - - - - - - <_HeatProjectReference Include="@(_MSBuildProjectReferenceExistent)" Condition=" '%(_MSBuildProjectReferenceExistent.DoNotHarvest)' == '' "> - Binaries;Symbols;Sources;Content;Satellites;Documents - payloadgroup - $(IntermediateOutputPath)_%(_MSBuildProjectReferenceExistent.Filename).wxs - - - - - - - - - - <_GeneratedFiles Include="$(HarvestProjectsGeneratedFile)" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - $(HarvestProjectsTransforms) - $(HarvestProjectsProjectOutputGroups) - $(HarvestProjectsDirectoryIds) - - - $(HarvestProjectsTransforms) - $(HarvestProjectsProjectOutputGroups) - $(HarvestProjectsDirectoryIds) - - - - - CombineHarvestProjects - - - - - - - - - - - - - - - - - $(HarvestDirectoryTransforms) - $(HarvestDirectoryComponentGroupName) - $(HarvestDirectoryDirectoryRefId) - $(HarvestDirectoryKeepEmptyDirectories) - $(HarvestDirectoryPreprocessorVariable) - $(HarvestDirectorySuppressCom) - $(HarvestDirectorySuppressRootDirectory) - $(HarvestDirectorySuppressRegistry) - - - - - - GetHarvestDirectoryContent - - - - - - - - - - - - - - - - - - - - - - - - - - $(HarvestFileTransforms) - $(HarvestFileComponentGroupName) - $(HarvestFileDirectoryRefId) - $(HarvestFilePreprocessorVariable) - $(HarvestFileSuppressCom) - $(HarvestFileSuppressRegistry) - $(HarvestFileSuppressRootDirectory) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/WixToolset.BuildTasks/wix.signing.targets b/src/WixToolset.BuildTasks/wix.signing.targets deleted file mode 100644 index 7c25175f..00000000 --- a/src/WixToolset.BuildTasks/wix.signing.targets +++ /dev/null @@ -1,370 +0,0 @@ - - - - - - $(MSBuildProjectFile).Signed.txt - $(IntermediateOutputPath)$(SignedFileName) - - - - - - - - - $(NoLogo) - $(SuppressAllWarnings) - $(SuppressSpecificWarnings) - $(TreatWarningsAsErrors) - $(TreatSpecificWarningsAsErrors) - $(VerboseOutput) - - - - - - GetMsmsToSign; - InternalSignMsm; - - - GetCabsToSign; - GetMsiToSign; - InternalSignCabs; - InscribeMsi; - InternalSignMsi; - - - GetContainersToSign; - InternalSignContainers; - InscribeBundleEngine; - InternalSignBundleEngine; - InscribeBundle; - InternalSignBundle; - - - - WixBuild; - CalculateSignTargetFiles; - BeforeSigning; - $(InternalSignDependsOn); - AfterSigning - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/WixToolset.BuildTasks/wix.targets b/src/WixToolset.BuildTasks/wix.targets deleted file mode 100644 index b8d6bb34..00000000 --- a/src/WixToolset.BuildTasks/wix.targets +++ /dev/null @@ -1,1063 +0,0 @@ - - - - - - true - - - - - - - - - - $(MSBuildThisFileDirectory) - $(WixBinDir)WixToolset.BuildTasks.dll - $(WixBinDir)wix.harvest.targets - $(WixBinDir)wix.signing.targets - $(WixBinDir)lux.targets - $(WixBinDir)LuxTasks.dll - - - - - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - $(MSBuildAllProjects);$(WixHarvestTargetsPath) - $(MSBuildAllProjects);$(WixSigningTargetsPath) - $(MSBuildAllProjects);$(LuxTargetsPath) - $(MSBuildAllProjects);$(CustomBeforeWixTargets) - $(MSBuildAllProjects);$(CustomAfterWixTargets) - - - - - - .wxs - wix - wix - - - $(MSBuildProjectName) - $(OutputName) - - - Package - - - full - - - - - .msi - .msm - .pcp - .wixlib - .exe - .wixipl - - - - - - - $(TargetDir) - $(PdbOutputDir)\ - - - $([System.IO.Path]::GetFullPath(`$([System.IO.Path]::Combine(`$(MSBuildProjectDirectory)`, `$(PdbOutputDir)`))`)) - - - $(TargetName).wixpdb - - - $(TargetPdbDir)$(TargetPdbFileName) - - - - - - - - - - - - - - - - - $(MSBuildProjectFile).BindContentsFileList.txt - $(MSBuildProjectFile).BindOutputsFileList.txt - $(MSBuildProjectFile).BindBuiltOutputsFileList.txt - - - - $(IntermediateOutputPath)cabcache\ - - - - $(WixBinDir) - - - - - - - - - - - - $(NoLogo) - $(SuppressAllWarnings) - $(SuppressSpecificWarnings) - $(TreatWarningsAsErrors) - $(TreatSpecificWarningsAsErrors) - $(VerboseOutput) - - $(Platform) - - - - - $(NoLogo) - $(BindFiles) - $(Pedantic) - $(SuppressAllWarnings) - $(SuppressSpecificWarnings) - $(SuppressSchemaValidation) - $(SuppressIntermediateFileVersionMatching) - $(TreatWarningsAsErrors) - $(TreatSpecificWarningsAsErrors) - $(VerboseOutput) - - - - - $(NoLogo) - $(BindFiles) - $(Pedantic) - $(SuppressAllWarnings) - $(SuppressSpecificWarnings) - $(SuppressSchemaValidation) - $(SuppressIntermediateFileVersionMatching) - $(TreatWarningsAsErrors) - $(TreatSpecificWarningsAsErrors) - $(VerboseOutput) - - - - - - - - - - - - - - - - - - <_PleaseSetThisInProjectFile>Please set this in the project file before the <Import> of the wix.targets file. - <_OutputTypeDescription>Possible values are: 'Package', 'Module', 'Library', 'Bundle', 'IntermediatePostLink'. $(_PleaseSetThisInProjectFile) - - - - - - - - - - - - - - - - - - - BuildOnlySettings; - PrepareForBuild; - PreBuildEvent; - - WixBuild; - Signing; - - GetTargetPath; - PrepareForRun; - IncrementalClean; - PostBuildEvent - - - - - - - - - - BeforeResolveReferences; - AssignProjectConfiguration; - ResolveProjectReferences; - ResolveWixLibraryReferences; - ResolveWixExtensionReferences; - AfterResolveReferences - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - AssignTargetPaths - - - - - - - - - ResolveReferences; - BeforeCompile; - _TimeStampBeforeCompile; - - CalculateDefineConstants; - Harvest; - - GenerateCompileWithObjectPath; - - AssignTargetPaths; - ReadPreviousBindInputsAndBuiltOutputs; - - CoreWixBuild; - - UpdateLinkFileWrites; - _TimeStampAfterCompile; - AfterCompile - - - - - - - - - $([System.IO.Path]::GetFullPath($(IntermediateOutputPath)%(CultureGroup.OutputFolder)$(TargetFileName))) - - $(IntermediateOutputPath)%(CultureGroup.OutputFolder)$(TargetPdbFileName) - - - - - - - - - - - ResolveReferences - - - - - - Configuration=$(ConfigurationName); - OutDir=$(OutDir); - Platform=$(PlatformName); - ProjectDir=$(ProjectDir); - ProjectExt=$(ProjectExt); - ProjectFileName=$(ProjectFileName); - ProjectName=$(ProjectName); - ProjectPath=$(ProjectPath); - TargetDir=$(TargetDir); - TargetExt=$(TargetExt); - TargetFileName=$(TargetFileName); - TargetName=$(TargetName); - TargetPath=$(TargetPath); - - - - - $(SolutionDefineConstants);DevEnvDir=$(DevEnvDir) - $(SolutionDefineConstants);SolutionDir=$(SolutionDir) - $(SolutionDefineConstants);SolutionExt=$(SolutionExt) - $(SolutionDefineConstants);SolutionFileName=$(SolutionFileName) - $(SolutionDefineConstants);SolutionName=$(SolutionName) - $(SolutionDefineConstants);SolutionPath=$(SolutionPath) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_CulturedTargetPath Include="$(TargetDir)%(CultureGroup.OutputFolder)$(TargetFileName)" /> - <_CulturedTargetPdbPath Include="$(TargetPdbDir)%(CultureGroup.OutputFolder)$(TargetPdbFileName)" /> - - - - @(_CulturedTargetPath) - @(_CulturedTargetPdbPath) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - $(TargetPath) - $(TargetFileName) - - - - - - PrepareForBuild;AssignTargetPaths - - - - - - - - - - - - - <_BuiltProjectOutputGroupOutputIntermediate Include="$(TargetPath)" /> - - - - - - - %(_BuiltProjectOutputGroupOutputIntermediate.FullPath) - - - - - - - AssignTargetPaths - - - - - - - - - - - - - - - - true - - - - true - true - $([System.IO.Path]::GetFullPath($(IntermediateOutputPath))) - - - - - - - - - <_FullPathToCopy Include="$(OutputFile)" Condition=" '@(_FullPathToCopy)'=='' " /> - <_RelativePath Include="$([MSBuild]::MakeRelative($(FullIntermediateOutputPath), %(_FullPathToCopy.Identity)))" /> - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/WixToolset.MSBuild/WixToolset.MSBuild.nuspec b/src/WixToolset.MSBuild/WixToolset.MSBuild.nuspec index c9e5cdf2..00cf440b 100644 --- a/src/WixToolset.MSBuild/WixToolset.MSBuild.nuspec +++ b/src/WixToolset.MSBuild/WixToolset.MSBuild.nuspec @@ -12,6 +12,10 @@ + + + + diff --git a/src/WixToolset.MSBuild/WixToolset.MSBuild.props b/src/WixToolset.MSBuild/WixToolset.MSBuild.props index b1d207f4..b453361b 100644 --- a/src/WixToolset.MSBuild/WixToolset.MSBuild.props +++ b/src/WixToolset.MSBuild/WixToolset.MSBuild.props @@ -3,7 +3,6 @@ - $([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\tools\netcoreapp2.1\wix.targets')) - $([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\tools\net461\wix.targets')) + $([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\tools\wix.targets')) diff --git a/src/WixToolset.MSBuild/wix.ca.targets b/src/WixToolset.MSBuild/wix.ca.targets new file mode 100644 index 00000000..4578c2d8 --- /dev/null +++ b/src/WixToolset.MSBuild/wix.ca.targets @@ -0,0 +1,123 @@ + + + + + + + + + + true + + $(TargetName).CA$(TargetExt) + + $(MSBuildThisFileDirectory) + $(WixSdkPath)x86\ + $(WixSdkPath)x64\ + + $(WixSdkPath)MakeSfxCA.exe + $(WixSdkX64Path)SfxCA.dll + $(WixSdkX86Path)SfxCA.dll + + + + + + + + + + + + + + + + + + + @(CustomActionReferenceContents);@(Content->'%(FullPath)');$(CustomActionContents) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/WixToolset.MSBuild/wix.harvest.targets b/src/WixToolset.MSBuild/wix.harvest.targets new file mode 100644 index 00000000..e4d866ea --- /dev/null +++ b/src/WixToolset.MSBuild/wix.harvest.targets @@ -0,0 +1,499 @@ + + + + + + + + + + + + + + + + + $(NoLogo) + $(SuppressAllWarnings) + $(SuppressSpecificWarnings) + $(TreatWarningsAsErrors) + $(TreatSpecificWarningsAsErrors) + $(VerboseOutput) + true + false + true + false + + + + + + false + + $(HarvestNoLogo) + $(HarvestSuppressAllWarnings) + $(HarvestSuppressSpecificWarnings) + $(HarvestTreatWarningsAsErrors) + $(HarvestTreatSpecificWarningsAsErrors) + $(HarvestVerboseOutput) + $(HarvestAutogenerateGuids) + $(HarvestGenerateGuidsNow) + $(HarvestSuppressFragments) + $(HarvestSuppressUniqueIds) + $(HarvestTransforms) + $(IntermediateOutputPath)Product.Generated.wxs + $(IntermediateOutputPath)Bundle.Generated.wxs + + + + + $(HarvestNoLogo) + $(HarvestSuppressAllWarnings) + $(HarvestSuppressSpecificWarnings) + $(HarvestTreatWarningsAsErrors) + $(HarvestTreatSpecificWarningsAsErrors) + $(HarvestVerboseOutput) + $(HarvestAutogenerateGuids) + $(HarvestGenerateGuidsNow) + $(HarvestSuppressFragments) + $(HarvestSuppressUniqueIds) + $(HarvestTransforms) + + + + + $(HarvestNoLogo) + $(HarvestSuppressAllWarnings) + $(HarvestSuppressSpecificWarnings) + $(HarvestTreatWarningsAsErrors) + $(HarvestTreatSpecificWarningsAsErrors) + $(HarvestVerboseOutput) + $(HarvestAutogenerateGuids) + $(HarvestGenerateGuidsNow) + $(HarvestSuppressFragments) + $(HarvestSuppressUniqueIds) + $(HarvestTransforms) + + + + + + ConvertReferences; + ConvertBundleReferences; + HarvestProjects; + HarvestDirectory; + HarvestFile; + GenerateCode; + + + + + + + + RefreshGeneratedFile; + RefreshBundleGeneratedFile + + + + + + + + + <_HeatProjectReference Include="@(_MSBuildProjectReferenceExistent)" Condition=" '%(_MSBuildProjectReferenceExistent.DoNotHarvest)' == '' "> + %(_MSBuildProjectReferenceExistent.RefTargetDir) + Binaries;Symbols;Sources;Content;Satellites;Documents + %(_MSBuildProjectReferenceExistent.Name) + $(IntermediateOutputPath)_%(_MSBuildProjectReferenceExistent.Filename).wxs + + + + + + + + + + <_GeneratedFiles Include="$(HarvestProjectsGeneratedFile)" /> + + + + + + + + + <_HeatProjectReference Include="@(_MSBuildProjectReferenceExistent)" Condition=" '%(_MSBuildProjectReferenceExistent.DoNotHarvest)' == '' "> + Binaries;Symbols;Sources;Content;Satellites;Documents + payloadgroup + $(IntermediateOutputPath)_%(_MSBuildProjectReferenceExistent.Filename).wxs + + + + + + + + + + <_GeneratedFiles Include="$(HarvestProjectsGeneratedFile)" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + $(HarvestProjectsTransforms) + $(HarvestProjectsProjectOutputGroups) + $(HarvestProjectsDirectoryIds) + + + $(HarvestProjectsTransforms) + $(HarvestProjectsProjectOutputGroups) + $(HarvestProjectsDirectoryIds) + + + + + CombineHarvestProjects + + + + + + + + + + + + + + + + + $(HarvestDirectoryTransforms) + $(HarvestDirectoryComponentGroupName) + $(HarvestDirectoryDirectoryRefId) + $(HarvestDirectoryKeepEmptyDirectories) + $(HarvestDirectoryPreprocessorVariable) + $(HarvestDirectorySuppressCom) + $(HarvestDirectorySuppressRootDirectory) + $(HarvestDirectorySuppressRegistry) + + + + + + GetHarvestDirectoryContent + + + + + + + + + + + + + + + + + + + + + + + + + + $(HarvestFileTransforms) + $(HarvestFileComponentGroupName) + $(HarvestFileDirectoryRefId) + $(HarvestFilePreprocessorVariable) + $(HarvestFileSuppressCom) + $(HarvestFileSuppressRegistry) + $(HarvestFileSuppressRootDirectory) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/WixToolset.MSBuild/wix.signing.targets b/src/WixToolset.MSBuild/wix.signing.targets new file mode 100644 index 00000000..7c25175f --- /dev/null +++ b/src/WixToolset.MSBuild/wix.signing.targets @@ -0,0 +1,370 @@ + + + + + + $(MSBuildProjectFile).Signed.txt + $(IntermediateOutputPath)$(SignedFileName) + + + + + + + + + $(NoLogo) + $(SuppressAllWarnings) + $(SuppressSpecificWarnings) + $(TreatWarningsAsErrors) + $(TreatSpecificWarningsAsErrors) + $(VerboseOutput) + + + + + + GetMsmsToSign; + InternalSignMsm; + + + GetCabsToSign; + GetMsiToSign; + InternalSignCabs; + InscribeMsi; + InternalSignMsi; + + + GetContainersToSign; + InternalSignContainers; + InscribeBundleEngine; + InternalSignBundleEngine; + InscribeBundle; + InternalSignBundle; + + + + WixBuild; + CalculateSignTargetFiles; + BeforeSigning; + $(InternalSignDependsOn); + AfterSigning + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/WixToolset.MSBuild/wix.targets b/src/WixToolset.MSBuild/wix.targets new file mode 100644 index 00000000..b35d18c7 --- /dev/null +++ b/src/WixToolset.MSBuild/wix.targets @@ -0,0 +1,1060 @@ + + + + + + true + + + + + + + + + + $(MSBuildThisFileDirectory)netcoreapp2.1\ + $(MSBuildThisFileDirectory)net461\ + $(WixBinDir)WixToolset.BuildTasks.dll + $(MSBuildThisFileDirectory)wix.harvest.targets + $(MSBuildThisFileDirectory)wix.signing.targets + + + + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) + $(MSBuildAllProjects);$(WixHarvestTargetsPath) + $(MSBuildAllProjects);$(WixSigningTargetsPath) + $(MSBuildAllProjects);$(CustomBeforeWixTargets) + $(MSBuildAllProjects);$(CustomAfterWixTargets) + + + + + + .wxs + wix + wix + + + $(MSBuildProjectName) + $(OutputName) + + + Package + + + full + + + + + .msi + .msm + .pcp + .wixlib + .exe + .wixipl + + + + + + + $(TargetDir) + $(PdbOutputDir)\ + + + $([System.IO.Path]::GetFullPath(`$([System.IO.Path]::Combine(`$(MSBuildProjectDirectory)`, `$(PdbOutputDir)`))`)) + + + $(TargetName).wixpdb + + + $(TargetPdbDir)$(TargetPdbFileName) + + + + + + + + + + + + + + + + + $(MSBuildProjectFile).BindContentsFileList.txt + $(MSBuildProjectFile).BindOutputsFileList.txt + $(MSBuildProjectFile).BindBuiltOutputsFileList.txt + + + + $(IntermediateOutputPath)cabcache\ + + + + $(WixBinDir) + + + + + + + + + + + + $(NoLogo) + $(SuppressAllWarnings) + $(SuppressSpecificWarnings) + $(TreatWarningsAsErrors) + $(TreatSpecificWarningsAsErrors) + $(VerboseOutput) + + $(Platform) + + + + + $(NoLogo) + $(BindFiles) + $(Pedantic) + $(SuppressAllWarnings) + $(SuppressSpecificWarnings) + $(SuppressSchemaValidation) + $(SuppressIntermediateFileVersionMatching) + $(TreatWarningsAsErrors) + $(TreatSpecificWarningsAsErrors) + $(VerboseOutput) + + + + + $(NoLogo) + $(BindFiles) + $(Pedantic) + $(SuppressAllWarnings) + $(SuppressSpecificWarnings) + $(SuppressSchemaValidation) + $(SuppressIntermediateFileVersionMatching) + $(TreatWarningsAsErrors) + $(TreatSpecificWarningsAsErrors) + $(VerboseOutput) + + + + + + + + + + + + + + + + + + <_PleaseSetThisInProjectFile>Please set this in the project file before the <Import> of the wix.targets file. + <_OutputTypeDescription>Possible values are: 'Package', 'Module', 'Library', 'Bundle', 'IntermediatePostLink'. $(_PleaseSetThisInProjectFile) + + + + + + + + + + + + + + + + + + + BuildOnlySettings; + PrepareForBuild; + PreBuildEvent; + + WixBuild; + Signing; + + GetTargetPath; + PrepareForRun; + IncrementalClean; + PostBuildEvent + + + + + + + + + + BeforeResolveReferences; + AssignProjectConfiguration; + ResolveProjectReferences; + ResolveWixLibraryReferences; + ResolveWixExtensionReferences; + AfterResolveReferences + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + AssignTargetPaths + + + + + + + + + ResolveReferences; + BeforeCompile; + _TimeStampBeforeCompile; + + CalculateDefineConstants; + Harvest; + + GenerateCompileWithObjectPath; + + AssignTargetPaths; + ReadPreviousBindInputsAndBuiltOutputs; + + CoreWixBuild; + + UpdateLinkFileWrites; + _TimeStampAfterCompile; + AfterCompile + + + + + + + + + $([System.IO.Path]::GetFullPath($(IntermediateOutputPath)%(CultureGroup.OutputFolder)$(TargetFileName))) + + $(IntermediateOutputPath)%(CultureGroup.OutputFolder)$(TargetPdbFileName) + + + + + + + + + + + ResolveReferences + + + + + + Configuration=$(ConfigurationName); + OutDir=$(OutDir); + Platform=$(PlatformName); + ProjectDir=$(ProjectDir); + ProjectExt=$(ProjectExt); + ProjectFileName=$(ProjectFileName); + ProjectName=$(ProjectName); + ProjectPath=$(ProjectPath); + TargetDir=$(TargetDir); + TargetExt=$(TargetExt); + TargetFileName=$(TargetFileName); + TargetName=$(TargetName); + TargetPath=$(TargetPath); + + + + + $(SolutionDefineConstants);DevEnvDir=$(DevEnvDir) + $(SolutionDefineConstants);SolutionDir=$(SolutionDir) + $(SolutionDefineConstants);SolutionExt=$(SolutionExt) + $(SolutionDefineConstants);SolutionFileName=$(SolutionFileName) + $(SolutionDefineConstants);SolutionName=$(SolutionName) + $(SolutionDefineConstants);SolutionPath=$(SolutionPath) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_CulturedTargetPath Include="$(TargetDir)%(CultureGroup.OutputFolder)$(TargetFileName)" /> + <_CulturedTargetPdbPath Include="$(TargetPdbDir)%(CultureGroup.OutputFolder)$(TargetPdbFileName)" /> + + + + @(_CulturedTargetPath) + @(_CulturedTargetPdbPath) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + $(TargetPath) + $(TargetFileName) + + + + + + PrepareForBuild;AssignTargetPaths + + + + + + + + + + + + + <_BuiltProjectOutputGroupOutputIntermediate Include="$(TargetPath)" /> + + + + + + + %(_BuiltProjectOutputGroupOutputIntermediate.FullPath) + + + + + + + AssignTargetPaths + + + + + + + + + + + + + + + + true + + + + true + true + $([System.IO.Path]::GetFullPath($(IntermediateOutputPath))) + + + + + + + + + <_FullPathToCopy Include="$(OutputFile)" Condition=" '@(_FullPathToCopy)'=='' " /> + <_RelativePath Include="$([MSBuild]::MakeRelative($(FullIntermediateOutputPath), %(_FullPathToCopy.Identity)))" /> + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/test/WixToolsetTest.BuildTasks/MsbuildFixture.cs b/src/test/WixToolsetTest.BuildTasks/MsbuildFixture.cs index 0c225390..0768f863 100644 --- a/src/test/WixToolsetTest.BuildTasks/MsbuildFixture.cs +++ b/src/test/WixToolsetTest.BuildTasks/MsbuildFixture.cs @@ -11,7 +11,8 @@ namespace WixToolsetTest.BuildTasks public class MsbuildFixture { - private static readonly string WixTargetsPath = Path.Combine(Path.GetDirectoryName(new Uri(typeof(WixBuild).Assembly.CodeBase).AbsolutePath), "wix.targets"); + private static readonly string WixBinPath = Path.GetDirectoryName(new Uri(typeof(WixBuild).Assembly.CodeBase).AbsolutePath) + "\\"; + private static readonly string WixTargetsPath = Path.Combine(WixBinPath, "wix.targets"); [Fact] public void CanBuildSimpleBundle() @@ -27,6 +28,7 @@ namespace WixToolsetTest.BuildTasks var result = MsbuildRunner.Execute(projectPath, new[] { $"-p:WixTargetsPath={WixTargetsPath}", + $"-p:WixBinDir={WixBinPath}", $"-p:IntermediateOutputPath={intermediateFolder}", $"-p:OutputPath={binFolder}" }); @@ -64,6 +66,7 @@ namespace WixToolsetTest.BuildTasks var result = MsbuildRunner.Execute(projectPath, new[] { $"-p:WixTargetsPath={WixTargetsPath}", + $"-p:WixBinDir={WixBinPath}", $"-p:IntermediateOutputPath={intermediateFolder}", $"-p:OutputPath={binFolder}" }); @@ -126,6 +129,7 @@ namespace WixToolsetTest.BuildTasks { wixpdbType == null ? String.Empty : $"-p:WixPdbType={wixpdbType}", $"-p:WixTargetsPath={WixTargetsPath}", + $"-p:WixBinDir={WixBinPath}", $"-p:IntermediateOutputPath={intermediateFolder}", $"-p:OutputPath={binFolder}", }); @@ -153,6 +157,7 @@ namespace WixToolsetTest.BuildTasks var result = MsbuildRunner.Execute(projectPath, new[] { $"-p:WixTargetsPath={WixTargetsPath}", + $"-p:WixBinDir={WixBinPath}", $"-p:IntermediateOutputPath={intermediateFolder}", $"-p:OutputPath={binFolder}", $"-p:InstallerPlatform=x64", @@ -178,6 +183,7 @@ namespace WixToolsetTest.BuildTasks var result = MsbuildRunner.Execute(projectPath, new[] { $"-p:WixTargetsPath={WixTargetsPath}", + $"-p:WixBinDir={WixBinPath}", $"-p:IntermediateOutputPath={intermediateFolder}", $"-p:OutputPath={binFolder}", "-p:SuppressIces=\"ICE45;ICE46\"" @@ -200,6 +206,7 @@ namespace WixToolsetTest.BuildTasks var result = MsbuildRunner.Execute(projectPath, new[] { $"-p:WixTargetsPath={WixTargetsPath}", + $"-p:WixBinDir={WixBinPath}", $"-p:IntermediateOutputPath={intermediateFolder}", $"-p:OutputPath={binFolder}", "-p:SuppressSpecificWarnings=\"1118;1102\"" @@ -225,6 +232,7 @@ namespace WixToolsetTest.BuildTasks var result = MsbuildRunner.Execute(projectPath, new[] { $"-p:WixTargetsPath={WixTargetsPath}", + $"-p:WixBinDir={WixBinPath}", $"-p:IntermediateOutputPath={intermediateFolder}", $"-p:OutputPath={binFolder}", "-p:OutputType=IntermediatePostLink" @@ -253,6 +261,7 @@ namespace WixToolsetTest.BuildTasks var result = MsbuildRunner.Execute(projectPath, new[] { $"-p:WixTargetsPath={WixTargetsPath}", + $"-p:WixBinDir={WixBinPath}", $"-p:IntermediateOutputPath={intermediateFolder}", $"-p:OutputPath={binFolder}", "-v:diag" @@ -271,6 +280,7 @@ namespace WixToolsetTest.BuildTasks result = MsbuildRunner.Execute(projectPath, new[] { $"-p:WixTargetsPath={WixTargetsPath}", + $"-p:WixBinDir={WixBinPath}", $"-p:IntermediateOutputPath={intermediateFolder}", $"-p:OutputPath={binFolder}", "-t:Clean", diff --git a/src/test/WixToolsetTest.BuildTasks/MsbuildHeatFixture.cs b/src/test/WixToolsetTest.BuildTasks/MsbuildHeatFixture.cs index 13dd0160..95805658 100644 --- a/src/test/WixToolsetTest.BuildTasks/MsbuildHeatFixture.cs +++ b/src/test/WixToolsetTest.BuildTasks/MsbuildHeatFixture.cs @@ -14,7 +14,8 @@ namespace WixToolsetTest.BuildTasks public class MsbuildHeatFixture { - private static readonly string WixTargetsPath = Path.Combine(Path.GetDirectoryName(new Uri(typeof(HeatTask).Assembly.CodeBase).AbsolutePath), "wix.targets"); + private static readonly string WixBinPath = Path.GetDirectoryName(new Uri(typeof(WixBuild).Assembly.CodeBase).AbsolutePath) + "\\"; + private static readonly string WixTargetsPath = Path.Combine(WixBinPath, "wix.targets"); [Fact] public void CanBuildHeatFilePackage() @@ -30,6 +31,7 @@ namespace WixToolsetTest.BuildTasks var result = MsbuildRunner.Execute(projectPath, new[] { $"-p:WixTargetsPath={WixTargetsPath}", + $"-p:WixBinDir={WixBinPath}", $"-p:IntermediateOutputPath={intermediateFolder}", $"-p:OutputPath={binFolder}" }); @@ -86,6 +88,7 @@ namespace WixToolsetTest.BuildTasks var result = MsbuildRunner.Execute(projectPath, new[] { $"-p:WixTargetsPath={WixTargetsPath}", + $"-p:WixBinDir={WixBinPath}", $"-p:IntermediateOutputPath={intermediateFolder}", $"-p:OutputPath={binFolder}" }); diff --git a/src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj b/src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj index 333c7c79..9fb2bc82 100644 --- a/src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj +++ b/src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj @@ -31,6 +31,12 @@ + + + + + + -- cgit v1.2.3-55-g6feb