Skip to content

Commit aa5a347

Browse files
authored
Merge pull request #29 from Ramo-Y/feature/dotnet-update
Update dotnet version to 10 and maintain NuGet and actions
2 parents 559a7f0 + b2468bd commit aa5a347

14 files changed

Lines changed: 33 additions & 35 deletions

File tree

.github/workflows/build.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515
- name: Checkout
16-
uses: actions/checkout@v4
16+
uses: actions/checkout@v6
1717
- name: Setup .NET
18-
uses: actions/setup-dotnet@v4
18+
uses: actions/setup-dotnet@v5
1919
with:
20-
dotnet-version: 8.0.x
20+
dotnet-version: 10.0.x
2121
- name: Restore dependencies
2222
run: dotnet restore
2323
working-directory: src
@@ -34,7 +34,7 @@ jobs:
3434
tags: ${{ secrets.DOCKERHUB_USERNAME }}/${{ vars.IMAGE_NAME }}:${{ inputs.image_version }}
3535
outputs: type=docker,dest=/tmp/${{ vars.IMAGE_NAME }}.tar
3636
- name: Upload artifact
37-
uses: actions/upload-artifact@v4
37+
uses: actions/upload-artifact@v6
3838
with:
3939
name: ${{ vars.IMAGE_NAME }}
4040
path: /tmp/${{ vars.IMAGE_NAME }}.tar

.github/workflows/cleanup.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ jobs:
66
runs-on: ubuntu-latest
77
steps:
88
- name: Checkout
9-
uses: actions/checkout@v4
9+
uses: actions/checkout@v6
1010
- uses: geekyeggo/delete-artifact@v5
1111
with:
1212
name: ${{ vars.IMAGE_NAME }}

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ jobs:
1010
runs-on: ubuntu-latest
1111
steps:
1212
- name: Checkout
13-
uses: actions/checkout@v4
13+
uses: actions/checkout@v6
1414
- name: Set up Docker Buildx
1515
uses: docker/setup-buildx-action@v3
1616
- name: Download artifact
17-
uses: actions/download-artifact@v4
17+
uses: actions/download-artifact@v7
1818
with:
1919
name: ${{ vars.IMAGE_NAME }}
2020
path: /tmp

.github/workflows/set_version.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- name: Checkout
14-
uses: actions/checkout@v4
14+
uses: actions/checkout@v6
1515
- name: Set Version
1616
id: set-version
1717
run: |

.github/workflows/test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515
- name: Checkout
16-
uses: actions/checkout@v4
16+
uses: actions/checkout@v6
1717
- name: Create temp directories
1818
run: |
1919
mkdir ${{ runner.temp }}/BulkRename
@@ -27,7 +27,7 @@ jobs:
2727
- name: Set up Docker Buildx
2828
uses: docker/setup-buildx-action@v3
2929
- name: Download artifact
30-
uses: actions/download-artifact@v4
30+
uses: actions/download-artifact@v7
3131
with:
3232
name: ${{ vars.IMAGE_NAME }}
3333
path: /tmp
@@ -43,7 +43,7 @@ jobs:
4343
run: dotnet test src/**/*.IntegrationTests.csproj
4444
- name: Upload logs on fail
4545
if: ${{ failure() }}
46-
uses: actions/upload-artifact@v4
46+
uses: actions/upload-artifact@v6
4747
with:
4848
name: Build failure logs
4949
path: ${{ runner.temp }}/BulkRename/Logs

.github/workflows/update-dockerhub-readme.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- name: Checkout
14-
uses: actions/checkout@v4
14+
uses: actions/checkout@v6
1515
- name: Docker Hub Description
16-
uses: peter-evans/dockerhub-description@v4
16+
uses: peter-evans/dockerhub-description@v5
1717
with:
1818
username: ${{ secrets.DOCKERHUB_USERNAME }}
1919
password: ${{ secrets.DOCKERHUB_TOKEN }}

src/BulkRename.IntegrationTests/BulkRename.IntegrationTests.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@
1010
<PrivateAssets>all</PrivateAssets>
1111
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1212
</PackageReference>
13-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
14-
<PackageReference Include="NUnit" Version="4.3.2" />
15-
<PackageReference Include="NUnit.Analyzers" Version="4.7.0">
13+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
14+
<PackageReference Include="NUnit" Version="4.4.0" />
15+
<PackageReference Include="NUnit.Analyzers" Version="4.11.2">
1616
<PrivateAssets>all</PrivateAssets>
1717
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1818
</PackageReference>
19-
<PackageReference Include="NUnit3TestAdapter" Version="5.0.0" />
19+
<PackageReference Include="NUnit3TestAdapter" Version="6.1.0" />
2020
</ItemGroup>
2121

2222
<ItemGroup>

src/BulkRename/BulkRename.csproj

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.14" />
9-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.14" />
10-
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.14">
8+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.2" />
9+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="10.0.2" />
10+
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.2">
1111
<PrivateAssets>all</PrivateAssets>
1212
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1313
</PackageReference>
14-
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
15-
<PackageReference Include="Serilog" Version="4.2.0" />
16-
<PackageReference Include="Serilog.AspNetCore" Version="8.0.3" />
17-
<PackageReference Include="Serilog.Sinks.Seq" Version="8.0.0" />
14+
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
15+
<PackageReference Include="Serilog" Version="4.3.0" />
16+
<PackageReference Include="Serilog.AspNetCore" Version="10.0.0" />
17+
<PackageReference Include="Serilog.Sinks.Seq" Version="9.0.0" />
1818
</ItemGroup>
1919

2020
</Project>

src/BulkRename/Models/Entities/Episode.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ public class Episode
99
public Guid EpisodeID { get; set; }
1010

1111
#pragma warning disable CS8618
12-
public string EpsEpisodeOriginalName { get; set; }
12+
public string? EpsEpisodeOriginalName { get; set; }
1313

14-
public string EpsEpisodeNewName { get; set; }
14+
public string? EpsEpisodeNewName { get; set; }
1515

16-
public string EpsNumberString { get; set; }
16+
public string? EpsNumberString { get; set; }
1717

1818
// ReSharper disable once InconsistentNaming
1919
public Guid EpsSeasonID_FK { get; set; }

src/BulkRename/Models/Entities/RenamingSession.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@ public class RenamingSession
77
[Key]
88
public Guid RenamingSessionID { get; set; }
99

10-
#pragma warning disable CS8618
11-
public string RenName { get; set; }
10+
public string? RenName { get; set; }
1211

1312
public DateTime RenExecutingDateTime { get; set; }
1413

0 commit comments

Comments
 (0)