Skip to content

Commit 4f4b232

Browse files
ch1seLch1seL
committed
add Net 10 support
1 parent f7367e4 commit 4f4b232

11 files changed

Lines changed: 36 additions & 60 deletions

File tree

‎Directory.Packages.props‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
<PropertyGroup>
66
<RuntimeVersion Condition="'$(TargetFramework)' == 'net8.0'">8.0.0</RuntimeVersion>
77
<RuntimeVersion Condition="'$(TargetFramework)' == 'net9.0'">9.0.0</RuntimeVersion>
8+
<RuntimeVersion Condition="'$(TargetFramework)' == 'net10.0'">10.0.0</RuntimeVersion>
89
</PropertyGroup>
910
<ItemGroup>
1011
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="$(RuntimeVersion)" />
1112
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="$(RuntimeVersion)" />
1213
<PackageVersion Include="Microsoft.JSInterop" Version="$(RuntimeVersion)" />
13-
<PackageVersion Include="Shouldly" Version="4.3.0" />
1414
</ItemGroup>
1515
<ItemGroup>
1616
<PackageVersion Include="BenchmarkDotNet" Version="0.14.0" />
@@ -19,14 +19,14 @@
1919
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.11.0" />
2020
<PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
2121
<PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.0" />
22-
<PackageVersion Include="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.1" />
23-
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
24-
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
25-
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.1" />
26-
<PackageVersion Include="Microsoft.Extensions.Http" Version="8.0.1" />
27-
<PackageVersion Include="Microsoft.Extensions.Logging" Version="8.0.1" />
28-
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.2" />
29-
<PackageVersion Include="Microsoft.Extensions.Options" Version="8.0.2" />
22+
<PackageVersion Include="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.0" />
23+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
24+
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
25+
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0" />
26+
<PackageVersion Include="Microsoft.Extensions.Http" Version="8.0.0" />
27+
<PackageVersion Include="Microsoft.Extensions.Logging" Version="8.0.0" />
28+
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
29+
<PackageVersion Include="Microsoft.Extensions.Options" Version="8.0.0" />
3030
<PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
3131
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
3232
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
@@ -35,6 +35,7 @@
3535
<PackageVersion Include="Serilog.Extensions.Logging" Version="8.0.0" />
3636
<PackageVersion Include="Serilog.Sinks.Console" Version="6.0.0" />
3737
<PackageVersion Include="Serilog.Sinks.XUnit" Version="3.0.5" />
38+
<PackageVersion Include="Shouldly" Version="4.3.0" />
3839
<PackageVersion Include="System.Text.Json" Version="8.0.5" />
3940
<PackageVersion Include="Testcontainers" Version="4.0.0" />
4041
<PackageVersion Include="Xunit.DependencyInjection" Version="8.7.1" />

‎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": "9.0.0",
3+
"version": "10.0.0",
44
"rollForward": "latestMajor",
55
"allowPrerelease": false
66
}

‎samples/BlazorApp/App.razor‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,4 @@
33
<RouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)"/>
44
<FocusOnNavigate RouteData="@routeData" Selector="h1"/>
55
</Found>
6-
<NotFound>
7-
<PageTitle>Not found</PageTitle>
8-
<LayoutView Layout="@typeof(MainLayout)">
9-
<p role="alert">Sorry, there's nothing at this address.</p>
10-
</LayoutView>
11-
</NotFound>
126
</Router>

‎samples/Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
33

44
<PropertyGroup>
5-
<TargetFramework>net9.0</TargetFramework>
5+
<TargetFramework>net10.0</TargetFramework>
66
<IsPackable>false</IsPackable>
77
<ImplicitUsings>enable</ImplicitUsings>
88
</PropertyGroup>

‎samples/TestingExample/BomberTests.cs‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,25 +10,22 @@ public class BomberTests(IEverClient everClient, IEverPackageManager packageMana
1010
private const decimal TopUpCoins = 2M;
1111
private const decimal SendEverCoins = 1M;
1212

13-
private readonly IEverClient _everClient = everClient;
14-
private readonly IEverGiver _giver = giver;
15-
private readonly IEverPackageManager _packageManager = packageManager;
1613
private Bomber _bomber;
1714
private decimal _bomberDeployFees;
1815
private Sink _sink;
1916
private decimal _sinkDeployFees;
2017

2118
public async Task InitializeAsync() {
22-
KeyPair keyPair = await _everClient.Crypto.GenerateRandomSignKeys();
23-
_bomber = new Bomber(_everClient, _packageManager);
24-
_sink = new Sink(_everClient, _packageManager);
19+
KeyPair keyPair = await everClient.Crypto.GenerateRandomSignKeys();
20+
_bomber = new Bomber(everClient, packageManager);
21+
_sink = new Sink(everClient, packageManager);
2522
await Task.WhenAll(
2623
_bomber.Init(keyPair),
2724
_sink.Init(keyPair)
2825
);
2926
await Task.WhenAll(
30-
_giver.SendTransaction(_bomber.Address, TopUpCoins),
31-
_giver.SendTransaction(_sink.Address, TopUpCoins)
27+
giver.SendTransaction(_bomber.Address, TopUpCoins),
28+
giver.SendTransaction(_sink.Address, TopUpCoins)
3229
);
3330
var bomberDeployTask = _bomber.Deploy();
3431
var sinkDeployTask = _sink.Deploy();

‎samples/TestingExample/CalculatorExternalTests.cs‎

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,16 @@
55

66
namespace TestingExample;
77

8-
public class CalculatorExternalTests : IAsyncLifetime {
9-
private readonly IEverClient _everClient;
10-
private readonly IEverGiver _giver;
11-
private readonly IEverPackageManager _packageManager;
8+
public class CalculatorExternalTests(IEverClient everClient, IEverPackageManager packageManager, IEverGiver giver)
9+
: IAsyncLifetime {
1210
private CalculatorExternal _calculator;
1311
private KeyPair _keyPair;
1412

15-
public CalculatorExternalTests(IEverClient everClient, IEverPackageManager packageManager, IEverGiver giver) {
16-
_everClient = everClient;
17-
_packageManager = packageManager;
18-
_giver = giver;
19-
}
20-
2113
public async Task InitializeAsync() {
22-
_keyPair = await _everClient.Crypto.GenerateRandomSignKeys();
23-
_calculator = new CalculatorExternal(_everClient, _packageManager);
14+
_keyPair = await everClient.Crypto.GenerateRandomSignKeys();
15+
_calculator = new CalculatorExternal(everClient, packageManager);
2416
await _calculator.Init(_keyPair);
25-
await _giver.SendTransaction(_calculator.Address, 10m);
17+
await giver.SendTransaction(_calculator.Address, 10m);
2618
await _calculator.Deploy();
2719
}
2820

@@ -71,8 +63,8 @@ public async Task Subtract100_ReturnsMinus100() {
7163

7264
[Fact]
7365
public async Task AnotherPubkeyHasNoAccess() {
74-
KeyPair keyPair = await _everClient.Crypto.GenerateRandomSignKeys();
75-
var calculatorAccount = new CalculatorExternal(_everClient, _packageManager);
66+
KeyPair keyPair = await everClient.Crypto.GenerateRandomSignKeys();
67+
var calculatorAccount = new CalculatorExternal(everClient, packageManager);
7668
await calculatorAccount.Init(_keyPair.Public);
7769
await calculatorAccount.Init(keyPair); // Reinit with another signer
7870

‎samples/TestingExample/CalculatorInternalTests.cs‎

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,35 +7,27 @@
77

88
namespace TestingExample;
99

10-
public class CalculatorInternalTests : IAsyncLifetime {
11-
private readonly IEverClient _everClient;
12-
private readonly IEverGiver _giver;
13-
private readonly IEverPackageManager _packageManager;
10+
public class CalculatorInternalTests(IEverClient everClient, IEverPackageManager packageManager, IEverGiver giver)
11+
: IAsyncLifetime {
1412
private CalculatorInternal _calculator;
1513
private IMultisigAccount _multisig;
1614

17-
public CalculatorInternalTests(IEverClient everClient, IEverPackageManager packageManager, IEverGiver giver) {
18-
_everClient = everClient;
19-
_packageManager = packageManager;
20-
_giver = giver;
21-
}
22-
2315
public async Task InitializeAsync() {
2416
_multisig = await CreateMultisig();
25-
_calculator = new CalculatorInternal(_everClient, _packageManager);
17+
_calculator = new CalculatorInternal(everClient, packageManager);
2618
await _calculator.Init(_multisig, new { owner_ = _multisig.Address });
2719
await _calculator.Deploy();
2820
}
2921

3022
public async Task DisposeAsync() {
31-
await _multisig.SubmitTransaction(_giver.Address, 0, false, true, string.Empty);
23+
await _multisig.SubmitTransaction(giver.Address, 0, false, true, string.Empty);
3224
}
3325

3426
private async Task<IMultisigAccount> CreateMultisig(decimal coins = 20m) {
35-
var multisig = new SafeMultisigAccount(_everClient, _packageManager);
36-
KeyPair keyPair = await _everClient.Crypto.GenerateRandomSignKeys();
27+
var multisig = new SafeMultisigAccount(everClient, packageManager);
28+
KeyPair keyPair = await everClient.Crypto.GenerateRandomSignKeys();
3729
await multisig.Init(keyPair);
38-
await _giver.SendTransaction(multisig.Address, coins);
30+
await giver.SendTransaction(multisig.Address, coins);
3931
await multisig.Deploy([keyPair.Public], 1, TimeSpan.FromHours(1));
4032
return multisig;
4133
}
@@ -76,7 +68,7 @@ await Parallel.ForEachAsync(
7668
[Fact]
7769
public async Task AnotherMultisigHasNoAccess() {
7870
IMultisigAccount anotherMultisig = await CreateMultisig();
79-
var calculatorWithAnotherMultisig = new CalculatorInternal(_everClient, _packageManager, _calculator.Address);
71+
var calculatorWithAnotherMultisig = new CalculatorInternal(everClient, packageManager, _calculator.Address);
8072
await calculatorWithAnotherMultisig.Init(anotherMultisig, new { owner_ = _multisig.Address });
8173

8274
await _calculator.Add(1);

‎src/Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<Import Project="..\PackageInfo.targets" />
55

66
<PropertyGroup>
7-
<TargetFrameworks>netstandard2.1;net8.0;net9.0</TargetFrameworks>
7+
<TargetFrameworks>netstandard2.1;net8.0;net9.0;net10.0</TargetFrameworks>
88
<Nullable>enable</Nullable>
99
</PropertyGroup>
1010

‎src/EverscaleNet.Adapter.Wasm/EverscaleNet.Adapter.Wasm.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.Razor">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
4+
<TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
55
</PropertyGroup>
66

77
<Import Project="DownloadLib.targets" />

‎src/EverscaleNet.WebClient/EverscaleNet.WebClient.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">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
4+
<TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
55
</PropertyGroup>
66

77
<ItemGroup>

0 commit comments

Comments
 (0)