Merge feb release back to dev (#1780)

p3dr0rv · fadidurah · web-flow · commit 41259d8d92af · 2024-02-14T09:26:17.000-08:00
* update changelog. common, build.gradle and version.properties

* fix rc1

* update common

* update to rc2

* update common

* update changelog

* rc3

* update to rc5

* remove rc

* update adal test app

* update

* revert 1.0.+

---------

Co-authored-by: fadidurah &lt;fadidurah@microsoft.com&gt;
diff --git a/adal/versioning/version.properties b/adal/versioning/version.properties
@@ -1,3 +1,3 @@
 #Wed Aug 01 15:24:11 PDT 2018
-versionName=4.8.5
+versionName=4.8.6
 versionCode=1
diff --git a/changelog.txt b/changelog.txt
@@ -1,6 +1,10 @@
 Version Next
 -------------
 
+Version 4.8.6
+-------------
+- [PATCH] Update common @17.1.0
+
 Version 4.8.5
 -------------
 - [PATCH] Update common @17.0.1
diff --git a/userappwithbroker/build.gradle b/userappwithbroker/build.gradle
@@ -16,8 +16,8 @@ allprojects {
     }
 }
 
-def adalVersion = "4.8.4"
-def commonVersion = "17.0.0"
+def adalVersion = "4.8.6"
+def commonVersion = "17.1.0"
 
 if (project.hasProperty("distAdalVersion")) {
     println "Overriding adal version to dist property " + distAdalVersion

Original file line number	Diff line number	Diff line change
`@@ -16,8 +16,8 @@ allprojects {`
`16`	`16`	`}`
`17`	`17`	`}`
`18`	`18`
`19`		`-def adalVersion = "4.8.4"`
`20`		`-def commonVersion = "17.0.0"`
	`19`	`+def adalVersion = "4.8.6"`
	`20`	`+def commonVersion = "17.1.0"`
`21`	`21`
`22`	`22`	`if (project.hasProperty("distAdalVersion")) {`
`23`	`23`	`println "Overriding adal version to dist property " + distAdalVersion`