Skip to content

Commit 42736ce

Browse files
authored
Upgrade to EF Core 6.0.0. (PomeloFoundation#1555)
1 parent 51e232f commit 42736ce

File tree

5 files changed

+12
-12
lines changed

5 files changed

+12
-12
lines changed

Dependencies.targets

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<Project>
22
<PropertyGroup Label="Common Versions">
3-
<DotnetRuntimeVersion>6.0.0-rc.2.21480.5</DotnetRuntimeVersion>
4-
<EFCoreVersion>$(DotnetRuntimeVersion)</EFCoreVersion> <!-- [$(DotnetRuntimeVersion), 7.0.0) -->
3+
<DotnetRuntimeVersion>6.0.0</DotnetRuntimeVersion>
4+
<EFCoreVersion>[$(DotnetRuntimeVersion), 7.0.0)</EFCoreVersion>
55
<DependencyPreviewVersion>$(DotnetRuntimeVersion)</DependencyPreviewVersion>
6-
<AspNetCoreVersion>6.0.0-rc.2.21480.10</AspNetCoreVersion>
6+
<AspNetCoreVersion>$(DotnetRuntimeVersion)</AspNetCoreVersion>
77
</PropertyGroup>
88

99
<ItemGroup Label="Dependencies">

Version.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
- "servicing" - EF Core release independent, code quality production ready, mainly bugfixes
1414
-->
1515
<VersionPrefix>6.0.0</VersionPrefix>
16-
<PreReleaseVersionLabel>rc</PreReleaseVersionLabel>
17-
<PreReleaseVersionIteration>2</PreReleaseVersionIteration>
16+
<PreReleaseVersionLabel>rtm</PreReleaseVersionLabel>
17+
<PreReleaseVersionIteration>1</PreReleaseVersionIteration>
1818

1919
<!--
2020
The following properties will automatically be set by CI builds when appropriate:

azure-pipelines.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ variables:
1717
runIntegrationTests: true
1818

1919
# Dotnet + Tools versioning:
20-
majorDotnetVersion: 6 # empty uses global.json (for rtm/servicing releases)
21-
includeDotnetPrereleases: true
20+
majorDotnetVersion: # empty uses global.json (for rtm/servicing releases), otherwise the major version, e.g. 6
21+
includeDotnetPrereleases: false
2222

2323
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
2424
DOTNET_CLI_TELEMETRY_OPTOUT: 1
@@ -42,7 +42,7 @@ jobs:
4242
MySQL 5.7 (Linux):
4343
vmImageName: 'ubuntu-latest'
4444
databaseServerType: 'mysql'
45-
databaseServerVersion: '5.7.35'
45+
databaseServerVersion: '5.7.34'
4646
sqlMode: $(mysqlLegacySqlMode)
4747
skipTests: false
4848
MariaDB 10.6 (Linux):

dotnet-tools.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"isRoot": true,
44
"tools": {
55
"dotnet-ef": {
6-
"version": "6.0.0-rc.2.21480.5",
6+
"version": "6.0.0",
77
"commands": [
88
"dotnet-ef"
99
]

global.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"sdk": {
3-
"version": "6.0.0",
4-
"allowPrerelease": true,
5-
"rollForward": "latestMajor"
3+
"version": "6.0.100",
4+
"allowPrerelease": false,
5+
"rollForward": "latestFeature"
66
}
77
}

0 commit comments

Comments
 (0)