Skip to content

Commit

Permalink
Updates readme & fixes versioning.
Browse files Browse the repository at this point in the history
  • Loading branch information
mntone committed Jan 17, 2023
1 parent 1d69133 commit 716d922
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 5 deletions.
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 <u>Version 1.0.x</u>)
- *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`.
Expand Down
3 changes: 2 additions & 1 deletion projection/AngelUmbrella.projection.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@
<VersionSuffix Condition="'$(AngelVersionPreRelease)'!=''">$(AngelVersionPreRelease)</VersionSuffix>
<AssemblyVersion>$(AngelVersionMajor).$(AngelVersionMinor).$(AngelVersionPatch).$(AngelVersionPreReleaseId)</AssemblyVersion>
<FileVersion>$(AngelVersionMajor).$(AngelVersionMinor).$(AngelVersionBuild).$(AngelVersionRevision)</FileVersion>
<InformationalVersion>$(AngelVersionMajor).$(AngelVersionMinor).$(AngelVersionPatch)-$(AngelVersionPreRelease)</InformationalVersion>
<InformationalVersion Condition="$(AngelVersionPreReleaseId)&lt;10000">$(AngelVersionMajor).$(AngelVersionMinor).$(AngelVersionPatch)-$(AngelVersionPreRelease)</InformationalVersion>
<InformationalVersion Condition="$(AngelVersionPreReleaseId)&gt;=10000">$(AngelVersionMajor).$(AngelVersionMinor).$(AngelVersionPatch)</InformationalVersion>
<Authors>$(AngelAuthor)</Authors>
<Copyright>$(AngelCopyright)</Copyright>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/AngelUmbrella.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
<FloatingPointModel>Fast</FloatingPointModel>
<LanguageStandard>stdcpp20</LanguageStandard>
<ConformanceMode>true</ConformanceMode>
<AdditionalOptions>%(AdditionalOptions) /bigobj /Zm200</AdditionalOptions>
<AdditionalOptions>%(AdditionalOptions) /d1trimfile:"$(ProjectDir)\" /bigobj /Zm200</AdditionalOptions>
<AdditionalUsingDirectories>$(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
</ClCompile>
<Link>
Expand Down
2 changes: 1 addition & 1 deletion src/version.h
Original file line number Diff line number Diff line change
Expand Up @@ -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) \
Expand Down
2 changes: 1 addition & 1 deletion src/version.props
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<AngelVersionPatch>0</AngelVersionPatch>
<AngelVersionBuild Condition="$(AngelVersionBuild)==''">$([System.DateTime]::Now.ToString(`yyyy`))</AngelVersionBuild>
<AngelVersionRevision Condition="$(AngelVersionRevision)==''">$([System.DateTime]::Now.ToString(`MMdd`))</AngelVersionRevision>
<AngelVersionPreRelease>beta1</AngelVersionPreRelease>
<AngelVersionPreRelease></AngelVersionPreRelease>
<AngelVersionPreReleaseId Condition="'$(AngelVersionPreRelease.StartsWith(`alpha`))'">$(AngelVersionPreRelease.Substring(5))</AngelVersionPreReleaseId>
<AngelVersionPreReleaseId Condition="'$(AngelVersionPreRelease.StartsWith(`beta`))'">$([MSBuild]::Add(1000, $([System.Convert]::ToUInt16($(AngelVersionPreRelease.Substring(4)), 10))))</AngelVersionPreReleaseId>
<AngelVersionPreReleaseId Condition="$(AngelVersionPreReleaseId)==''">10000</AngelVersionPreReleaseId>
Expand Down

0 comments on commit 716d922

Please sign in to comment.