Skip to content

Commit 1ebebd4

Browse files
cincuranetcincuranet
committed
Update targets
1 parent db1a9ef commit 1ebebd4

File tree

11 files changed

+16
-36
lines changed

11 files changed

+16
-36
lines changed

‎build.ps1‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ function Versions() {
2828
function v($file) {
2929
return (Get-Item $file).VersionInfo.ProductVersion -replace '(\d+)\.(\d+)\.(\d+)(-[a-z0-9]+)?.*','$1.$2.$3$4'
3030
}
31-
$script:versionProvider = v $baseDir\src\FirebirdSql.Data.FirebirdClient\bin\$Configuration\net8.0\FirebirdSql.Data.FirebirdClient.dll
32-
$script:versionEFCore = v $baseDir\src\FirebirdSql.EntityFrameworkCore.Firebird\bin\$Configuration\net8.0\FirebirdSql.EntityFrameworkCore.Firebird.dll
31+
$script:versionProvider = v $baseDir\src\FirebirdSql.Data.FirebirdClient\bin\$Configuration\net10.0\FirebirdSql.Data.FirebirdClient.dll
32+
$script:versionEFCore = v $baseDir\src\FirebirdSql.EntityFrameworkCore.Firebird\bin\$Configuration\net10.0\FirebirdSql.EntityFrameworkCore.Firebird.dll
3333
$script:versionEF6 = v $baseDir\src\EntityFramework.Firebird\bin\$Configuration\net48\EntityFramework.Firebird.dll
3434
}
3535

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net9.0</TargetFramework>
3+
<TargetFramework>net10.0</TargetFramework>
44
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
55
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
66
<SkipSourceLink>true</SkipSourceLink>
@@ -16,7 +16,7 @@
1616
<Using Include="NUnit.Framework.Legacy.CollectionAssert" Alias="CollectionAssert" />
1717
<Using Include="NUnit.Framework.Legacy.StringAssert" Alias="StringAssert" />
1818
</ItemGroup>
19-
<ItemGroup Condition="'$(TargetFramework)'=='net9.0'">
19+
<ItemGroup Condition="'$(TargetFramework)'=='net10.0'">
2020
<!-- left in repo as an example/documentation for .NET Framework -->
2121
<None Remove="app.config" />
2222
</ItemGroup>

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,17 +47,12 @@
4747
</ItemGroup>
4848
<ItemGroup>
4949
<PackageReference Include="EntityFramework" Version="$(EF6ReferencePackageVersion)" />
50+
<PackageReference Include="FirebirdSql.Data.FirebirdClient" Version="$(EF6ReferenceProviderVersion)" />
5051
</ItemGroup>
5152
<ItemGroup Condition="'$(TargetFramework)'=='net48'">
5253
<Reference Include="System.Configuration" />
5354
<Reference Include="Microsoft.CSharp" />
5455
</ItemGroup>
5556
<ItemGroup Condition="'$(TargetFramework)'=='netstandard2.1'">
5657
</ItemGroup>
57-
<ItemGroup Condition="'$(Configuration)'!='Debug'">
58-
<PackageReference Include="FirebirdSql.Data.FirebirdClient" Version="$(EF6ReferenceProviderVersion)" />
59-
</ItemGroup>
60-
<ItemGroup Condition="'$(Configuration)'=='Debug'">
61-
<ProjectReference Include="..\FirebirdSql.Data.FirebirdClient\FirebirdSql.Data.FirebirdClient.csproj" />
62-
</ItemGroup>
6358
</Project>

‎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>net9.0</TargetFramework>
3+
<TargetFramework>net10.0</TargetFramework>
44
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
55
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
66
<SkipSourceLink>true</SkipSourceLink>

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

Lines changed: 4 additions & 19 deletions
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;net8.0</TargetFrameworks>
3+
<TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
44
<AssemblyName>FirebirdSql.Data.FirebirdClient</AssemblyName>
55
<RootNamespace>FirebirdSql.Data</RootNamespace>
66
<SignAssembly>true</SignAssembly>
@@ -38,32 +38,17 @@
3838
<None Include="..\..\license.txt" Pack="true" PackagePath="" />
3939
<None Include="..\..\firebird-logo.png" Pack="true" PackagePath="" />
4040
</ItemGroup>
41-
<ItemGroup Condition="'$(TargetFramework)'=='net48'">
42-
<Reference Include="System.Transactions" />
43-
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.6.0" />
44-
</ItemGroup>
45-
<ItemGroup Condition="'$(TargetFramework)'=='netstandard2.0'">
46-
<PackageReference Include="System.Reflection.Emit" Version="4.7.0" />
47-
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.6.0" />
48-
</ItemGroup>
49-
<ItemGroup Condition="'$(TargetFramework)'=='netstandard2.1'">
50-
</ItemGroup>
51-
<ItemGroup Condition="'$(TargetFramework)'=='net5.0'">
52-
</ItemGroup>
53-
<ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
41+
<ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
5442
</ItemGroup>
55-
<ItemGroup Condition="'$(TargetFramework)'=='net7.0'">
43+
<ItemGroup Condition="'$(TargetFramework)'=='net9.0'">
5644
</ItemGroup>
57-
<ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
45+
<ItemGroup Condition="'$(TargetFramework)'=='net10.0'">
5846
</ItemGroup>
5947
<ItemGroup>
6048
<PackageReference Include="ConfigureAwaitChecker.Analyzer" Version="5.0.0.1">
6149
<PrivateAssets>all</PrivateAssets>
6250
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
6351
</PackageReference>
6452
</ItemGroup>
65-
<ItemGroup>
66-
<Compile Update="FirebirdClient\FbBatchCommand.cs" />
67-
</ItemGroup>
6853
<Import Project="..\FirebirdSql.Data.External\FirebirdSql.Data.External.projitems" Label="Shared" />
6954
</Project>

‎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>net9.0</TargetFramework>
3+
<TargetFramework>net10.0</TargetFramework>
44
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
55
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
66
<SkipSourceLink>true</SkipSourceLink>

‎src/FirebirdSql.EntityFrameworkCore.Firebird.Tests/FirebirdSql.EntityFrameworkCore.Firebird.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>net9.0</TargetFramework>
3+
<TargetFramework>net10.0</TargetFramework>
44
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
55
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
66
<SkipSourceLink>true</SkipSourceLink>

‎src/FirebirdSql.EntityFrameworkCore.Firebird/FirebirdSql.EntityFrameworkCore.Firebird.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-
<TargetFrameworks>net8.0</TargetFrameworks>
3+
<TargetFrameworks>net10.0</TargetFrameworks>
44
<AssemblyName>FirebirdSql.EntityFrameworkCore.Firebird</AssemblyName>
55
<RootNamespace>FirebirdSql.EntityFrameworkCore.Firebird</RootNamespace>
66
<SignAssembly>true</SignAssembly>

‎src/Perf/Perf.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
<PropertyGroup>
33
<OutputType>Exe</OutputType>
4-
<TargetFramework>net9.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<SkipSourceLink>true</SkipSourceLink>
66
</PropertyGroup>
77
<ItemGroup>

‎src/Scratchpad/Scratchpad.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
<PropertyGroup>
33
<OutputType>Exe</OutputType>
4-
<TargetFramework>net9.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<SkipSourceLink>true</SkipSourceLink>
66
<SignAssembly>true</SignAssembly>
77
<AssemblyOriginatorKeyFile>..\FirebirdSql.Data.TestsBase\FirebirdSql.Data.TestsBase.snk</AssemblyOriginatorKeyFile>

0 commit comments

Comments
 (0)