Skip to content

Commit 36f3c5c

Browse files
shoatmanshoatman
authored
Merge pull request #1459 from AzureAD/release/2.1.0-RC1
Release/2.1.0
2 parents e4618f2 + ed4dabe commit 36f3c5c

File tree

19 files changed

+479
-15
lines changed

19 files changed

+479
-15
lines changed

‎azure-pipelines/auth-client/instrumented-test.yml‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# File: azure-pipelines\auth-client\instrumented-test.yml
2+
# Description: Run instrumented test for MSAL in a docker container
3+
name: Instrumented Tests
4+
5+
trigger:
6+
- main
7+
8+
pool:
9+
name: DockerBuildAgents
10+
11+
resources:
12+
repositories:
13+
- repository: common
14+
type: github
15+
name: AzureAD/microsoft-authentication-library-common-for-android
16+
ref: dev
17+
endpoint: ANDROID_GITHUB
18+
19+
jobs:
20+
- job: instrumentedTest
21+
displayName: Instrumented Test MSAL
22+
workspace:
23+
clean: all
24+
steps:
25+
- template: azure-pipelines/templates/steps/auth-client/docker-tasks.yml@common

‎azure-pipelines/maven-release/msal-maven-release.yml‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
# File: azure-pipelines\maven-release\msal-maven-release.yml
2+
# Description: Publish msal to internal feed
3+
# https://identitydivision.visualstudio.com/Engineering/_packaging?_a=package&feed=AndroidADAL&package=com.microsoft.identity.client%3Amsal&protocolType=maven
4+
# Variable: 'msalVersion' was defined in the Variables tab
5+
# Variable: 'ENV_VSTS_MVN_ANDROIDADMSAL_USERNAME' was defined in the Variables tab
6+
# Variable: 'mvnAccessToken' was defined in the Variables tab
7+
# https://docs.microsoft.com/en-us/azure/devops/organizations/accounts/use-personal-access-tokens-to-authenticate
8+
name: $(date:yyyyMMdd)$(rev:.r)
9+
10+
trigger: none
11+
pr: none
12+
13+
resources:
14+
repositories:
15+
- repository: self
16+
type: git
17+
ref: master
18+
- repository: common
19+
type: github
20+
name: AzureAD/microsoft-authentication-library-common-for-android
21+
ref: dev
22+
endpoint: ANDROID_GITHUB
23+
24+
jobs:
25+
- template: azure-pipelines/templates/steps/maven-release/maven-release-jobs.yml@common
26+
parameters:
27+
project: msal
28+
projectVersion: $(msalVersion)
29+
checkoutSubmodules: recursive
30+
envVstsMvnAndroidAccessTokenVar: ENV_VSTS_MVN_ANDROID_MSAL_ACCESSTOKEN
31+
gradleAssembleReleaseTask: msal:clean msal:assembleDistRelease
32+
gradleGeneratePomFiletask: msal:generatePomFileForMsalPublication
33+
aarSourceFolder: msal\build\outputs\aar
34+
jarSourceFolder: msal\build\outputs\jar
35+
pomSourceFolder: msal\build\publications\msal
36+
gpgAar: true
37+
gpgSourcesJar: true
38+
gpgJavadocJar: true
39+
gpgJar: false

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

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
# File: azure-pipelines\pull-request-validation\pr-msal.yml
2+
# Description: Assemble and run unit test
3+
# Variable: 'ENV_VSTS_MVN_ANDROIDADACCOUNTS_USERNAME' was defined in the Variables tab
4+
# Variable: 'mvnAccessToken' was defined in the Variables tab
5+
# https://docs.microsoft.com/en-us/azure/devops/organizations/accounts/use-personal-access-tokens-to-authenticate
6+
name: $(date:yyyyMMdd)$(rev:.r)
7+
8+
variables:
9+
- name: BuildParameters.jdkVersion
10+
value: 1.8
11+
- name: BuildParameters.jdkArchitecture
12+
value: x64
13+
- name: BuildParameters.javaHomeSelection
14+
value: JDKVersion
15+
- name: robolectricSdkVersion
16+
value: 28
17+
18+
trigger:
19+
branches:
20+
include:
21+
- dev
22+
- master
23+
- release/*
24+
batch: True
25+
26+
resources:
27+
repositories:
28+
- repository: common
29+
type: github
30+
name: AzureAD/microsoft-authentication-library-common-for-android
31+
ref: dev
32+
endpoint: ANDROID_GITHUB
33+
34+
jobs:
35+
- job: Phase_1
36+
displayName: Phase 1
37+
cancelTimeoutInMinutes: 1
38+
pool:
39+
name: Hosted Windows 2019 with VS2019
40+
steps:
41+
- checkout: self
42+
clean: true
43+
submodules: recursive
44+
persistCredentials: True
45+
- template: azure-pipelines/templates/steps/credscan-policheck.yml@common
46+
parameters:
47+
policheckCmdLineArgsDir: msal
48+
- template: azure-pipelines/templates/steps/automation-cert.yml@common
49+
- task: JavaToolInstaller@0
50+
displayName: Use Java 8
51+
inputs:
52+
jdkArchitectureOption: x64
53+
jdkSourceOption: PreInstalled
54+
- task: Gradle@2
55+
name: Gradle1
56+
displayName: Assemble Release
57+
inputs:
58+
tasks: clean msal:assembleLocal
59+
publishJUnitResults: false
60+
testResultsFiles: '**/build/test-results/TEST-*.xml'
61+
jdkVersion: $(BuildParameters.jdkVersion)
62+
jdkArchitecture: $(BuildParameters.jdkArchitecture)
63+
sqGradlePluginVersion: 2.0.1
64+
- task: Gradle@2
65+
displayName: Run Unit tests
66+
inputs:
67+
tasks: testLocalDebugUnitTest -Plabtest -ProbolectricSdkVersion=28 -i
68+
javaHomeSelection: $(BuildParameters.javaHomeSelection)
69+
jdkVersion: 1.11
70+
- task: ComponentGovernanceComponentDetection@0
71+
displayName: Component Detection
72+
...

‎azure-pipelines/vsts-releases/msal-vsts-release.yml‎

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
# File: azure-pipelines\vsts-releases\msal-vsts-release.yml
2+
# Description: Publish msal to maven central (sonatype)
3+
# https://search.maven.org/search?q=g:com.microsoft.identity.client
4+
# Variable: 'ENV_VSTS_MVN_ANDROID_MSAL_USERNAME' was defined in the Variables tab
5+
# Variable: 'mvnAccessToken' was defined in the Variables tab
6+
# https://docs.microsoft.com/en-us/azure/devops/organizations/accounts/use-personal-access-tokens-to-authenticate
7+
name: $(date:yyyyMMdd)$(rev:.r)
8+
9+
trigger: none
10+
pr: none
11+
12+
resources:
13+
repositories:
14+
- repository: self
15+
type: git
16+
ref: master
17+
- repository: common
18+
type: github
19+
name: AzureAD/microsoft-authentication-library-common-for-android
20+
ref: dev
21+
endpoint: ANDROID_GITHUB
22+
23+
jobs:
24+
- job: Phase_1
25+
displayName: Phase 1
26+
cancelTimeoutInMinutes: 1
27+
pool:
28+
name: Hosted Windows 2019 with VS2019
29+
steps:
30+
- checkout: self
31+
clean: true
32+
submodules: recursive
33+
persistCredentials: True
34+
- task: CmdLine@1
35+
displayName: Set MVN Access Token in Environment
36+
inputs:
37+
filename: echo
38+
arguments: '##vso[task.setvariable variable=ENV_VSTS_MVN_ANDROID_MSAL_ACCESSTOKEN]$(mvnAccessToken)'
39+
- template: azure-pipelines/templates/steps/credscan-policheck.yml@common
40+
parameters:
41+
policheckCmdLineArgsDir: msal
42+
- task: Gradle@1
43+
name: Gradle1
44+
displayName: Assemble Release
45+
inputs:
46+
tasks: clean msal:assembleDistRelease
47+
publishJUnitResults: false
48+
jdkArchitecture: x86
49+
sqAnalysisBreakBuildIfQualityGateFailed: false
50+
- task: Gradle@2
51+
displayName: Publish
52+
inputs:
53+
tasks: msal:publish
54+
publishJUnitResults: false
55+
- task: CopyFiles@2
56+
name: CopyFiles1
57+
displayName: Copy Files to Artifact Staging Directory
58+
inputs:
59+
SourceFolder: msal\build\
60+
TargetFolder: $(build.artifactstagingdirectory)
61+
- task: PublishPipelineArtifact@1
62+
name: PublishPipelineArtifact1
63+
displayName: 'Publish Artifact: msal Release'
64+
inputs:
65+
ArtifactName: msalRelease
66+
TargetPath: $(Build.ArtifactStagingDirectory)
67+
...

‎changelog‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
11
MSAL Wiki : https://github.com/AzureAD/microsoft-authentication-library-for-android/wiki
2+
Version 2.1.0
3+
----------
4+
- Picks up [email protected]
5+
- Adds preview support for authorization using current Android Task
6+
- Fixes resource URI casing issue.
7+
28
Version 2.0.12
39
----------
410
- Picks up [email protected]

‎common‎

Submodule common updated 191 files

‎msal/build.gradle‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -274,9 +274,9 @@ dependencies {
274274
transitive = false
275275
}
276276

277-
snapshotApi(group: 'com.microsoft.identity', name: 'common', version: '3.4.3', changing: true)
277+
snapshotApi(group: 'com.microsoft.identity', name: 'common', version: '3.4.4', changing: true)
278278

279-
distApi("com.microsoft.identity:common:3.4.3") {
279+
distApi("com.microsoft.identity:common:3.4.4") {
280280
transitive = false
281281
}
282282
}
@@ -418,6 +418,8 @@ publishing {
418418
}
419419

420420
tasks.whenTaskAdded { task ->
421+
422+
421423
if (task.name.contains('assemble')) {
422424
task.dependsOn 'pmd'
423425
}
@@ -426,6 +428,10 @@ tasks.whenTaskAdded { task ->
426428
&& !task.name.contains('Snapshot')
427429
&& !task.name.contains('Test')
428430
&& !task.name.contains('Local')) {
429-
task.dependsOn 'lint', 'javadocJar', 'sourcesJar'
431+
task.dependsOn 'javadocJar', 'sourcesJar'
430432
}
433+
434+
435+
436+
431437
}

‎msal/src/main/AndroidManifest.xml‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,26 @@
1313
android:exported="false"
1414
android:launchMode="singleTask" />
1515

16+
<activity
17+
android:name="com.microsoft.identity.common.internal.providers.oauth2.CurrentTaskAuthorizationActivity"
18+
android:configChanges="orientation|keyboardHidden|screenSize|smallestScreenSize|screenLayout"
19+
android:exported="false"
20+
android:launchMode="standard" />
21+
1622
<!-- Helper activity for displaying current broker redirect URI configuration -->
1723
<activity
1824
android:name="com.microsoft.identity.client.helper.BrokerHelperActivity"
1925
android:configChanges="orientation|keyboardHidden|screenSize|smallestScreenSize|screenLayout"
2026
android:exported="false"
21-
android:launchMode="singleTask" />
27+
android:launchMode="standard" />
2228

2329
<!-- MSAL will use system webview (custom tab) to render the sign-in page, BrowserTabActivity is to get response back from System Webview. Multiple apps on the device could integrate MSAL, OS will check which BrowserTabActivity can handle the intent based on the intent filter declared, so this activity has to be exported.-->
2430
<activity
2531
android:name="com.microsoft.identity.client.BrowserTabActivity"
2632
android:exported="true" />
33+
34+
<activity
35+
android:name="com.microsoft.identity.client.CurrentTaskBrowserTabActivity"
36+
android:exported="true" />
2737
</application>
2838
</manifest>

0 commit comments

Comments
 (0)