diff options
author | Bob Arnson <bob@firegiant.com> | 2021-06-28 19:02:39 -0400 |
---|---|---|
committer | Bob Arnson <bob@firegiant.com> | 2021-06-28 20:03:09 -0400 |
commit | 9735af72f3ec4dacd2df3c8c2e9704d148f00a59 (patch) | |
tree | 370bcdb6a83b597bd528ac5dbc35cfd56a68a264 | |
parent | d53045b4903d28bf18fd1291d0fa71a0ff200c41 (diff) | |
download | wix-9735af72f3ec4dacd2df3c8c2e9704d148f00a59.tar.gz wix-9735af72f3ec4dacd2df3c8c2e9704d148f00a59.tar.bz2 wix-9735af72f3ec4dacd2df3c8c2e9704d148f00a59.zip |
Fix build versioning to ignore tags.
-rw-r--r-- | src/Directory.Build.props | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 6776c6fe..8969b436 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props | |||
@@ -26,6 +26,7 @@ | |||
26 | 26 | ||
27 | <GitThisAssembly>false</GitThisAssembly> | 27 | <GitThisAssembly>false</GitThisAssembly> |
28 | <GitVersionFile>version.txt</GitVersionFile> | 28 | <GitVersionFile>version.txt</GitVersionFile> |
29 | <GitIgnoreTagVersion>true</GitIgnoreTagVersion> | ||
29 | <GitInfoReportImportance>low</GitInfoReportImportance> | 30 | <GitInfoReportImportance>low</GitInfoReportImportance> |
30 | <GitBaseVersionRegex Condition="'$(GitBaseVersionRegex)' == ''">v?(?<MAJOR>\d+|{[\dA-za-z\-\.]+})\.(?<MINOR>(\d+|{[\dA-za-z\-\.]+}))(?:\-(?<LABEL>[\dA-Za-z\-\.{}]+))?$|^v?(?<MAJOR>\d+|{[\dA-za-z\-\.]+})\.(?<MINOR>(\d+|{[\dA-za-z\-\.]+}))\.(?<PATCH>\d+|{[\dA-za-z\-\.]+})(?:\-(?<LABEL>[\dA-Za-z\-\.{}]+))?$|^(?<LABEL>[\dA-Za-z\-\.{}]+)\-v?(?<MAJOR>\d+|{[\dA-za-z\-\.]+})\.(?<MINOR>\d+|{[\dA-za-z\-\.]+})\.(?<PATCH>\d+|{[\dA-za-z\-\.]+})$</GitBaseVersionRegex> | 31 | <GitBaseVersionRegex Condition="'$(GitBaseVersionRegex)' == ''">v?(?<MAJOR>\d+|{[\dA-za-z\-\.]+})\.(?<MINOR>(\d+|{[\dA-za-z\-\.]+}))(?:\-(?<LABEL>[\dA-Za-z\-\.{}]+))?$|^v?(?<MAJOR>\d+|{[\dA-za-z\-\.]+})\.(?<MINOR>(\d+|{[\dA-za-z\-\.]+}))\.(?<PATCH>\d+|{[\dA-za-z\-\.]+})(?:\-(?<LABEL>[\dA-Za-z\-\.{}]+))?$|^(?<LABEL>[\dA-Za-z\-\.{}]+)\-v?(?<MAJOR>\d+|{[\dA-za-z\-\.]+})\.(?<MINOR>\d+|{[\dA-za-z\-\.]+})\.(?<PATCH>\d+|{[\dA-za-z\-\.]+})$</GitBaseVersionRegex> |
31 | </PropertyGroup> | 32 | </PropertyGroup> |