maddo/Catalog
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Switch to MinVer, add CI/CD, unify thumbnail options

Browse source 
- Add .gitlab-ci.yml for Windows CI/CD: build, publish, and GitLab Release with artifact upload
- Replace GitVersion.MsBuild with MinVer for versioning; update all versioning logic in .csproj
- Remove GitVersion CLI fallback for Visual Studio builds
- Update post-publish renaming to use MinVer's Version property
- Replace multiple thumbnail text checkboxes with a single ComboBox selector in MainWindow.xaml
- Change default UI startup: prefer WPF MainWindow, fallback to WinForms MainForm
This commit is contained in:
MaddoScientisto 2026-02-16 21:49:46 +01:00
commit da9d9875b0
4 changed files with 94 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

32
imagecatalog/Program.cs
View file

@ -79,24 +79,24 @@ static class Program
// the block below and comment out the WPF branch.
// -----------------------------------------------------------------------------
// // Force WinForms UI (uncomment to enable)
var mainForm = serviceProvider.GetRequiredService<MainForm>();
// If you want to set the DataModel explicitly on the WinForms form use the lines below
// var mainViewModel = serviceProvider.GetRequiredService<DataModel>();
// mainForm.Model = mainViewModel;
Application.Run(mainForm);
//var mainForm = serviceProvider.GetRequiredService<MainForm>();
//// If you want to set the DataModel explicitly on the WinForms form use the lines below
//// var mainViewModel = serviceProvider.GetRequiredService<DataModel>();
//// mainForm.Model = mainViewModel;
//Application.Run(mainForm);
// -----------------------------------------------------------------------------
//if (serviceProvider.GetService(typeof(ImageCatalog_2.MainWindow)) is ImageCatalog_2.MainWindow wpfMain)
//{
// // Start WPF app
// var app = new System.Windows.Application();
// app.Run(wpfMain);
//}
//else
//{
// var mainForm = serviceProvider.GetRequiredService<MainForm>();
// Application.Run(mainForm);
//}
if (serviceProvider.GetService(typeof(ImageCatalog_2.MainWindow)) is ImageCatalog_2.MainWindow wpfMain)
{
// Start WPF app
var app = new System.Windows.Application();
app.Run(wpfMain);
}
else
{
var mainForm = serviceProvider.GetRequiredService<MainForm>();
Application.Run(mainForm);
}
}
private static void ConfigureServices(ServiceCollection services)