From add68f8547c1e30468c35ccff79d748d2d4b6999 Mon Sep 17 00:00:00 2001 From: Doug Semler Date: Fri, 22 Mar 2019 15:50:16 -0400 Subject: [PATCH] Add WiX define constants When a WiX project has been detected via the property WixTargetsImported and GenerateGitVersionWixDefines is true, the GitVersion_* properties are passed to the WiX compiler so that they me be used as $(var.GitVersion_*) in .wxs files. This avoids the need to run the executable version to generate a .wxi file. --- .../functionality/GitVersionBuild.targets | 30 +++++++++++++++++++ .../functionality/GitVersionCommon.props | 3 ++ 2 files changed, 33 insertions(+) diff --git a/src/GitVersionTask/NugetAssets/build/functionality/GitVersionBuild.targets b/src/GitVersionTask/NugetAssets/build/functionality/GitVersionBuild.targets index 95d8e40022..ff6c8923cf 100644 --- a/src/GitVersionTask/NugetAssets/build/functionality/GitVersionBuild.targets +++ b/src/GitVersionTask/NugetAssets/build/functionality/GitVersionBuild.targets @@ -86,6 +86,36 @@ $(GitVersion_AssemblySemFileVer) + + GitVersion_Major=$(GitVersion_Major);$(DefineConstants) + GitVersion_Minor=$(GitVersion_Minor);$(DefineConstants) + GitVersion_Patch=$(GitVersion_Patch);$(DefineConstants) + GitVersion_PreReleaseTag=$(GitVersion_PreReleaseTag);$(DefineConstants) + GitVersion_PreReleaseTagWithDash=$(GitVersion_PreReleaseTagWithDash);$(DefineConstants) + GitVersion_PreReleaseLabel=$(GitVersion_PreReleaseLabel);$(DefineConstants) + GitVersion_PreReleaseNumber=$(GitVersion_PreReleaseNumber);$(DefineConstants) + GitVersion_BuildMetaData=$(GitVersion_BuildMetaData);$(DefineConstants) + GitVersion_BuildMetaDataPadded=$(GitVersion_BuildMetaDataPadded);$(DefineConstants) + GitVersion_FullBuildMetaData=$(GitVersion_FullBuildMetaData);$(DefineConstants) + GitVersion_MajorMinorPatch=$(GitVersion_MajorMinorPatch);$(DefineConstants) + GitVersion_SemVer=$(GitVersion_SemVer);$(DefineConstants) + GitVersion_LegacySemVer=$(GitVersion_LegacySemVer);$(DefineConstants) + GitVersion_LegacySemVerPadded=$(GitVersion_LegacySemVerPadded);$(DefineConstants) + GitVersion_AssemblySemVer=$(GitVersion_AssemblySemVer);$(DefineConstants) + GitVersion_AssemblySemFileVer=$(GitVersion_AssemblySemFileVer);$(DefineConstants) + GitVersion_FullSemVer=$(GitVersion_FullSemVer);$(DefineConstants) + GitVersion_InformationalVersion=$(GitVersion_InformationalVersion);$(DefineConstants) + GitVersion_BranchName=$(GitVersion_BranchName);$(DefineConstants) + GitVersion_Sha=$(GitVersion_Sha);$(DefineConstants) + GitVersion_NuGetVersionV2=$(GitVersion_NuGetVersionV2);$(DefineConstants) + GitVersion_NuGetVersion=$(GitVersion_NuGetVersion);$(DefineConstants) + GitVersion_NuGetPreReleaseTagV2=$(GitVersion_NuGetPreReleaseTagV2);$(DefineConstants) + GitVersion_NuGetPreReleaseTag=$(GitVersion_NuGetPreReleaseTag);$(DefineConstants) + GitVersion_CommitDate=$(GitVersion_CommitDate);$(DefineConstants) + GitVersion_CommitsSinceVersionSource=$(GitVersion_CommitsSinceVersionSource);$(DefineConstants) + GitVersion_CommitsSinceVersionSourcePadded=$(GitVersion_CommitsSinceVersionSourcePadded);$(DefineConstants) + + diff --git a/src/GitVersionTask/NugetAssets/build/functionality/GitVersionCommon.props b/src/GitVersionTask/NugetAssets/build/functionality/GitVersionCommon.props index 36b320e5a5..ebf736a940 100644 --- a/src/GitVersionTask/NugetAssets/build/functionality/GitVersionCommon.props +++ b/src/GitVersionTask/NugetAssets/build/functionality/GitVersionCommon.props @@ -26,6 +26,9 @@ false true + false + true +