Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to .NET 8 #73

Merged
merged 4 commits into from
Jan 14, 2024
Merged

Upgrade to .NET 8 #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2bae186
Upgrade to .NET 8
gdlcf88 Jan 14, 2024
5f13720
Change version to `1.3.0`
gdlcf88 Jan 14, 2024
725f1c1
Fix .NET format issues
gdlcf88 Jan 14, 2024
1ab7377
Merge branch 'main' into net8
gdlcf88 Jan 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
<Project>
<PropertyGroup>

<GrpcVersion>2.51.0</GrpcVersion>
<GoogleProtobufVersion>3.21.12</GoogleProtobufVersion>
<GrpcVersion>2.60.0</GrpcVersion>
<GoogleProtobufVersion>3.25.2</GoogleProtobufVersion>

<EfCoreVersion>7.0.1</EfCoreVersion>
<EfCoreVersionForNet6>6.0.9</EfCoreVersionForNet6>
<EfCoreVersion>8.0.1</EfCoreVersion>
<EfCoreVersionForNet6>6.0.26</EfCoreVersionForNet6>
<EfCoreVersionForNetStandard21>5.0.17</EfCoreVersionForNetStandard21>

<DapperVersion>2.0.123</DapperVersion>
<MongoDbDriverVersion>2.18.0</MongoDbDriverVersion>
<DapperVersion>2.1.28</DapperVersion>
<MongoDbDriverVersion>2.23.1</MongoDbDriverVersion>
<Mongo2GoVersion>3.1.3</Mongo2GoVersion>

<NewtonsoftJsonVersion>13.0.2</NewtonsoftJsonVersion>
<NewtonsoftJsonVersion>13.0.3</NewtonsoftJsonVersion>

<MicrosoftPackagesVersion>3.1.*</MicrosoftPackagesVersion>
<MicrosoftNetTestSdkVersion>17.2.*</MicrosoftNetTestSdkVersion>
<MicrosoftPackagesVersion>8.0.0</MicrosoftPackagesVersion>
<MicrosoftNetTestSdkVersion>17.8.0</MicrosoftNetTestSdkVersion>

<DistributedLockCoreVersion>1.0.5</DistributedLockCoreVersion>

Expand Down
6 changes: 3 additions & 3 deletions common.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project>
<PropertyGroup>
<LangVersion>latest</LangVersion>
<Version>1.2.0</Version>
<Version>1.3.0</Version>
<NoWarn>$(NoWarn);CS1591</NoWarn>
<Authors>Stepping</Authors>
<Company>Stepping</Company>
Expand All @@ -17,8 +17,8 @@
<ItemGroup>
<None Include="$(MSBuildThisFileDirectory)/icon.png" Pack="true" PackagePath="/" Visible="false"/>
<None Include="$(MSBuildThisFileDirectory)/docs/README.md" Pack="true" PackagePath="/" Visible="false"/>
<PackageReference Include="ConfigureAwait.Fody" Version="3.3.1" PrivateAssets="All"/>
<PackageReference Include="Fody" Version="6.6.3">
<PackageReference Include="ConfigureAwait.Fody" Version="3.3.2" PrivateAssets="All"/>
<PackageReference Include="Fody" Version="6.8.0">
<PrivateAssets>All</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
Expand Down
4 changes: 2 additions & 2 deletions common.testing.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project>
<PropertyGroup>
<TargetFrameworks>net7.0;net6.0;netcoreapp3.1</TargetFrameworks>
<TargetFrameworks>net8.0;net6.0;netcoreapp3.1</TargetFrameworks>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<LangVersion>10.0</LangVersion>
Expand All @@ -9,7 +9,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="coverlet.collector" Version="3.1.2">
<PackageReference Include="coverlet.collector" Version="6.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
4 changes: 2 additions & 2 deletions src/Stepping.DbProviders.EfCore/Stepping.DbProviders.EfCore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Import Project="..\..\common.props" />

<PropertyGroup>
<TargetFrameworks>net7.0;net6.0;netstandard2.1</TargetFrameworks>
<TargetFrameworks>net8.0;net6.0;netstandard2.1</TargetFrameworks>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<RootNamespace />
Expand All @@ -15,7 +15,7 @@

<ItemGroup>
<PackageReference Include="Dapper" Version="$(DapperVersion)" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="$(EfCoreVersion)" Condition="'$(TargetFramework)' == 'net7.0'"/>
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="$(EfCoreVersion)" Condition="'$(TargetFramework)' == 'net8.0'"/>
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="$(EfCoreVersionForNet6)" Condition="'$(TargetFramework)' == 'net6.0'"/>
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="$(EfCoreVersionForNetStandard21)" Condition="'$(TargetFramework)' == 'netstandard2.1'"/>
</ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/Stepping.TmProviders.LocalTm.EfCore/Stepping.TmProviders.LocalTm.EfCore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Import Project="..\..\common.props" />

<PropertyGroup>
<TargetFrameworks>net7.0;net6.0;netstandard2.1</TargetFrameworks>
<TargetFrameworks>net8.0;net6.0;netstandard2.1</TargetFrameworks>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<RootNamespace />
Expand All @@ -14,7 +14,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="$(EfCoreVersion)" Condition="'$(TargetFramework)' == 'net7.0'" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="$(EfCoreVersion)" Condition="'$(TargetFramework)' == 'net8.0'" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="$(EfCoreVersionForNet6)" Condition="'$(TargetFramework)' == 'net6.0'" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="$(EfCoreVersionForNetStandard21)" Condition="'$(TargetFramework)' == 'netstandard2.1'" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion ...LocalTm.HostedServiceProcessor/Stepping.TmProviders.LocalTm.HostedServiceProcessor.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Import Project="..\..\common.props" />

<PropertyGroup>
<TargetFrameworks>net7.0;net6.0</TargetFrameworks>
<TargetFrameworks>net8.0;net6.0</TargetFrameworks>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<RootNamespace />
Expand Down
2 changes: 1 addition & 1 deletion src/Stepping.TmProviders.LocalTm/Stepping.TmProviders.LocalTm.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Import Project="..\..\common.props" />

<PropertyGroup>
<TargetFrameworks>net7.0;net6.0</TargetFrameworks>
<TargetFrameworks>net8.0;net6.0</TargetFrameworks>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<RootNamespace />
Expand Down
2 changes: 1 addition & 1 deletion test/Stepping.DbProviders.EfCore.Tests/Stepping.DbProviders.EfCore.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Import Project="..\..\common.testing.props"/>

<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="$(EfCoreVersion)" Condition="'$(TargetFramework)' == 'net7.0'"/>
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="$(EfCoreVersion)" Condition="'$(TargetFramework)' == 'net8.0'"/>
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="$(EfCoreVersionForNet6)" Condition="'$(TargetFramework)' == 'net6.0'"/>
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="$(EfCoreVersionForNetStandard21)" Condition="'$(TargetFramework)' == 'netcoreapp3.1'"/>

Expand Down
4 changes: 4 additions & 0 deletions test/Stepping.DbProviders.EfCore.Tests/Tests/EfCoreDbBarrierInserterTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,9 @@ public async Task Should_Insert_Rollback_Success_If_Another_Transaction_Commit()
await dbContext1.DisposeAsync();

#if NETCOREAPP3_1
#pragma warning disable xUnit1031
task.Wait(CancellationToken.None);
#pragma warning restore xUnit1031
#else
await task.WaitAsync(CancellationToken.None);
#endif
Expand Down Expand Up @@ -142,7 +144,9 @@ public async Task Should_Insert_Rollback_Success_If_Another_Transaction_Rollback
await dbContext1.DisposeAsync();

#if NETCOREAPP3_1
#pragma warning disable xUnit1031
task.Wait(CancellationToken.None);
#pragma warning restore xUnit1031
#else
await task.WaitAsync(CancellationToken.None);
#endif
Expand Down
4 changes: 4 additions & 0 deletions test/Stepping.DbProviders.MongoDb.Tests/Tests/MongoDbBarrierInserterTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,9 @@ public async Task Should_Insert_Rollback_Success_If_Another_Transaction_Commit()
sessionHandle1.Dispose();

#if NETCOREAPP3_1
#pragma warning disable xUnit1031
task.Wait(CancellationToken.None);
#pragma warning restore xUnit1031
#else
await task.WaitAsync(CancellationToken.None);
#endif
Expand Down Expand Up @@ -143,7 +145,9 @@ public async Task Should_Insert_Rollback_Success_If_Another_Transaction_Rollback
sessionHandle1.Dispose();

#if NETCOREAPP3_1
#pragma warning disable xUnit1031
task.Wait(CancellationToken.None);
#pragma warning restore xUnit1031
#else
await task.WaitAsync(CancellationToken.None);
#endif
Expand Down
10 changes: 5 additions & 5 deletions test/Stepping.TestBase/Stepping.TestBase.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(MicrosoftPackagesVersion)"/>
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftPackagesVersion)"/>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNetTestSdkVersion)"/>
<PackageReference Include="NSubstitute" Version="4.3.0"/>
<PackageReference Include="Shouldly" Version="4.0.3"/>
<PackageReference Include="xunit" Version="2.4.1"/>
<PackageReference Include="xunit.extensibility.execution" Version="2.4.1"/>
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5"/>
<PackageReference Include="NSubstitute" Version="5.1.0"/>
<PackageReference Include="Shouldly" Version="4.2.1"/>
<PackageReference Include="xunit" Version="2.6.5"/>
<PackageReference Include="xunit.extensibility.execution" Version="2.6.5"/>
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.6"/>
<ProjectReference Include="..\..\src\Stepping.Core\Stepping.Core.csproj"/>
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion test/Stepping.TmProviders.Dtm.Grpc.TestApp/Stepping.TmProviders.Dtm.Grpc.TestApp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFrameworks>net7.0;net6.0</TargetFrameworks>
<TargetFrameworks>net8.0;net6.0</TargetFrameworks>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>

Expand Down
2 changes: 1 addition & 1 deletion test/Stepping.TmProviders.Dtm.Grpc.Tests/Stepping.TmProviders.Dtm.Grpc.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Import Project="..\..\common.testing.props"/>

<ItemGroup>
<PackageReference Include="Grpc.Core.Testing" Version="2.46.3"/>
<PackageReference Include="Grpc.Core.Testing" Version="2.46.6" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNetTestSdkVersion)"/>
<ProjectReference Include="..\..\src\Stepping.TmProviders.Dtm.Grpc\Stepping.TmProviders.Dtm.Grpc.csproj"/>
<ProjectReference Include="..\Stepping.TestBase\Stepping.TestBase.csproj"/>
Expand Down
2 changes: 1 addition & 1 deletion ...tepping.TmProviders.LocalTm.EfCore.Tests/Stepping.TmProviders.LocalTm.EfCore.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Import Project="..\..\common.testing.props"/>

<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="$(EfCoreVersion)" Condition="'$(TargetFramework)' == 'net7.0'"/>
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="$(EfCoreVersion)" Condition="'$(TargetFramework)' == 'net8.0'"/>
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="$(EfCoreVersionForNet6)" Condition="'$(TargetFramework)' == 'net6.0'"/>
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="$(EfCoreVersionForNetStandard21)" Condition="'$(TargetFramework)' == 'netcoreapp3.1'"/>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNetTestSdkVersion)"/>
Expand Down
6 changes: 4 additions & 2 deletions test/Stepping.TmProviders.LocalTm.TestApp/Stepping.TmProviders.LocalTm.TestApp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFrameworks>net7.0;net6.0</TargetFrameworks>
<TargetFrameworks>net8.0;net6.0</TargetFrameworks>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="$(MicrosoftPackagesVersion)" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="$(EfCoreVersion)" Condition="'$(TargetFramework)' == 'net8.0'"/>
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="$(EfCoreVersionForNet6)" Condition="'$(TargetFramework)' == 'net6.0'"/>
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="$(EfCoreVersionForNetStandard21)" Condition="'$(TargetFramework)' == 'netcoreapp3.1'"/>
<ProjectReference Include="..\..\src\Stepping.TmProviders.LocalTm.EfCore\Stepping.TmProviders.LocalTm.EfCore.csproj" />
<ProjectReference Include="..\..\src\Stepping.TmProviders.LocalTm\Stepping.TmProviders.LocalTm.csproj" />
</ItemGroup>
Expand Down
Loading