diff --git a/README.md b/README.md index b02d571..13cc3a0 100644 --- a/README.md +++ b/README.md @@ -10,9 +10,11 @@ https://user-images.githubusercontent.com/901816/211709015-77fee141-17b7-45e6-a9 - **DesktopAcrylicHelper** (C++) / **DesktopAcrylicControllerExtensions** (C#) - Provide to set acrylic colors (Choose assets from `Theme` and `Kind`). - *Mntone.AngelUmbrella.Converters* - **BooleanToVisibilityConverter** - Convert from *bool* to *Microsoft.UI.Xaml.Visibility* (TwoWay). + - **DateTimeToStringConverter** - Convert from *DateTime* (C++) / *DateTimeOffset* (C#) to *hstring* (OneWay). - **InvertedBooleanConverterTest** - Convert from *bool* to inverted *bool* (TwoWay). - **StringIsPresentToVisibilityConverter** - Convert from *hstring* to *Microsoft.UI.Xaml.Visibility* (OneWay only). -- *Mntone.AngelUmbrella.Controls* (*Mntone.AngelUmbrella.UI.Controls* in Version 1.0.x) +- *Mntone.AngelUmbrella.Controls* + - **OddEvenStyleSelector** - Provide to choose the odd/even style. - **SettingsCard** - Provide basic settings card. - **SettingsExpander** - Provide settings card with expander. - **SettingsPanel** - Provide settings layout in items control, such as `ListView` or `GridView`, with the style `CardListViewItemStyle`. diff --git a/projection/AngelUmbrella.projection.csproj b/projection/AngelUmbrella.projection.csproj index 94310c0..0ebd91e 100644 --- a/projection/AngelUmbrella.projection.csproj +++ b/projection/AngelUmbrella.projection.csproj @@ -36,7 +36,8 @@ $(AngelVersionPreRelease) $(AngelVersionMajor).$(AngelVersionMinor).$(AngelVersionPatch).$(AngelVersionPreReleaseId) $(AngelVersionMajor).$(AngelVersionMinor).$(AngelVersionBuild).$(AngelVersionRevision) - $(AngelVersionMajor).$(AngelVersionMinor).$(AngelVersionPatch)-$(AngelVersionPreRelease) + $(AngelVersionMajor).$(AngelVersionMinor).$(AngelVersionPatch)-$(AngelVersionPreRelease) + $(AngelVersionMajor).$(AngelVersionMinor).$(AngelVersionPatch) $(AngelAuthor) $(AngelCopyright) diff --git a/src/AngelUmbrella.vcxproj b/src/AngelUmbrella.vcxproj index d25ff2b..0769fb7 100644 --- a/src/AngelUmbrella.vcxproj +++ b/src/AngelUmbrella.vcxproj @@ -91,7 +91,7 @@ Fast stdcpp20 true - %(AdditionalOptions) /bigobj /Zm200 + %(AdditionalOptions) /d1trimfile:"$(ProjectDir)\" /bigobj /Zm200 $(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories) diff --git a/src/version.h b/src/version.h index becd6d8..85ca9fd 100644 --- a/src/version.h +++ b/src/version.h @@ -14,7 +14,7 @@ "." STRINGIZE(ANGEL_VERSION_REVISION) #define VER_PRODUCT_VERSION ANGEL_VERSION_MAJOR, ANGEL_VERSION_MINOR, ANGEL_VERSION_PATCH, ANGEL_VERSION_PREID -#ifdef ANGEL_VERSION_PRERELEASE +#if ANGEL_VERSION_PREID < 10000 #define VER_PRODUCT_VERSION_STR STRINGIZE(ANGEL_VERSION_MAJOR) \ "." STRINGIZE(ANGEL_VERSION_MINOR) \ "." STRINGIZE(ANGEL_VERSION_PATCH) \ diff --git a/src/version.props b/src/version.props index 0f04859..acff92a 100644 --- a/src/version.props +++ b/src/version.props @@ -8,7 +8,7 @@ 0 $([System.DateTime]::Now.ToString(`yyyy`)) $([System.DateTime]::Now.ToString(`MMdd`)) - beta1 + $(AngelVersionPreRelease.Substring(5)) $([MSBuild]::Add(1000, $([System.Convert]::ToUInt16($(AngelVersionPreRelease.Substring(4)), 10)))) 10000