Skip to content

Commit d0d909d

Browse files
authored
1 parent e24de6b commit d0d909d

File tree

6 files changed

+33
-32
lines changed

6 files changed

+33
-32
lines changed

azure-pipelines/pull-request-validation/pr-msal.yml

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -93,31 +93,31 @@ jobs:
9393
# inputs:
9494
# tasks: clean msal:lintLocalDebug
9595
# publishJUnitResults: false
96-
- job: codeql
97-
displayName: CodeQL
98-
cancelTimeoutInMinutes: 1
99-
steps:
100-
- checkout: self
101-
clean: true
102-
submodules: recursive
103-
persistCredentials: True
104-
- task: CmdLine@1
105-
displayName: Set Office MVN Access Token in Environment
106-
inputs:
107-
filename: echo
108-
arguments: '##vso[task.setvariable variable=ENV_VSTS_MVN_ANDROID_MSAL_ACCESSTOKEN]$(System.AccessToken)'
109-
- task: Semmle@1
110-
inputs:
111-
sourceCodeDirectory: '$(Build.SourcesDirectory)'
112-
language: 'java'
113-
buildCommandsString: 'gradlew.bat clean msal:assembleLocal'
114-
querySuite: 'Recommended'
115-
timeout: '1800'
116-
- task: PublishPipelineArtifact@1
117-
displayName: 'Publish code analysis artifacts'
118-
inputs:
119-
targetPath: '$(Build.SourcesDirectory)\build\outputs\'
120-
ArtifactName: 'outputs'
121-
condition: failed()
96+
#- job: codeql
97+
# displayName: CodeQL
98+
# cancelTimeoutInMinutes: 1
99+
# steps:
100+
# - checkout: self
101+
# clean: true
102+
# submodules: recursive
103+
# persistCredentials: True
104+
# - task: CmdLine@1
105+
# displayName: Set Office MVN Access Token in Environment
106+
# inputs:
107+
# filename: echo
108+
# arguments: '##vso[task.setvariable variable=ENV_VSTS_MVN_ANDROID_MSAL_ACCESSTOKEN]$(System.AccessToken)'
109+
# - task: Semmle@1
110+
# inputs:
111+
# sourceCodeDirectory: '$(Build.SourcesDirectory)'
112+
# language: 'java'
113+
# buildCommandsString: 'gradlew.bat clean msal:assembleLocal'
114+
# querySuite: 'Recommended'
115+
# timeout: '1800'
116+
# - task: PublishPipelineArtifact@1
117+
# displayName: 'Publish code analysis artifacts'
118+
# inputs:
119+
# targetPath: '$(Build.SourcesDirectory)\build\outputs\'
120+
# ArtifactName: 'outputs'
121+
# condition: failed()
122122

123123
...

changelog

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
MSAL Wiki : https://github.com/AzureAD/microsoft-authentication-library-for-android/wiki
2+
Version 4.6.3
3+
----------
4+
- [PATCH] Update common @14.0.1
5+
26
Version 4.6.2
37
----------
48
- [PATCH] Wire new Broker Discovery Client into MSAL - still disabled by default (#1835)

msal/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ task sourcesJar(type: Jar) {
187187

188188
// In dev, we want to keep the dependencies(common4j, broker4j, common) to 0.0.+ to be able to be consumed by daily dev pipeline.
189189
// In release/*, we change these to specific versions being consumed.
190-
String commonVersion = project.hasProperty("distCommonVersion") ? project.distCommonVersion : "14.0.0"
190+
String commonVersion = project.hasProperty("distCommonVersion") ? project.distCommonVersion : "14.0.1"
191191

192192
dependencies {
193193
//Please leave this in... desugaring is currently disabled by default; however it's required for running some tests

msal/src/test/java/com/microsoft/identity/client/e2e/tests/mocked/CrossCloudGuestAccountTest.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@
6565
import java.util.regex.Pattern;
6666

6767
import static com.microsoft.identity.client.e2e.utils.AcquireTokenTestHelper.getAccount;
68-
import static com.microsoft.identity.common.java.cache.AbstractAccountCredentialCache.SHA1_APPLICATION_IDENTIFIER_ACCESS_TOKEN_CLEARED;
6968
import static com.microsoft.identity.internal.testutils.TestConstants.Scopes.USER_READ_SCOPE;
7069
import static org.junit.Assert.assertEquals;
7170
import static org.junit.Assert.assertFalse;
@@ -297,8 +296,6 @@ public void onError(@NonNull MsalException exception) {
297296
final IMultiTypeNameValueStorage sharedPreferences = mComponents.getStorageSupplier()
298297
.getEncryptedFileStore(SHARED_PREFERENCES_NAME);
299298
final Map<String, ?> cacheValues = sharedPreferences.getAll();
300-
//Getting rid of the SHA-1 cleared flag so it doesn't mess with the assertions below.
301-
cacheValues.remove(SHA1_APPLICATION_IDENTIFIER_ACCESS_TOKEN_CLEARED);
302299

303300
assertEquals("Verify number of Cache records (AT, RT, IdToken, AccountRecord) for non removed account",
304301
4, cacheValues.size());

msal/versioning/version.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#Wed Aug 01 15:24:11 PDT 2018
2-
versionName=4.6.2
2+
versionName=4.6.3
33
versionCode=0

0 commit comments

Comments
 (0)