Skip to content

Commit 4750668

Browse files
ch1seLch1seL
committed
update to 1.48.1
support net9.0 get rid of supporting of net6.0, net.7.0
1 parent cf19d5d commit 4750668

21 files changed

Lines changed: 612 additions & 610 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,8 @@ jobs:
6666
uses: actions/setup-dotnet@v4
6767
with:
6868
dotnet-version: |
69-
6.x
70-
7.x
7169
8.x
70+
9.x
7271
7372
- name: Restore
7473
run: dotnet restore -v normal

‎Directory.Build.props‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<PropertyGroup>
55
<LangVersion>latest</LangVersion>
66
<ImplicitUsings>true</ImplicitUsings>
7+
<NoWarn>xUnit1041</NoWarn>
78
</PropertyGroup>
89

910
</Project>

‎Directory.Packages.props‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@
33
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
44
</PropertyGroup>
55
<PropertyGroup>
6-
<RuntimeVersion Condition="'$(TargetFramework)' == 'net6.0'">6.0.25</RuntimeVersion>
7-
<RuntimeVersion Condition="'$(TargetFramework)' == 'net7.0'">7.0.14</RuntimeVersion>
86
<RuntimeVersion Condition="'$(TargetFramework)' == 'net8.0'">8.0.0</RuntimeVersion>
7+
<RuntimeVersion Condition="'$(TargetFramework)' == 'net9.0'">9.0.0</RuntimeVersion>
98
</PropertyGroup>
109
<ItemGroup>
1110
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="$(RuntimeVersion)" />
@@ -18,25 +17,25 @@
1817
<PackageVersion Include="EnumExtensions.System.Text.Json" Version="1.2.0" />
1918
<PackageVersion Include="FluentAssertions" Version="6.12.0" />
2019
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.10.0" />
21-
<PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0" />
22-
<PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="6.0.0" />
23-
<PackageVersion Include="Microsoft.Extensions.Configuration.UserSecrets" Version="6.0.0" />
24-
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
25-
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="6.0.0" />
26-
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="6.0.0" />
27-
<PackageVersion Include="Microsoft.Extensions.Http" Version="6.0.0" />
28-
<PackageVersion Include="Microsoft.Extensions.Logging" Version="6.0.0" />
29-
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0" />
30-
<PackageVersion Include="Microsoft.Extensions.Options" Version="6.0.0" />
31-
<PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="6.0.0" />
20+
<PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
21+
<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" />
30+
<PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
3231
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
3332
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
3433
<PackageVersion Include="Polly" Version="8.4.1" />
3534
<PackageVersion Include="Serilog.Extensions.Hosting" Version="8.0.0" />
3635
<PackageVersion Include="Serilog.Extensions.Logging" Version="8.0.0" />
3736
<PackageVersion Include="Serilog.Sinks.Console" Version="6.0.0" />
3837
<PackageVersion Include="Serilog.Sinks.XUnit" Version="3.0.5" />
39-
<PackageVersion Include="System.Text.Json" Version="7.0.0" />
38+
<PackageVersion Include="System.Text.Json" Version="8.0.5" />
4039
<PackageVersion Include="Testcontainers" Version="3.9.0" />
4140
<PackageVersion Include="Xunit.DependencyInjection" Version="8.7.1" />
4241
<PackageVersion Include="Xunit.DependencyInjection.Logging" Version="8.1.0" />
@@ -52,4 +51,4 @@
5251
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
5352
</PackageVersion>
5453
</ItemGroup>
55-
</Project>
54+
</Project>

‎PackageInfo.targets‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@
2323
</PropertyGroup>
2424

2525
<PropertyGroup>
26-
<PackageVersion Condition=" $(PackageVersion) == '' ">$(SDKVersion)$(PackageVersionPostfix)</PackageVersion>
27-
<AssemblyVersion Condition=" $(AssemblyVersion) == '' ">$(SDKVersion)</AssemblyVersion>
26+
<PackageVersion Condition=" $(PackageVersion) == '' ">$(SDK_Version)$(PackageVersionPostfix)</PackageVersion>
27+
<AssemblyVersion Condition=" $(AssemblyVersion) == '' ">$(SDK_Version)</AssemblyVersion>
2828
<RunNumber Condition=" $(RunNumber) == '' ">0</RunNumber>
29-
<FileVersion Condition=" $(FileVersion) == '' ">$(SDKVersion).$(RunNumber)</FileVersion>
29+
<FileVersion Condition=" $(FileVersion) == '' ">$(SDK_Version).$(RunNumber)</FileVersion>
3030
</PropertyGroup>
3131

3232
<PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">

‎SDKVersion.targets‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
<!-- used by tools\ClientGenerator (tools/api.json) -->
66
<!-- used by src\EverscaleNet.Adapter.Rust (runtime binaries) see DownloadLib.targets -->
77
<!-- used by src\EverscaleNet.Adapter.Wasm (runtime binaries) see DownloadLib.targets -->
8-
<SDKVersion>1.48.0</SDKVersion>
8+
<SDK_Version>1.48.1</SDK_Version>
9+
<SDK_JS_Version>1.48.0</SDK_JS_Version>
910
</PropertyGroup>
1011

1112
</Project>

‎global.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"sdk": {
3+
"version": "9.0.0",
4+
"rollForward": "latestMajor",
5+
"allowPrerelease": false
6+
}
7+
}

‎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>net8.0</TargetFramework>
5+
<TargetFramework>net9.0</TargetFramework>
66
<IsPackable>false</IsPackable>
77
<ImplicitUsings>enable</ImplicitUsings>
88
</PropertyGroup>

‎samples/TestingExample/BomberTests.cs‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,18 @@
55

66
namespace TestingExample;
77

8-
public class BomberTests : IAsyncLifetime {
8+
public class BomberTests(IEverClient everClient, IEverPackageManager packageManager, IEverGiver giver) : IAsyncLifetime {
99
private const decimal TopUpCoins = 2M;
1010
private const decimal SendEverCoins = 1M;
11-
private readonly IEverClient _everClient;
12-
private readonly IEverGiver _giver;
13-
private readonly IEverPackageManager _packageManager;
11+
12+
private readonly IEverClient _everClient = everClient;
13+
private readonly IEverGiver _giver = giver;
14+
private readonly IEverPackageManager _packageManager = packageManager;
1415
private Bomber _bomber;
1516
private decimal _bomberDeployFees;
1617
private Sink _sink;
1718
private decimal _sinkDeployFees;
1819

19-
public BomberTests(IEverClient everClient, IEverPackageManager packageManager, IEverGiver giver) {
20-
_everClient = everClient;
21-
_packageManager = packageManager;
22-
_giver = giver;
23-
}
24-
2520
public async Task InitializeAsync() {
2621
KeyPair keyPair = await _everClient.Crypto.GenerateRandomSignKeys();
2722
_bomber = new Bomber(_everClient, _packageManager);

‎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;net6.0;net7.0;net8.0</TargetFrameworks>
7+
<TargetFrameworks>netstandard2.1;net8.0;net9.0</TargetFrameworks>
88
<Nullable>enable</Nullable>
99
</PropertyGroup>
1010

‎src/EverscaleNet.Adapter.Rust/DownloadLib.targets‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
</ItemGroup>
77

88
<PropertyGroup>
9-
<_SDKVersionDenormalized>$([System.String]::Copy('$(SDKVersion)').Replace('.', '_'))</_SDKVersionDenormalized>
9+
<_SDKVersionDenormalized>$([System.String]::Copy('$(SDK_Version)').Replace('.', '_'))</_SDKVersionDenormalized>
1010

11-
<_GitHubReleaseUrl>https://github.com/tonlabs/ever-sdk/releases/download/$(SDKVersion)</_GitHubReleaseUrl>
11+
<_GitHubReleaseUrl>https://github.com/tonlabs/ever-sdk/releases/download/$(SDK_Version)</_GitHubReleaseUrl>
1212
<_TonLibDownloadUrlWin>$(_GitHubReleaseUrl)/tonclient_$(_SDKVersionDenormalized)_win32_dll.gz</_TonLibDownloadUrlWin>
1313
<_TonLibDownloadUrlLinux>$(_GitHubReleaseUrl)/tonclient_$(_SDKVersionDenormalized)_linux.gz</_TonLibDownloadUrlLinux>
1414
<_TonLibDownloadUrlMacOS>$(_GitHubReleaseUrl)/tonclient_$(_SDKVersionDenormalized)_darwin.gz</_TonLibDownloadUrlMacOS>
@@ -35,7 +35,7 @@
3535
</ItemGroup>
3636

3737
<Target Name="DownloadContentFiles" BeforeTargets="DispatchToInnerBuilds" Inputs="..\..\SDKVersion.targets" Outputs="@(LibFiles)">
38-
<Message Importance="high" Text="SDKVersion: $(SDKVersion)" />
38+
<Message Importance="high" Text="SDK_Version: $(SDK_Version)" />
3939
<MakeDir Directories="$(MSBuildThisFileDirectory)..\runtimes\win-x64\native\" />
4040
<DownloadFile SourceUrl="$(_TonLibDownloadUrlWin)" DestinationFolder="$(MSBuildThisFileDirectory)..\downloads\" DestinationFileName="tonclient_win32_dll.gz">
4141
<Output TaskParameter="DownloadedFile" ItemName="None" />

0 commit comments

Comments
 (0)