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

develop #1

Open
maddo wants to merge 126 commits from develop into master
pull from: develop
merge into: maddo:master
Conversation 0 Commits 126 Files changed 345 +29 -14
5 changed files with 29 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 8048c41cd0 - Show all commits

Upgraded to .NET 9

Prev Next
Marco 2025-07-08 14:35:27 +02:00
commit 8048c41cd0

8
CatalogVbLib/CatalogVbLib.vbproj
View file

@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0-windows</TargetFramework>
<TargetFramework>net9.0-windows</TargetFramework>
<OutputType>Library</OutputType>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<UseWindowsForms>true</UseWindowsForms>
@ -36,9 +36,9 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Ben.Demystifier" Version="0.4.1" />
<PackageReference Include="System.Collections.Immutable" Version="8.0.0" />
<PackageReference Include="System.Collections.Immutable" Version="9.0.6" />
<PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
<PackageReference Include="System.Reflection.Metadata" Version="8.0.1" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
<PackageReference Include="System.Reflection.Metadata" Version="9.0.6" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.1.2" />
</ItemGroup>
</Project>

18
MaddoShared/MaddoShared.csproj
View file

@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0-windows7.0</TargetFramework>
<TargetFramework>net9.0-windows</TargetFramework>
<OutputType>Library</OutputType>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<UseWindowsForms>true</UseWindowsForms>
@ -13,18 +13,18 @@
<ItemGroup>
<PackageReference Include="AsyncEnumerator" Version="4.0.2" />
<PackageReference Include="Ben.Demystifier" Version="0.4.1" />
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.6" />
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.5" />
<PackageReference Include="System.Buffers" Version="4.5.1" />
<PackageReference Include="System.Collections.Immutable" Version="8.0.0" />
<PackageReference Include="System.Memory" Version="4.5.5" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.10" />
<PackageReference Include="System.Buffers" Version="4.6.1" />
<PackageReference Include="System.Collections.Immutable" Version="9.0.6" />
<PackageReference Include="System.Memory" Version="4.6.3" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.1.2" />
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.6.3" />
<PackageReference Include="Z.ExtensionMethods" Version="2.1.1" />
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.421302">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Microsoft.Windows.Compatibility" Version="8.0.10" />
<PackageReference Include="Microsoft.Windows.Compatibility" Version="9.0.6" />
</ItemGroup>
</Project>

13
imagecatalog/Form1.cs
View file

@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Diagnostics;
using System.Drawing;
using System.IO;
@ -51,6 +52,7 @@ namespace ImageCatalog
// Do not modify it using the code editor.
private Button _Button1;
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
internal Button Button1
{
[MethodImpl(MethodImplOptions.Synchronized)]
@ -82,6 +84,7 @@ namespace ImageCatalog
internal Label Label20;
private Button _Button6;
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
internal Button Button6
{
[MethodImpl(MethodImplOptions.Synchronized)]
@ -108,6 +111,7 @@ namespace ImageCatalog
private Button _Button5;
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
internal Button Button5
{
[MethodImpl(MethodImplOptions.Synchronized)]
@ -134,6 +138,7 @@ namespace ImageCatalog
private Button _Button7;
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
internal Button Button7
{
[MethodImpl(MethodImplOptions.Synchronized)]
@ -173,6 +178,7 @@ namespace ImageCatalog
internal PictureBox PictureBox2;
private PictureBox _PictureBox1;
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
internal PictureBox PictureBox1
{
[MethodImpl(MethodImplOptions.Synchronized)]
@ -213,6 +219,7 @@ namespace ImageCatalog
internal Label Label23;
private Button _Button4;
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
internal Button Button4
{
[MethodImpl(MethodImplOptions.Synchronized)]
@ -277,6 +284,7 @@ namespace ImageCatalog
internal GroupBox GroupBox5;
private Button _Button8;
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
internal Button Button8
{
[MethodImpl(MethodImplOptions.Synchronized)]
@ -332,6 +340,7 @@ namespace ImageCatalog
internal CheckBox CheckBox6;
private Button _Button3;
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
internal Button Button3
{
[MethodImpl(MethodImplOptions.Synchronized)]
@ -358,6 +367,7 @@ namespace ImageCatalog
private Button _Button2;
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
internal Button Button2
{
[MethodImpl(MethodImplOptions.Synchronized)]
@ -410,6 +420,7 @@ namespace ImageCatalog
internal Panel Panel1;
private CheckBox _CheckBox18;
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
internal CheckBox CheckBox18
{
[MethodImpl(MethodImplOptions.Synchronized)]
@ -436,6 +447,7 @@ namespace ImageCatalog
private CheckBox _CheckBox4;
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
internal CheckBox CheckBox4
{
[MethodImpl(MethodImplOptions.Synchronized)]
@ -462,6 +474,7 @@ namespace ImageCatalog
private CheckBox _CheckBox12;
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
internal CheckBox CheckBox12
{
[MethodImpl(MethodImplOptions.Synchronized)]

2
imagecatalog/ImageCatalog 2.csproj
View file

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>net8.0-windows</TargetFramework>
<TargetFramework>net9.0-windows</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<UseWindowsForms>true</UseWindowsForms>

2
imagecatalog/MainForm.cs
View file

@ -1,6 +1,7 @@
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing;
using System.Drawing.Text;
using System.IO;
@ -25,6 +26,7 @@ namespace ImageCatalog
public partial class MainForm
{
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
public DataModel Model { get; set; }
private readonly ITestService _service;