Improve multi-line text, logo, and version display
- Enhance ImageCreatorAlternate to support multi-line text rendering with correct sizing, spacing, and shadow for each line. - Only draw logos on non-thumbnail images to match GDI behavior. - Add a status bar to MainWindow showing the app version at runtime. - Upgrade MinVer to 7.0.0 and adjust versioning to avoid WPF/XAML assembly identity issues. - Refactor XAML layout to accommodate the new status bar.
This commit is contained in:
parent
8db7ee8075
commit
f4893a39e9
4 changed files with 70 additions and 23 deletions
|
|
@ -7,10 +7,6 @@
|
|||
<UseWindowsForms>true</UseWindowsForms>
|
||||
<UseWPF>true</UseWPF>
|
||||
<ProduceReferenceAssembly>False</ProduceReferenceAssembly>
|
||||
<AssemblyVersion>3.1.2.0</AssemblyVersion>
|
||||
<FileVersion>3.1.2.0</FileVersion>
|
||||
<InformationalVersion>3.1.2</InformationalVersion>
|
||||
<Version>3.1.2</Version>
|
||||
<!-- Default assembly name for regular builds -->
|
||||
<AssemblyName>ImageCatalog</AssemblyName>
|
||||
<LangVersion>default</LangVersion>
|
||||
|
|
@ -20,6 +16,9 @@
|
|||
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Keep MinVer package enabled but do NOT let it overwrite AssemblyVersion/FileVersion used at build-time.
|
||||
This prevents MinVer from injecting a computed version into generated BAML/pack URIs which can cause
|
||||
WPF to try loading a mismatched assembly identity at runtime. Do a full clean rebuild after this change. -->
|
||||
<UpdateVersionProperties>true</UpdateVersionProperties>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||
|
|
@ -46,20 +45,15 @@
|
|||
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.3" />
|
||||
<PackageReference Include="Microsoft.Extensions.Logging" Version="10.0.3" />
|
||||
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="10.0.3" />
|
||||
<PackageReference Include="MinVer" Version="3.0.0" PrivateAssets="all" />
|
||||
<PackageReference Include="MinVer" Version="7.0.0" PrivateAssets="all" />
|
||||
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.421302">
|
||||
<PrivateAssets>all</PrivateAssets>
|
||||
</PackageReference>
|
||||
</ItemGroup>
|
||||
|
||||
<!-- If MinVer ran and produced values, prefer them for assembly/file/informational version
|
||||
so the built assembly exposes the computed version for runtime and the publish rename uses the same value. -->
|
||||
<PropertyGroup>
|
||||
<!-- Prefer explicit MSBuild 'Version' set by MinVer when available -->
|
||||
<AssemblyVersion Condition="'$(Version)' != ''">$(Version)</AssemblyVersion>
|
||||
<FileVersion Condition="'$(Version)' != ''">$(Version)</FileVersion>
|
||||
<InformationalVersion Condition="'$(Version)' != ''">$(Version)</InformationalVersion>
|
||||
</PropertyGroup>
|
||||
<!-- MinVer provides a computed 'Version' property. Do not automatically override AssemblyVersion/FileVersion
|
||||
with MinVer's computed Version to avoid mismatches embedded into generated XAML/BAML. The explicit
|
||||
AssemblyVersion/FileVersion at the top of this file will be used for runtime identity. -->
|
||||
<ItemGroup>
|
||||
<Compile Update="Properties\Settings.Designer.cs">
|
||||
<DesignTimeSharedInput>True</DesignTimeSharedInput>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue