Skip to content

Commit af1ad30

Browse files
AsYlum-AsYlum-
committed
Use .net 10.
1 parent 6e8c67c commit af1ad30

File tree

20 files changed

+51
-22
lines changed

20 files changed

+51
-22
lines changed

‎.github/workflows/build-and-release.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,22 +30,22 @@ jobs:
3030

3131
steps:
3232
- name: Checkout
33-
uses: actions/checkout@v4.2.2
33+
uses: actions/checkout@v5.0.0
3434
with:
3535
fetch-depth: 0
3636

3737
- name: Install .NET Core
38-
uses: actions/setup-dotnet@v4.3.1
38+
uses: actions/setup-dotnet@v5.0.0
3939
with:
40-
dotnet-version: 8.0.x
40+
dotnet-version: 10.0.x
4141

4242
- name: Restore & build the application
4343
run: dotnet build $env:Solution_Name --configuration $env:Configuration
4444
env:
4545
Configuration: ${{ matrix.configuration }}
4646

4747
- name: Upload build artifacts
48-
uses: actions/upload-artifact@v4.6.2
48+
uses: actions/upload-artifact@v5.0.0
4949
with:
5050
name: ${{ env.Asset_Name }}.zip
5151
path: ./UOFiddler/bin/Release/
@@ -65,7 +65,7 @@ jobs:
6565

6666
steps:
6767
- name: Download artifacts
68-
uses: actions/download-artifact@v4.3.0
68+
uses: actions/download-artifact@v6.0.0
6969
with:
7070
name: ${{ env.Asset_Name }}.zip
7171
path: ./${{ env.Asset_Name }}/
@@ -74,7 +74,7 @@ jobs:
7474
run: 7z a -tzip ${{ env.Asset_Name }}.zip './${{ env.Asset_Name }}'
7575

7676
- name: Create release
77-
uses: softprops/action-gh-release@v2.2.2
77+
uses: softprops/action-gh-release@v2.4.2
7878
with:
7979
name: UOFiddler ${{ github.ref_name }}
8080
generate_release_notes: true

‎.github/workflows/build-pr.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,14 @@ jobs:
2727

2828
steps:
2929
- name: Checkout
30-
uses: actions/checkout@v4.2.2
30+
uses: actions/checkout@v5.0.0
3131
with:
3232
fetch-depth: 1
3333

3434
- name: Install .NET Core
35-
uses: actions/setup-dotnet@v4.3.1
35+
uses: actions/setup-dotnet@v5.0.0
3636
with:
37-
dotnet-version: 8.0.x
37+
dotnet-version: 10.0.x
3838

3939
- name: Restore & build the application
4040
run: dotnet build $env:Solution_Name --configuration $env:Configuration

‎README.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,12 @@ We have dedicated channel on POL Discord: https://discord.gg/4JbC8hA
88

99
## Requirements
1010

11+
Starting from version 4.18.0:
12+
13+
- Requires .NET Desktop Runtime 10.0.x (or SDK) installed to run the application.
14+
- You can download .NET 10.0 at: <https://dotnet.microsoft.com/en-us/download/dotnet/10.0>
15+
- Minimum supported Windows version is Windows 10.
16+
1117
Starting from version 4.11.0:
1218

1319
- Requires .NET Desktop Runtime 8.0.x (or SDK) installed to run the application.

‎Ultima/Ultima.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net8.0-windows</TargetFramework>
3+
<TargetFramework>net10.0-windows</TargetFramework>
44
<UseWindowsForms>true</UseWindowsForms>
55
<UseWPF>true</UseWPF>
66
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>

‎UoFiddler.Controls/Forms/AnimDataImportForm.cs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using System;
22
using System.Collections.Generic;
3+
using System.ComponentModel;
34
using System.Windows.Forms;
45
using UoFiddler.Controls.Classes;
56
using static Ultima.Animdata;
@@ -8,7 +9,9 @@ namespace UoFiddler.Controls.Forms
89
{
910
public partial class AnimDataImportForm : Form
1011
{
12+
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
1113
public Action OnAfterImport { get; set; }
14+
1215
public AnimDataImportForm()
1316
{
1417
InitializeComponent();

‎UoFiddler.Controls/Forms/ItemDetailForm.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
***************************************************************************/
1111

1212
using System;
13+
using System.ComponentModel;
1314
using System.Drawing;
1415
using System.Drawing.Imaging;
1516
using System.IO;
@@ -44,6 +45,7 @@ public ItemDetailForm(int i)
4445
/// <summary>
4546
/// Sets Hue
4647
/// </summary>
48+
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
4749
public int Hue
4850
{
4951
get => _hue;

‎UoFiddler.Controls/UoFiddler.Controls.csproj‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<AssemblyName>Controls</AssemblyName>
4-
<TargetFramework>net8.0-windows</TargetFramework>
4+
<TargetFramework>net10.0-windows</TargetFramework>
55
<UseWindowsForms>true</UseWindowsForms>
66
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
77
<AssemblyTitle>Controls</AssemblyTitle>
@@ -428,8 +428,6 @@
428428
</ItemGroup>
429429
<ItemGroup>
430430
<PackageReference Include="Serilog" Version="4.3.0" />
431-
<PackageReference Include="System.Drawing.Common" Version="9.0.5" />
432-
<PackageReference Include="System.Resources.Extensions" Version="9.0.5" />
433431
<PackageReference Include="AnimatedGif" Version="1.0.5" />
434432
</ItemGroup>
435433
</Project>

‎UoFiddler.Controls/UserControls/AnimatedPictureBox.cs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ public AnimatedFrame CurrentFrame
6767
get => _frames?[_frameIndex];
6868
}
6969

70+
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
7071
public int FrameIndex
7172
{
7273
get => _frameIndex;
@@ -84,6 +85,7 @@ public int FrameIndex
8485
}
8586
}
8687

88+
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
8789
public bool ShowFrameBounds
8890
{
8991
get => _showFrameBounds;
@@ -94,6 +96,7 @@ public bool ShowFrameBounds
9496
}
9597
}
9698

99+
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
97100
public int FrameDelay
98101
{
99102
get => _timer.Interval;
@@ -118,6 +121,7 @@ public int FrameDelay
118121
}
119122
}
120123

124+
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
121125
public bool Animate
122126
{
123127
get => _animate;

‎UoFiddler.Controls/UserControls/ItemsControl.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ public ItemsControl()
4242

4343
private int _selectedGraphicId = -1;
4444

45+
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
4546
public int SelectedGraphicId
4647
{
4748
get => _selectedGraphicId;

‎UoFiddler.Controls/UserControls/LandTilesControl.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
using System;
1313
using System.Collections.Generic;
14+
using System.ComponentModel;
1415
using System.Drawing;
1516
using System.Drawing.Imaging;
1617
using System.IO;
@@ -41,6 +42,7 @@ public LandTilesControl()
4142
private readonly List<int> _tileList = new List<int>();
4243
private bool _showFreeSlots;
4344

45+
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
4446
public int SelectedGraphicId
4547
{
4648
get => _selectedGraphicId;

0 commit comments

Comments
 (0)