Skip to content

Commit 94ff42c

Browse files
biancodebiancode
committed
chore: update to version 2025.35.1 with critical fixes and UI improvements
Critical fixes from upstream v2025.35: - Tag deletion bug fix (remote deletion checkbox now works correctly) - Windows frame parameter fix for proper window rendering Improvements: - Updated Avalonia dependencies to 11.3.6 for stability - Centralized version management (single source of truth in VERSION file) - About dialog now dynamically reads version from VERSION file UI Fixes: - Fixed commit message box button area height (24px → 32px) to prevent clipping - Fixed preferences history preset buttons (Height: 24px → 28px, FontSize: 11 → 12) - Added proper margins for better button spacing in both locations Technical changes: - VERSION file is now copied to output directory during build - About.axaml.cs reads version at runtime instead of hardcoding - Consistent version across all application components
1 parent a93a542 commit 94ff42c

5 files changed

Lines changed: 54 additions & 18 deletions

File tree

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2025.34.11
1+
2025.35.1

‎src/SourceGit.csproj‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,16 @@
3939
</ItemGroup>
4040

4141
<ItemGroup>
42-
<PackageReference Include="Avalonia" Version="11.3.3" />
43-
<PackageReference Include="Avalonia.Controls.DataGrid" Version="11.3.3" />
44-
<PackageReference Include="Avalonia.Desktop" Version="11.3.3" />
45-
<PackageReference Include="Avalonia.Fonts.Inter" Version="11.3.3" />
46-
<PackageReference Include="Avalonia.Themes.Fluent" Version="11.3.3" />
47-
<PackageReference Include="Avalonia.Diagnostics" Version="11.3.3" Condition="'$(Configuration)' == 'Debug'" />
42+
<None Include="../VERSION" CopyToOutputDirectory="Always" Link="VERSION" />
43+
</ItemGroup>
44+
45+
<ItemGroup>
46+
<PackageReference Include="Avalonia" Version="11.3.6" />
47+
<PackageReference Include="Avalonia.Controls.DataGrid" Version="11.3.6" />
48+
<PackageReference Include="Avalonia.Desktop" Version="11.3.6" />
49+
<PackageReference Include="Avalonia.Fonts.Inter" Version="11.3.6" />
50+
<PackageReference Include="Avalonia.Themes.Fluent" Version="11.3.6" />
51+
<PackageReference Include="Avalonia.Diagnostics" Version="11.3.6" Condition="'$(Configuration)' == 'Debug'" />
4852
<PackageReference Include="Avalonia.AvaloniaEdit" Version="11.3.0" />
4953
<PackageReference Include="AvaloniaEdit.TextMate" Version="11.3.0" />
5054
<PackageReference Include="Azure.AI.OpenAI" Version="2.2.0-beta.5" />

‎src/Views/About.axaml.cs‎

Lines changed: 34 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
using System;
2+
using System.IO;
13
using System.Reflection;
24
using Avalonia.Interactivity;
35

@@ -10,15 +12,45 @@ public About()
1012
CloseOnESC = true;
1113
InitializeComponent();
1214

13-
// Use Iniationware version format (Year.Week.IWIncrement)
14-
TxtVersion.Text = "v2025.34.10";
15+
// Get version from VERSION file or assembly
16+
var version = GetApplicationVersion();
17+
TxtVersion.Text = $"v{version}";
1518

1619
var assembly = Assembly.GetExecutingAssembly();
1720
var copyright = assembly.GetCustomAttribute<AssemblyCopyrightAttribute>();
1821
if (copyright != null)
1922
TxtCopyright.Text = copyright.Copyright;
2023
}
2124

25+
private string GetApplicationVersion()
26+
{
27+
// First try to read from VERSION file (if it exists in the app directory)
28+
var versionFile = Path.Combine(AppContext.BaseDirectory, "VERSION");
29+
if (!File.Exists(versionFile))
30+
{
31+
// Try from source directory during development
32+
var sourceVersionFile = Path.Combine(AppContext.BaseDirectory, "../../../../../VERSION");
33+
if (File.Exists(sourceVersionFile))
34+
versionFile = sourceVersionFile;
35+
}
36+
37+
if (File.Exists(versionFile))
38+
{
39+
var version = File.ReadAllText(versionFile).Trim();
40+
if (!string.IsNullOrEmpty(version))
41+
return version;
42+
}
43+
44+
// Fallback to assembly version
45+
var assembly = Assembly.GetExecutingAssembly();
46+
var version_attr = assembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>();
47+
if (version_attr != null && !string.IsNullOrEmpty(version_attr.InformationalVersion))
48+
return version_attr.InformationalVersion;
49+
50+
// Last fallback
51+
return assembly.GetName().Version?.ToString() ?? "Unknown";
52+
}
53+
2254
private void OnVisitReleaseNotes(object _, RoutedEventArgs e)
2355
{
2456
Native.OS.OpenBrowser($"https://github.com/Iniationware/sourcegit/releases/tag/{TxtVersion.Text}");

‎src/Views/CommitMessageTextBox.axaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
BorderThickness="1"
1313
BorderBrush="{DynamicResource Brush.Border2}"
1414
CornerRadius="4">
15-
<Grid RowDefinitions="Auto,1,*,1,24">
15+
<Grid RowDefinitions="Auto,1,*,1,32">
1616
<v:EnhancedTextBox Grid.Row="0"
1717
x:Name="SubjectEditor"
1818
Classes="no_border"
@@ -66,7 +66,7 @@
6666
Background="{DynamicResource Brush.Window}"
6767
BorderThickness="1,0,0,0"
6868
CornerRadius="0,0,4,4">
69-
<Grid ColumnDefinitions="Auto,Auto,Auto,Auto,*" Margin="0,4">
69+
<Grid ColumnDefinitions="Auto,Auto,Auto,Auto,*" Margin="4">
7070
<Button Grid.Column="0"
7171
Classes="icon_button"
7272
Width="24"

‎src/Views/Preferences.axaml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -135,23 +135,23 @@
135135
</Grid>
136136

137137
<!-- Quick preset buttons -->
138-
<StackPanel Orientation="Horizontal" Spacing="4">
139-
<Button Content="100" Width="50" Height="24" FontSize="11"
138+
<StackPanel Orientation="Horizontal" Spacing="4" Margin="0,0,0,4">
139+
<Button Content="100" Width="50" Height="28" FontSize="12"
140140
Background="{DynamicResource Brush.Window}"
141141
Command="{Binding SetMaxHistoryCommitsCommand}" CommandParameter="100"/>
142-
<Button Content="500" Width="50" Height="24" FontSize="11"
142+
<Button Content="500" Width="50" Height="28" FontSize="12"
143143
Background="{DynamicResource Brush.Window}"
144144
Command="{Binding SetMaxHistoryCommitsCommand}" CommandParameter="500"/>
145-
<Button Content="1K" Width="50" Height="24" FontSize="11"
145+
<Button Content="1K" Width="50" Height="28" FontSize="12"
146146
Background="{DynamicResource Brush.Window}"
147147
Command="{Binding SetMaxHistoryCommitsCommand}" CommandParameter="1000"/>
148-
<Button Content="2K" Width="50" Height="24" FontSize="11"
148+
<Button Content="2K" Width="50" Height="28" FontSize="12"
149149
Background="{DynamicResource Brush.Window}"
150150
Command="{Binding SetMaxHistoryCommitsCommand}" CommandParameter="2000"/>
151-
<Button Content="5K" Width="50" Height="24" FontSize="11"
151+
<Button Content="5K" Width="50" Height="28" FontSize="12"
152152
Background="{DynamicResource Brush.Window}"
153153
Command="{Binding SetMaxHistoryCommitsCommand}" CommandParameter="5000"/>
154-
<Button Content="10K" Width="50" Height="24" FontSize="11"
154+
<Button Content="10K" Width="50" Height="28" FontSize="12"
155155
Background="{DynamicResource Brush.Window}"
156156
Command="{Binding SetMaxHistoryCommitsCommand}" CommandParameter="10000"/>
157157
</StackPanel>

0 commit comments

Comments
 (0)