Skip to content

Commit

Permalink
Regression 4.9.2 where aliased ECClassId switch from returning classI…
Browse files Browse the repository at this point in the history
…d to className (#7279)

Co-authored-by: Affan Khan <khanaffan@users.noreply.github.com>
Co-authored-by: imodeljs-admin <38288322+imodeljs-admin@users.noreply.github.com>
Co-authored-by: Paul Connelly <22944042+pmconne@users.noreply.github.com>
(cherry picked from commit 0716d56)

# Conflicts:
#	common/config/rush/pnpm-lock.yaml
#	core/backend/package.json
#	test-apps/display-test-app/android/imodeljs-test-app/app/build.gradle
#	test-apps/display-test-app/ios/imodeljs-test-app/imodeljs-test-app.xcodeproj/project.pbxproj
#	tools/internal/ios/core-test-runner/core-test-runner.xcodeproj/project.pbxproj
  • Loading branch information
khanaffan authored and mergify[bot] committed Oct 21, 2024
1 parent 7f71678 commit 7c860aa
Show file tree
Hide file tree
Showing 7 changed files with 147 additions and 248 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"changes": [
{
"packageName": "@itwin/core-backend",
"comment": "Comply with 4.8.x ECSql row format",
"type": "none"
}
],
"packageName": "@itwin/core-backend"
}
4 changes: 4 additions & 0 deletions core/backend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,11 @@
"webpack": "^5.76.0"
},
"dependencies": {
<<<<<<< HEAD
"@bentley/imodeljs-native": "4.9.32",
=======
"@bentley/imodeljs-native": "4.10.14",
>>>>>>> 0716d56cbd (Regression 4.9.2 where aliased ECClassId switch from returning classId to className (#7279))
"@itwin/cloud-agnostic-core": "^2.2.4",
"@itwin/core-telemetry": "workspace:*",
"@itwin/object-storage-azure": "^2.2.5",
Expand Down
Loading

0 comments on commit 7c860aa

Please sign in to comment.