Skip to content

Commit 716d922

Browse files
committed
Updates readme & fixes versioning.
1 parent 1d69133 commit 716d922

5 files changed

Lines changed: 8 additions & 5 deletions

File tree

README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,11 @@ https://user-images.githubusercontent.com/901816/211709015-77fee141-17b7-45e6-a9
1010
- **DesktopAcrylicHelper** (C++) / **DesktopAcrylicControllerExtensions** (C#) - Provide to set acrylic colors (Choose assets from `Theme` and `Kind`).
1111
- *Mntone.AngelUmbrella.Converters*
1212
- **BooleanToVisibilityConverter** - Convert from *bool* to *Microsoft.UI.Xaml.Visibility* (TwoWay).
13+
- **DateTimeToStringConverter** - Convert from *DateTime* (C++) / *DateTimeOffset* (C#) to *hstring* (OneWay).
1314
- **InvertedBooleanConverterTest** - Convert from *bool* to inverted *bool* (TwoWay).
1415
- **StringIsPresentToVisibilityConverter** - Convert from *hstring* to *Microsoft.UI.Xaml.Visibility* (OneWay only).
15-
- *Mntone.AngelUmbrella.Controls* (*Mntone.AngelUmbrella.UI.Controls* in <u>Version 1.0.x</u>)
16+
- *Mntone.AngelUmbrella.Controls*
17+
- **OddEvenStyleSelector** - Provide to choose the odd/even style.
1618
- **SettingsCard** - Provide basic settings card.
1719
- **SettingsExpander** - Provide settings card with expander.
1820
- **SettingsPanel** - Provide settings layout in items control, such as `ListView` or `GridView`, with the style `CardListViewItemStyle`.

projection/AngelUmbrella.projection.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@
3636
<VersionSuffix Condition="'$(AngelVersionPreRelease)'!=''">$(AngelVersionPreRelease)</VersionSuffix>
3737
<AssemblyVersion>$(AngelVersionMajor).$(AngelVersionMinor).$(AngelVersionPatch).$(AngelVersionPreReleaseId)</AssemblyVersion>
3838
<FileVersion>$(AngelVersionMajor).$(AngelVersionMinor).$(AngelVersionBuild).$(AngelVersionRevision)</FileVersion>
39-
<InformationalVersion>$(AngelVersionMajor).$(AngelVersionMinor).$(AngelVersionPatch)-$(AngelVersionPreRelease)</InformationalVersion>
39+
<InformationalVersion Condition="$(AngelVersionPreReleaseId)&lt;10000">$(AngelVersionMajor).$(AngelVersionMinor).$(AngelVersionPatch)-$(AngelVersionPreRelease)</InformationalVersion>
40+
<InformationalVersion Condition="$(AngelVersionPreReleaseId)&gt;=10000">$(AngelVersionMajor).$(AngelVersionMinor).$(AngelVersionPatch)</InformationalVersion>
4041
<Authors>$(AngelAuthor)</Authors>
4142
<Copyright>$(AngelCopyright)</Copyright>
4243
</PropertyGroup>

src/AngelUmbrella.vcxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@
9191
<FloatingPointModel>Fast</FloatingPointModel>
9292
<LanguageStandard>stdcpp20</LanguageStandard>
9393
<ConformanceMode>true</ConformanceMode>
94-
<AdditionalOptions>%(AdditionalOptions) /bigobj /Zm200</AdditionalOptions>
94+
<AdditionalOptions>%(AdditionalOptions) /d1trimfile:"$(ProjectDir)\" /bigobj /Zm200</AdditionalOptions>
9595
<AdditionalUsingDirectories>$(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
9696
</ClCompile>
9797
<Link>

src/version.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"." STRINGIZE(ANGEL_VERSION_REVISION)
1515

1616
#define VER_PRODUCT_VERSION ANGEL_VERSION_MAJOR, ANGEL_VERSION_MINOR, ANGEL_VERSION_PATCH, ANGEL_VERSION_PREID
17-
#ifdef ANGEL_VERSION_PRERELEASE
17+
#if ANGEL_VERSION_PREID < 10000
1818
#define VER_PRODUCT_VERSION_STR STRINGIZE(ANGEL_VERSION_MAJOR) \
1919
"." STRINGIZE(ANGEL_VERSION_MINOR) \
2020
"." STRINGIZE(ANGEL_VERSION_PATCH) \

src/version.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<AngelVersionPatch>0</AngelVersionPatch>
99
<AngelVersionBuild Condition="$(AngelVersionBuild)==''">$([System.DateTime]::Now.ToString(`yyyy`))</AngelVersionBuild>
1010
<AngelVersionRevision Condition="$(AngelVersionRevision)==''">$([System.DateTime]::Now.ToString(`MMdd`))</AngelVersionRevision>
11-
<AngelVersionPreRelease>beta1</AngelVersionPreRelease>
11+
<AngelVersionPreRelease></AngelVersionPreRelease>
1212
<AngelVersionPreReleaseId Condition="'$(AngelVersionPreRelease.StartsWith(`alpha`))'">$(AngelVersionPreRelease.Substring(5))</AngelVersionPreReleaseId>
1313
<AngelVersionPreReleaseId Condition="'$(AngelVersionPreRelease.StartsWith(`beta`))'">$([MSBuild]::Add(1000, $([System.Convert]::ToUInt16($(AngelVersionPreRelease.Substring(4)), 10))))</AngelVersionPreReleaseId>
1414
<AngelVersionPreReleaseId Condition="$(AngelVersionPreReleaseId)==''">10000</AngelVersionPreReleaseId>

0 commit comments

Comments
 (0)