From 4983aeeb2da6e96bc8aad698752b3b962f58e585 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Sun, 7 Apr 2024 03:26:12 -0700 Subject: Move to ReleaseFlow and SomeVer --- src/Directory.Build.props | 4 - src/Directory.Build.targets | 73 ++----------- src/Directory.csproj.targets | 8 -- src/Directory.vcxproj.targets | 40 ------- src/Directory.wixproj.targets | 7 +- .../WixToolset.BootstrapperApplicationApi.nuspec | 2 +- src/api/burn/bextutil/bextutil.nuspec | 2 +- src/build_init.cmd | 2 +- src/burn/engine/engine.vcxproj | 10 +- src/ext/Bal/wixstdfn/wixstdfn.nuspec | 4 +- .../SetBuildNumber/Directory.Packages.props.pp | 1 - src/internal/SetBuildNumber/SetBuildNumber.proj | 115 --------------------- src/internal/SetBuildNumber/SomeVerInfo.cs.pp | 29 ++++++ src/internal/SetBuildNumber/SomeVerInfo.props.pp | 25 +++++ src/internal/SetBuildNumber/SomeVerInfo.rc.pp | 52 ++++++++++ src/internal/SetBuildNumber/SomeVerInfo.targets | 49 +++++++++ src/internal/SetBuildNumber/SomeVerInit.props | 13 +++ src/internal/SetBuildNumber/SomeVerInit.verproj | 33 ++++++ src/internal/SetBuildNumber/wixver.props.pp | 13 --- .../WixBuildFinalize/WixBuildFinalize.proj | 2 +- src/libs/wcautil/WixToolset.WcaUtil/wcautil.nuspec | 2 +- src/version.txt | 1 - .../Bundles/CreateBurnManifestCommand.cs | 2 +- .../WixToolset.Core.Burn.csproj | 2 +- .../WixToolset.Core/CommandLine/VersionCommand.cs | 10 +- .../ExtensibilityServices/PreprocessHelper.cs | 6 +- src/wix/WixToolset.Core/WixToolset.Core.csproj | 2 +- src/wix/WixToolset.Sdk/WixToolset.Sdk.csproj | 10 +- 28 files changed, 243 insertions(+), 276 deletions(-) delete mode 100644 src/internal/SetBuildNumber/SetBuildNumber.proj create mode 100644 src/internal/SetBuildNumber/SomeVerInfo.cs.pp create mode 100644 src/internal/SetBuildNumber/SomeVerInfo.props.pp create mode 100644 src/internal/SetBuildNumber/SomeVerInfo.rc.pp create mode 100644 src/internal/SetBuildNumber/SomeVerInfo.targets create mode 100644 src/internal/SetBuildNumber/SomeVerInit.props create mode 100644 src/internal/SetBuildNumber/SomeVerInit.verproj delete mode 100644 src/internal/SetBuildNumber/wixver.props.pp delete mode 100644 src/version.txt (limited to 'src') diff --git a/src/Directory.Build.props b/src/Directory.Build.props index db9bf0b2..b27e35d7 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -32,11 +32,7 @@ https://wixtoolset.org/ wix.png - false version.txt - true - low - 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\-\.]+})$ diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets index 0ce90600..4adf903c 100644 --- a/src/Directory.Build.targets +++ b/src/Directory.Build.targets @@ -16,93 +16,42 @@ - - - - - - $(GitBaseVersion.Replace('{apiversion}', '$(ApiVersion)')) - $(GitBaseVersion.Replace('{height}', '$(GitCommits)')) - $(GitBaseVersion.Replace('{commits}', '$(GitCommits)')) - - + + + - - $(GetPackageVersionDependsOn); - __SetPropertiesFromGit; - - - <__SetPropertiesFromGitDependsOn Condition=" '$(GitInfoFromCache)'!='true' "> - GitVersion - - - - - - $(GitBaseVersionMajor).$(GitBaseVersionMinor).0.0 - $(GitBaseVersionMajor).$(GitBaseVersionMinor).$(GitBaseVersionPatch).$(GitCommits) - $(GitBaseVersionMajor).$(GitBaseVersionMinor).$(GitBaseVersionPatch)$(GitSemVerDashLabel) - $(GitBaseVersionMajor).$(GitBaseVersionMinor) - $(PackageVersion) - $(GitBaseVersionMajor).$(GitBaseVersionMinor).$(GitBaseVersionPatch)$(GitSemVerDashLabel)+$(GitSha) - - false - - $(GitRepositoryUrl.Replace('.git','')) - git - $(GitSha) - true - - $(RepositoryUrl) - - $(GitBaseVersionMajor) - $(GitBaseVersionMinor) - $(GitBaseVersionPatch) - + https://github.com/wixtoolset/wix + git + $(SomeVerInfoSha) + true - - + $(RepositoryUrl) + $(GenerateNuspecDependsOn); - __SetPropertiesFromGit; __SetNuspecProperties - $(MSBuildProjectName).nuspec $(MSBuildProjectName) $(Description) $(OutputPath) - $(NuspecProperties);Id=$(PackageId);Version=$(PackageVersion);Authors=$(Authors);Configuration=$(Configuration) + $(NuspecProperties);Id=$(PackageId);Version=$(PackageVersion);MajorVersion=$(SomeVerInfoMajor);NextMajorVersion=$(SomeVerInfoNextMajor);Authors=$(Authors);Configuration=$(Configuration) $(NuspecProperties);Copyright=$(Copyright);Description=$(Description);Title=$(Title) $(NuspecProperties);RepositoryType=$(RepositoryType);RepositoryCommit=$(RepositoryCommit);RepositoryUrl=$(RepositoryUrl) $(NuspecProperties);ProjectUrl=$(ProjectUrl);ProjectFolder=$(MSBuildProjectDirectory) - - - - diff --git a/src/Directory.csproj.targets b/src/Directory.csproj.targets index ba7185e8..2c6abce3 100644 --- a/src/Directory.csproj.targets +++ b/src/Directory.csproj.targets @@ -5,16 +5,8 @@ false $(OutputPath)\$(AssemblyName).xml $(DefineConstants);DEBUG - - $(RootBuildFolder)ThisAssembly.WixVer.cs - - - - - - Major false diff --git a/src/Directory.vcxproj.targets b/src/Directory.vcxproj.targets index 16e9f80c..15ad909d 100644 --- a/src/Directory.vcxproj.targets +++ b/src/Directory.vcxproj.targets @@ -2,46 +2,6 @@ - - - $(PrepareForBuildDependsOn); - __SetVersionResource - - - - - - <_ResourceFileType Condition=" '$(ConfigurationType)'=='Application' ">VFT_APP - <_ResourceFileType Condition=" '$(ConfigurationType)'=='DynamicLibrary' ">VFT_DLL - $(TargetName) - $(Description) - - - - - - %(PreprocessorDefinitions); - GITVER_FILEVER=$(FileVersion.Replace('.', ',')); - GITVER_PRODUCTVER=$(AssemblyVersion.Replace('.', ',')); - GITVER_FILE_VERSION=$(FileVersion); - GITVER_PRODUCT_VERSION=$(AssemblyVersion); - GITVER_FILE_TYPE=$(_ResourceFileType); - GITVER_CODEPAGE=0; - GITVER_LCID=$([System.Convert]::ToInt32('%(Culture)', 16)); - GITVER_VERSION_BLOCK=$([System.Convert]::ToString($([MSBuild]::Multiply($([System.Convert]::ToUint64('%(Culture)', 16)), 65536)), 16).PadLeft(8, '0')); - GITVER_COMPANY=$(Company); - GITVER_COPYRIGHT=$(Copyright); - GITVER_TITLE=$(Title); - GITVER_PRODUCT=$(Product); - GITVER_INFORMATIONAL_VERSION=$(InformationalVersion); - GITVER_INTERNAL_NAME=$(TargetName); - GITVER_FILE_NAME=$(TargetFileName); - - - - - $(AfterLinkTargets); diff --git a/src/Directory.wixproj.targets b/src/Directory.wixproj.targets index b509d0a7..4b95db87 100644 --- a/src/Directory.wixproj.targets +++ b/src/Directory.wixproj.targets @@ -3,16 +3,15 @@ - -prerelease + -prerelease $(DefineConstants); SetupVersion=$(PackageVersion); - SetupMajorMinorVersion=$(GitBaseVersionMajor).$(GitBaseVersionMinor); - SetupDashedMajorMinorVersion=$(GitBaseVersionMajor)-$(GitBaseVersionMinor); + SetupMajorMinorVersion=$(SomeVerInfoMajor).$(SomeVerInfoMinor); + SetupDashedMajorMinorVersion=$(SomeVerInfoMajor)-$(SomeVerInfoMinor); SetupDashedPrerelease=$(PrereleaseSuffix) diff --git a/src/api/burn/WixToolset.BootstrapperApplicationApi/WixToolset.BootstrapperApplicationApi.nuspec b/src/api/burn/WixToolset.BootstrapperApplicationApi/WixToolset.BootstrapperApplicationApi.nuspec index 3b42d53d..e59b4862 100644 --- a/src/api/burn/WixToolset.BootstrapperApplicationApi/WixToolset.BootstrapperApplicationApi.nuspec +++ b/src/api/burn/WixToolset.BootstrapperApplicationApi/WixToolset.BootstrapperApplicationApi.nuspec @@ -16,7 +16,7 @@ - + diff --git a/src/api/burn/bextutil/bextutil.nuspec b/src/api/burn/bextutil/bextutil.nuspec index 8d03da2f..c6371f4f 100644 --- a/src/api/burn/bextutil/bextutil.nuspec +++ b/src/api/burn/bextutil/bextutil.nuspec @@ -13,7 +13,7 @@ $projectUrl$ - + diff --git a/src/build_init.cmd b/src/build_init.cmd index c9c27c57..726d7b1c 100644 --- a/src/build_init.cmd +++ b/src/build_init.cmd @@ -5,7 +5,7 @@ md ..\build\artifacts md ..\build\logs\crashdumps md ..\build\logs\TestResults -msbuild -Restore internal\SetBuildNumber\SetBuildNumber.proj -nologo +msbuild -Restore internal\SetBuildNumber\SomeVerInit.verproj -nologo @popd @endlocal diff --git a/src/burn/engine/engine.vcxproj b/src/burn/engine/engine.vcxproj index 7e2e80b6..249f8eef 100644 --- a/src/burn/engine/engine.vcxproj +++ b/src/burn/engine/engine.vcxproj @@ -158,12 +158,12 @@ rc.exe -fo "$(OutDir)engine.res" "$(IntDir)engine.messages.rc" - + - $(GitBaseVersionMajor) - $(GitBaseVersionMinor) - $(GitBaseVersionPatch) - $(GitCommits) + $(SomeVerInfoMajor) + $(SomeVerInfoMinor) + $(SomeVerInfoPatch) + $(SomeVerInfoHeight) $(rmj).$(rmm).$(rup).$(rpr) $(InformationalVersion) diff --git a/src/ext/Bal/wixstdfn/wixstdfn.nuspec b/src/ext/Bal/wixstdfn/wixstdfn.nuspec index 1924431e..334a4101 100644 --- a/src/ext/Bal/wixstdfn/wixstdfn.nuspec +++ b/src/ext/Bal/wixstdfn/wixstdfn.nuspec @@ -15,8 +15,8 @@ README.md - - + + diff --git a/src/internal/SetBuildNumber/Directory.Packages.props.pp b/src/internal/SetBuildNumber/Directory.Packages.props.pp index 0c4b1dfb..7300664b 100644 --- a/src/internal/SetBuildNumber/Directory.Packages.props.pp +++ b/src/internal/SetBuildNumber/Directory.Packages.props.pp @@ -77,7 +77,6 @@ - diff --git a/src/internal/SetBuildNumber/SetBuildNumber.proj b/src/internal/SetBuildNumber/SetBuildNumber.proj deleted file mode 100644 index 9ff4e7c3..00000000 --- a/src/internal/SetBuildNumber/SetBuildNumber.proj +++ /dev/null @@ -1,115 +0,0 @@ - - - - - - net6.0 - - false - - - https://api.nuget.org/v3/index.json - true - - C# - .cs - true - - - - - __SetPropertiesFromGit; - GitThisAssembly; - SetGlobalJson; - SetDirectoryPackagesProps; - SetOverallWixVersions - - - $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\..\..\global.json)) - $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\..\..\Directory.Packages.props)) - $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\..\..\build\wixver.props)) - $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\..\..\build\ThisAssembly.WixVer.cs)) - - - - - - $([System.IO.File]::ReadAllText(global.json.pp)) - $(GlobalJsonText.Replace('{apiversion}', $(ApiVersion))) - $(GlobalJsonText.Replace('{fileversion}', $(FileVersion))) - $(GlobalJsonText.Replace('{fullversion}', $(InformationalVersion))) - $(GlobalJsonText.Replace('{informationalversion}', $(InformationalVersion))) - $(GlobalJsonText.Replace('{height}', $(GitCommits))) - $(GlobalJsonText.Replace('{packageversion}', $(PackageVersion))) - $(GlobalJsonText.Replace('{version}', $(Version))) - - - - - - - - - - - <!-- DO NOT MODIFY! Auto-generated from internal\SetBuildNumber\Directory.Packages.props.pp --> - $([System.IO.File]::ReadAllText(Directory.Packages.props.pp)) - $(CentralPackageVersionsText.Replace('{apiversion}', $(ApiVersion))) - $(CentralPackageVersionsText.Replace('{fileversion}', $(FileVersion))) - $(CentralPackageVersionsText.Replace('{fullversion}', $(InformationalVersion))) - $(CentralPackageVersionsText.Replace('{informationalversion}', $(InformationalVersion))) - $(CentralPackageVersionsText.Replace('{height}', $(GitCommits))) - $(CentralPackageVersionsText.Replace('{packageversion}', $(PackageVersion))) - $(CentralPackageVersionsText.Replace('{version}', $(Version))) - - - - - - - - - - - <!-- DO NOT MODIFY! Auto-generated from internal\SetBuildNumber\wixver.props.pp --> - $([System.IO.File]::ReadAllText(wixver.props.pp)) - $(OverallWixVersionsText.Replace('{GitBaseVersionMajor}', $(GitBaseVersionMajor))) - $(OverallWixVersionsText.Replace('{GitBaseVersionMinor}', $(GitBaseVersionMinor))) - $(OverallWixVersionsText.Replace('{GitBaseVersionPatch}', $(GitBaseVersionPatch))) - $(OverallWixVersionsText.Replace('{GitCommits}', $(GitCommits))) - $(OverallWixVersionsText.Replace('{GitSemVerDashLabel}', $(GitSemVerDashLabel))) - $(OverallWixVersionsText.Replace('{GitSha}', $(GitSha))) - $(OverallWixVersionsText.Replace('{GitRepositoryUrl}', $(GitRepositoryUrl.Replace('.git','')))) - - - - - - - - - - - - - - diff --git a/src/internal/SetBuildNumber/SomeVerInfo.cs.pp b/src/internal/SetBuildNumber/SomeVerInfo.cs.pp new file mode 100644 index 00000000..3a468ef0 --- /dev/null +++ b/src/internal/SetBuildNumber/SomeVerInfo.cs.pp @@ -0,0 +1,29 @@ +// DO NOT MODIFY! Auto-generated from SomeVerInfo.cs.pp + +/// Provides access to the current assembly information. +partial class SomeVerInfo +{ + /// Full information version: {informationalversion} + public const string InformationalVersion = @"{informationalversion}"; + + /// File version: {fileversion} + public const string FileVersion = @"{fileversion}"; + + /// Commits on top of base version: 2 + public const string Commits = @"{height}"; + + /// Major version: {major} + public const string Major = @"{major}"; + + /// Minor version: {minor} + public const string Minor = @"{minor}"; + + /// Patch version: {patch} + public const string Patch = @"{patch}"; + + /// Label: {dashlabel} + public const string Label = @"{dashlabel}"; + + /// ShortSha: {shortsha} + public const string ShortSha = @"{shortsha}"; +} diff --git a/src/internal/SetBuildNumber/SomeVerInfo.props.pp b/src/internal/SetBuildNumber/SomeVerInfo.props.pp new file mode 100644 index 00000000..28fcd3fd --- /dev/null +++ b/src/internal/SetBuildNumber/SomeVerInfo.props.pp @@ -0,0 +1,25 @@ + + + true + true + {nextmajor} + {nextminor} + {major} + {minor} + {patch} + {height} + {fullheight} + {label} + {dashlabel} + {sha} + {shortsha} + {informationalversion} + + + + {major}.0.0.0 + {major}.{minor}.{patch}.{fullheight} + {informationalversion} + {major}.{minor}.{patch}{dashlabel} + + diff --git a/src/internal/SetBuildNumber/SomeVerInfo.rc.pp b/src/internal/SetBuildNumber/SomeVerInfo.rc.pp new file mode 100644 index 00000000..6aad140d --- /dev/null +++ b/src/internal/SetBuildNumber/SomeVerInfo.rc.pp @@ -0,0 +1,52 @@ +#pragma once +// ------------------------------------------------------------------------------ +// +// This code was generated from SomeVerInfo.rc. +// +// ------------------------------------------------------------------------------ + +#if defined(_UNICODE) +#define CREATE_VERSION_STRING(x) L ## #x +#else +#define CREATE_VERSION_STRING(x) #x +#endif + +#define CVS(x) CREATE_VERSION_STRING(x) + +#ifdef RC_INVOKED + +#include + +VS_VERSION_INFO VERSIONINFO + FILEVERSION {major},{minor},{patch},{fullheight} + PRODUCTVERSION {major},{minor},0,0 + FILEFLAGSMASK 0x3FL +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x4L + FILETYPE SOMEVER_FILE_TYPE + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK CVS(SOMEVER_VERSION_BLOCK) + BEGIN + VALUE "CompanyName", CVS(SOMEVER_COMPANY) + VALUE "FileDescription", CVS(SOMEVER_TITLE) + VALUE "FileVersion", CVS({fileversion}) + VALUE "InternalName", CVS(SOMEVER_INTERNAL_NAME) + VALUE "OriginalFilename", CVS(SOMEVER_FILE_NAME) + VALUE "ProductName", CVS(SOMEVER_PRODUCT) + VALUE "ProductVersion", CVS({informationalversion}) + VALUE "LegalCopyright", CVS(SOMEVER_COPYRIGHT) + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", SOMEVER_LCID, SOMEVER_CODEPAGE + END +END +#endif diff --git a/src/internal/SetBuildNumber/SomeVerInfo.targets b/src/internal/SetBuildNumber/SomeVerInfo.targets new file mode 100644 index 00000000..6ed1117a --- /dev/null +++ b/src/internal/SetBuildNumber/SomeVerInfo.targets @@ -0,0 +1,49 @@ + + + + + + + + + + + + + $(PrepareForBuildDependsOn); + __SetVersionResource + + + + + + <_ResourceFileType Condition=" '$(ConfigurationType)'=='Application' ">VFT_APP + <_ResourceFileType Condition=" '$(ConfigurationType)'=='DynamicLibrary' ">VFT_DLL + 0x0409 + $(TargetName) + $(Description) + + + + + + %(PreprocessorDefinitions); + SOMEVER_FILE_TYPE=$(_ResourceFileType); + SOMEVER_CODEPAGE=0; + SOMEVER_LCID=$([System.Convert]::ToInt32('$(Lcid)', 16)); + SOMEVER_VERSION_BLOCK=$([System.Convert]::ToString($([MSBuild]::Multiply($([System.Convert]::ToUint64('$(Lcid)', 16)), 65536)), 16).PadLeft(8, '0')); + SOMEVER_COMPANY=$(Company); + SOMEVER_COPYRIGHT=$(Copyright); + SOMEVER_TITLE=$(Title); + SOMEVER_PRODUCT=$(Product); + SOMEVER_INTERNAL_NAME=$(TargetName); + SOMEVER_FILE_NAME=$(TargetFileName); + + + + + + diff --git a/src/internal/SetBuildNumber/SomeVerInit.props b/src/internal/SetBuildNumber/SomeVerInit.props new file mode 100644 index 00000000..01970e31 --- /dev/null +++ b/src/internal/SetBuildNumber/SomeVerInit.props @@ -0,0 +1,13 @@ + + + + + $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\..\..\global.json)) + $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\..\..\Directory.Packages.props)) + $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\..\..\build\SomeVerInfo.cs)) + $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\..\..\build\SomeVerInfo.rc)) + $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\..\..\build\SomeVerInfo.props)) + + true + + diff --git a/src/internal/SetBuildNumber/SomeVerInit.verproj b/src/internal/SetBuildNumber/SomeVerInit.verproj new file mode 100644 index 00000000..7d963267 --- /dev/null +++ b/src/internal/SetBuildNumber/SomeVerInit.verproj @@ -0,0 +1,33 @@ + + + + + + netstandard2.0 + + + false + + + https://api.nuget.org/v3/index.json + true + + + major + build + true + v + + + true + + + + + + + + + + + diff --git a/src/internal/SetBuildNumber/wixver.props.pp b/src/internal/SetBuildNumber/wixver.props.pp deleted file mode 100644 index 3197181f..00000000 --- a/src/internal/SetBuildNumber/wixver.props.pp +++ /dev/null @@ -1,13 +0,0 @@ - - - true - true - {GitBaseVersionMajor} - {GitBaseVersionMinor} - {GitBaseVersionPatch} - {GitCommits} - {GitSemVerDashLabel} - {GitSha} - {GitRepositoryUrl} - - diff --git a/src/internal/WixBuildFinalize/WixBuildFinalize.proj b/src/internal/WixBuildFinalize/WixBuildFinalize.proj index d161f2cf..bd68a471 100644 --- a/src/internal/WixBuildFinalize/WixBuildFinalize.proj +++ b/src/internal/WixBuildFinalize/WixBuildFinalize.proj @@ -6,7 +6,7 @@ net472 - + $projectUrl$ - + diff --git a/src/version.txt b/src/version.txt deleted file mode 100644 index 3a8c0822..00000000 --- a/src/version.txt +++ /dev/null @@ -1 +0,0 @@ -6.0.0-dev.1 diff --git a/src/wix/WixToolset.Core.Burn/Bundles/CreateBurnManifestCommand.cs b/src/wix/WixToolset.Core.Burn/Bundles/CreateBurnManifestCommand.cs index 193bfcc8..c2e20d82 100644 --- a/src/wix/WixToolset.Core.Burn/Bundles/CreateBurnManifestCommand.cs +++ b/src/wix/WixToolset.Core.Burn/Bundles/CreateBurnManifestCommand.cs @@ -75,7 +75,7 @@ namespace WixToolset.Core.Burn.Bundles writer.WriteStartElement("BurnManifest", BurnCommon.BurnNamespace); // Write attributes to support harvesting bundles. - writer.WriteAttributeString("EngineVersion", $"{ThisAssembly.Git.BaseVersion.Major}.{ThisAssembly.Git.BaseVersion.Minor}.{ThisAssembly.Git.BaseVersion.Patch}.{ThisAssembly.Git.Commits}"); + writer.WriteAttributeString("EngineVersion", $"{SomeVerInfo.Major}.{SomeVerInfo.Minor}.{SomeVerInfo.Patch}.{SomeVerInfo.Commits}"); writer.WriteAttributeString("ProtocolVersion", BurnCommon.BURN_PROTOCOL_VERSION.ToString()); writer.WriteAttributeString("Win64", this.BundleSymbol.Platform == Platform.X86 ? "no" : "yes"); diff --git a/src/wix/WixToolset.Core.Burn/WixToolset.Core.Burn.csproj b/src/wix/WixToolset.Core.Burn/WixToolset.Core.Burn.csproj index 42390b6d..3184cc1f 100644 --- a/src/wix/WixToolset.Core.Burn/WixToolset.Core.Burn.csproj +++ b/src/wix/WixToolset.Core.Burn/WixToolset.Core.Burn.csproj @@ -9,7 +9,7 @@ embedded true true - true + true diff --git a/src/wix/WixToolset.Core/CommandLine/VersionCommand.cs b/src/wix/WixToolset.Core/CommandLine/VersionCommand.cs index 2fb13967..1831f067 100644 --- a/src/wix/WixToolset.Core/CommandLine/VersionCommand.cs +++ b/src/wix/WixToolset.Core/CommandLine/VersionCommand.cs @@ -19,11 +19,11 @@ namespace WixToolset.Core.CommandLine public override Task ExecuteAsync(CancellationToken cancellationToken) { // $(GitBaseVersionMajor).$(GitBaseVersionMinor).$(GitBaseVersionPatch)$(GitSemVerDashLabel)+$(Commit) - Console.WriteLine("{0}.{1}.{2}{3}+{4}", ThisAssembly.Git.BaseVersion.Major - , ThisAssembly.Git.BaseVersion.Minor - , ThisAssembly.Git.BaseVersion.Patch - , ThisAssembly.Git.SemVer.DashLabel - , ThisAssembly.Git.Commit); + Console.WriteLine("{0}.{1}.{2}{3}+{4}", SomeVerInfo.Major + , SomeVerInfo.Minor + , SomeVerInfo.Patch + , SomeVerInfo.Label + , SomeVerInfo.ShortSha); return Task.FromResult(0); } diff --git a/src/wix/WixToolset.Core/ExtensibilityServices/PreprocessHelper.cs b/src/wix/WixToolset.Core/ExtensibilityServices/PreprocessHelper.cs index 1392a584..50160ebb 100644 --- a/src/wix/WixToolset.Core/ExtensibilityServices/PreprocessHelper.cs +++ b/src/wix/WixToolset.Core/ExtensibilityServices/PreprocessHelper.cs @@ -87,7 +87,7 @@ namespace WixToolset.Core.ExtensibilityServices var result = this.EvaluateFunction(context, prefix, functionName, args); - // If the function didn't evaluate, try to evaluate the original value as a variable to support + // If the function didn't evaluate, try to evaluate the original value as a variable to support // the use of open and closed parens inside variable names. Example: $(env.ProgramFiles(x86)) should resolve. if (result == null) { @@ -262,10 +262,10 @@ namespace WixToolset.Core.ExtensibilityServices } case "WIXMAJORVERSION": - return ThisAssembly.Git.BaseVersion.Major; + return SomeVerInfo.Major; case "WIXVERSION": - return $"{ThisAssembly.Git.BaseVersion.Major}.{ThisAssembly.Git.BaseVersion.Minor}.{ThisAssembly.Git.BaseVersion.Patch}.{ThisAssembly.Git.Commits}"; + return $"{SomeVerInfo.Major}.{SomeVerInfo.Minor}.{SomeVerInfo.Patch}.{SomeVerInfo.Commits}"; default: return null; diff --git a/src/wix/WixToolset.Core/WixToolset.Core.csproj b/src/wix/WixToolset.Core/WixToolset.Core.csproj index 33e151bc..5445b6db 100644 --- a/src/wix/WixToolset.Core/WixToolset.Core.csproj +++ b/src/wix/WixToolset.Core/WixToolset.Core.csproj @@ -9,7 +9,7 @@ embedded true true - true + true diff --git a/src/wix/WixToolset.Sdk/WixToolset.Sdk.csproj b/src/wix/WixToolset.Sdk/WixToolset.Sdk.csproj index 2f9b33fd..a45d660e 100644 --- a/src/wix/WixToolset.Sdk/WixToolset.Sdk.csproj +++ b/src/wix/WixToolset.Sdk/WixToolset.Sdk.csproj @@ -37,30 +37,30 @@ XmlInputPath="$(PublishDir)tools\wix.props" Namespaces="$(Namespaces)" Query="//msb:WixToolsetMajorVersion" - Value="$(WixMajorVersion)" /> + Value="$(SomeVerInfoMajor)" /> + Value="$(SomeVerInfoMinor)" /> + Value="$(SomeVerInfoPatch)" /> + Value="$(SomeVerInfoMajor).$(SomeVerInfoMinor)" /> + Value="$(SomeVerInfoMajor).$(SomeVerInfoMinor).$(SomeVerInfoPatch)" /> -- cgit v1.2.3-55-g6feb