From ab9397d514f7de51d39b9c316f35add98fdca180 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Mon, 19 Jun 2017 00:10:20 -0700 Subject: [PATCH] Standardize WiX Toolset on .NET Framework v4.5 --- src/Setup/Bundle/Bundle.wxs | 4 +- src/Setup/CoreMsi/Lux.wxs | 1 - src/Setup/CoreMsi/MSBuild.wxs | 8 - src/Setup/WixBA/InstallationViewModel.cs | 27 +- src/Setup/WixBA/WixBA.BootstrapperCore.config | 7 +- src/Setup/WixBA/WixBA.csproj | 1 - src/Setup/Zip/binaries.zipproj | 2 - .../WixVSExtension.MSBuild12.csproj | 1 - .../WixVSExtension.MSBuild14.csproj | 1 - src/ext/lux/ca/CustomAction.config | 24 +- src/ext/lux/ca/LuxCustomActions.csproj | 1 - src/ext/lux/lux/app.config | 3 - src/ext/lux/nit/app.config | 9 - src/ext/lux/nit/nit.csproj | 1 - src/tools/WixTasks/WixTasks.csproj | 15 - src/tools/WixTasks/wix.targets | 3075 +++++++++++++++- src/tools/WixTasks/wix200x.targets | 3091 ----------------- src/tools/WixTasks/wix2010.targets | 3073 ---------------- src/tools/WixUnit/AssemblyInfo.cs | 1 - src/tools/WixUnit/WixUnit.csproj | 1 - src/tools/WixUnit/app.config | 10 - src/tools/candle/app.config | 4 - src/tools/dark/app.config | 4 - src/tools/heat/app.config | 4 - src/tools/insignia/app.config | 7 +- src/tools/light/app.config | 4 - src/tools/lit/app.config | 4 - src/tools/melt/app.config | 4 - src/tools/pyro/app.config | 4 - src/tools/retina/app.config | 9 +- src/tools/shine/app.config | 6 +- src/tools/shine/shine.csproj | 1 - src/tools/smoke/app.config | 4 - src/tools/torch/app.config | 4 - src/tools/wix/AssemblyInfo.cs | 1 - src/tools/wix/Wix.csproj | 1 - src/tools/wixcop/app.config | 7 +- .../Products/TestExe/TestExe/TestExe.csproj | 3 +- test/data/HeathS/Applications/Signal.csproj | 1 - .../src/Assembly1/Assembly1.csproj | 4 +- test/src/Burn/Frost/Core/Core.csproj | 2 - test/src/Burn/Frost/Frost/Frost.csproj | 2 - test/src/Burn/Frost/Shim/AssemblyInfo.cpp | 2 - .../Burn/BurnIntegrationTests.csproj | 1 - .../MsbuildIntegrationTests.csproj | 1 - test/src/WixTestTools/WixTestTools.csproj | 1 - test/src/WixTests/WixTests.csproj | 1 - tools/WixBuild.csproj.props | 2 +- tools/WixBuild.vcxproj.props | 3 + tools/src/DocCompiler/DocCompiler.csproj | 3 - tools/src/DocCompiler/app.config | 10 - tools/src/DocFromXsd/DocFromXsd.csproj | 1 - tools/src/DocFromXsd/app.config | 6 - tools/src/FlattenXml/AssemblyInfo.cs | 1 - tools/src/TildeToRelative/AssemblyInfo.cs | 1 - tools/src/TildeToRelative/app.config | 6 - tools/src/WixBuild/WixBuild.csproj | 3 +- tools/src/XsdGen/AssemblyInfo.cs | 1 - tools/src/XsdStitch/AssemblyInfo.cs | 1 - 59 files changed, 3088 insertions(+), 6392 deletions(-) delete mode 100644 src/ext/lux/nit/app.config delete mode 100644 src/tools/WixTasks/wix200x.targets delete mode 100644 src/tools/WixTasks/wix2010.targets delete mode 100644 src/tools/WixUnit/app.config delete mode 100644 tools/src/DocCompiler/app.config delete mode 100644 tools/src/DocFromXsd/app.config delete mode 100644 tools/src/TildeToRelative/app.config diff --git a/src/Setup/Bundle/Bundle.wxs b/src/Setup/Bundle/Bundle.wxs index 3ebb9d6cf..12c04e87c 100644 --- a/src/Setup/Bundle/Bundle.wxs +++ b/src/Setup/Bundle/Bundle.wxs @@ -26,10 +26,8 @@ - - - + diff --git a/src/Setup/CoreMsi/Lux.wxs b/src/Setup/CoreMsi/Lux.wxs index 22f7e56b3..2e5a91725 100644 --- a/src/Setup/CoreMsi/Lux.wxs +++ b/src/Setup/CoreMsi/Lux.wxs @@ -19,7 +19,6 @@ - diff --git a/src/Setup/CoreMsi/MSBuild.wxs b/src/Setup/CoreMsi/MSBuild.wxs index 979d4eeb6..0588dee6e 100644 --- a/src/Setup/CoreMsi/MSBuild.wxs +++ b/src/Setup/CoreMsi/MSBuild.wxs @@ -15,14 +15,6 @@ - - - - - - - - diff --git a/src/Setup/WixBA/InstallationViewModel.cs b/src/Setup/WixBA/InstallationViewModel.cs index 08fa8f664..eeae2c6c4 100644 --- a/src/Setup/WixBA/InstallationViewModel.cs +++ b/src/Setup/WixBA/InstallationViewModel.cs @@ -101,7 +101,7 @@ void RootPropertyChanged(object sender, PropertyChangedEventArgs e) /// /// Gets the title for the application. /// - public string Version + public string Version { get { return String.Concat("v", WixBA.Model.Version.ToString()); } } @@ -275,7 +275,7 @@ public ICommand TryAgainCommand { if (this.tryAgainCommand == null) { - this.tryAgainCommand = new RelayCommand(param => + this.tryAgainCommand = new RelayCommand(param => { this.root.Canceled = false; WixBA.Plan(WixBA.Model.PlannedAction); @@ -436,29 +436,6 @@ private void DetectComplete(object sender, DetectCompleteEventArgs e) } else if (Hresult.Succeeded(e.Status)) { - // block if CLR v2 isn't available; sorry, it's needed for the MSBuild tasks - if (WixBA.Model.Engine.EvaluateCondition("NOT NETFRAMEWORK35_SP_LEVEL")) - { - string message = "WiX Toolset requires the .NET Framework 3.5.1 Windows feature to be enabled."; - WixBA.Model.Engine.Log(LogLevel.Verbose, message); - - if (Display.Full == WixBA.Model.Command.Display) - { - WixBA.Dispatcher.Invoke((Action)delegate() - { - MessageBox.Show(message, "WiX Toolset", MessageBoxButton.OK, MessageBoxImage.Error); - if (null != WixBA.View) - { - WixBA.View.Close(); - } - } - ); - } - - this.root.InstallState = InstallationState.Failed; - return; - } - if (this.Downgrade) { // TODO: What behavior do we want for downgrade? diff --git a/src/Setup/WixBA/WixBA.BootstrapperCore.config b/src/Setup/WixBA/WixBA.BootstrapperCore.config index 3ca3d842b..7bf7495d4 100644 --- a/src/Setup/WixBA/WixBA.BootstrapperCore.config +++ b/src/Setup/WixBA/WixBA.BootstrapperCore.config @@ -9,12 +9,9 @@ - + - - - - + diff --git a/src/Setup/WixBA/WixBA.csproj b/src/Setup/WixBA/WixBA.csproj index 56a33e7d6..df50b0b43 100644 --- a/src/Setup/WixBA/WixBA.csproj +++ b/src/Setup/WixBA/WixBA.csproj @@ -8,7 +8,6 @@ WixBA Library Microsoft.Tools.WindowsInstallerXml.UX - v4.0 diff --git a/src/Setup/Zip/binaries.zipproj b/src/Setup/Zip/binaries.zipproj index 9f7594048..e0c6c552b 100644 --- a/src/Setup/Zip/binaries.zipproj +++ b/src/Setup/Zip/binaries.zipproj @@ -46,8 +46,6 @@ - - diff --git a/src/ext/VSExtension/wixext/WixVSExtension.MSBuild12/WixVSExtension.MSBuild12.csproj b/src/ext/VSExtension/wixext/WixVSExtension.MSBuild12/WixVSExtension.MSBuild12.csproj index f58547247..181fce07e 100644 --- a/src/ext/VSExtension/wixext/WixVSExtension.MSBuild12/WixVSExtension.MSBuild12.csproj +++ b/src/ext/VSExtension/wixext/WixVSExtension.MSBuild12/WixVSExtension.MSBuild12.csproj @@ -8,7 +8,6 @@ WixVSExtension.MSBuild12 Library Microsoft.Tools.WindowsInstallerXml.Extensions.WixVSExtension - 4.5 diff --git a/src/ext/VSExtension/wixext/WixVSExtension.MSBuild14/WixVSExtension.MSBuild14.csproj b/src/ext/VSExtension/wixext/WixVSExtension.MSBuild14/WixVSExtension.MSBuild14.csproj index 8a1e96187..4f0860b59 100644 --- a/src/ext/VSExtension/wixext/WixVSExtension.MSBuild14/WixVSExtension.MSBuild14.csproj +++ b/src/ext/VSExtension/wixext/WixVSExtension.MSBuild14/WixVSExtension.MSBuild14.csproj @@ -8,7 +8,6 @@ WixVSExtension.MSBuild14 Library Microsoft.Tools.WindowsInstallerXml.Extensions.WixVSExtension - 4.5 diff --git a/src/ext/lux/ca/CustomAction.config b/src/ext/lux/ca/CustomAction.config index df3cb6b59..3892e2a27 100644 --- a/src/ext/lux/ca/CustomAction.config +++ b/src/ext/lux/ca/CustomAction.config @@ -4,28 +4,6 @@ - - - + - - diff --git a/src/ext/lux/ca/LuxCustomActions.csproj b/src/ext/lux/ca/LuxCustomActions.csproj index 4d8b957d5..d916a77f6 100644 --- a/src/ext/lux/ca/LuxCustomActions.csproj +++ b/src/ext/lux/ca/LuxCustomActions.csproj @@ -8,7 +8,6 @@ Library Microsoft.Tools.WindowsInstallerXml.Extensions LuxCustomActions - v4.0 diff --git a/src/ext/lux/lux/app.config b/src/ext/lux/lux/app.config index 7c29d15e0..24c688b11 100644 --- a/src/ext/lux/lux/app.config +++ b/src/ext/lux/lux/app.config @@ -6,7 +6,4 @@ - - - diff --git a/src/ext/lux/nit/app.config b/src/ext/lux/nit/app.config deleted file mode 100644 index bd737ea86..000000000 --- a/src/ext/lux/nit/app.config +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/src/ext/lux/nit/nit.csproj b/src/ext/lux/nit/nit.csproj index 4e9f302db..9e4516cc7 100644 --- a/src/ext/lux/nit/nit.csproj +++ b/src/ext/lux/nit/nit.csproj @@ -27,7 +27,6 @@ $(RootNamespace).Data.Messages.resources - Designer ResXFileCodeGenerator diff --git a/src/tools/WixTasks/WixTasks.csproj b/src/tools/WixTasks/WixTasks.csproj index f4ce98074..611ad0a2e 100644 --- a/src/tools/WixTasks/WixTasks.csproj +++ b/src/tools/WixTasks/WixTasks.csproj @@ -10,7 +10,6 @@ Microsoft.Tools.WindowsInstallerXml.Build.Tasks OnBuildSuccess true - v3.5 1591 @@ -53,12 +52,6 @@ PreserveNewest - - PreserveNewest - - - PreserveNewest - PreserveNewest @@ -82,12 +75,4 @@ - diff --git a/src/tools/WixTasks/wix.targets b/src/tools/WixTasks/wix.targets index a96f0d87a..1ff527c93 100644 --- a/src/tools/WixTasks/wix.targets +++ b/src/tools/WixTasks/wix.targets @@ -3,22 +3,3073 @@ + xmlns="http://schemas.microsoft.com/developer/msbuild/2003" + DefaultTargets="Build" + InitialTargets="_CheckForInvalidConfigurationAndPlatform; + _CheckRequiredProperties"> + + true + + $(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Installer XML\3.14@InstallRoot) + $(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\Windows Installer XML\3.14@InstallRoot) + + + + + + + $(MSBuildProjectFullPath).user + + + + + + + $(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets + $(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets + $(WixInstallPath)\WixTasks.dll + $(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Lux.targets + $(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Lux.targets + $(WixInstallPath)\LuxTasks.dll + + + + + $(MSBuildAllProjects);$(MSBuildProjectFullPath) + $(MSBuildAllProjects);$(WixTargetsPath) + $(MSBuildAllProjects);$(LuxTargetsPath) + $(MSBuildAllProjects);$(UserTargetsPath) + $(MSBuildAllProjects);$(CustomBeforeWixTargets) + $(MSBuildAllProjects);$(CustomAfterWixTargets) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + + + + + + + $(OutputPath)\ + $(MSBuildProjectName) + + bin\Debug\ + <_OriginalConfiguration>$(Configuration) + <_OriginalPlatform>$(Platform) + Debug + $(Configuration) + AnyCPU + <_OriginalOutputType>$(OutputType) + Package + true + + + + + <_InvalidConfigurationError Condition=" '$(SkipInvalidConfigurations)' != 'true' ">true + <_InvalidConfigurationWarning Condition=" '$(SkipInvalidConfigurations)' == 'true' ">true + + + + + obj\ + $(BaseIntermediateOutputPath)\ + .wixobj + $(MSBuildProjectFile).FileList.txt + $(MSBuildProjectFile).BindContentsFileList + .txt + $(MSBuildProjectFile).BindOutputsFileList + .txt + $(MSBuildProjectFile).BindBuiltOutputsFileList + .txt + $(MSBuildProjectFile).Signed.txt + + + + $(BaseIntermediateOutputPath)$(Configuration)\ + $(BaseIntermediateOutputPath)$(PlatformName)\$(Configuration)\ + + + $(IntermediateOutputPath)\ + + + $(IntermediateOutputPath)cabcache\ + + + + + + + + $(WixInstallPath) + $(WixToolPath) + + + + + + + .msi + .msm + .pcp + .wixlib + .exe + + + + + $(OutputPath) + + $(OutDir)\ + + + $(OutDir) + $(PdbOutputPath)\ + + + $(MSBuildProjectName) + + + $(MSBuildProjectFile) + + + $(MSBuildProjectExtension) + + + $(MSBuildProjectDirectory)\ + + + $(ProjectDir)$(ProjectFileName) + + + .wixpdb + + + $(OutputName) + + + $(TargetName)$(TargetExt) + + + $(TargetName)$(TargetPdbExt) + + + $(Configuration) + + + $(Platform) + + + + + <_OutputPathItem Include="$(OutDir)" /> + <_IntermediateOutputPathItem Include="$(IntermediateOutputPath)" /> + + + + + + $([System.IO.Path]::GetFullPath(`$([System.IO.Path]::Combine(`$(MSBuildProjectDirectory)`, `$(OutDir)`))`)) + $([System.IO.Path]::GetFullPath(`$([System.IO.Path]::Combine(`$(MSBuildProjectDirectory)`, `$(PdbOutputPath)`))`)) + + + $(TargetDir)$(TargetFileName) + $(TargetPdbDir)$(TargetPdbName) + + + + + + + + + + *Undefined if not building from within Visual Studio* + + + *Undefined if not building a solution or within Visual Studio* + + + *Undefined if not building a solution or within Visual Studio* + + + *Undefined if not building a solution or within Visual Studio* + + + *Undefined if not building a solution or within Visual Studio* + + + *Undefined if not building a solution or within Visual Studio* + + + + + + + + + + + + $(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) + + + + + $(NoLogo) + $(SuppressAllWarnings) + $(SuppressSpecificWarnings) + $(SuppressSchemaValidation) + $(TreatWarningsAsErrors) + $(TreatSpecificWarningsAsErrors) + $(VerboseOutput) + $(Platform) + + + + + $(NoLogo) + $(BindFiles) + $(Pedantic) + $(SuppressAllWarnings) + $(SuppressSpecificWarnings) + $(SuppressSchemaValidation) + $(SuppressIntermediateFileVersionMatching) + $(TreatWarningsAsErrors) + $(TreatSpecificWarningsAsErrors) + $(VerboseOutput) + + + + + $(NoLogo) + $(BindFiles) + $(Pedantic) + $(SuppressAllWarnings) + $(SuppressSpecificWarnings) + $(SuppressSchemaValidation) + $(SuppressIntermediateFileVersionMatching) + $(TreatWarningsAsErrors) + $(TreatSpecificWarningsAsErrors) + $(VerboseOutput) + + + + + + + + + + + + + + + + + + $(NoLogo) + $(SuppressAllWarnings) + $(SuppressSpecificWarnings) + $(TreatWarningsAsErrors) + $(TreatSpecificWarningsAsErrors) + $(VerboseOutput) + + + + + 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); + + + + + + + + + + + + + + + + + + + + + + + <_PleaseSetThisInProjectFile>Please set this in the project file before the <Import> of the wix.targets file. + <_OutputTypeDescription>The OutputType defines whether a Windows Installer package (.msi), PatchCreation (.pcp), merge module (.msm), wix library (.wixlib), or self-extracting executable (.exe) is being built. $(_PleaseSetThisInProjectFile) Possible values are 'Package', 'Module', 'Library', and 'Bundle'. + + + + + + + + + + + + + + + + + + + + + + + + BeforeBuild; + CoreBuild; + AfterBuild + + + + + + + + + + + + + + + BuildOnlySettings; + PrepareForBuild; + PreBuildEvent; + ResolveReferences; + AddCompilerDefineConstants; + CompileAndLink; + Signing; + GetTargetPath; + IncrementalClean; + PostBuildEvent + + + + + + + + + + + + + + BeforeRebuild; + Clean; + $(MSBuildProjectDefaultTargets); + AfterRebuild; + + + + BeforeRebuild; + Clean; + Build; + AfterRebuild; + + + + + + + + + + + + + + false + + + + + + + + + + + + + + + + + + + + + + + PrepareForBuild + + + + + + + + + + + + + + + + + + + + + + GetTargetPath + + + + + + + + + + + + + + + + + + + + + + BeforeResolveReferences; + AssignProjectConfiguration; + ResolveProjectReferences; + ResolveWixLibraryReferences; + ResolveWixExtensionReferences; + AfterResolveReferences + + + + + + + + + + + + + + + + + + + + + + + <_ProjectReferenceWithConfiguration> + %(FullPath) + + + + + + + + + + + + + + + + + + + <_MSBuildProjectReference Include="@(_ProjectReferenceWithConfiguration)" Condition="'$(BuildingInsideVisualStudio)'!='true' and '@(_ProjectReferenceWithConfiguration)'!=''"/> + + + + + <_MSBuildProjectReferenceExistent Include="@(_MSBuildProjectReference)" Condition="Exists('%(Identity)')"/> + <_MSBuildProjectReferenceNonexistent Include="@(_MSBuildProjectReference)" Condition="!Exists('%(Identity)')"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PrepareForBuild; + AssignCultures + + + + + + + + + + + PrepareForBuild; + + + + + + + + + + + + + + + + + + + + + + + + + + ResolveReferences; + AddSolutionDefineConstants; + AddProjectReferenceDefineConstants; + + + + + + + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ResolveReferences; + BeforeCompileAndLink; + _TimeStampBeforeCompileAndLink; + ConvertReferences; + ConvertBundleReferences; + Harvest; + GenerateCode; + Compile; + Lib; + Link; + _TimeStampAfterCompileAndLink; + AfterCompileAndLink + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + HarvestProjects; + HarvestDirectory; + HarvestFile; + + + + + + + + RefreshGeneratedFile; + RefreshBundleGeneratedFile + + + + + + + + GetMsmsToSign; + InternalSignMsm; + + + GetCabsToSign; + GetMsiToSign; + InternalSignCabs; + InscribeMsi; + InternalSignMsi; + + + GetContainersToSign; + InternalSignContainers; + InscribeBundleEngine; + InternalSignBundleEngine; + InscribeBundle; + InternalSignBundle; + + + + CompileAndLink; + BeforeSigning; + $(InternalSignDependsOn); + AfterSigning + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_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) + + - - true + CombineHarvestProjects + + + + + + + + + + + + + + + + + $(HarvestDirectoryTransforms) + $(HarvestDirectoryComponentGroupName) + $(HarvestDirectoryDirectoryRefId) + $(HarvestDirectoryKeepEmptyDirectories) + $(HarvestDirectoryPreprocessorVariable) + $(HarvestDirectorySuppressCom) + $(HarvestDirectorySuppressRootDirectory) + $(HarvestDirectorySuppressRegistry) + + + + + + GetHarvestDirectoryContent + + + + + + + + + + + + + + + + + + + + + + + + + + $(HarvestFileTransforms) + $(HarvestFileComponentGroupName) + $(HarvestFileDirectoryRefId) + $(HarvestFilePreprocessorVariable) + $(HarvestFileSuppressCom) + $(HarvestFileSuppressRegistry) + $(HarvestFileSuppressRootDirectory) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PrepareForBuild; + ResolveWixExtensionReferences; + GenerateCompileWithObjectPath + + + + + + + + + + + + + + + + + + + + + PrepareForBuild; + ResolveWixExtensionReferences; + CompileAndLink; + InternalSignCabs + + + + + + + + + + + PrepareForBuild; + ResolveWixExtensionReferences; + CompileAndLink; + InternalSignContainers + + + + + + + + + + + + + + + + + + + PrepareForBuild; + ResolveWixExtensionReferences; + CompileAndLink; + InternalSignBundleEngine + + + + + + + + + + + + + + PrepareForBuild; + ResolveWixExtensionReferences + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - wix2010.targets - - wix200x.targets + [IN] + @(CompileObjOutput) - The compiled .wixobj file. + @(CultureGroup) - The cultures to build + @(EmbeddedResource) - The list of wxl files to use for localization. + @(WixObject) - The list of .wixobj files. + @(WixLibrary) - The list of .wixlib files. + @(WixExtension) - The list of wix dll extension files. + + [OUT] + $(TargetDir)\%(Culture)\$(TargetName)$(TargetExt) - The compiled .msi, .msm, or .exe files. + ================================================================================================ + --> + + + PrepareForBuild; + ResolveReferences; + AssignCultures; + ReadPreviousBindInputsAndBuiltOutputs; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + BeforeClean; + CleanReferencedProjects; + CoreClean; + AfterClean + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + GetTargetPath + + + + + + + + + + + + + + + + + + + + + + + + + true + $(TargetPath) + $(TargetFileName) + + + + + + PrepareForBuild;AssignCultures + true + + + + + + + + + + %(_BuiltProjectOutputGroupOutputIntermediate.FullPath) + + + + + + + + + + + + + + + + + + + + AssignCultures + + + + + + + + + + + + + + + + + PrepareForBuild + + + + + + PrepareForBuild + + + + + + + + + + + + + + + + + + + + + + + + + + PrepareForBuild + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + diff --git a/src/tools/WixTasks/wix200x.targets b/src/tools/WixTasks/wix200x.targets deleted file mode 100644 index 6debd94cd..000000000 --- a/src/tools/WixTasks/wix200x.targets +++ /dev/null @@ -1,3091 +0,0 @@ - - - - - - - - - - - $(MSBuildProjectFullPath).user - - - - - - - $(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets - $(MSBuildExtensionsPath32)\..\WiX Toolset v3.14\bin\WixTasks.dll - $(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets - $(MSBuildExtensionsPath)\..\WiX Toolset v3.14\bin\WixTasks.dll - $(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Lux.targets - $(MSBuildExtensionsPath32)\..\WiX Toolset v3.14\bin\LuxTasks.dll - $(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Lux.targets - $(MSBuildExtensionsPath)\..\WiX Toolset v3.14\bin\LuxTasks.dll - - - - - $(MSBuildAllProjects);$(MSBuildProjectFullPath) - $(MSBuildAllProjects);$(WixTargetsPath) - $(MSBuildAllProjects);$(LuxTargetsPath) - $(MSBuildAllProjects);$(UserTargetsPath) - $(MSBuildAllProjects);$(CustomBeforeWixTargets) - $(MSBuildAllProjects);$(CustomAfterWixTargets) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - - - - - Debug - AnyCPU - bin\$(Configuration)\ - - $(OutputPath)\ - <_OriginalOutputType>$(OutputType) - Package - true - - - - - obj\ - $(IntermediateOutputPath)\ - $(BaseIntermediateOutputPath)$(Configuration)\ - $(BaseIntermediateOutputPath)$(Platform)\$(Configuration)\ - .wixobj - $(IntermediateOutputPath)cabcache\ - $(MSBuildProjectFile).FileList.txt - $(MSBuildProjectFile).BindContentsFileList - .txt - $(MSBuildProjectFile).BindOutputsFileList - .txt - $(MSBuildProjectFile).BindBuiltOutputsFileList - .txt - $(MSBuildProjectFile).Signed.txt - - - - - - - .msi - .msm - .pcp - .wixlib - .exe - - - - - $(OutputPath) - - $(OutDir)\ - - - $(OutDir) - $(PdbOutputPath)\ - - - $(MSBuildProjectName) - - - $(MSBuildProjectFile) - - - $(MSBuildProjectExtension) - - - $(MSBuildProjectDirectory)\ - - - $(ProjectDir)$(ProjectFileName) - - - .wixpdb - - - $(OutputName) - - - $(TargetName)$(TargetExt) - - - $(TargetName)$(TargetPdbExt) - - - $(Configuration) - - - $(Platform) - - - - - <_OutputPathItem Include="$(OutDir)" /> - <_IntermediateOutputPathItem Include="$(IntermediateOutputPath)" /> - <_PdbOutputPathItem Include="$(PdbOutputPath)" /> - - - - - - @(_OutputPathItem->'%(FullPath)') - @(_PdbOutputPathItem->'%(FullPath)') - - - @(_OutputPathItem->'%(FullPath)$(TargetFileName)') - @(_PdbOutputPathItem->'%(FullPath)$(TargetPdbName)') - - - - - - - - - - *Undefined if not building from within Visual Studio* - - - *Undefined if not building a solution or within Visual Studio* - - - *Undefined if not building a solution or within Visual Studio* - - - *Undefined if not building a solution or within Visual Studio* - - - *Undefined if not building a solution or within Visual Studio* - - - *Undefined if not building a solution or within Visual Studio* - - - - - - - - - - - - $(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) - - - - - $(NoLogo) - $(SuppressAllWarnings) - $(SuppressSpecificWarnings) - $(SuppressSchemaValidation) - $(TreatWarningsAsErrors) - $(TreatSpecificWarningsAsErrors) - $(VerboseOutput) - $(Platform) - - - - - $(NoLogo) - $(BindFiles) - $(Pedantic) - $(SuppressAllWarnings) - $(SuppressSpecificWarnings) - $(SuppressSchemaValidation) - $(SuppressIntermediateFileVersionMatching) - $(TreatWarningsAsErrors) - $(TreatSpecificWarningsAsErrors) - $(VerboseOutput) - - - - - $(NoLogo) - $(BindFiles) - $(Pedantic) - $(SuppressAllWarnings) - $(SuppressSpecificWarnings) - $(SuppressSchemaValidation) - $(SuppressIntermediateFileVersionMatching) - $(TreatWarningsAsErrors) - $(TreatSpecificWarningsAsErrors) - $(VerboseOutput) - - - - - - - - - - - - - - - - - - $(NoLogo) - $(SuppressAllWarnings) - $(SuppressSpecificWarnings) - $(TreatWarningsAsErrors) - $(TreatSpecificWarningsAsErrors) - $(VerboseOutput) - - - - - - - <_PleaseSetThisInProjectFile>Please set this in the project file before the <Import> of the wix.targets file. - <_OutputTypeDescription>The OutputType defines whether a Windows Installer package (.msi), PatchCreation (.pcp), merge module (.msm), wix library (.wixlib), or self-extracting executable (.exe) is being built. $(_PleaseSetThisInProjectFile) Possible values are 'Package', 'Module', 'Library', and 'Bundle'. - - - - - - - - - - - - - - - - - - - - - SOFTWARE\Microsoft\Windows Installer XML\3.14 - SOFTWARE\Wow6432Node\Microsoft\Windows Installer XML\3.14 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - BeforeBuild; - CoreBuild; - AfterBuild - - - - - - - - - - - - - - - BuildOnlySettings; - PrepareForBuild; - PreBuildEvent; - ResolveReferences; - AddCompilerDefineConstants; - CompileAndLink; - Signing; - GetTargetPath; - IncrementalClean; - PostBuildEvent - - - - - - - - - - - - - - BeforeRebuild; - Clean; - $(MSBuildProjectDefaultTargets); - AfterRebuild; - - - - BeforeRebuild; - Clean; - Build; - AfterRebuild; - - - - - - - - - - - - - - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PrepareForBuild - - - - - - - - - - - - - - - - - - - - - - GetTargetPath - - - - - - - - - - - - - - - - - - - - - - BeforeResolveReferences; - SplitProjectReferencesByType; - ResolveProjectReferences; - ResolveVCProjectReferences; - ResolveWixLibraryReferences; - ResolveWixExtensionReferences; - AfterResolveReferences - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PrepareForBuild; - AssignCultures - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PrepareForBuild; - - - - - - - - - - - - - - - - - - - - - - - - - - ResolveReferences; - AddSolutionDefineConstants; - AddProjectReferenceDefineConstants; - - - - - - - - - - - - - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ResolveReferences; - BeforeCompileAndLink; - _TimeStampBeforeCompileAndLink; - ConvertReferences; - ConvertBundleReferences; - Harvest; - GenerateCode; - Compile; - Lib; - Link; - UpdateLinkFileWrites; - _TimeStampAfterCompileAndLink; - AfterCompileAndLink - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - HarvestProjects; - HarvestDirectory; - HarvestFile; - - - - - - - - RefreshGeneratedFile; - RefreshBundleGeneratedFile - - - - - - - - GetMsmsToSign; - InternalSignMsm; - - - GetCabsToSign; - GetMsiToSign; - InternalSignCabs; - InscribeMsi; - InternalSignMsi; - - - GetContainersToSign; - InternalSignContainers; - InscribeBundleEngine; - InternalSignBundleEngine; - InscribeBundle; - InternalSignBundle; - - - - CompileAndLink; - BeforeSigning; - $(InternalSignDependsOn); - AfterSigning - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - CombineHarvestProjects - - - - - - - - - - - - - - - - - - GetHarvestDirectoryContent - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PrepareForBuild; - ResolveWixExtensionReferences; - GenerateCompileWithObjectPath - - - - - - - - - - - - - - - - - - - - - PrepareForBuild; - ResolveWixExtensionReferences; - CompileAndLink; - InternalSignCabs - - - - - - - - - - - PrepareForBuild; - ResolveWixExtensionReferences; - CompileAndLink; - InternalSignContainers - - - - - - - - - - - - - - - - - - - PrepareForBuild; - ResolveWixExtensionReferences; - CompileAndLink; - InternalSignBundleEngine - - - - - - - - - - - - - - PrepareForBuild; - ResolveWixExtensionReferences - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PrepareForBuild; - ResolveReferences; - AssignCultures; - ReadPreviousBindInputsAndBuiltOutputs; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - BeforeClean; - CleanReferencedProjects; - CoreClean; - AfterClean - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - GetTargetPath - - - - - - - - - - - - - - - - - - - - - - - - - true - $(TargetPath) - $(TargetFileName) - - - - - - PrepareForBuild;AssignCultures - true - - - - - - - - - - - - - - - - - - - - - - - - - - - AssignCultures - - - - - - - - - - - - - - - - - - PrepareForBuild - - - - - - PrepareForBuild - - - - - - - - - - - - - - - - - - - - - - - - - - PrepareForBuild - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/tools/WixTasks/wix2010.targets b/src/tools/WixTasks/wix2010.targets deleted file mode 100644 index 42d9a91cd..000000000 --- a/src/tools/WixTasks/wix2010.targets +++ /dev/null @@ -1,3073 +0,0 @@ - - - - - - - $(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Installer XML\3.14@InstallRoot) - $(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\Windows Installer XML\3.14@InstallRoot) - - - - - - - $(MSBuildProjectFullPath).user - - - - - - - $(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets - $(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets - $(WixInstallPath)\WixTasks.dll - $(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Lux.targets - $(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Lux.targets - $(WixInstallPath)\LuxTasks.dll - - - - - $(MSBuildAllProjects);$(MSBuildProjectFullPath) - $(MSBuildAllProjects);$(WixTargetsPath) - $(MSBuildAllProjects);$(LuxTargetsPath) - $(MSBuildAllProjects);$(UserTargetsPath) - $(MSBuildAllProjects);$(CustomBeforeWixTargets) - $(MSBuildAllProjects);$(CustomAfterWixTargets) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - - - - - - - $(OutputPath)\ - $(MSBuildProjectName) - - bin\Debug\ - <_OriginalConfiguration>$(Configuration) - <_OriginalPlatform>$(Platform) - Debug - $(Configuration) - AnyCPU - <_OriginalOutputType>$(OutputType) - Package - true - - - - - <_InvalidConfigurationError Condition=" '$(SkipInvalidConfigurations)' != 'true' ">true - <_InvalidConfigurationWarning Condition=" '$(SkipInvalidConfigurations)' == 'true' ">true - - - - - obj\ - $(BaseIntermediateOutputPath)\ - .wixobj - $(MSBuildProjectFile).FileList.txt - $(MSBuildProjectFile).BindContentsFileList - .txt - $(MSBuildProjectFile).BindOutputsFileList - .txt - $(MSBuildProjectFile).BindBuiltOutputsFileList - .txt - $(MSBuildProjectFile).Signed.txt - - - - $(BaseIntermediateOutputPath)$(Configuration)\ - $(BaseIntermediateOutputPath)$(PlatformName)\$(Configuration)\ - - - $(IntermediateOutputPath)\ - - - $(IntermediateOutputPath)cabcache\ - - - - - - - - $(WixInstallPath) - $(WixToolPath) - - - - - - - .msi - .msm - .pcp - .wixlib - .exe - - - - - $(OutputPath) - - $(OutDir)\ - - - $(OutDir) - $(PdbOutputPath)\ - - - $(MSBuildProjectName) - - - $(MSBuildProjectFile) - - - $(MSBuildProjectExtension) - - - $(MSBuildProjectDirectory)\ - - - $(ProjectDir)$(ProjectFileName) - - - .wixpdb - - - $(OutputName) - - - $(TargetName)$(TargetExt) - - - $(TargetName)$(TargetPdbExt) - - - $(Configuration) - - - $(Platform) - - - - - <_OutputPathItem Include="$(OutDir)" /> - <_IntermediateOutputPathItem Include="$(IntermediateOutputPath)" /> - - - - - - $([System.IO.Path]::GetFullPath(`$([System.IO.Path]::Combine(`$(MSBuildProjectDirectory)`, `$(OutDir)`))`)) - $([System.IO.Path]::GetFullPath(`$([System.IO.Path]::Combine(`$(MSBuildProjectDirectory)`, `$(PdbOutputPath)`))`)) - - - $(TargetDir)$(TargetFileName) - $(TargetPdbDir)$(TargetPdbName) - - - - - - - - - - *Undefined if not building from within Visual Studio* - - - *Undefined if not building a solution or within Visual Studio* - - - *Undefined if not building a solution or within Visual Studio* - - - *Undefined if not building a solution or within Visual Studio* - - - *Undefined if not building a solution or within Visual Studio* - - - *Undefined if not building a solution or within Visual Studio* - - - - - - - - - - - - $(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) - - - - - $(NoLogo) - $(SuppressAllWarnings) - $(SuppressSpecificWarnings) - $(SuppressSchemaValidation) - $(TreatWarningsAsErrors) - $(TreatSpecificWarningsAsErrors) - $(VerboseOutput) - $(Platform) - - - - - $(NoLogo) - $(BindFiles) - $(Pedantic) - $(SuppressAllWarnings) - $(SuppressSpecificWarnings) - $(SuppressSchemaValidation) - $(SuppressIntermediateFileVersionMatching) - $(TreatWarningsAsErrors) - $(TreatSpecificWarningsAsErrors) - $(VerboseOutput) - - - - - $(NoLogo) - $(BindFiles) - $(Pedantic) - $(SuppressAllWarnings) - $(SuppressSpecificWarnings) - $(SuppressSchemaValidation) - $(SuppressIntermediateFileVersionMatching) - $(TreatWarningsAsErrors) - $(TreatSpecificWarningsAsErrors) - $(VerboseOutput) - - - - - - - - - - - - - - - - - - $(NoLogo) - $(SuppressAllWarnings) - $(SuppressSpecificWarnings) - $(TreatWarningsAsErrors) - $(TreatSpecificWarningsAsErrors) - $(VerboseOutput) - - - - - 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); - - - - - - - - - - - - - - - - - - - - - - - <_PleaseSetThisInProjectFile>Please set this in the project file before the <Import> of the wix.targets file. - <_OutputTypeDescription>The OutputType defines whether a Windows Installer package (.msi), PatchCreation (.pcp), merge module (.msm), wix library (.wixlib), or self-extracting executable (.exe) is being built. $(_PleaseSetThisInProjectFile) Possible values are 'Package', 'Module', 'Library', and 'Bundle'. - - - - - - - - - - - - - - - - - - - - - - - - BeforeBuild; - CoreBuild; - AfterBuild - - - - - - - - - - - - - - - BuildOnlySettings; - PrepareForBuild; - PreBuildEvent; - ResolveReferences; - AddCompilerDefineConstants; - CompileAndLink; - Signing; - GetTargetPath; - IncrementalClean; - PostBuildEvent - - - - - - - - - - - - - - BeforeRebuild; - Clean; - $(MSBuildProjectDefaultTargets); - AfterRebuild; - - - - BeforeRebuild; - Clean; - Build; - AfterRebuild; - - - - - - - - - - - - - - false - - - - - - - - - - - - - - - - - - - - - - - PrepareForBuild - - - - - - - - - - - - - - - - - - - - - - GetTargetPath - - - - - - - - - - - - - - - - - - - - - - BeforeResolveReferences; - AssignProjectConfiguration; - ResolveProjectReferences; - ResolveWixLibraryReferences; - ResolveWixExtensionReferences; - AfterResolveReferences - - - - - - - - - - - - - - - - - - - - - - - <_ProjectReferenceWithConfiguration> - %(FullPath) - - - - - - - - - - - - - - - - - - - <_MSBuildProjectReference Include="@(_ProjectReferenceWithConfiguration)" Condition="'$(BuildingInsideVisualStudio)'!='true' and '@(_ProjectReferenceWithConfiguration)'!=''"/> - - - - - <_MSBuildProjectReferenceExistent Include="@(_MSBuildProjectReference)" Condition="Exists('%(Identity)')"/> - <_MSBuildProjectReferenceNonexistent Include="@(_MSBuildProjectReference)" Condition="!Exists('%(Identity)')"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PrepareForBuild; - AssignCultures - - - - - - - - - - - PrepareForBuild; - - - - - - - - - - - - - - - - - - - - - - - - - - ResolveReferences; - AddSolutionDefineConstants; - AddProjectReferenceDefineConstants; - - - - - - - - - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ResolveReferences; - BeforeCompileAndLink; - _TimeStampBeforeCompileAndLink; - ConvertReferences; - ConvertBundleReferences; - Harvest; - GenerateCode; - Compile; - Lib; - Link; - _TimeStampAfterCompileAndLink; - AfterCompileAndLink - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - HarvestProjects; - HarvestDirectory; - HarvestFile; - - - - - - - - RefreshGeneratedFile; - RefreshBundleGeneratedFile - - - - - - - - GetMsmsToSign; - InternalSignMsm; - - - GetCabsToSign; - GetMsiToSign; - InternalSignCabs; - InscribeMsi; - InternalSignMsi; - - - GetContainersToSign; - InternalSignContainers; - InscribeBundleEngine; - InternalSignBundleEngine; - InscribeBundle; - InternalSignBundle; - - - - CompileAndLink; - BeforeSigning; - $(InternalSignDependsOn); - AfterSigning - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_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) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PrepareForBuild; - ResolveWixExtensionReferences; - GenerateCompileWithObjectPath - - - - - - - - - - - - - - - - - - - - - PrepareForBuild; - ResolveWixExtensionReferences; - CompileAndLink; - InternalSignCabs - - - - - - - - - - - PrepareForBuild; - ResolveWixExtensionReferences; - CompileAndLink; - InternalSignContainers - - - - - - - - - - - - - - - - - - - PrepareForBuild; - ResolveWixExtensionReferences; - CompileAndLink; - InternalSignBundleEngine - - - - - - - - - - - - - - PrepareForBuild; - ResolveWixExtensionReferences - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PrepareForBuild; - ResolveReferences; - AssignCultures; - ReadPreviousBindInputsAndBuiltOutputs; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - BeforeClean; - CleanReferencedProjects; - CoreClean; - AfterClean - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - GetTargetPath - - - - - - - - - - - - - - - - - - - - - - - - - true - $(TargetPath) - $(TargetFileName) - - - - - - PrepareForBuild;AssignCultures - true - - - - - - - - - - %(_BuiltProjectOutputGroupOutputIntermediate.FullPath) - - - - - - - - - - - - - - - - - - - - AssignCultures - - - - - - - - - - - - - - - - - - PrepareForBuild - - - - - - PrepareForBuild - - - - - - - - - - - - - - - - - - - - - - - - - - PrepareForBuild - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/tools/WixUnit/AssemblyInfo.cs b/src/tools/WixUnit/AssemblyInfo.cs index bd79bea27..178f52054 100644 --- a/src/tools/WixUnit/AssemblyInfo.cs +++ b/src/tools/WixUnit/AssemblyInfo.cs @@ -11,4 +11,3 @@ [assembly: AssemblyCulture("")] [assembly: CLSCompliant(true)] [assembly: ComVisible(false)] -[assembly: SecurityPermission(SecurityAction.RequestMinimum, Execution = true)] diff --git a/src/tools/WixUnit/WixUnit.csproj b/src/tools/WixUnit/WixUnit.csproj index 1150356ac..e361c163a 100644 --- a/src/tools/WixUnit/WixUnit.csproj +++ b/src/tools/WixUnit/WixUnit.csproj @@ -33,7 +33,6 @@ - diff --git a/src/tools/WixUnit/app.config b/src/tools/WixUnit/app.config deleted file mode 100644 index 700aff6f4..000000000 --- a/src/tools/WixUnit/app.config +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/src/tools/candle/app.config b/src/tools/candle/app.config index bbfc73636..71c529fb2 100644 --- a/src/tools/candle/app.config +++ b/src/tools/candle/app.config @@ -3,10 +3,6 @@ - - - - diff --git a/src/tools/dark/app.config b/src/tools/dark/app.config index 1191aad80..ac36a9215 100644 --- a/src/tools/dark/app.config +++ b/src/tools/dark/app.config @@ -6,10 +6,6 @@ - - - - diff --git a/src/tools/heat/app.config b/src/tools/heat/app.config index a607f99a8..ff255f363 100644 --- a/src/tools/heat/app.config +++ b/src/tools/heat/app.config @@ -6,10 +6,6 @@ - - - - diff --git a/src/tools/insignia/app.config b/src/tools/insignia/app.config index 700aff6f4..71c529fb2 100644 --- a/src/tools/insignia/app.config +++ b/src/tools/insignia/app.config @@ -3,8 +3,7 @@ - - - - + + + diff --git a/src/tools/light/app.config b/src/tools/light/app.config index bbfc73636..71c529fb2 100644 --- a/src/tools/light/app.config +++ b/src/tools/light/app.config @@ -3,10 +3,6 @@ - - - - diff --git a/src/tools/lit/app.config b/src/tools/lit/app.config index bbfc73636..71c529fb2 100644 --- a/src/tools/lit/app.config +++ b/src/tools/lit/app.config @@ -3,10 +3,6 @@ - - - - diff --git a/src/tools/melt/app.config b/src/tools/melt/app.config index bbfc73636..71c529fb2 100644 --- a/src/tools/melt/app.config +++ b/src/tools/melt/app.config @@ -3,10 +3,6 @@ - - - - diff --git a/src/tools/pyro/app.config b/src/tools/pyro/app.config index bbfc73636..71c529fb2 100644 --- a/src/tools/pyro/app.config +++ b/src/tools/pyro/app.config @@ -3,10 +3,6 @@ - - - - diff --git a/src/tools/retina/app.config b/src/tools/retina/app.config index 5d0a22abe..71c529fb2 100644 --- a/src/tools/retina/app.config +++ b/src/tools/retina/app.config @@ -3,10 +3,7 @@ - - - - - - + + + diff --git a/src/tools/shine/app.config b/src/tools/shine/app.config index 7e077ed85..71c529fb2 100644 --- a/src/tools/shine/app.config +++ b/src/tools/shine/app.config @@ -3,7 +3,7 @@ - - - + + + diff --git a/src/tools/shine/shine.csproj b/src/tools/shine/shine.csproj index 802cb81fd..bf0681ed4 100644 --- a/src/tools/shine/shine.csproj +++ b/src/tools/shine/shine.csproj @@ -8,7 +8,6 @@ shine Exe Microsoft.Tools.WindowsInstallerXml.Tools - v4.0 x86 diff --git a/src/tools/smoke/app.config b/src/tools/smoke/app.config index bbfc73636..71c529fb2 100644 --- a/src/tools/smoke/app.config +++ b/src/tools/smoke/app.config @@ -3,10 +3,6 @@ - - - - diff --git a/src/tools/torch/app.config b/src/tools/torch/app.config index bbfc73636..71c529fb2 100644 --- a/src/tools/torch/app.config +++ b/src/tools/torch/app.config @@ -3,10 +3,6 @@ - - - - diff --git a/src/tools/wix/AssemblyInfo.cs b/src/tools/wix/AssemblyInfo.cs index aca0a51ae..14185e9ba 100644 --- a/src/tools/wix/AssemblyInfo.cs +++ b/src/tools/wix/AssemblyInfo.cs @@ -11,4 +11,3 @@ [assembly: AssemblyCulture("")] [assembly: CLSCompliant(true)] [assembly: ComVisible(false)] -[assembly: SecurityPermission(SecurityAction.RequestMinimum, Execution = true)] diff --git a/src/tools/wix/Wix.csproj b/src/tools/wix/Wix.csproj index ab8dece9d..d9640ede3 100644 --- a/src/tools/wix/Wix.csproj +++ b/src/tools/wix/Wix.csproj @@ -8,7 +8,6 @@ wix Library Microsoft.Tools.WindowsInstallerXml - v3.5 618 true diff --git a/src/tools/wixcop/app.config b/src/tools/wixcop/app.config index 700aff6f4..71c529fb2 100644 --- a/src/tools/wixcop/app.config +++ b/src/tools/wixcop/app.config @@ -3,8 +3,7 @@ - - - - + + + diff --git a/test/data/BurnTestPayloads/Products/TestExe/TestExe/TestExe.csproj b/test/data/BurnTestPayloads/Products/TestExe/TestExe/TestExe.csproj index 4ed2107aa..3fc03b6a3 100644 --- a/test/data/BurnTestPayloads/Products/TestExe/TestExe/TestExe.csproj +++ b/test/data/BurnTestPayloads/Products/TestExe/TestExe/TestExe.csproj @@ -13,7 +13,6 @@ Properties TestExe TestExe - v3.5 512 @@ -57,7 +56,7 @@ - - - - - - - - - diff --git a/tools/src/DocFromXsd/DocFromXsd.csproj b/tools/src/DocFromXsd/DocFromXsd.csproj index 57d0eeff2..739dfd40f 100644 --- a/tools/src/DocFromXsd/DocFromXsd.csproj +++ b/tools/src/DocFromXsd/DocFromXsd.csproj @@ -25,7 +25,6 @@ - diff --git a/tools/src/DocFromXsd/app.config b/tools/src/DocFromXsd/app.config deleted file mode 100644 index 1c7a90d09..000000000 --- a/tools/src/DocFromXsd/app.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/tools/src/FlattenXml/AssemblyInfo.cs b/tools/src/FlattenXml/AssemblyInfo.cs index ec32a6df2..ea93f82b0 100644 --- a/tools/src/FlattenXml/AssemblyInfo.cs +++ b/tools/src/FlattenXml/AssemblyInfo.cs @@ -10,4 +10,3 @@ [assembly: AssemblyDescription("Windows Installer XML Toolset FlattenXml")] [assembly: CLSCompliant(true)] [assembly: ComVisible(false)] -[assembly: SecurityPermission(SecurityAction.RequestMinimum, Execution = true)] diff --git a/tools/src/TildeToRelative/AssemblyInfo.cs b/tools/src/TildeToRelative/AssemblyInfo.cs index a7d99df63..74aedb21b 100644 --- a/tools/src/TildeToRelative/AssemblyInfo.cs +++ b/tools/src/TildeToRelative/AssemblyInfo.cs @@ -10,4 +10,3 @@ [assembly: AssemblyDescription("WiX Toolset TildeToRelative")] [assembly: CLSCompliant(true)] [assembly: ComVisible(false)] -[assembly: SecurityPermission(SecurityAction.RequestMinimum, Execution = true)] diff --git a/tools/src/TildeToRelative/app.config b/tools/src/TildeToRelative/app.config deleted file mode 100644 index 97f712e26..000000000 --- a/tools/src/TildeToRelative/app.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/tools/src/WixBuild/WixBuild.csproj b/tools/src/WixBuild/WixBuild.csproj index 5adfa1680..296334d6d 100644 --- a/tools/src/WixBuild/WixBuild.csproj +++ b/tools/src/WixBuild/WixBuild.csproj @@ -8,7 +8,6 @@ Library Microsoft.Tools.WindowsInstallerXml.WixBuild WixBuild - v4.0 @@ -24,7 +23,7 @@ - + false diff --git a/tools/src/XsdGen/AssemblyInfo.cs b/tools/src/XsdGen/AssemblyInfo.cs index 71127e2d1..ad763c54f 100644 --- a/tools/src/XsdGen/AssemblyInfo.cs +++ b/tools/src/XsdGen/AssemblyInfo.cs @@ -11,4 +11,3 @@ [assembly: AssemblyCulture("")] [assembly: CLSCompliant(true)] [assembly: ComVisible(false)] -[assembly: SecurityPermission(SecurityAction.RequestMinimum, Execution = true)] diff --git a/tools/src/XsdStitch/AssemblyInfo.cs b/tools/src/XsdStitch/AssemblyInfo.cs index c5a3c97ca..f5ad584f4 100644 --- a/tools/src/XsdStitch/AssemblyInfo.cs +++ b/tools/src/XsdStitch/AssemblyInfo.cs @@ -11,4 +11,3 @@ [assembly: AssemblyCulture("")] [assembly: CLSCompliant(true)] [assembly: ComVisible(false)] -[assembly: SecurityPermission(SecurityAction.RequestMinimum, Execution = true)]