Merge branch 'develop' into v1_border-borderBrush-background-fix_2834

This commit is contained in:
Tig
2023-08-30 06:58:48 -06:00
committed by GitHub
6 changed files with 15 additions and 31 deletions

View File

@@ -8,10 +8,8 @@
<UseDataCollector />
<!-- Version numbers are automatically updated by gitversion when a release is released -->
<!-- Do not modify these. -->
<!--<AssemblyVersion>1.14.0.0</AssemblyVersion>
<FileVersion>1.14.0.0</FileVersion>
<Version>1.14.0-pre0001</Version>
<InformationalVersion>1.14.0-pre.1+Branch.develop.Sha.e0b7464669ef87b96b57f2285200e02bcf85d0e7</InformationalVersion>-->
<FileVersion>1.0.0.0</FileVersion>
<Version>1.0.0</Version>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<DefineConstants>TRACE</DefineConstants>