Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: update oneauth version and use x64 packages #8882

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

chore: update oneauth version and use x64 packages #8882

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2a2fdfb
update oneauth version and use x64 packages
a-b-r-o-w-n Jan 4, 2022
d6b6baa
Fixed Windows package name
tonyanziano Jan 4, 2022
25e499f
Merge branch 'main' of https://github.com/microsoft/BotFramework-Comp…
tonyanziano Mar 25, 2022
a11cb86
Added missing OneAuth keychain entitlements.
tonyanziano Apr 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Composer/packages/electron-server/resources/entitlements-keychain.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
<key>keychain-access-groups</key>
<array>
<string>UBF8T346G9.com.microsoft.identity.universalstorage</string>
<string>UBF8T346G9.com.microsoft.oneauth</string>
<string>UBF8T346G9.com.microsoft.adalcache</string>
</array>
<key>com.apple.application-identifier</key>
<string>UBF8T346G9.com.microsoft.botframework.composer</string>
Expand Down
6 changes: 3 additions & 3 deletions Composer/packages/electron-server/scripts/installOneAuth.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@ const { log } = require('./common');
*/

let packageName = null;
const packageVersion = process.env.ONEAUTH_VERSION || '1.36.0';
const packageVersion = process.env.ONEAUTH_VERSION || '1.43.0';

switch (process.platform) {
case 'darwin':
packageName = 'oneauth-mac';
packageName = process.env.ONEAUTH_PACKAGE_MAC || 'oneauth-mac-x64';
log.info('Mac detected. Using %s package.', packageName);
break;
case 'win32':
packageName = 'oneauth-win64';
packageName = process.env.ONEAUTH_PACKAGE_WIN || 'oneauth-win-x64';
log.info('Windows detected. Using %s package.', packageName);
break;
default:
Expand Down