From 0f17b40d057aba78cfc2070cf15cf3de20aa3b47 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Wed, 31 Aug 2022 15:36:32 +0000 Subject: [PATCH] chore(deploy): Release --- .changeset/fluffy-cobras-beg.md | 5 ----- .changeset/green-buses-beg.md | 5 ----- .changeset/tidy-singers-carry.md | 7 ------- .changeset/violet-comics-cover.md | 5 ----- .changeset/weak-mice-boil.md | 5 ----- CHANGELOG.md | 13 +++++++++++++ docs/configuration/mac.md | 4 ++-- docs/configuration/mas.md | 4 ++-- packages/app-builder-lib/CHANGELOG.md | 16 ++++++++++++++++ packages/app-builder-lib/package.json | 2 +- packages/app-builder-lib/src/version.ts | 2 +- packages/builder-util/CHANGELOG.md | 6 ++++++ packages/builder-util/package.json | 2 +- packages/dmg-builder/CHANGELOG.md | 8 ++++++++ packages/dmg-builder/package.json | 2 +- .../CHANGELOG.md | 8 ++++++++ .../package.json | 2 +- packages/electron-builder/CHANGELOG.md | 15 +++++++++++++++ packages/electron-builder/package.json | 2 +- .../electron-forge-maker-appimage/CHANGELOG.md | 7 +++++++ .../electron-forge-maker-appimage/package.json | 2 +- .../electron-forge-maker-nsis-web/CHANGELOG.md | 7 +++++++ .../electron-forge-maker-nsis-web/package.json | 2 +- packages/electron-forge-maker-nsis/CHANGELOG.md | 7 +++++++ packages/electron-forge-maker-nsis/package.json | 2 +- packages/electron-forge-maker-snap/CHANGELOG.md | 7 +++++++ packages/electron-forge-maker-snap/package.json | 2 +- packages/electron-publish/CHANGELOG.md | 7 +++++++ packages/electron-publish/package.json | 2 +- packages/electron-updater/CHANGELOG.md | 6 ++++++ packages/electron-updater/package.json | 2 +- 31 files changed, 123 insertions(+), 43 deletions(-) delete mode 100644 .changeset/fluffy-cobras-beg.md delete mode 100644 .changeset/green-buses-beg.md delete mode 100644 .changeset/tidy-singers-carry.md delete mode 100644 .changeset/violet-comics-cover.md delete mode 100644 .changeset/weak-mice-boil.md diff --git a/.changeset/fluffy-cobras-beg.md b/.changeset/fluffy-cobras-beg.md deleted file mode 100644 index f16619935ee..00000000000 --- a/.changeset/fluffy-cobras-beg.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"electron-builder": patch ---- - -fix: replace update-notifier with simple-update-notifier due to security alert diff --git a/.changeset/green-buses-beg.md b/.changeset/green-buses-beg.md deleted file mode 100644 index 26d87c9cc75..00000000000 --- a/.changeset/green-buses-beg.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"app-builder-lib": patch ---- - -chore: Add documentation details to entitlement option for macOS configurations diff --git a/.changeset/tidy-singers-carry.md b/.changeset/tidy-singers-carry.md deleted file mode 100644 index 8b12cede991..00000000000 --- a/.changeset/tidy-singers-carry.md +++ /dev/null @@ -1,7 +0,0 @@ ---- -"app-builder-lib": minor -"electron-builder": minor -"builder-util": patch ---- - -Allow explicit `buildNumber` in config. `buildNumber` will take precedence over any environment variables (#6945) diff --git a/.changeset/violet-comics-cover.md b/.changeset/violet-comics-cover.md deleted file mode 100644 index 3567a534968..00000000000 --- a/.changeset/violet-comics-cover.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"app-builder-lib": patch ---- - -fix: Swaps order of Apple certificate selection to fix publishing the MAS package on Mac Apple Store. (#7040) diff --git a/.changeset/weak-mice-boil.md b/.changeset/weak-mice-boil.md deleted file mode 100644 index 7ee05f6d2d6..00000000000 --- a/.changeset/weak-mice-boil.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"electron-updater": patch ---- - -fix(docs): improve `downloadUpdate` typing to match the doc diff --git a/CHANGELOG.md b/CHANGELOG.md index 1301184f5b0..7fc843f4c86 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,16 @@ +# [](https://github.com/electron-userland/electron-builder/compare/v23.4.0...v) (2022-08-31) + + +### Bug Fixes + +* allow user to define explicit `buildNumber` in config, useful for fpm `--iteration` flag ([#7075](https://github.com/electron-userland/electron-builder/issues/7075)) ([8166267](https://github.com/electron-userland/electron-builder/commit/8166267d487cd26b154e28cf60d89102a487a353)) +* improve `downloadUpdate` typing to match the doc ([#7099](https://github.com/electron-userland/electron-builder/issues/7099)) ([cd21b09](https://github.com/electron-userland/electron-builder/commit/cd21b0918843fe1269ddaf8dde099c8faeb54b80)) +* Invalid code signing for MAS build due to ordering of certificate check ([#7040](https://github.com/electron-userland/electron-builder/issues/7040)) ([#7089](https://github.com/electron-userland/electron-builder/issues/7089)) ([a1d86fd](https://github.com/electron-userland/electron-builder/commit/a1d86fd75bbc7b252403c16966430a2e3562205d)) +* replace update-notifier with simple-update notifier due to dependency vulnerability ([#7078](https://github.com/electron-userland/electron-builder/issues/7078)) ([48cbb12](https://github.com/electron-userland/electron-builder/commit/48cbb120dc11994889f4aa61c8431531ce274006)) +* updating integration test for prerelease flag ([#7072](https://github.com/electron-userland/electron-builder/issues/7072)) ([f205998](https://github.com/electron-userland/electron-builder/commit/f205998999ff615c9ea63184520a1efbbff5a785)) + + + # [](https://github.com/electron-userland/electron-builder/compare/v23.3.3...v) (2022-07-28) diff --git a/docs/configuration/mac.md b/docs/configuration/mac.md index 40a2e18df6c..81b7175b4df 100644 --- a/docs/configuration/mac.md +++ b/docs/configuration/mac.md @@ -17,10 +17,10 @@ The top-level [mac](configuration.md#Configuration-mac) key contains set of opti

icon = build/icon.icns String | “undefined” - The path to application icon.

  • -

    entitlements String | “undefined” - The path to entitlements file for signing the app. build/entitlements.mac.plist will be used if exists (it is a recommended way to set). MAS entitlements is specified in the mas.

    +

    entitlements String | “undefined” - The path to entitlements file for signing the app. build/entitlements.mac.plist will be used if exists (it is a recommended way to set). MAS entitlements is specified in the mas. See this folder in osx-sign’s repository for examples. Be aware that your app may crash if the right entitlements are not set like com.apple.security.cs.allow-jit for example on arm64 builds with Electron 20+. See Signing and Notarizing macOS Builds from the Electron documentation for more information.

  • -

    entitlementsInherit String | “undefined” - The path to child entitlements which inherit the security settings for signing frameworks and bundles of a distribution. build/entitlements.mac.inherit.plist will be used if exists (it is a recommended way to set). Otherwise default.

    +

    entitlementsInherit String | “undefined” - The path to child entitlements which inherit the security settings for signing frameworks and bundles of a distribution. build/entitlements.mac.inherit.plist will be used if exists (it is a recommended way to set). See this folder in osx-sign’s repository for examples.

    This option only applies when signing with entitlements provided.

  • diff --git a/docs/configuration/mas.md b/docs/configuration/mas.md index 4b83b1c64fa..5d5f496f004 100644 --- a/docs/configuration/mas.md +++ b/docs/configuration/mas.md @@ -3,8 +3,8 @@ Inherits [macOS options](mac.md). diff --git a/packages/app-builder-lib/CHANGELOG.md b/packages/app-builder-lib/CHANGELOG.md index b53a3d56280..ba84e9994d1 100644 --- a/packages/app-builder-lib/CHANGELOG.md +++ b/packages/app-builder-lib/CHANGELOG.md @@ -1,5 +1,21 @@ # app-builder-lib +## 23.5.0 + +### Minor Changes + +- [#7075](https://github.com/electron-userland/electron-builder/pull/7075) [`8166267d`](https://github.com/electron-userland/electron-builder/commit/8166267d487cd26b154e28cf60d89102a487a353) Thanks [@davej](https://github.com/davej)! - Allow explicit `buildNumber` in config. `buildNumber` will take precedence over any environment variables (#6945) + +### Patch Changes + +- [#7097](https://github.com/electron-userland/electron-builder/pull/7097) [`e78a65c4`](https://github.com/electron-userland/electron-builder/commit/e78a65c46a55f794da2dd0d2f6e838f8421174b9) Thanks [@AxelTerizaki](https://github.com/AxelTerizaki)! - chore: Add documentation details to entitlement option for macOS configurations + +* [#7089](https://github.com/electron-userland/electron-builder/pull/7089) [`a1d86fd7`](https://github.com/electron-userland/electron-builder/commit/a1d86fd75bbc7b252403c16966430a2e3562205d) Thanks [@jeanfbrito](https://github.com/jeanfbrito)! - fix: Swaps order of Apple certificate selection to fix publishing the MAS package on Mac Apple Store. (#7040) + +* Updated dependencies [[`8166267d`](https://github.com/electron-userland/electron-builder/commit/8166267d487cd26b154e28cf60d89102a487a353)]: + - builder-util@23.5.0 + - electron-publish@23.5.0 + ## 23.4.0 ### Minor Changes diff --git a/packages/app-builder-lib/package.json b/packages/app-builder-lib/package.json index b75423b8535..9a0457dd459 100644 --- a/packages/app-builder-lib/package.json +++ b/packages/app-builder-lib/package.json @@ -1,7 +1,7 @@ { "name": "app-builder-lib", "description": "electron-builder lib", - "version": "23.4.0", + "version": "23.5.0", "main": "out/index.js", "files": [ "out", diff --git a/packages/app-builder-lib/src/version.ts b/packages/app-builder-lib/src/version.ts index 88475989be3..9d0819aca37 100644 --- a/packages/app-builder-lib/src/version.ts +++ b/packages/app-builder-lib/src/version.ts @@ -1 +1 @@ -export const PACKAGE_VERSION = "23.4.0" +export const PACKAGE_VERSION = "23.5.0" diff --git a/packages/builder-util/CHANGELOG.md b/packages/builder-util/CHANGELOG.md index aa54511e5ca..0f18efd2249 100644 --- a/packages/builder-util/CHANGELOG.md +++ b/packages/builder-util/CHANGELOG.md @@ -1,5 +1,11 @@ # builder-util +## 23.5.0 + +### Patch Changes + +- [#7075](https://github.com/electron-userland/electron-builder/pull/7075) [`8166267d`](https://github.com/electron-userland/electron-builder/commit/8166267d487cd26b154e28cf60d89102a487a353) Thanks [@davej](https://github.com/davej)! - Allow explicit `buildNumber` in config. `buildNumber` will take precedence over any environment variables (#6945) + ## 23.4.0 ### Minor Changes diff --git a/packages/builder-util/package.json b/packages/builder-util/package.json index a160d9934a2..a154488e858 100644 --- a/packages/builder-util/package.json +++ b/packages/builder-util/package.json @@ -1,6 +1,6 @@ { "name": "builder-util", - "version": "23.4.0", + "version": "23.5.0", "main": "out/util.js", "author": "Vladimir Krivosheev", "license": "MIT", diff --git a/packages/dmg-builder/CHANGELOG.md b/packages/dmg-builder/CHANGELOG.md index b9cdc4377d0..f8347ca403a 100644 --- a/packages/dmg-builder/CHANGELOG.md +++ b/packages/dmg-builder/CHANGELOG.md @@ -1,5 +1,13 @@ # dmg-builder +## 23.5.0 + +### Patch Changes + +- Updated dependencies [[`e78a65c4`](https://github.com/electron-userland/electron-builder/commit/e78a65c46a55f794da2dd0d2f6e838f8421174b9), [`8166267d`](https://github.com/electron-userland/electron-builder/commit/8166267d487cd26b154e28cf60d89102a487a353), [`a1d86fd7`](https://github.com/electron-userland/electron-builder/commit/a1d86fd75bbc7b252403c16966430a2e3562205d)]: + - app-builder-lib@23.5.0 + - builder-util@23.5.0 + ## 23.4.0 ### Patch Changes diff --git a/packages/dmg-builder/package.json b/packages/dmg-builder/package.json index f282fe0665a..b30aae4a74a 100644 --- a/packages/dmg-builder/package.json +++ b/packages/dmg-builder/package.json @@ -1,6 +1,6 @@ { "name": "dmg-builder", - "version": "23.4.0", + "version": "23.5.0", "main": "out/dmgUtil.js", "author": "Vladimir Krivosheev", "license": "MIT", diff --git a/packages/electron-builder-squirrel-windows/CHANGELOG.md b/packages/electron-builder-squirrel-windows/CHANGELOG.md index 437b403bbcd..72b296c21bf 100644 --- a/packages/electron-builder-squirrel-windows/CHANGELOG.md +++ b/packages/electron-builder-squirrel-windows/CHANGELOG.md @@ -1,5 +1,13 @@ # electron-builder-squirrel-windows +## 23.5.0 + +### Patch Changes + +- Updated dependencies [[`e78a65c4`](https://github.com/electron-userland/electron-builder/commit/e78a65c46a55f794da2dd0d2f6e838f8421174b9), [`8166267d`](https://github.com/electron-userland/electron-builder/commit/8166267d487cd26b154e28cf60d89102a487a353), [`a1d86fd7`](https://github.com/electron-userland/electron-builder/commit/a1d86fd75bbc7b252403c16966430a2e3562205d)]: + - app-builder-lib@23.5.0 + - builder-util@23.5.0 + ## 23.4.0 ### Patch Changes diff --git a/packages/electron-builder-squirrel-windows/package.json b/packages/electron-builder-squirrel-windows/package.json index 4a63a252d3c..e857be3b427 100644 --- a/packages/electron-builder-squirrel-windows/package.json +++ b/packages/electron-builder-squirrel-windows/package.json @@ -1,6 +1,6 @@ { "name": "electron-builder-squirrel-windows", - "version": "23.4.0", + "version": "23.5.0", "main": "out/SquirrelWindowsTarget.js", "author": "Vladimir Krivosheev", "license": "MIT", diff --git a/packages/electron-builder/CHANGELOG.md b/packages/electron-builder/CHANGELOG.md index 8c1205a1500..2afdb949cab 100644 --- a/packages/electron-builder/CHANGELOG.md +++ b/packages/electron-builder/CHANGELOG.md @@ -1,5 +1,20 @@ # electron-builder +## 23.5.0 + +### Minor Changes + +- [#7075](https://github.com/electron-userland/electron-builder/pull/7075) [`8166267d`](https://github.com/electron-userland/electron-builder/commit/8166267d487cd26b154e28cf60d89102a487a353) Thanks [@davej](https://github.com/davej)! - Allow explicit `buildNumber` in config. `buildNumber` will take precedence over any environment variables (#6945) + +### Patch Changes + +- [#7078](https://github.com/electron-userland/electron-builder/pull/7078) [`48cbb120`](https://github.com/electron-userland/electron-builder/commit/48cbb120dc11994889f4aa61c8431531ce274006) Thanks [@mmaietta](https://github.com/mmaietta)! - fix: replace update-notifier with simple-update-notifier due to security alert + +- Updated dependencies [[`e78a65c4`](https://github.com/electron-userland/electron-builder/commit/e78a65c46a55f794da2dd0d2f6e838f8421174b9), [`8166267d`](https://github.com/electron-userland/electron-builder/commit/8166267d487cd26b154e28cf60d89102a487a353), [`a1d86fd7`](https://github.com/electron-userland/electron-builder/commit/a1d86fd75bbc7b252403c16966430a2e3562205d)]: + - app-builder-lib@23.5.0 + - builder-util@23.5.0 + - dmg-builder@23.5.0 + ## 23.4.0 ### Patch Changes diff --git a/packages/electron-builder/package.json b/packages/electron-builder/package.json index 9e8916a5475..ef2254e4131 100644 --- a/packages/electron-builder/package.json +++ b/packages/electron-builder/package.json @@ -1,7 +1,7 @@ { "name": "electron-builder", "description": "A complete solution to package and build a ready for distribution Electron app for MacOS, Windows and Linux with “auto update” support out of the box", - "version": "23.4.0", + "version": "23.5.0", "main": "out/index.js", "files": [ "out" diff --git a/packages/electron-forge-maker-appimage/CHANGELOG.md b/packages/electron-forge-maker-appimage/CHANGELOG.md index c5782f98858..62929d7c198 100644 --- a/packages/electron-forge-maker-appimage/CHANGELOG.md +++ b/packages/electron-forge-maker-appimage/CHANGELOG.md @@ -1,5 +1,12 @@ # electron-forge-maker-appimage +## 23.5.0 + +### Patch Changes + +- Updated dependencies [[`e78a65c4`](https://github.com/electron-userland/electron-builder/commit/e78a65c46a55f794da2dd0d2f6e838f8421174b9), [`8166267d`](https://github.com/electron-userland/electron-builder/commit/8166267d487cd26b154e28cf60d89102a487a353), [`a1d86fd7`](https://github.com/electron-userland/electron-builder/commit/a1d86fd75bbc7b252403c16966430a2e3562205d)]: + - app-builder-lib@23.5.0 + ## 23.4.0 ### Patch Changes diff --git a/packages/electron-forge-maker-appimage/package.json b/packages/electron-forge-maker-appimage/package.json index abfbf7b420a..4125f558d7d 100644 --- a/packages/electron-forge-maker-appimage/package.json +++ b/packages/electron-forge-maker-appimage/package.json @@ -1,6 +1,6 @@ { "name": "electron-forge-maker-appimage", - "version": "23.4.0", + "version": "23.5.0", "main": "main.js", "author": "Vladimir Krivosheev", "license": "MIT", diff --git a/packages/electron-forge-maker-nsis-web/CHANGELOG.md b/packages/electron-forge-maker-nsis-web/CHANGELOG.md index 997bba87f8b..e8dcfb0f988 100644 --- a/packages/electron-forge-maker-nsis-web/CHANGELOG.md +++ b/packages/electron-forge-maker-nsis-web/CHANGELOG.md @@ -1,5 +1,12 @@ # electron-forge-maker-nsis-web +## 23.5.0 + +### Patch Changes + +- Updated dependencies [[`e78a65c4`](https://github.com/electron-userland/electron-builder/commit/e78a65c46a55f794da2dd0d2f6e838f8421174b9), [`8166267d`](https://github.com/electron-userland/electron-builder/commit/8166267d487cd26b154e28cf60d89102a487a353), [`a1d86fd7`](https://github.com/electron-userland/electron-builder/commit/a1d86fd75bbc7b252403c16966430a2e3562205d)]: + - app-builder-lib@23.5.0 + ## 23.4.0 ### Patch Changes diff --git a/packages/electron-forge-maker-nsis-web/package.json b/packages/electron-forge-maker-nsis-web/package.json index 1ca1b406640..d8021000594 100644 --- a/packages/electron-forge-maker-nsis-web/package.json +++ b/packages/electron-forge-maker-nsis-web/package.json @@ -1,6 +1,6 @@ { "name": "electron-forge-maker-nsis-web", - "version": "23.4.0", + "version": "23.5.0", "main": "main.js", "author": "Vladimir Krivosheev", "license": "MIT", diff --git a/packages/electron-forge-maker-nsis/CHANGELOG.md b/packages/electron-forge-maker-nsis/CHANGELOG.md index b005cc6292a..64f7a1f5ed2 100644 --- a/packages/electron-forge-maker-nsis/CHANGELOG.md +++ b/packages/electron-forge-maker-nsis/CHANGELOG.md @@ -1,5 +1,12 @@ # electron-forge-maker-nsis +## 23.5.0 + +### Patch Changes + +- Updated dependencies [[`e78a65c4`](https://github.com/electron-userland/electron-builder/commit/e78a65c46a55f794da2dd0d2f6e838f8421174b9), [`8166267d`](https://github.com/electron-userland/electron-builder/commit/8166267d487cd26b154e28cf60d89102a487a353), [`a1d86fd7`](https://github.com/electron-userland/electron-builder/commit/a1d86fd75bbc7b252403c16966430a2e3562205d)]: + - app-builder-lib@23.5.0 + ## 23.4.0 ### Patch Changes diff --git a/packages/electron-forge-maker-nsis/package.json b/packages/electron-forge-maker-nsis/package.json index bac75acd214..77f1661393a 100644 --- a/packages/electron-forge-maker-nsis/package.json +++ b/packages/electron-forge-maker-nsis/package.json @@ -1,6 +1,6 @@ { "name": "electron-forge-maker-nsis", - "version": "23.4.0", + "version": "23.5.0", "main": "main.js", "author": "Vladimir Krivosheev", "license": "MIT", diff --git a/packages/electron-forge-maker-snap/CHANGELOG.md b/packages/electron-forge-maker-snap/CHANGELOG.md index 149da117cd9..076c29fe45e 100644 --- a/packages/electron-forge-maker-snap/CHANGELOG.md +++ b/packages/electron-forge-maker-snap/CHANGELOG.md @@ -1,5 +1,12 @@ # electron-forge-maker-snap +## 23.5.0 + +### Patch Changes + +- Updated dependencies [[`e78a65c4`](https://github.com/electron-userland/electron-builder/commit/e78a65c46a55f794da2dd0d2f6e838f8421174b9), [`8166267d`](https://github.com/electron-userland/electron-builder/commit/8166267d487cd26b154e28cf60d89102a487a353), [`a1d86fd7`](https://github.com/electron-userland/electron-builder/commit/a1d86fd75bbc7b252403c16966430a2e3562205d)]: + - app-builder-lib@23.5.0 + ## 23.4.0 ### Patch Changes diff --git a/packages/electron-forge-maker-snap/package.json b/packages/electron-forge-maker-snap/package.json index b7f1c09439e..e4630d53794 100644 --- a/packages/electron-forge-maker-snap/package.json +++ b/packages/electron-forge-maker-snap/package.json @@ -1,6 +1,6 @@ { "name": "electron-forge-maker-snap", - "version": "23.4.0", + "version": "23.5.0", "main": "main.js", "author": "Vladimir Krivosheev", "license": "MIT", diff --git a/packages/electron-publish/CHANGELOG.md b/packages/electron-publish/CHANGELOG.md index 430aefccd80..ae85ba95cb9 100644 --- a/packages/electron-publish/CHANGELOG.md +++ b/packages/electron-publish/CHANGELOG.md @@ -1,5 +1,12 @@ # electron-publish +## 23.5.0 + +### Patch Changes + +- Updated dependencies [[`8166267d`](https://github.com/electron-userland/electron-builder/commit/8166267d487cd26b154e28cf60d89102a487a353)]: + - builder-util@23.5.0 + ## 23.4.0 ### Minor Changes diff --git a/packages/electron-publish/package.json b/packages/electron-publish/package.json index da37afa1c57..37bbbc37d88 100644 --- a/packages/electron-publish/package.json +++ b/packages/electron-publish/package.json @@ -1,6 +1,6 @@ { "name": "electron-publish", - "version": "23.4.0", + "version": "23.5.0", "main": "out/publisher.js", "author": "Vladimir Krivosheev", "license": "MIT", diff --git a/packages/electron-updater/CHANGELOG.md b/packages/electron-updater/CHANGELOG.md index c366b37aef7..dd431efdd73 100644 --- a/packages/electron-updater/CHANGELOG.md +++ b/packages/electron-updater/CHANGELOG.md @@ -1,5 +1,11 @@ ## 4.3.0 +## 5.2.3 + +### Patch Changes + +- [#7099](https://github.com/electron-userland/electron-builder/pull/7099) [`cd21b091`](https://github.com/electron-userland/electron-builder/commit/cd21b0918843fe1269ddaf8dde099c8faeb54b80) Thanks [@alefoll](https://github.com/alefoll)! - fix(docs): improve `downloadUpdate` typing to match the doc + ## 5.2.2 ### Patch Changes diff --git a/packages/electron-updater/package.json b/packages/electron-updater/package.json index a4d6d5435d7..254ae62aedc 100644 --- a/packages/electron-updater/package.json +++ b/packages/electron-updater/package.json @@ -1,6 +1,6 @@ { "name": "electron-updater", - "version": "5.2.2", + "version": "5.2.3", "description": "Cross platform updater for electron applications", "main": "out/main.js", "author": "Vladimir Krivosheev",