Skip to content

Commit 74419a4

Browse files
BobrisBobris
committed
Upgrade projects to target .NET 9.0 and update package references
1 parent d028a4a commit 74419a4

File tree

13 files changed

+75
-83
lines changed

13 files changed

+75
-83
lines changed

‎.github/workflows/dotnet.yml

+21-22
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,28 @@
11
name: .NET
22

33
on:
4-
push:
5-
branches: [ master ]
6-
pull_request:
7-
branches: [ master ]
4+
push:
5+
branches: [master]
6+
pull_request:
7+
branches: [master]
88

99
jobs:
10-
build:
10+
build:
11+
runs-on: ${{ matrix.os }}
1112

12-
runs-on: ${{ matrix.os }}
13+
strategy:
14+
matrix:
15+
os: [ubuntu-latest, windows-latest]
1316

14-
strategy:
15-
matrix:
16-
os: [ubuntu-latest, windows-latest]
17-
18-
steps:
19-
- uses: actions/checkout@v2
20-
- name: Setup .NET
21-
uses: actions/setup-dotnet@v1
22-
with:
23-
dotnet-version: 8.0.x
24-
- name: Restore dependencies
25-
run: dotnet restore
26-
- name: Build
27-
run: dotnet build --no-restore
28-
- name: Test
29-
run: dotnet test --no-build --verbosity normal
17+
steps:
18+
- uses: actions/checkout@v2
19+
- name: Setup .NET
20+
uses: actions/setup-dotnet@v1
21+
with:
22+
dotnet-version: 9.0.x
23+
- name: Restore dependencies
24+
run: dotnet restore
25+
- name: Build
26+
run: dotnet build --no-restore
27+
- name: Test
28+
run: dotnet test --no-build --verbosity normal

‎BTDB.SourceGenerator.Sample/BTDB.SourceGenerator.Sample.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22
<PropertyGroup>
33
<OutputType>Exe</OutputType>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
<TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
66
<LangVersion>preview</LangVersion>
77
<Nullable>enable</Nullable>

‎BTDB.SourceGenerator.Test/BTDB.SourceGenerator.Tests.csproj

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
<Nullable>enable</Nullable>
66

77
<IsPackable>false</IsPackable>
@@ -11,12 +11,12 @@
1111

1212
<ItemGroup>
1313
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing.XUnit" Version="1.1.2"/>
14-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.0"/>
14+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0"/>
1515
<PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.11.0"/>
1616
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.11.0"/>
17-
<PackageReference Include="Verify.SourceGenerators" Version="2.4.0"/>
18-
<PackageReference Include="Verify.Xunit" Version="26.2.0"/>
19-
<PackageReference Include="xunit" Version="2.9.0"/>
17+
<PackageReference Include="Verify.SourceGenerators" Version="2.5.0"/>
18+
<PackageReference Include="Verify.Xunit" Version="28.4.0"/>
19+
<PackageReference Include="xunit" Version="2.9.2"/>
2020
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
2121
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2222
<PrivateAssets>all</PrivateAssets>

‎BTDB.SourceGenerator/BTDB.SourceGenerator.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<ItemGroup>
2828
<None Include="../README.md" Pack="true" PackagePath="/"/>
2929
<None Include="$(OutputPath)\$(AssemblyName).dll" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false"/>
30-
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4">
30+
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0">
3131
<PrivateAssets>all</PrivateAssets>
3232
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3333
</PackageReference>

‎BTDB.SourceGenerator/HashCode.cs

+1-8
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ namespace BTDB.SourceGenerator;
1010
/// </summary>
1111
struct HashCode
1212
{
13-
static readonly uint s_seed = GenerateGlobalSeed();
13+
static readonly uint s_seed = 42;
1414

1515
const uint Prime1 = 2654435761U;
1616
const uint Prime2 = 2246822519U;
@@ -22,13 +22,6 @@ struct HashCode
2222
uint _queue1, _queue2, _queue3;
2323
uint _length;
2424

25-
static uint GenerateGlobalSeed()
26-
{
27-
var buffer = new byte[sizeof(uint)];
28-
new Random().NextBytes(buffer);
29-
return BitConverter.ToUInt32(buffer, 0);
30-
}
31-
3225
public static int Combine<T1>(T1 value1)
3326
{
3427
// Provide a way of diffusing bits from something with a limited

‎BTDB/BTDB.csproj

+1-1
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>net9.0</TargetFramework>
44
<TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
55
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
66
<LangVersion>latest</LangVersion>

‎BTDB/BTreeLib/RootNode12.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ public bool Reference()
131131
{
132132
while (true)
133133
{
134-
var original = Thread.VolatileRead(ref _referenceCount);
134+
var original = Volatile.Read(ref _referenceCount);
135135
if (original == 0)
136136
return true;
137137
if (Interlocked.CompareExchange(ref _referenceCount, original + 1, original) == original)

‎BTDBTest/BTDBTest.csproj

+3-3
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>net9.0</TargetFramework>
44
<TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
55
<LangVersion>latest</LangVersion>
66
<NoWarn>1701;1702;1720</NoWarn>
@@ -9,11 +9,11 @@
99
</PropertyGroup>
1010
<ItemGroup>
1111
<PackageReference Include="Assent" Version="2.3.2"/>
12-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.0"/>
12+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0"/>
1313
<PackageReference Include="System.Reactive" Version="6.0.1"/>
1414
<PackageReference Include="System.Reactive.Core" Version="6.0.1"/>
1515
<PackageReference Include="System.Reactive.Interfaces" Version="6.0.1"/>
16-
<PackageReference Include="xunit" Version="2.9.0"/>
16+
<PackageReference Include="xunit" Version="2.9.2"/>
1717
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
1818
<PrivateAssets>all</PrivateAssets>
1919
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

‎BTDBTest/ObjectDbTableUpgradeTest.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public void Dispose()
3232

3333
void ApproveFieldHandlerLoggerMessages([CallerMemberName] string? testName = null)
3434
{
35-
Assent.Extensions.Assent(this, string.Join('\n', _fieldHandlerLoggerMessages) + "\n", null, testName);
35+
Assent.Extensions.Assent(this, string.Join('\n', _fieldHandlerLoggerMessages.AsSpan()) + "\n", null, testName);
3636
_fieldHandlerLoggerMessages.Clear();
3737
}
3838

‎DBBenchmark/DBBenchmark.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<OutputType>Exe</OutputType>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
<TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
66
<Nullable>enable</Nullable>
77
</PropertyGroup>
@@ -10,6 +10,6 @@
1010
<ProjectReference Include="..\BTDB\BTDB.csproj"/>
1111
</ItemGroup>
1212
<ItemGroup>
13-
<PackageReference Include="LightningDB" Version="0.16.0"/>
13+
<PackageReference Include="LightningDB" Version="0.17.0"/>
1414
</ItemGroup>
1515
</Project>

‎ODbDump/ODbDump.csproj

+19-19
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
<PropertyGroup>
3-
<OutputType>Exe</OutputType>
4-
<TargetFramework>net8.0</TargetFramework>
5-
<TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
6-
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
7-
<LangVersion>latest</LangVersion>
8-
<Version>32.17.0</Version>
9-
<Authors>Boris Letocha, Lubos Karasek</Authors>
10-
<Nullable>enable</Nullable>
11-
</PropertyGroup>
12-
<ItemGroup>
13-
<ProjectReference Include="..\BTDB\BTDB.csproj" />
14-
</ItemGroup>
15-
<ItemGroup>
16-
<RuntimeHostConfigurationOption Include="System.Globalization.Invariant" Value="true" />
17-
</ItemGroup>
18-
<ItemGroup>
19-
<PackageReference Include="Crc32.NET" Version="1.2.0" />
20-
</ItemGroup>
2+
<PropertyGroup>
3+
<OutputType>Exe</OutputType>
4+
<TargetFramework>net9.0</TargetFramework>
5+
<TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
6+
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
7+
<LangVersion>latest</LangVersion>
8+
<Version>32.17.0</Version>
9+
<Authors>Boris Letocha, Lubos Karasek</Authors>
10+
<Nullable>enable</Nullable>
11+
</PropertyGroup>
12+
<ItemGroup>
13+
<ProjectReference Include="..\BTDB\BTDB.csproj"/>
14+
</ItemGroup>
15+
<ItemGroup>
16+
<RuntimeHostConfigurationOption Include="System.Globalization.Invariant" Value="true"/>
17+
</ItemGroup>
18+
<ItemGroup>
19+
<PackageReference Include="Crc32.NET" Version="1.2.0"/>
20+
</ItemGroup>
2121
</Project>

‎Releaser/Releaser/Releaser.csproj

+14-14
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
<PropertyGroup>
3-
<OutputType>Exe</OutputType>
4-
<TargetFramework>net8.0</TargetFramework>
5-
<TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
6-
</PropertyGroup>
7-
<ItemGroup>
8-
<Reference Include="Octokit">
9-
<HintPath>Octokit.dll</HintPath>
10-
</Reference>
11-
</ItemGroup>
12-
<ItemGroup>
13-
<PackageReference Include="LibGit2Sharp" Version="0.30.0" />
14-
<PackageReference Include="Octokit" Version="12.0.0" />
15-
</ItemGroup>
2+
<PropertyGroup>
3+
<OutputType>Exe</OutputType>
4+
<TargetFramework>net9.0</TargetFramework>
5+
<TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
6+
</PropertyGroup>
7+
<ItemGroup>
8+
<Reference Include="Octokit">
9+
<HintPath>Octokit.dll</HintPath>
10+
</Reference>
11+
</ItemGroup>
12+
<ItemGroup>
13+
<PackageReference Include="LibGit2Sharp" Version="0.31.0"/>
14+
<PackageReference Include="Octokit" Version="13.0.1"/>
15+
</ItemGroup>
1616
</Project>

‎SimpleTester/SimpleTester.csproj

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<OutputType>Exe</OutputType>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
<TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
66
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
77
<DebugType>embedded</DebugType>
88
<DebugSymbols>true</DebugSymbols>
99
<Nullable>enable</Nullable>
1010
</PropertyGroup>
1111
<ItemGroup>
12-
<PackageReference Include="BenchmarkDotNet" Version="0.13.12" />
13-
<PackageReference Include="Disruptor" Version="5.0.0"/>
14-
<PackageReference Include="FluentAssertions" Version="6.12.0"/>
12+
<PackageReference Include="BenchmarkDotNet" Version="0.14.0"/>
13+
<PackageReference Include="Disruptor" Version="6.0.0"/>
14+
<PackageReference Include="FluentAssertions" Version="7.0.0"/>
1515
<PackageReference Include="HdrHistogram" Version="2.5.0"/>
16-
<PackageReference Include="protobuf-net" Version="3.2.30"/>
16+
<PackageReference Include="protobuf-net" Version="3.2.45"/>
1717
<PackageReference Include="TerraFX.Interop.Mimalloc" Version="1.6.7.1"/>
1818
<PackageReference Include="XXHash.Managed" Version="1.5.0"/>
1919
</ItemGroup>

0 commit comments

Comments
 (0)