Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 6c96b0f

Browse files
Update relevant parts to net8.0
1 parent 87933e5 commit 6c96b0f

File tree

13 files changed

+22
-28
lines changed

13 files changed

+22
-28
lines changed

‎.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ jobs:
1919
- name: Checkout
2020
uses: actions/checkout@v4
2121

22-
- name: .NET 7.0
22+
- name: .NET 8.0
2323
uses: actions/setup-dotnet@v3
2424
with:
25-
dotnet-version: 7.0.x
25+
dotnet-version: 8.0.x
2626

2727
- name: Build
2828
run: |

‎include.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ function Check-ExitCode() {
77
}
88

99
function Get-UsedTargetFramework() {
10-
return 'net7.0'
10+
return 'net8.0'
1111
}

‎src/Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<EmbedUntrackedSources>true</EmbedUntrackedSources>
2828
</PropertyGroup>
2929
<ItemGroup Condition="'$(SkipSourceLink)'!='true'">
30-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
30+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
3131
<PrivateAssets>all</PrivateAssets>
3232
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
3333
</PackageReference>

‎src/EntityFramework.Firebird.Tests/EntityFramework.Firebird.Tests.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<!-- Figure out a way to run it on net4.8 (FirebirdSql.Data.TestsBase uses IAsyncDisposable) -->
4-
<TargetFramework>net7.0</TargetFramework>
3+
<TargetFramework>net8.0</TargetFramework>
54
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
65
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
76
<SkipSourceLink>true</SkipSourceLink>
@@ -12,7 +11,8 @@
1211
<OutputType>Exe</OutputType>
1312
<StartupObject>FirebirdSql.Data.TestsBase.Program</StartupObject>
1413
</PropertyGroup>
15-
<ItemGroup Condition="'$(TargetFramework)'=='net7.0'">
14+
<ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
15+
<!-- left in repo as an example/documentation for .NET Framework -->
1616
<None Remove="app.config" />
1717
</ItemGroup>
1818
<ItemGroup>

‎src/EntityFramework.Firebird.Tests/EntityFrameworkTestsBase.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ public abstract class EntityFrameworkTestsBase : FbTestsBase
2828
static EntityFrameworkTestsBase()
2929
{
3030
#if !NETFRAMEWORK
31+
// example/documentation for .NET Framework
3132
System.Data.Common.DbProviderFactories.RegisterFactory(FbProviderServices.ProviderInvariantName, FirebirdClientFactory.Instance);
3233
#endif
3334
DbConfiguration.SetConfiguration(new FbTestDbContext.Conf());

‎src/FirebirdSql.Data.FirebirdClient.Tests/FirebirdSql.Data.FirebirdClient.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net7.0</TargetFramework>
3+
<TargetFramework>net8.0</TargetFramework>
44
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
55
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
66
<SkipSourceLink>true</SkipSourceLink>

‎src/FirebirdSql.Data.FirebirdClient/Common/IscException.cs

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727

2828
namespace FirebirdSql.Data.Common;
2929

30-
[Serializable]
3130
internal sealed class IscException : Exception
3231
{
3332
private string _message;
@@ -117,27 +116,13 @@ public static IscException ForIOException(IOException exception)
117116
return ForErrorCodes(new[] { IscCodes.isc_net_write_err, IscCodes.isc_net_read_err }, exception);
118117
}
119118

120-
private IscException(SerializationInfo info, StreamingContext context)
121-
: base(info, context)
122-
{
123-
Errors = (List<IscError>)info.GetValue(nameof(Errors), typeof(List<IscError>));
124-
ErrorCode = info.GetInt32(nameof(ErrorCode));
125-
}
126-
127119
public void BuildExceptionData()
128120
{
129121
BuildErrorCode();
130122
BuildSqlState();
131123
BuildExceptionMessage();
132124
}
133125

134-
public override void GetObjectData(SerializationInfo info, StreamingContext context)
135-
{
136-
base.GetObjectData(info, context);
137-
info.AddValue(nameof(Errors), Errors);
138-
info.AddValue(nameof(ErrorCode), ErrorCode);
139-
}
140-
141126
private void BuildErrorCode()
142127
{
143128
ErrorCode = Errors.Count != 0 ? Errors[0].ErrorCode : 0;

‎src/FirebirdSql.Data.FirebirdClient/FirebirdClient/FbException.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@
2424

2525
namespace FirebirdSql.Data.FirebirdClient;
2626

27+
#if !NET8_0_OR_GREATER
2728
[Serializable]
29+
#endif
2830
public sealed class FbException : DbException
2931
{
3032
#region Fields
@@ -50,22 +52,26 @@ private FbException(string message, Exception innerException)
5052
: base(message, innerException)
5153
{ }
5254

55+
#if !NET8_0_OR_GREATER
5356
private FbException(SerializationInfo info, StreamingContext context)
5457
: base(info, context)
5558
{
5659
_errors = (FbErrorCollection)info.GetValue("errors", typeof(FbErrorCollection));
5760
}
61+
#endif
5862

5963
#endregion
6064

6165
#region Methods
6266

67+
#if !NET8_0_OR_GREATER
6368
public override void GetObjectData(SerializationInfo info, StreamingContext context)
6469
{
6570
base.GetObjectData(info, context);
6671

6772
info.AddValue("errors", _errors);
6873
}
74+
#endif
6975

7076
#endregion
7177

‎src/FirebirdSql.Data.FirebirdClient/FirebirdSql.Data.FirebirdClient.csproj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net48;netstandard2.0;netstandard2.1;net5.0;net6.0;net7.0</TargetFrameworks>
3+
<TargetFrameworks>net48;netstandard2.0;netstandard2.1;net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
44
<AssemblyName>FirebirdSql.Data.FirebirdClient</AssemblyName>
55
<RootNamespace>FirebirdSql.Data</RootNamespace>
66
<SignAssembly>true</SignAssembly>
@@ -53,6 +53,8 @@
5353
</ItemGroup>
5454
<ItemGroup Condition="'$(TargetFramework)'=='net7.0'">
5555
</ItemGroup>
56+
<ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
57+
</ItemGroup>
5658
<ItemGroup>
5759
<PackageReference Include="ConfigureAwaitChecker.Analyzer" Version="5.0.0.1">
5860
<PrivateAssets>all</PrivateAssets>

‎src/FirebirdSql.EntityFrameworkCore.Firebird.FunctionalTests/FirebirdSql.EntityFrameworkCore.Firebird.FunctionalTests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net7.0</TargetFramework>
3+
<TargetFramework>net8.0</TargetFramework>
44
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
55
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
66
<SkipSourceLink>true</SkipSourceLink>

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /