Skip to content

Commit f7b0501

Browse files
marwannettourmarwannettour
authored
[migration] Migrate project to SDK 10 and fix deprecations (#284)
1 parent 7a512cc commit f7b0501

31 files changed

+827
-163
lines changed

‎.github/workflows/trigger-PR-pipeline.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ jobs:
3232
mkdir -p src/ByteSync.Client
3333
echo "$CLIENT_LOCAL_SETTINGS_JSON" > src/ByteSync.Client/local.settings.json
3434
35-
- name: Setup .NET 8 Environment
35+
- name: Setup .NET 10 Environment
3636
uses: actions/setup-dotnet@v4
3737
with:
38-
dotnet-version: '8.0.x'
38+
dotnet-version: '10.0.x'
3939

4040
- name: Install SonarScanner for .NET
4141
run: |
@@ -98,10 +98,10 @@ jobs:
9898
key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }}
9999
restore-keys: |
100100
${{ runner.os }}-nuget-
101-
- name: Setup .NET 8 Environment
101+
- name: Setup .NET 10 Environment
102102
uses: actions/setup-dotnet@v4
103103
with:
104-
dotnet-version: '8.0.x'
104+
dotnet-version: '10.0.x'
105105

106106
- name: Create Config Files
107107
shell: bash

‎src/ByteSync.Client/Business/Actions/Shared/SharedActionsGroup.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using ByteSync.Business.Inventories;
1+
using ByteSync.Business.Inventories;
22
using ByteSync.Common.Business.Actions;
33
using ByteSync.Common.Business.EndPoints;
44
using ByteSync.Common.Business.Inventories;

‎src/ByteSync.Client/ByteSync.Client.csproj‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<Nullable>enable</Nullable>
55
<DisableWinExeOutputInference>true</DisableWinExeOutputInference>
66
<ApplicationIcon>Assets\ByteSync.ico</ApplicationIcon>
7-
<TargetFramework>net8.0</TargetFramework>
7+
<TargetFramework>net10.0</TargetFramework>
88
<RuntimeIdentifiers>win-x64;linux-x64</RuntimeIdentifiers>
99
<IsWindows Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))' == 'true'">true</IsWindows>
1010
<IsOSX Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::OSX)))' == 'true'">true</IsOSX>
@@ -65,13 +65,13 @@
6565
<PackageReference Include="DynamicData" Version="9.4.1"/>
6666
<PackageReference Include="FastRsyncNet" Version="2.4.4"/>
6767
<PackageReference Include="LiveChartsCore.SkiaSharpView.Avalonia" Version="2.0.0-beta.700"/>
68-
<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="8.0.23"/>
69-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0"/>
70-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.1"/>
71-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1"/>
72-
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.1"/>
68+
<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="10.0.5"/>
69+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="10.0.5"/>
70+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="10.0.5"/>
71+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.5"/>
72+
<PackageReference Include="Microsoft.Extensions.Http" Version="10.0.5"/>
7373
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="8.0.22"/>
74-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.3"/>
74+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.5"/>
7575
<PackageReference Include="Mono.Posix.NETStandard" Version="1.0.0"/>
7676
<PackageReference Include="Polly" Version="8.6.5"/>
7777
<PackageReference Include="ReactiveMarbles.ObservableEvents.SourceGenerator" Version="1.3.1">

‎src/ByteSync.Common/ByteSync.Common.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<LangVersion>default</LangVersion>
55
<Nullable>enable</Nullable>
66
<PackageId>ByteSync.Common</PackageId>
7-
<TargetFramework>net8.0</TargetFramework>
7+
<TargetFramework>net10.0</TargetFramework>
88
</PropertyGroup>
99

1010
<ItemGroup>
@@ -14,7 +14,7 @@
1414
</ItemGroup>
1515

1616
<ItemGroup>
17-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.3" />
17+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.5" />
1818
<PackageReference Include="Serilog" Version="4.3.0" />
1919
<PackageReference Include="System.IO.Abstractions" Version="22.1.0"/>
2020
</ItemGroup>

‎src/ByteSync.Functions/ByteSync.Functions.csproj‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net8.0</TargetFramework>
3+
<TargetFramework>net10.0</TargetFramework>
44
<AzureFunctionsVersion>v4</AzureFunctionsVersion>
55
<OutputType>Exe</OutputType>
66
<ImplicitUsings>enable</ImplicitUsings>
@@ -13,19 +13,19 @@
1313
<PackageReference Include="Azure.Identity" Version="1.17.1"/>
1414
<PackageReference Include="MediatR" Version="12.5.0" />
1515
<PackageReference Include="Microsoft.ApplicationInsights.WorkerService" Version="2.23.0" />
16-
<PackageReference Include="Microsoft.Azure.Functions.Worker" Version="1.24.0"/>
17-
<PackageReference Include="Microsoft.Azure.Functions.Worker.ApplicationInsights" Version="1.4.0" />
16+
<PackageReference Include="Microsoft.Azure.Functions.Worker" Version="2.51.0"/>
17+
<PackageReference Include="Microsoft.Azure.Functions.Worker.ApplicationInsights" Version="2.50.0" />
1818
<PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Http" Version="3.3.0" />
1919
<PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.SignalRService" Version="1.14.1" />
2020
<PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Timer" Version="4.3.1" />
21-
<PackageReference Include="Microsoft.Azure.Functions.Worker.Sdk" Version="1.18.1" />
22-
<PackageReference Include="Microsoft.Azure.AppConfiguration.AspNetCore" Version="8.1.2" />
23-
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.23"/>
24-
<PackageReference Include="Microsoft.Azure.SignalR" Version="1.32.0"/>
25-
<PackageReference Include="Microsoft.Azure.SignalR.Management" Version="1.32.0"/>
26-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
27-
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.1" />
28-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.3" />
21+
<PackageReference Include="Microsoft.Azure.Functions.Worker.Sdk" Version="2.0.7" />
22+
<PackageReference Include="Microsoft.Azure.AppConfiguration.AspNetCore" Version="8.5.0" />
23+
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="10.0.5"/>
24+
<PackageReference Include="Microsoft.Azure.SignalR" Version="1.33.0"/>
25+
<PackageReference Include="Microsoft.Azure.SignalR.Management" Version="1.33.0"/>
26+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.5" />
27+
<PackageReference Include="Microsoft.Extensions.Http" Version="10.0.5" />
28+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.5" />
2929
<PackageReference Include="RedLock.net" Version="2.3.2" />
3030
<PackageReference Include="StackExchange.Redis" Version="2.10.1"/>
3131
</ItemGroup>

‎src/ByteSync.Functions/Helpers/Middlewares/JwtMiddleware.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ private static async Task HandleTokenError(FunctionContext context, string messa
182182
if (httpReqData != null)
183183
{
184184
var newHttpResponse = httpReqData.CreateResponse(httpStatusCode);
185-
await newHttpResponse.WriteAsJsonAsync(new { ResponseStatus = message }, newHttpResponse.StatusCode);
185+
await newHttpResponse.WriteAsJsonAsync(new { ResponseStatus = message });
186186
context.GetInvocationResult().Value = newHttpResponse;
187187
}
188188
}

‎src/ByteSync.Functions/Http/AnnouncementFunction.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public async Task<HttpResponseData> GetAnnouncements(
2323
var announcements = await _mediator.Send(new GetActiveAnnouncementsRequest());
2424

2525
var response = req.CreateResponse();
26-
await response.WriteAsJsonAsync(announcements, HttpStatusCode.OK);
26+
await response.WriteAsJsonAsync(announcements);
2727
return response;
2828
}
2929
}

‎src/ByteSync.Functions/Http/AuthFunction.cs‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using System.Net;
1+
using System.Net;
22
using ByteSync.Common.Business.Auth;
33
using ByteSync.Functions.Helpers.Misc;
44
using ByteSync.ServerCommon.Commands.Authentication;
@@ -30,11 +30,12 @@ public async Task<HttpResponseData> Login([HttpTrigger(AuthorizationLevel.Anonym
3030
var response = req.CreateResponse();
3131
if (authResult.IsSuccess)
3232
{
33-
await response.WriteAsJsonAsync(authResult, HttpStatusCode.OK);
33+
await response.WriteAsJsonAsync(authResult);
3434
}
3535
else
3636
{
37-
await response.WriteAsJsonAsync(authResult, HttpStatusCode.Unauthorized);
37+
response.StatusCode = HttpStatusCode.Unauthorized;
38+
await response.WriteAsJsonAsync(authResult);
3839
}
3940

4041
return response;
@@ -52,11 +53,12 @@ public async Task<HttpResponseData> RefreshTokens([HttpTrigger(AuthorizationLeve
5253
var response = req.CreateResponse();
5354
if (authResult.IsSuccess)
5455
{
55-
await response.WriteAsJsonAsync(authResult, HttpStatusCode.OK);
56+
await response.WriteAsJsonAsync(authResult);
5657
}
5758
else
5859
{
59-
await response.WriteAsJsonAsync(authResult, HttpStatusCode.Unauthorized);
60+
response.StatusCode = HttpStatusCode.Unauthorized;
61+
await response.WriteAsJsonAsync(authResult);
6062
}
6163

6264
return response;

‎src/ByteSync.Functions/Http/CloudSessionFunction.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public async Task<HttpResponseData> Create([HttpTrigger(AuthorizationLevel.Anony
3030
var cloudSessionResult = await _mediator.Send(request);
3131

3232
var response = req.CreateResponse();
33-
await response.WriteAsJsonAsync(cloudSessionResult, HttpStatusCode.OK);
33+
await response.WriteAsJsonAsync(cloudSessionResult);
3434

3535
return response;
3636
}
@@ -44,7 +44,7 @@ public async Task<HttpResponseData> AskPasswordExchangeKey(
4444
var parameters = await FunctionHelper.DeserializeRequestBody<AskCloudSessionPasswordExchangeKeyParameters>(req);
4545
var result = await _mediator.Send(new AskPasswordExchangeKeyRequest(client, parameters), executionContext.CancellationToken);
4646
var response = req.CreateResponse();
47-
await response.WriteAsJsonAsync(result, HttpStatusCode.OK);
47+
await response.WriteAsJsonAsync(result);
4848
return response;
4949
}
5050

@@ -72,7 +72,7 @@ public async Task<HttpResponseData> FinalizeJoinCloudSession(
7272
var result = await _mediator.Send(request);
7373

7474
var response = req.CreateResponse();
75-
await response.WriteAsJsonAsync(result, HttpStatusCode.OK);
75+
await response.WriteAsJsonAsync(result);
7676

7777
return response;
7878
}
@@ -86,7 +86,7 @@ public async Task<HttpResponseData> AskJoinCloudSession(
8686
var parameters = await FunctionHelper.DeserializeRequestBody<AskJoinCloudSessionParameters>(req);
8787
var result = await _mediator.Send(new AskJoinCloudSessionRequest(client, parameters));
8888
var response = req.CreateResponse();
89-
await response.WriteAsJsonAsync(result, HttpStatusCode.OK);
89+
await response.WriteAsJsonAsync(result);
9090
return response;
9191
}
9292

‎src/ByteSync.Functions/Http/CloudSessionProfileFunction.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public async Task<HttpResponseData> CreateCloudSessionProfile(
2929
var result = await _cloudSessionProfileService.CreateCloudSessionProfile(sessionId, client);
3030

3131
var response = req.CreateResponse();
32-
await response.WriteAsJsonAsync(result, HttpStatusCode.OK);
32+
await response.WriteAsJsonAsync(result);
3333

3434
return response;
3535
}
@@ -47,7 +47,7 @@ public async Task<HttpResponseData> GetCloudSessionProfileData(
4747
var result = await _cloudSessionProfileService.GetCloudSessionProfileData(parameters, client);
4848

4949
var response = req.CreateResponse();
50-
await response.WriteAsJsonAsync(result, HttpStatusCode.OK);
50+
await response.WriteAsJsonAsync(result);
5151

5252
return response;
5353
}
@@ -63,7 +63,7 @@ public async Task<HttpResponseData> GetProfileDetailsPassword([HttpTrigger(
6363
var result = await _cloudSessionProfileService.GetProfileDetailsPassword(parameters, client);
6464

6565
var response = req.CreateResponse();
66-
await response.WriteAsJsonAsync(result, HttpStatusCode.OK);
66+
await response.WriteAsJsonAsync(result);
6767

6868
return response;
6969
}
@@ -79,7 +79,7 @@ public async Task<HttpResponseData> DeleteCloudSessionProfile([HttpTrigger(
7979
var result = await _cloudSessionProfileService.DeleteCloudSessionProfile(parameters, client);
8080

8181
var response = req.CreateResponse();
82-
await response.WriteAsJsonAsync(result, HttpStatusCode.OK);
82+
await response.WriteAsJsonAsync(result);
8383

8484
return response;
8585
}

0 commit comments

Comments
 (0)