Skip to content

Commit 615c1ef

Browse files
upgrade packages; upgrade pipeline
minor minor minor update minver
1 parent efbf3aa commit 615c1ef

File tree

10 files changed

+60
-59
lines changed

10 files changed

+60
-59
lines changed

.github/workflows/build.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ on:
1414

1515
jobs:
1616
build:
17-
runs-on: ubuntu-22.04
17+
runs-on: ubuntu-24.04
1818
steps:
1919
- uses: actions/checkout@v2
2020
with:
@@ -23,18 +23,18 @@ jobs:
2323
uses: actions/setup-java@v1
2424
with:
2525
java-version: 11.0.x
26-
- name: Setup .NET 6.0
26+
- name: Setup .NET 9.0
2727
uses: actions/setup-dotnet@v1
2828
with:
29-
dotnet-version: 6.0.x
30-
- name: Setup .NET 3.1
29+
dotnet-version: 9.0.x
30+
- name: Setup .NET 8.0
3131
uses: actions/setup-dotnet@v1
3232
with:
33-
dotnet-version: 3.1.x
34-
- name: Setup .NET 2.0
33+
dotnet-version: 8.0.x
34+
- name: Setup .NET 2.1
3535
uses: actions/setup-dotnet@v1
3636
with:
37-
dotnet-version: 2.x.x
37+
dotnet-version: 2.1.x
3838
- name: Restore tools
3939
run: dotnet tool restore
4040
- name: Run the build script

.github/workflows/publish.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ on:
2020
default: 'false'
2121
jobs:
2222
publish:
23-
runs-on: ubuntu-22.04
23+
runs-on: ubuntu-24.04
2424
steps:
2525
- uses: actions/checkout@v2
2626
with:
@@ -29,18 +29,18 @@ jobs:
2929
uses: actions/setup-java@v1
3030
with:
3131
java-version: 11.0.x
32-
- name: Setup .NET 6.0
32+
- name: Setup .NET 9.0
3333
uses: actions/setup-dotnet@v1
3434
with:
35-
dotnet-version: 6.0.x
36-
- name: Setup .NET 3.1
35+
dotnet-version: 9.0.x
36+
- name: Setup .NET 8.0
3737
uses: actions/setup-dotnet@v1
3838
with:
39-
dotnet-version: 3.1.x
40-
- name: Setup .NET 2.0
39+
dotnet-version: 8.0.x
40+
- name: Setup .NET 2.1
4141
uses: actions/setup-dotnet@v1
4242
with:
43-
dotnet-version: 2.x.x
43+
dotnet-version: 2.1.x
4444
- name: Restore tools
4545
run: dotnet tool restore
4646
- name: Run the build script

examples/MvcExample/MvcExample.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "6.0.100",
3+
"version": "9.0.100",
44
"rollForward": "latestMinor"
55
}
66
}

src/TrueLayer/TrueLayer.csproj

Lines changed: 30 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,32 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
<PropertyGroup>
3-
<TargetFrameworks>net6.0;netstandard2.1</TargetFrameworks>
4-
<RootNamespace>TrueLayer</RootNamespace>
5-
<AssemblyName>TrueLayer.Client</AssemblyName>
6-
<PackageId>TrueLayer.Client</PackageId>
7-
<Description>.NET client for the TrueLayer API</Description>
8-
<PackageIcon>icon.png</PackageIcon>
9-
<LangVersion>latest</LangVersion>
10-
<Authors>TrueLayer</Authors>
11-
<Company>TrueLayer</Company>
12-
<RepositoryUrl>https://github.com/TrueLayer/truelayer-dotnet</RepositoryUrl>
13-
</PropertyGroup>
14-
<ItemGroup>
15-
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0" />
16-
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="5.0.0" />
17-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="5.0.0" />
18-
<PackageReference Include="Microsoft.Extensions.Http" Version="5.0.0" />
19-
<PackageReference Include="jose-jwt" Version="3.2.0" />
20-
<PackageReference Include="OneOf" Version="3.0.201" />
21-
<PackageReference Include="TrueLayer.Signing" Version="0.1.11" />
22-
</ItemGroup>
23-
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.1' ">
24-
<PackageReference Include="System.Text.Json" Version="[5.0.2,6.0)" />
25-
<PackageReference Include="Microsoft.CSharp" Version="[4.7,5.0)" />
26-
<PackageReference Include="System.ComponentModel.Annotations" Version="[4.7,6.0]" />
27-
</ItemGroup>
28-
<ItemGroup>
29-
<None Include="..\shared\icon.png" Pack="true" PackagePath="\" />
30-
</ItemGroup>
2+
<PropertyGroup>
3+
<TargetFrameworks>net9.0;net8.0;netstandard2.1</TargetFrameworks>
4+
<RootNamespace>TrueLayer</RootNamespace>
5+
<AssemblyName>TrueLayer.Client</AssemblyName>
6+
<PackageId>TrueLayer.Client</PackageId>
7+
<Description>.NET client for the TrueLayer API</Description>
8+
<PackageIcon>icon.png</PackageIcon>
9+
<LangVersion>latest</LangVersion>
10+
<Authors>TrueLayer</Authors>
11+
<Company>TrueLayer</Company>
12+
<RepositoryUrl>https://github.com/TrueLayer/truelayer-dotnet</RepositoryUrl>
13+
</PropertyGroup>
14+
<ItemGroup>
15+
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.0"/>
16+
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.0"/>
17+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.0"/>
18+
<PackageReference Include="Microsoft.Extensions.Http" Version="9.0.0"/>
19+
<PackageReference Include="System.Text.Json" Version="9.0.0"/>
20+
<PackageReference Include="OneOf" Version="3.0.271"/>
21+
<PackageReference Include="TrueLayer.Signing" Version="0.1.15"/>
22+
<PackageReference Update="MinVer" Version="6.0.0" />
23+
</ItemGroup>
24+
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.1' ">
25+
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
26+
<PackageReference Include="System.Text.Json" Version="[5.0.2,6.0)"/>
27+
<PackageReference Include="Microsoft.CSharp" Version="[4.7,5.0)"/>
28+
</ItemGroup>
29+
<ItemGroup>
30+
<None Include="..\shared\icon.png" Pack="true" PackagePath="\"/>
31+
</ItemGroup>
3132
</Project>

test/TrueLayer.AcceptanceTests/ApiTestFixture.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public ApiTestFixture()
3131

3232
private static IConfiguration LoadConfiguration()
3333
=> new ConfigurationBuilder()
34-
.SetBasePath(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location))
34+
.SetBasePath(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location)!)
3535
.AddJsonFile("appsettings.json")
3636
.AddJsonFile("appsettings.local.json", true)
3737
.AddEnvironmentVariables()

test/TrueLayer.AcceptanceTests/TrueLayer.AcceptanceTests.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net6.0</TargetFramework>
3+
<TargetFramework>net9.0</TargetFramework>
44
<IsPackable>false</IsPackable>
55
<RootNamespace>TrueLayer.AcceptanceTests</RootNamespace>
66
<AssemblyName>TrueLayer.AcceptanceTests</AssemblyName>
@@ -19,8 +19,8 @@
1919
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2020
<PrivateAssets>all</PrivateAssets>
2121
</PackageReference>
22-
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="6.0.0" />
23-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
22+
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.0" />
23+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.0" />
2424
<PackageReference Include="Moq" Version="4.16.1" />
2525
</ItemGroup>
2626
<ItemGroup>

test/TrueLayer.Benchmarks/TrueLayer.Benchmarks.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<OutputType>Exe</OutputType>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
<Nullable>enable</Nullable>
66
<WarningsAsErrors>nullable;</WarningsAsErrors>
77
</PropertyGroup>
88
<ItemGroup>
9-
<PackageReference Include="BenchmarkDotNet" Version="0.13.1"/>
9+
<PackageReference Include="BenchmarkDotNet" Version="0.14.0" />
1010
</ItemGroup>
1111
<ItemGroup>
1212
<ProjectReference Include="..\..\src\TrueLayer\TrueLayer.csproj"/>

test/TrueLayer.Tests/TrueLayer.Tests.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net6.0</TargetFramework>
3+
<TargetFramework>net9.0</TargetFramework>
44
<IsPackable>false</IsPackable>
55
<Nullable>enable</Nullable>
66
<WarningsAsErrors>nullable;</WarningsAsErrors>
@@ -18,7 +18,7 @@
1818
</PackageReference>
1919
<PackageReference Include="FluentAssertions" Version="6.12.2"/>
2020
<PackageReference Include="RichardSzalay.MockHttp" Version="7.0.0" />
21-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.0"/>
21+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.0" />
2222
<PackageReference Include="Moq" Version="4.20.72"/>
2323
</ItemGroup>
2424
<ItemGroup>

test/TrueLayer.Tests/TrueLayerServiceCollectionExtensionsTests.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ public void Should_register_truelayer_client()
2020
WS1/11+TH1x/lgKckAws6sAzJLPtCUZLV4IZTb6ENg==
2121
-----END EC PRIVATE KEY-----";
2222
var configuration = new ConfigurationBuilder()
23-
.AddInMemoryCollection(new KeyValuePair<string, string>[] {
24-
new("TrueLayer:ClientId", "client_id"),
25-
new("TrueLayer:ClientSecret", "secret"),
26-
new("TrueLayer:Payments:SigningKey:KeyId", Guid.NewGuid().ToString()),
27-
new("TrueLayer:Payments:SigningKey:PrivateKey", privateKey),
28-
})
23+
.AddInMemoryCollection([
24+
new KeyValuePair<string, string?>("TrueLayer:ClientId", "client_id"),
25+
new KeyValuePair<string, string?>("TrueLayer:ClientSecret", "secret"),
26+
new KeyValuePair<string, string?>("TrueLayer:Payments:SigningKey:KeyId", Guid.NewGuid().ToString()),
27+
new KeyValuePair<string, string?>("TrueLayer:Payments:SigningKey:PrivateKey", privateKey)
28+
])
2929
.Build();
3030
var services = new ServiceCollection()
3131
.AddTrueLayer(configuration)

0 commit comments

Comments
 (0)