Merge branch 'dev' into sedemche/merge_main_in_dev

AzureAD · Dec 20, 2024 · 32ed147 · 32ed147
2 parents 6616a0f + 1d64572
commit 32ed147
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 9 deletions.
diff --git a/MSAL/IdentityCore b/MSAL/IdentityCore
diff --git a/MSAL/src/public/MSALWebviewParameters.h b/MSAL/src/public/MSALWebviewParameters.h
@@ -44,7 +44,8 @@ NS_ASSUME_NONNULL_BEGIN
 #pragma mark - Configuration options
 
 /**
- The view controller to present from. If nil, the current topmost view controller will be used.
+ The view controller to present from. If nil, MSAL will attempt to still proceed with the authentication, but the results will be unexpected.
+ It is strongly recommended to provide a non-null parentViewController to avoid unexpected results.
  */
 @property (nullable, weak, nonatomic) MSALViewController *parentViewController;
 
@@ -90,7 +91,7 @@ NS_ASSUME_NONNULL_BEGIN
 /**
    Creates an instance of MSALWebviewParameters with a provided parentViewController.
    @param parentViewController The view controller to present authorization UI from.
-   @note parentViewController is mandatory on iOS 13+. It is strongly recommended on macOS 10.15+ to allow correct presentation of ASWebAuthenticationSession. If parentViewController is not provided on macOS 10.15+, MSAL will use application's keyWindow for presentation
+   @note parentViewController is mandatory on iOS 13+  and macOS 10.15+. Your app will experience unexpected results if parentViewController is not provided.
 */
 - (nonnull instancetype)initWithAuthPresentationViewController:(MSALViewController *)parentViewController;
 

diff --git a/azure_pipelines/pr-validation.yml b/azure_pipelines/pr-validation.yml
@@ -49,11 +49,17 @@ jobs:
   - script: |
           /bin/bash -c "sudo xcode-select -s /Applications/Xcode_15.4.app"
     displayName: 'Switch to use Xcode 15.4'
+  - task: CmdLine@2
+    displayName: Installing xcpretty
+    inputs:
+      script: |
+        gem install xcpretty -N -v 0.3.0
+      failOnStderr: true
   - task: CmdLine@2
     displayName: Installing dependencies
     inputs:
       script: |
-        gem install xcpretty slather bundler -N
+        gem install slather bundler -N
       failOnStderr: true
   - checkout: self
     clean: true
@@ -193,7 +199,7 @@ jobs:
 - job: 'Validate_SPM_Integration'
   displayName: Validate SPM Integration
   pool:
-    vmImage: 'macOS-13'
+    vmImage: 'macOS-14'
     timeOutInMinutes: 15
   workspace:
     clean: all
@@ -208,8 +214,8 @@ jobs:
     path: s
 
   - script: |
-        /bin/bash -c "sudo xcode-select -s /Applications/Xcode_14.3.app"
-    displayName: 'Switch to use Xcode 14.3'
+        /bin/bash -c "sudo xcode-select -s /Applications/Xcode_15.4.app"
+    displayName: 'Switch to use Xcode 15.4'
 
   - task: Bash@3
     displayName: Set variable BRANCH_NAME to a temporary branch

diff --git a/azure_pipelines/templates/tests-with-conf-file.yml b/azure_pipelines/templates/tests-with-conf-file.yml
@@ -26,7 +26,7 @@ steps:
       script: |        
         cd $(Agent.BuildDirectory)/s
   
-  - script: 'gem install xcpretty'
+  - script: 'gem install xcpretty -v 0.3.0'
     displayName: 'Install xcpretty'
 
   - task: AzureCLI@2

diff --git a/spm-integration-test.sh b/spm-integration-test.sh
@@ -56,4 +56,4 @@ rm -f NativeAuthSampleApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Pac
 echo "Running the Sample App with the temporary Swift Package"
 
 xcodebuild -resolvePackageDependencies
-xcodebuild -scheme NativeAuthSampleApp -configuration Release -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 14,OS=16.4' clean build
+xcodebuild -scheme NativeAuthSampleApp -configuration Release -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 15,OS=17.5' clean build
+1 −1		IdentityCore/src/logger/MSIDMaskedUsernameLogParameter.m
+11 −0		IdentityCore/tests/MSIDMaskedUsernameLogParameterTests.m
+1 −0		IdentityCore/tests/automation/shared/MSIDAutomationTestRequest.h
+2 −0		IdentityCore/tests/automation/shared/MSIDAutomationTestRequest.m
+1 −0		IdentityCore/tests/automation/shared/MSIDAutomationUserInformation.h
+2 −0		IdentityCore/tests/automation/shared/MSIDAutomationUserInformation.m
+8 −0		IdentityCore/tests/automation/ui_app_lib/MSIDClearCookiesTestAction.m
+28 −13		IdentityCore/tests/automation/ui_tests_lib/MSIDBaseUITest.m
+8 −1		azure_pipelines/msal_submodule_check.yaml
+8 −2		azure_pipelines/pr-validation.yml
+3 −0		changelog.txt