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

Compare commits

merge into: maddo:develop
Branches Tags
maddo:develop
maddo:master
...
pull from: maddo:master
Branches Tags
maddo:develop
maddo:master
Sign in to create a new pull request.

1 commit
develop ... master

Author SHA1 Message Date
Marco
60bda11522 Upgrade to .net 9 2025-07-08 12:03:11 +02:00
4 changed files with 30 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

8
CatalogVbLib/CatalogVbLib.vbproj
View file

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

24
MaddoShared/MaddoShared.csproj
View file

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

13
imagecatalog/Form1.cs
View file

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

2
imagecatalog/ImageCatalog 2.csproj
View file

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