Skip to content

Commit ad4b93d

Browse files
mohitc1Azure DevOps Pipeline
andauthored
Working/release/24.2.0 to release (#3104)
Co-authored-by: Azure DevOps Pipeline <build-agent@azuredevops.com>
1 parent 2388e1d commit ad4b93d

5 files changed

Lines changed: 28 additions & 3 deletions

File tree

changelog.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
vNext
22
----------
3+
4+
Version 24.2.0
5+
----------
36
- [PATCH] Add support for Authenticator app activation links in WebView, enabling account pairing/MFA flows to launch Microsoft Authenticator directly instead of redirecting to the Play Store (#3090)
47
- [PATCH] Fix: WPJ's BrokerDiscovery cache crash due to shared predefined encryption key with MSAL (#3081)
58
- [PATCH] Fix ABBA deadlock between AzureActiveDirectory and AzureActiveDirectoryAuthority class monitors by extracting polymorphic getAuthorityURL() calls outside synchronized scopes and removing unnecessary synchronized from ConcurrentHashMap read-only methods (#3082)

common/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ tasks.register("jacocoTestReport", JacocoReport) {
8787

8888
// In dev, we want to keep the dependencies(common4j, broker4j, common) to 1.0.+ to be able to be consumed by daily dev pipeline.
8989
// In release/*, we change these to specific versions being consumed.
90-
def common4jVersion = "1.0.+"
90+
def common4jVersion = "24.2.0"
9191
if (project.hasProperty("distCommon4jVersion") && project.distCommon4jVersion != '') {
9292
common4jVersion = project.distCommon4jVersion
9393
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
#Wed May 12 20:08:39 UTC 2021
2-
versionName=24.1.0
2+
versionName=24.2.0
33
versionCode=1
44
latestPatchVersion=227

uiautomationutilities/src/main/java/com/microsoft/identity/client/ui/automation/utils/UiAutomatorUtils.java

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -550,6 +550,28 @@ public static void handleButtonClickForObjectWithTextSafely(@NonNull final Strin
550550
}
551551
}
552552

553+
554+
/**
555+
* Clicks the button element that contains the supplied text.
556+
* Do not throw an exception if the button is not found. Waits
557+
* for the button to exist with the supplied timeout before giving up
558+
* and logging a warning.
559+
*
560+
* @param text the text on the button to click
561+
* @param existsTimeout the maximum time to wait, in milliseconds, for the button
562+
* to exist before giving up and logging a warning
563+
*/
564+
public static void handleButtonClickForObjectWithTextSafely(@NonNull final String text, final long existsTimeout) {
565+
final UiObject button = obtainUiObjectWithText(text, existsTimeout);
566+
567+
try {
568+
button.click();
569+
} catch (final UiObjectNotFoundException e) {
570+
Logger.w(TAG, "Button with text \"" + text + "\" was not found after waiting "
571+
+ existsTimeout + " ms: " + e.getMessage());
572+
}
573+
}
574+
553575
/**
554576
* Clicks the button element that contains text matching the supplied regex
555577
*/

versioning/version.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
#Tue Apr 06 22:55:08 UTC 2021
2-
versionName=24.1.0
2+
versionName=24.2.0
33
versionCode=1
44
latestPatchVersion=234

0 commit comments

Comments
 (0)