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 --- .../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 --- 9 files changed, 201 insertions(+), 129 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 (limited to 'src/internal/SetBuildNumber') 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} - - -- cgit v1.2.3-55-g6feb