Skip to content

Commit 4395b92

Browse files
bkoelmanbkoelman
committed
Target stable release
1 parent 90446d8 commit 4395b92

File tree

9 files changed

+11
-42
lines changed

9 files changed

+11
-42
lines changed

‎.github/workflows/build.yml

+3-21
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ jobs:
5050
dotnet-version: |
5151
6.0.x
5252
8.0.x
53-
dotnet-quality: 'preview'
5453
- name: Setup PowerShell (Ubuntu)
5554
if: matrix.os == 'ubuntu-latest'
5655
run: |
@@ -90,13 +89,8 @@ jobs:
9089
- name: Git checkout
9190
uses: actions/checkout@v4
9291
- name: Restore tools
93-
shell: pwsh
9492
run: |
95-
# Temporary workaround for bug in .NET 8 RC2 at https://github.com/dotnet/sdk/issues/35989
96-
$tools = Get-Content ".config/dotnet-tools.json" | ConvertFrom-Json
97-
foreach ($tool in $tools.tools.PsObject.Properties) {
98-
& dotnet tool install $tool.Name --version $tool.Value.version
99-
}
93+
dotnet tool restore
10094
- name: Restore packages
10195
run: |
10296
dotnet restore
@@ -192,17 +186,11 @@ jobs:
192186
dotnet-version: |
193187
6.0.x
194188
8.0.x
195-
dotnet-quality: 'preview'
196189
- name: Git checkout
197190
uses: actions/checkout@v4
198191
- name: Restore tools
199-
shell: pwsh
200192
run: |
201-
# Temporary workaround for bug in .NET 8 RC2 at https://github.com/dotnet/sdk/issues/35989
202-
$tools = Get-Content ".config/dotnet-tools.json" | ConvertFrom-Json
203-
foreach ($tool in $tools.tools.PsObject.Properties) {
204-
& dotnet tool install $tool.Name --version $tool.Value.version
205-
}
193+
dotnet tool restore
206194
- name: InspectCode
207195
shell: pwsh
208196
run: |
@@ -251,19 +239,13 @@ jobs:
251239
dotnet-version: |
252240
6.0.x
253241
8.0.x
254-
dotnet-quality: 'preview'
255242
- name: Git checkout
256243
uses: actions/checkout@v4
257244
with:
258245
fetch-depth: 2
259246
- name: Restore tools
260-
shell: pwsh
261247
run: |
262-
# Temporary workaround for bug in .NET 8 RC2 at https://github.com/dotnet/sdk/issues/35989
263-
$tools = Get-Content ".config/dotnet-tools.json" | ConvertFrom-Json
264-
foreach ($tool in $tools.tools.PsObject.Properties) {
265-
& dotnet tool install $tool.Name --version $tool.Value.version
266-
}
248+
dotnet tool restore
267249
- name: Restore packages
268250
run: |
269251
dotnet restore

‎Directory.Build.props

-6
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,6 @@
1313
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
1414
</PropertyGroup>
1515

16-
<!-- To be removed when stable .NET 8 version has been released. -->
17-
<PropertyGroup>
18-
<NoWarn>$(NoWarn);NU5104</NoWarn>
19-
<SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
20-
</PropertyGroup>
21-
2216
<ItemGroup>
2317
<PackageReference Include="JetBrains.Annotations" Version="2023.3.*" PrivateAssets="All" />
2418
<PackageReference Include="CSharpGuidelinesAnalyzer" Version="3.8.*" PrivateAssets="All" />

‎package-versions.props

+3-5
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,11 @@
2424

2525
<PropertyGroup Condition="'$(TargetFramework)' == 'net8.0'">
2626
<!-- Published dependencies (only update on major version change) -->
27-
<EntityFrameworkCoreFrozenVersion>8.0.0-*</EntityFrameworkCoreFrozenVersion>
27+
<EntityFrameworkCoreFrozenVersion>8.0.0</EntityFrameworkCoreFrozenVersion>
2828

2929
<!-- Non-published dependencies (these are safe to update, won't cause a breaking change) -->
30-
<AspNetCoreVersion>8.0.0-*</AspNetCoreVersion>
31-
<EntityFrameworkCoreVersion>8.0.0-*</EntityFrameworkCoreVersion>
32-
<NpgsqlVersion>8.0.0-*</NpgsqlVersion>
30+
<AspNetCoreVersion>8.0.*</AspNetCoreVersion>
31+
<EntityFrameworkCoreVersion>8.0.*-*</EntityFrameworkCoreVersion>
3332
<SystemTextJsonVersion>$(AspNetCoreVersion)</SystemTextJsonVersion>
3433
</PropertyGroup>
3534

@@ -40,7 +39,6 @@
4039
<!-- Non-published dependencies (these are safe to update, won't cause a breaking change) -->
4140
<AspNetCoreVersion>6.0.*</AspNetCoreVersion>
4241
<EntityFrameworkCoreVersion>7.0.*</EntityFrameworkCoreVersion>
43-
<NpgsqlVersion>7.0.*</NpgsqlVersion>
4442
<SystemTextJsonVersion>7.0.*</SystemTextJsonVersion>
4543
</PropertyGroup>
4644
</Project>

‎src/Examples/DapperExample/DapperExample.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<PackageReference Include="Dapper" Version="$(DapperVersion)" />
1616
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="$(EntityFrameworkCoreVersion)" />
1717
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="$(EntityFrameworkCoreVersion)" />
18-
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="$(NpgsqlVersion)" />
18+
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="$(EntityFrameworkCoreVersion)" />
1919
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="$(EntityFrameworkCoreVersion)" />
2020
</ItemGroup>
2121
</Project>

‎src/Examples/DatabasePerTenantExample/DatabasePerTenantExample.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@
1313

1414
<ItemGroup>
1515
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="$(EntityFrameworkCoreVersion)" />
16-
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="$(NpgsqlVersion)" />
16+
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="$(EntityFrameworkCoreVersion)" />
1717
</ItemGroup>
1818
</Project>

‎src/Examples/JsonApiDotNetCoreExample/JsonApiDotNetCoreExample.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@
1313

1414
<ItemGroup>
1515
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="$(EntityFrameworkCoreVersion)" />
16-
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="$(NpgsqlVersion)" />
16+
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="$(EntityFrameworkCoreVersion)" />
1717
</ItemGroup>
1818
</Project>

‎src/Examples/NoEntityFrameworkExample/Data/InMemoryModel.cs

-5
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,7 @@ private static void SetEntityProperties(RuntimeEntityType entityType, ResourceTy
1919
{
2020
foreach (PropertyInfo property in resourceType.ClrType.GetProperties())
2121
{
22-
#if NET6_0
2322
entityType.AddProperty(property.Name, property.PropertyType, property);
24-
#else
25-
// Temporary workaround for EF Core 8 RC1 and RC2.
26-
entityType.AddProperty(property.Name, property.PropertyType, propertyInfo: property);
27-
#endif
2823
}
2924
}
3025
}

‎src/Examples/ReportsExample/ReportsExample.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@
1313

1414
<ItemGroup>
1515
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="$(EntityFrameworkCoreVersion)" />
16-
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="$(NpgsqlVersion)" />
16+
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="$(EntityFrameworkCoreVersion)" />
1717
</ItemGroup>
1818
</Project>

‎test/TestBuildingBlocks/TestBuildingBlocks.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="$(AspNetCoreVersion)" />
1818
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="$(EntityFrameworkCoreVersion)" />
1919
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
20-
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="$(NpgsqlVersion)" />
20+
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="$(EntityFrameworkCoreVersion)" />
2121
<PackageReference Include="xunit" Version="$(XunitVersion)" />
2222
<PackageReference Include="xunit.runner.visualstudio" Version="$(XunitVersion)" PrivateAssets="All" />
2323
</ItemGroup>

0 commit comments

Comments
 (0)