From 3b8a8e5b6bb9a1ba0ceee5eb8b87a9831fab1426 Mon Sep 17 00:00:00 2001 From: Azure DevOps Pipeline Date: Mon, 3 Mar 2025 01:02:19 +0000 Subject: [PATCH 01/11] Update to RC1 --- changelog | 4 ++++ common | 2 +- msal/build.gradle | 4 ++-- msal/versioning/version.properties | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/changelog b/changelog index 685ecc962..137d64335 100644 --- a/changelog +++ b/changelog @@ -3,6 +3,10 @@ MSAL Wiki : https://github.com/AzureAD/microsoft-authentication-library-for-andr vNext ---------- +Version 5.10.1-RC1 +---------- +- [PATCH] Update common @20.1.0-RC1 + Version 5.10.0 ---------- - [PATCH] Update common @20.0.0 diff --git a/common b/common index 605a869c4..4bebea94a 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 605a869c4eea81fb31c163333bdd30f845433a5a +Subproject commit 4bebea94a583c624f8714a95ff71a16683546e6b diff --git a/msal/build.gradle b/msal/build.gradle index 08683e128..6570dea66 100644 --- a/msal/build.gradle +++ b/msal/build.gradle @@ -188,12 +188,12 @@ task sourcesJar(type: Jar) { // In dev, we want to keep the dependencies (common4j, common) to 1.0.+ to be able to be consumed by daily dev pipeline. // In release/*, we change these to specific versions being consumed. -def commonVersion = "1.0.+" +def commonVersion = "20.1.0-RC1" if (project.hasProperty("distCommonVersion")) { commonVersion = project.distCommonVersion } // Used for testfixtures -def common4jVersion = "1.0.+" +def common4jVersion = "20.1.0-RC1" if (project.hasProperty("distCommon4jVersion")) { distCommon4jVersion = project.distCommon4jVersion } diff --git a/msal/versioning/version.properties b/msal/versioning/version.properties index 2fddaa076..9c5315344 100644 --- a/msal/versioning/version.properties +++ b/msal/versioning/version.properties @@ -1,3 +1,3 @@ #Wed Aug 01 15:24:11 PDT 2018 -versionName=5.10.0 +versionName=5.10.1-RC1 versionCode=0 From d5789c10cba9fc4928b81d69fa1e069ac67327f7 Mon Sep 17 00:00:00 2001 From: Azure DevOps Pipeline Date: Mon, 3 Mar 2025 16:00:08 +0000 Subject: [PATCH 02/11] remove RC --- changelog | 4 ++-- common | 2 +- msal/build.gradle | 4 ++-- msal/versioning/version.properties | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/changelog b/changelog index 137d64335..1f43f4cc9 100644 --- a/changelog +++ b/changelog @@ -3,9 +3,9 @@ MSAL Wiki : https://github.com/AzureAD/microsoft-authentication-library-for-andr vNext ---------- -Version 5.10.1-RC1 +Version 5.10.1 ---------- -- [PATCH] Update common @20.1.0-RC1 +- [PATCH] Update common @20.1.0 Version 5.10.0 ---------- diff --git a/common b/common index 4bebea94a..513691f63 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 4bebea94a583c624f8714a95ff71a16683546e6b +Subproject commit 513691f63bd2f481f82968548b39f21ea4868dc5 diff --git a/msal/build.gradle b/msal/build.gradle index 6570dea66..c74c9ae74 100644 --- a/msal/build.gradle +++ b/msal/build.gradle @@ -188,12 +188,12 @@ task sourcesJar(type: Jar) { // In dev, we want to keep the dependencies (common4j, common) to 1.0.+ to be able to be consumed by daily dev pipeline. // In release/*, we change these to specific versions being consumed. -def commonVersion = "20.1.0-RC1" +def commonVersion = "20.1.0" if (project.hasProperty("distCommonVersion")) { commonVersion = project.distCommonVersion } // Used for testfixtures -def common4jVersion = "20.1.0-RC1" +def common4jVersion = "20.1.0" if (project.hasProperty("distCommon4jVersion")) { distCommon4jVersion = project.distCommon4jVersion } diff --git a/msal/versioning/version.properties b/msal/versioning/version.properties index 9c5315344..38e8a3948 100644 --- a/msal/versioning/version.properties +++ b/msal/versioning/version.properties @@ -1,3 +1,3 @@ #Wed Aug 01 15:24:11 PDT 2018 -versionName=5.10.1-RC1 +versionName=5.10.1 versionCode=0 From 3c6c7f93fd1dd04611dc33663cc91ffb6ebc68ed Mon Sep 17 00:00:00 2001 From: Melissa Ahn Date: Mon, 3 Mar 2025 11:54:15 -0800 Subject: [PATCH 03/11] 5.10.2-RC1 --- common | 2 +- msal/build.gradle | 4 ++-- msal/versioning/version.properties | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/common b/common index 513691f63..22bc2e03c 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 513691f63bd2f481f82968548b39f21ea4868dc5 +Subproject commit 22bc2e03c1cc9218c9c34168f737e8136f087c53 diff --git a/msal/build.gradle b/msal/build.gradle index c74c9ae74..9afd9f79e 100644 --- a/msal/build.gradle +++ b/msal/build.gradle @@ -188,12 +188,12 @@ task sourcesJar(type: Jar) { // In dev, we want to keep the dependencies (common4j, common) to 1.0.+ to be able to be consumed by daily dev pipeline. // In release/*, we change these to specific versions being consumed. -def commonVersion = "20.1.0" +def commonVersion = "20.1.1-RC1" if (project.hasProperty("distCommonVersion")) { commonVersion = project.distCommonVersion } // Used for testfixtures -def common4jVersion = "20.1.0" +def common4jVersion = "20.1.1-RC1" if (project.hasProperty("distCommon4jVersion")) { distCommon4jVersion = project.distCommon4jVersion } diff --git a/msal/versioning/version.properties b/msal/versioning/version.properties index 38e8a3948..a6f6ac7d0 100644 --- a/msal/versioning/version.properties +++ b/msal/versioning/version.properties @@ -1,3 +1,3 @@ #Wed Aug 01 15:24:11 PDT 2018 -versionName=5.10.1 +versionName=5.10.2-RC1 versionCode=0 From d56c0f170c66fbd6b5e99598d1bfcb0e9456a9d7 Mon Sep 17 00:00:00 2001 From: Melissa Ahn Date: Mon, 3 Mar 2025 11:55:37 -0800 Subject: [PATCH 04/11] changelog --- changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/changelog b/changelog index 1f43f4cc9..6269524ab 100644 --- a/changelog +++ b/changelog @@ -3,9 +3,9 @@ MSAL Wiki : https://github.com/AzureAD/microsoft-authentication-library-for-andr vNext ---------- -Version 5.10.1 +Version 5.10.2 ---------- -- [PATCH] Update common @20.1.0 +- [PATCH] Update common @20.1.1 Version 5.10.0 ---------- From 301e413f08446317bb0f90063aebfc804de1f9b7 Mon Sep 17 00:00:00 2001 From: Melissa Ahn Date: Wed, 5 Mar 2025 16:50:55 -0800 Subject: [PATCH 05/11] RC3 --- common | 2 +- msal/build.gradle | 4 ++-- msal/versioning/version.properties | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/common b/common index 22bc2e03c..69c8117b4 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 22bc2e03c1cc9218c9c34168f737e8136f087c53 +Subproject commit 69c8117b413210d59e9b8e8cef4adeef52756ad0 diff --git a/msal/build.gradle b/msal/build.gradle index 9afd9f79e..c20770962 100644 --- a/msal/build.gradle +++ b/msal/build.gradle @@ -188,12 +188,12 @@ task sourcesJar(type: Jar) { // In dev, we want to keep the dependencies (common4j, common) to 1.0.+ to be able to be consumed by daily dev pipeline. // In release/*, we change these to specific versions being consumed. -def commonVersion = "20.1.1-RC1" +def commonVersion = "20.1.1-RC3" if (project.hasProperty("distCommonVersion")) { commonVersion = project.distCommonVersion } // Used for testfixtures -def common4jVersion = "20.1.1-RC1" +def common4jVersion = "20.1.1-RC3" if (project.hasProperty("distCommon4jVersion")) { distCommon4jVersion = project.distCommon4jVersion } diff --git a/msal/versioning/version.properties b/msal/versioning/version.properties index a6f6ac7d0..32b78f49a 100644 --- a/msal/versioning/version.properties +++ b/msal/versioning/version.properties @@ -1,3 +1,3 @@ #Wed Aug 01 15:24:11 PDT 2018 -versionName=5.10.2-RC1 +versionName=5.10.2-RC3 versionCode=0 From d1f5523460f87c4bb66c9f4efc00311160c9502d Mon Sep 17 00:00:00 2001 From: Melissa Ahn Date: Thu, 6 Mar 2025 13:39:25 -0800 Subject: [PATCH 06/11] 5.10.2 --- common | 2 +- msal/build.gradle | 2 +- msal/versioning/version.properties | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common b/common index 69c8117b4..2d0013808 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 69c8117b413210d59e9b8e8cef4adeef52756ad0 +Subproject commit 2d00138086bba356b6fe9b0933c78622c0060ac2 diff --git a/msal/build.gradle b/msal/build.gradle index c20770962..73805c999 100644 --- a/msal/build.gradle +++ b/msal/build.gradle @@ -193,7 +193,7 @@ if (project.hasProperty("distCommonVersion")) { commonVersion = project.distCommonVersion } // Used for testfixtures -def common4jVersion = "20.1.1-RC3" +def common4jVersion = "20.1.1" if (project.hasProperty("distCommon4jVersion")) { distCommon4jVersion = project.distCommon4jVersion } diff --git a/msal/versioning/version.properties b/msal/versioning/version.properties index 32b78f49a..f82878c26 100644 --- a/msal/versioning/version.properties +++ b/msal/versioning/version.properties @@ -1,3 +1,3 @@ #Wed Aug 01 15:24:11 PDT 2018 -versionName=5.10.2-RC3 +versionName=5.10.2 versionCode=0 From 762882365385a15397acb664700860e783abaafe Mon Sep 17 00:00:00 2001 From: Melissa Ahn Date: Thu, 6 Mar 2025 15:20:31 -0800 Subject: [PATCH 07/11] updating submodule --- common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common b/common index 2d0013808..795df0412 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 2d00138086bba356b6fe9b0933c78622c0060ac2 +Subproject commit 795df0412003912d7aa8402b16f3a03455bd371d From f37025a10568e8febb5e99750673720474291e79 Mon Sep 17 00:00:00 2001 From: Melissa Ahn Date: Thu, 6 Mar 2025 15:42:45 -0800 Subject: [PATCH 08/11] removing another rc --- msal/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/msal/build.gradle b/msal/build.gradle index 73805c999..a0f07de0b 100644 --- a/msal/build.gradle +++ b/msal/build.gradle @@ -188,7 +188,7 @@ task sourcesJar(type: Jar) { // In dev, we want to keep the dependencies (common4j, common) to 1.0.+ to be able to be consumed by daily dev pipeline. // In release/*, we change these to specific versions being consumed. -def commonVersion = "20.1.1-RC3" +def commonVersion = "20.1.1" if (project.hasProperty("distCommonVersion")) { commonVersion = project.distCommonVersion } From 56ac38b1088a5aa6c293cd5f816f73ece67e105e Mon Sep 17 00:00:00 2001 From: Melissa Ahn Date: Thu, 6 Mar 2025 19:43:31 -0800 Subject: [PATCH 09/11] gradle change --- msal/build.gradle | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/msal/build.gradle b/msal/build.gradle index a0f07de0b..09ecf4c17 100644 --- a/msal/build.gradle +++ b/msal/build.gradle @@ -309,16 +309,16 @@ afterEvaluate { // Gradle 6.1.1 and Android Gradle Plugin 4.0.1 doesn't rename the file (see 'outputFileName' above) // Adding this work around to have the file properly renamed. // Please uncomment the section below for the Maven release step only. Currently troubleshooting why this extra renaming configuration is still needed for MSAL. -// tasks.named("assembleDistRelease").configure { -// def buildFile = file("$buildDir/outputs/aar/${archivesBaseName}-dist-release.aar") -// print "Build file $buildFile" -// doLast { -// println "Renaming build file $buildFile to '$buildDir${File.separator}outputs${File.separator}aar${File.separator}${archivesBaseName}-${version}.aar'" -// if (!buildFile.renameTo("$buildDir${File.separator}outputs${File.separator}aar${File.separator}${archivesBaseName}-${version}.aar")) { -// println "Rename failed!" -// } -// } -// } + tasks.named("assembleDistRelease").configure { + def buildFile = file("$buildDir/outputs/aar/${archivesBaseName}-dist-release.aar") + print "Build file $buildFile" + doLast { + println "Renaming build file $buildFile to '$buildDir${File.separator}outputs${File.separator}aar${File.separator}${archivesBaseName}-${version}.aar'" + if (!buildFile.renameTo("$buildDir${File.separator}outputs${File.separator}aar${File.separator}${archivesBaseName}-${version}.aar")) { + println "Rename failed!" + } + } + } publishing { publications { msal(MavenPublication) { From 89fac1bcaeb8449f5572fe6a8881e6f477c116ae Mon Sep 17 00:00:00 2001 From: Melissa Ahn Date: Fri, 7 Mar 2025 08:46:13 -0800 Subject: [PATCH 10/11] merging into dev --- common | 2 +- msal/build.gradle | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/common b/common index 795df0412..6676be01f 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 795df0412003912d7aa8402b16f3a03455bd371d +Subproject commit 6676be01fa0334f11ef249f32bef67280484b6f4 diff --git a/msal/build.gradle b/msal/build.gradle index 09ecf4c17..08683e128 100644 --- a/msal/build.gradle +++ b/msal/build.gradle @@ -188,12 +188,12 @@ task sourcesJar(type: Jar) { // In dev, we want to keep the dependencies (common4j, common) to 1.0.+ to be able to be consumed by daily dev pipeline. // In release/*, we change these to specific versions being consumed. -def commonVersion = "20.1.1" +def commonVersion = "1.0.+" if (project.hasProperty("distCommonVersion")) { commonVersion = project.distCommonVersion } // Used for testfixtures -def common4jVersion = "20.1.1" +def common4jVersion = "1.0.+" if (project.hasProperty("distCommon4jVersion")) { distCommon4jVersion = project.distCommon4jVersion } @@ -309,16 +309,16 @@ afterEvaluate { // Gradle 6.1.1 and Android Gradle Plugin 4.0.1 doesn't rename the file (see 'outputFileName' above) // Adding this work around to have the file properly renamed. // Please uncomment the section below for the Maven release step only. Currently troubleshooting why this extra renaming configuration is still needed for MSAL. - tasks.named("assembleDistRelease").configure { - def buildFile = file("$buildDir/outputs/aar/${archivesBaseName}-dist-release.aar") - print "Build file $buildFile" - doLast { - println "Renaming build file $buildFile to '$buildDir${File.separator}outputs${File.separator}aar${File.separator}${archivesBaseName}-${version}.aar'" - if (!buildFile.renameTo("$buildDir${File.separator}outputs${File.separator}aar${File.separator}${archivesBaseName}-${version}.aar")) { - println "Rename failed!" - } - } - } +// tasks.named("assembleDistRelease").configure { +// def buildFile = file("$buildDir/outputs/aar/${archivesBaseName}-dist-release.aar") +// print "Build file $buildFile" +// doLast { +// println "Renaming build file $buildFile to '$buildDir${File.separator}outputs${File.separator}aar${File.separator}${archivesBaseName}-${version}.aar'" +// if (!buildFile.renameTo("$buildDir${File.separator}outputs${File.separator}aar${File.separator}${archivesBaseName}-${version}.aar")) { +// println "Rename failed!" +// } +// } +// } publishing { publications { msal(MavenPublication) { From 353caf9f827a653da3ab946ad0d6d8c4bbef6e3e Mon Sep 17 00:00:00 2001 From: Melissa Ahn Date: Mon, 10 Mar 2025 15:25:19 -0700 Subject: [PATCH 11/11] common --- common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common b/common index 6676be01f..b8cb76067 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 6676be01fa0334f11ef249f32bef67280484b6f4 +Subproject commit b8cb76067b8976a6f064e5b7fd0f518c92c11210