Skip to content

Commit 7ae0a3b

Browse files
ibakuradzeibakuradze
authored
Merge pull request #29 from TBCBank/feature/upgrade-packages
upgrade nuget packages, upgrade to net9
2 parents e16dba9 + 45698c1 commit 7ae0a3b

File tree

55 files changed

+324
-447
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+324
-447
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ For more details see examples in repo:
143143
​
144144
​
145145

146-
[CoreApiAppExmaple](https://github.com/TBCBank/TBC.OpenAPI.SDK.OnlineInstallments/tree/master/examples/CoreApiAppExmaple)
146+
[CoreApiAppExample](https://github.com/TBCBank/TBC.OpenAPI.SDK.OnlineInstallments/tree/master/examples/CoreApiAppExample)
147147
​
148148

149149
[CoreConsoleAppExample](https://github.com/TBCBank/TBC.OpenAPI.SDK.OnlineInstallments/tree/master/examples/CoreConsoleAppExample)

‎TBC.OpenAPI.SDK.OnlineInstallments.sln‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TBC.OpenAPI.SDK.OnlineInsta
1313
EndProject
1414
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "examples", "examples", "{9E5C89E6-D2CA-488B-A78A-DA207CFD249B}"
1515
EndProject
16-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CoreApiAppExmaple", "examples\CoreApiAppExmaple\CoreApiAppExmaple.csproj", "{B9B02ED7-CF2C-472A-8C40-9750432C84E3}"
17-
EndProject
1816
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CoreConsoleAppExample", "examples\CoreConsoleAppExample\CoreConsoleAppExample.csproj", "{5B0E931E-8A8D-4575-ACCA-BE45CD29878B}"
1917
EndProject
2018
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetFrameworkExample", "examples\NetFrameworkExample\NetFrameworkExample.csproj", "{D30BABF9-AB3F-4A79-A8DF-822A760B50E1}"
@@ -34,6 +32,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflow", "workflow", "{A2
3432
nuget.yml = nuget.yml
3533
EndProjectSection
3634
EndProject
35+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CoreApiAppExample", "examples\CoreApiAppExample\CoreApiAppExample.csproj", "{8998EA34-4BE4-75E6-DE23-7EDFBC0201E2}"
36+
EndProject
3737
Global
3838
GlobalSection(SolutionConfigurationPlatforms) = preSolution
3939
Debug|Any CPU = Debug|Any CPU
@@ -48,10 +48,6 @@ Global
4848
{41293B3D-6929-49AA-9755-F3F8BEE5FD1D}.Debug|Any CPU.Build.0 = Debug|Any CPU
4949
{41293B3D-6929-49AA-9755-F3F8BEE5FD1D}.Release|Any CPU.ActiveCfg = Release|Any CPU
5050
{41293B3D-6929-49AA-9755-F3F8BEE5FD1D}.Release|Any CPU.Build.0 = Release|Any CPU
51-
{B9B02ED7-CF2C-472A-8C40-9750432C84E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
52-
{B9B02ED7-CF2C-472A-8C40-9750432C84E3}.Debug|Any CPU.Build.0 = Debug|Any CPU
53-
{B9B02ED7-CF2C-472A-8C40-9750432C84E3}.Release|Any CPU.ActiveCfg = Release|Any CPU
54-
{B9B02ED7-CF2C-472A-8C40-9750432C84E3}.Release|Any CPU.Build.0 = Release|Any CPU
5551
{5B0E931E-8A8D-4575-ACCA-BE45CD29878B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
5652
{5B0E931E-8A8D-4575-ACCA-BE45CD29878B}.Debug|Any CPU.Build.0 = Debug|Any CPU
5753
{5B0E931E-8A8D-4575-ACCA-BE45CD29878B}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -60,17 +56,21 @@ Global
6056
{D30BABF9-AB3F-4A79-A8DF-822A760B50E1}.Debug|Any CPU.Build.0 = Debug|Any CPU
6157
{D30BABF9-AB3F-4A79-A8DF-822A760B50E1}.Release|Any CPU.ActiveCfg = Release|Any CPU
6258
{D30BABF9-AB3F-4A79-A8DF-822A760B50E1}.Release|Any CPU.Build.0 = Release|Any CPU
59+
{8998EA34-4BE4-75E6-DE23-7EDFBC0201E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
60+
{8998EA34-4BE4-75E6-DE23-7EDFBC0201E2}.Debug|Any CPU.Build.0 = Debug|Any CPU
61+
{8998EA34-4BE4-75E6-DE23-7EDFBC0201E2}.Release|Any CPU.ActiveCfg = Release|Any CPU
62+
{8998EA34-4BE4-75E6-DE23-7EDFBC0201E2}.Release|Any CPU.Build.0 = Release|Any CPU
6363
EndGlobalSection
6464
GlobalSection(SolutionProperties) = preSolution
6565
HideSolutionNode = FALSE
6666
EndGlobalSection
6767
GlobalSection(NestedProjects) = preSolution
6868
{A10B4F21-4F48-4050-AD60-125AACDBFA08} = {A68DEA01-B311-4657-A87F-4F835E267313}
6969
{41293B3D-6929-49AA-9755-F3F8BEE5FD1D} = {10523430-313D-4B94-ACA6-1846DBF0B6C2}
70-
{B9B02ED7-CF2C-472A-8C40-9750432C84E3} = {9E5C89E6-D2CA-488B-A78A-DA207CFD249B}
7170
{5B0E931E-8A8D-4575-ACCA-BE45CD29878B} = {9E5C89E6-D2CA-488B-A78A-DA207CFD249B}
7271
{D30BABF9-AB3F-4A79-A8DF-822A760B50E1} = {9E5C89E6-D2CA-488B-A78A-DA207CFD249B}
7372
{A2E6D19C-8C74-4AAE-A6BA-91DF551EFF80} = {01D7BE5F-1C04-4675-A656-8D39C49007BB}
73+
{8998EA34-4BE4-75E6-DE23-7EDFBC0201E2} = {9E5C89E6-D2CA-488B-A78A-DA207CFD249B}
7474
EndGlobalSection
7575
GlobalSection(ExtensibilityGlobals) = postSolution
7676
SolutionGuid = {0E5B0916-B46E-4846-B9CE-36EE4A88DDC6}

‎codeql-analysis.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,13 @@ jobs:
4242

4343
steps:
4444
- name: Checkout repository
45-
uses: actions/checkout@v3
45+
uses: actions/checkout@v4
4646
with:
4747
fetch-depth: 2
4848

4949
# Initializes the CodeQL tools for scanning.
5050
- name: Initialize CodeQL
51-
uses: github/codeql-action/init@v2
51+
uses: github/codeql-action/init@v3
5252
with:
5353
languages: ${{ matrix.language }}
5454
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -57,9 +57,9 @@ jobs:
5757
# queries: ./path/to/local/query, your-org/your-repo/queries@main
5858

5959
- name: Setup .NET SDK
60-
uses: actions/setup-dotnet@v2
60+
uses: actions/setup-dotnet@v4
6161
with:
62-
dotnet-version: 6.0.x
62+
dotnet-version: 9.0.x
6363
include-prerelease: false
6464

6565
- name: Remove net framework example project
@@ -85,4 +85,4 @@ jobs:
8585
# make release
8686

8787
- name: Perform CodeQL Analysis
88-
uses: github/codeql-action/analyze@v2
88+
uses: github/codeql-action/analyze@v3

‎dependency-review.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ jobs:
99
runs-on: ubuntu-latest
1010
steps:
1111
- name: 'Checkout Repository'
12-
uses: actions/checkout@v3
12+
uses: actions/checkout@v4
1313
- name: 'Dependency Review'
14-
uses: actions/dependency-review-action@v1
14+
uses: actions/dependency-review-action@v4

examples/CoreApiAppExmaple/Controllers/TestController.cs renamed to examples/CoreApiAppExample/Controllers/TestController.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
using TBC.OpenAPI.SDK.OnlineInstallments.Models.Requests;
44
using TBC.OpenAPI.SDK.OnlineInstallments.Models.Responses;
55

6-
namespace CoreApiAppExmaple.Controllers
6+
namespace CoreApiAppExample.Controllers
77
{
88
[ApiController]
99
[Route("[controller]")]
@@ -17,9 +17,9 @@ public TestController(IOnlineInstallmentsClient onlineInstallmentsClient)
1717
}
1818

1919
[HttpGet]
20-
public async Task<ActionResult<GetApplicationStatusResponse>> GetApplicationStatus(GetApplicationStatusRequest model, CancellationToken cancellationToken = default)
20+
public async Task<ActionResult<GetApplicationStatusResponse>> GetApplicationStatus([FromQuery] string sessionId, [FromHeader] string merchantKey, CancellationToken cancellationToken = default)
2121
{
22-
var result = await _onlineInstallmentsClient.GetApplicationStatus(model, cancellationToken);
22+
var result = await _onlineInstallmentsClient.GetApplicationStatus(new GetApplicationStatusRequest { SessionId = sessionId, MerchantKey = merchantKey }, cancellationToken);
2323

2424
return Ok(result);
2525
}

examples/CoreApiAppExmaple/CoreApiAppExmaple.csproj renamed to examples/CoreApiAppExample/CoreApiAppExample.csproj

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

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
<Nullable>enable</Nullable>
66
<ImplicitUsings>enable</ImplicitUsings>
7+
<UserSecretsId>40bd5f8c-3a77-4c15-9812-fcbb6f223d91</UserSecretsId>
78
</PropertyGroup>
89

910
<ItemGroup>
10-
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
11+
<PackageReference Include="Swashbuckle.AspNetCore" Version="10.0.1" />
1112
</ItemGroup>
1213

1314
<ItemGroup>

examples/CoreApiAppExmaple/Program.cs renamed to examples/CoreApiAppExample/Program.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
// Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
1010
builder.Services.AddEndpointsApiExplorer();
1111
builder.Services.AddSwaggerGen();
12-
1312
builder.Services.AddOnlineInstallmentsClient(builder.Configuration.GetSection("OnlineInstallments").Get<OnlineInstallmentsClientOptions>());
13+
builder.Services.Configure<OnlineInstallmentsClientOptions>(builder.Configuration.GetSection("OnlineInstallments"));
1414

1515
var app = builder.Build();
1616

examples/CoreApiAppExmaple/Properties/launchSettings.json renamed to examples/CoreApiAppExample/Properties/launchSettings.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
}
1010
},
1111
"profiles": {
12-
"CoreApiAppExmaple": {
12+
"CoreApiAppExample": {
1313
"commandName": "Project",
1414
"dotnetRunMessages": true,
1515
"launchBrowser": true,

examples/CoreApiAppExmaple/appsettings.Development.json renamed to examples/CoreApiAppExample/appsettings.Development.json

File renamed without changes.

examples/CoreApiAppExmaple/appsettings.json renamed to examples/CoreApiAppExample/appsettings.json

File renamed without changes.

0 commit comments

Comments
 (0)