Merge branch 'dev' into spetrescu/merge_main_1.5.0_to_dev

Author: spetrescu84

CODEOWNERS

@@ -22,6 +22,7 @@ CHANGELOG.md @AzureAD/AppleIdentityTeam @AzureAD/MSAL-ObjC-CIAM
 /MSAL/MSAL.xcodeproj/xcshareddata/xcschemes/MSAL\ iOS\ Native\ Auth\ E2E\ Tests.xcscheme @AzureAD/MSAL-ObjC-CIAM
 /MSAL/MSAL.xcodeproj/xcshareddata/xcschemes/MSAL\ Mac\ Native\ Auth\ E2E\ Tests.xcscheme @AzureAD/MSAL-ObjC-CIAM
 /Package.swift @AzureAD/MSAL-ObjC-CIAM
+/spm-integration-test.sh @AzureAD/MSAL-ObjC-CIAM
 # For more details about inheritance patterns, or to assign different
 # owners for individual file extensions, see:
 # https://help.github.com/articles/about-codeowners/

build.py

@@ -107,30 +107,6 @@ class ColorValues:
         "platform" : "visionOS",
         "target" : "visionOSFramework"
     },
-    {
-        "name" : "iOS Test App",
-        "scheme" : "MSAL Test App (iOS)",
-        "operations" : [ "build" ],
-        "platform" : "visionOS",
-        "target" : "visionOSTestApp"
-
-    },
-    {
-        "name" : "Sample iOS App",
-        "scheme" : "SampleAppiOS",
-        "workspace" : "Samples/ios/SampleApp.xcworkspace",
-        "operations" : [ "build" ],
-        "platform" : "visionOS",
-        "target" : "visionOSSampleApp"
-    },
-    {
-        "name" : "Sample iOS App-iOS",
-        "scheme" : "SampleAppiOS-Swift",
-        "workspace" : "Samples/ios/SampleApp.xcworkspace",
-        "operations" : [ "build" ],
-        "platform" : "visionOS",
-        "target" : "visionOSSampleAppSwift"
-    },
 ]
 
 def print_operation_start(name, operation) :

spm-integration-test.sh

@@ -48,7 +48,7 @@ cd "$SAMPLE_APP_TEMP_DIR"
 git clone https://github.com/Azure-Samples/ms-identity-ciam-native-auth-ios-sample.git
 cd ms-identity-ciam-native-auth-ios-sample
 
-sed -i '' 's#kind = upToNextMinorVersion;#kind = branch;#' NativeAuthSampleApp.xcodeproj/project.pbxproj
+sed -i '' 's#kind = upToNextMajorVersion;#kind = branch;#' NativeAuthSampleApp.xcodeproj/project.pbxproj
 sed -i '' "s#minimumVersion = [0-9.]*;#branch = $BRANCH_NAME;#" NativeAuthSampleApp.xcodeproj/project.pbxproj
 
 rm -f NativeAuthSampleApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved