Skip to content

Commit 36dd6d3

Browse files
mipetriumipetriu
authored
Merge pull request #2623 from AzureAD/mipetriu/update_min_version
Update min deployment versions to iOS 16, macOS 11
2 parents 8fe5313 + 5de5990 commit 36dd6d3

File tree

6 files changed

+55
-60
lines changed

6 files changed

+55
-60
lines changed

‎CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
## TBD
22
* Integrate Broker XPC service into Mac Sample app
3+
* Update minimum supported version to iOS 16.0 and macOS 11.0 (#2623)
34

45
## [2.0.0]
56
* Use a single family refresh token (#2550)

‎MSAL/IdentityCore

Submodule IdentityCore updated 20 files

‎MSAL/MSAL.xcodeproj/project.pbxproj

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -7934,7 +7934,7 @@
79347934
ENABLE_BITCODE = NO;
79357935
GCC_DYNAMIC_NO_PIC = NO;
79367936
GCC_OPTIMIZATION_LEVEL = 0;
7937-
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
7937+
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
79387938
LD_RUNPATH_SEARCH_PATHS = (
79397939
"$(inherited)",
79407940
"@executable_path/Frameworks",
@@ -7954,7 +7954,7 @@
79547954
COPY_PHASE_STRIP = YES;
79557955
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
79567956
ENABLE_BITCODE = NO;
7957-
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
7957+
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
79587958
LD_RUNPATH_SEARCH_PATHS = (
79597959
"$(inherited)",
79607960
"@executable_path/Frameworks",
@@ -7972,7 +7972,7 @@
79727972
COPY_PHASE_STRIP = NO;
79737973
GCC_DYNAMIC_NO_PIC = NO;
79747974
GCC_OPTIMIZATION_LEVEL = 0;
7975-
MACOSX_DEPLOYMENT_TARGET = 10.15;
7975+
MACOSX_DEPLOYMENT_TARGET = 11.0;
79767976
PRODUCT_NAME = "MSAL (macOS Static Library)";
79777977
};
79787978
name = Debug;
@@ -7983,7 +7983,7 @@
79837983
buildSettings = {
79847984
COPY_PHASE_STRIP = YES;
79857985
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
7986-
MACOSX_DEPLOYMENT_TARGET = 10.15;
7986+
MACOSX_DEPLOYMENT_TARGET = 11.0;
79877987
PRODUCT_NAME = "MSAL (macOS Static Library)";
79887988
};
79897989
name = Release;
@@ -8046,7 +8046,7 @@
80468046
"$(inherited)",
80478047
"@executable_path/../Frameworks",
80488048
);
8049-
MACOSX_DEPLOYMENT_TARGET = 10.15;
8049+
MACOSX_DEPLOYMENT_TARGET = 11.0;
80508050
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
80518051
MTL_FAST_MATH = YES;
80528052
ONLY_ACTIVE_ARCH = YES;
@@ -8118,7 +8118,7 @@
81188118
"$(inherited)",
81198119
"@executable_path/../Frameworks",
81208120
);
8121-
MACOSX_DEPLOYMENT_TARGET = 10.15;
8121+
MACOSX_DEPLOYMENT_TARGET = 11.0;
81228122
MTL_ENABLE_DEBUG_INFO = NO;
81238123
MTL_FAST_MATH = YES;
81248124
PRODUCT_BUNDLE_IDENTIFIER = com.microsoft.MSALMacTestApp;
@@ -8187,7 +8187,7 @@
81878187
GCC_WARN_UNUSED_VARIABLE = YES;
81888188
GENERATE_INFOPLIST_FILE = YES;
81898189
HEADER_SEARCH_PATHS = $SRCROOT;
8190-
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
8190+
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
81918191
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
81928192
MACOSX_DEPLOYMENT_TARGET = 14.4;
81938193
MARKETING_VERSION = 1.0;
@@ -8260,7 +8260,7 @@
82608260
GCC_WARN_UNUSED_FUNCTION = YES;
82618261
GCC_WARN_UNUSED_VARIABLE = YES;
82628262
GENERATE_INFOPLIST_FILE = YES;
8263-
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
8263+
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
82648264
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
82658265
MACOSX_DEPLOYMENT_TARGET = 14.4;
82668266
MARKETING_VERSION = 1.0;
@@ -8334,7 +8334,7 @@
83348334
GCC_WARN_UNUSED_VARIABLE = YES;
83358335
GENERATE_INFOPLIST_FILE = YES;
83368336
HEADER_SEARCH_PATHS = $SRCROOT;
8337-
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
8337+
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
83388338
MARKETING_VERSION = 1.0;
83398339
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
83408340
MTL_FAST_MATH = YES;
@@ -8408,7 +8408,7 @@
84088408
GCC_WARN_UNUSED_VARIABLE = YES;
84098409
GENERATE_INFOPLIST_FILE = YES;
84108410
HEADER_SEARCH_PATHS = $SRCROOT;
8411-
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
8411+
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
84128412
MARKETING_VERSION = 1.0;
84138413
MTL_ENABLE_DEBUG_INFO = NO;
84148414
MTL_FAST_MATH = YES;
@@ -8601,7 +8601,7 @@
86018601
ENABLE_BITCODE = NO;
86028602
GCC_OPTIMIZATION_LEVEL = 0;
86038603
INFOPLIST_FILE = "$(SRCROOT)/test/automation/ios/resources/Info.plist";
8604-
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
8604+
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
86058605
LD_RUNPATH_SEARCH_PATHS = (
86068606
"$(inherited)",
86078607
"@executable_path/Frameworks",
@@ -8623,7 +8623,7 @@
86238623
DEVELOPMENT_TEAM = UBF8T346G9;
86248624
ENABLE_BITCODE = NO;
86258625
INFOPLIST_FILE = "$(SRCROOT)/test/automation/ios/resources/Info.plist";
8626-
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
8626+
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
86278627
LD_RUNPATH_SEARCH_PATHS = (
86288628
"$(inherited)",
86298629
"@executable_path/Frameworks",
@@ -8689,7 +8689,7 @@
86898689
"$(inherited)",
86908690
"@executable_path/../Frameworks",
86918691
);
8692-
MACOSX_DEPLOYMENT_TARGET = 10.15;
8692+
MACOSX_DEPLOYMENT_TARGET = 11.0;
86938693
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
86948694
MTL_FAST_MATH = YES;
86958695
ONLY_ACTIVE_ARCH = YES;
@@ -8753,7 +8753,7 @@
87538753
"$(inherited)",
87548754
"@executable_path/../Frameworks",
87558755
);
8756-
MACOSX_DEPLOYMENT_TARGET = 10.15;
8756+
MACOSX_DEPLOYMENT_TARGET = 11.0;
87578757
MTL_ENABLE_DEBUG_INFO = NO;
87588758
MTL_FAST_MATH = YES;
87598759
PRODUCT_BUNDLE_IDENTIFIER = "com.microsoft.unit-test-host";
@@ -8816,7 +8816,7 @@
88168816
GCC_WARN_UNUSED_FUNCTION = YES;
88178817
GCC_WARN_UNUSED_VARIABLE = YES;
88188818
INFOPLIST_FILE = test/automation/tests/interactive/Info.plist;
8819-
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
8819+
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
88208820
LD_RUNPATH_SEARCH_PATHS = (
88218821
"$(inherited)",
88228822
"@executable_path/Frameworks",
@@ -8884,7 +8884,7 @@
88848884
GCC_WARN_UNUSED_FUNCTION = YES;
88858885
GCC_WARN_UNUSED_VARIABLE = YES;
88868886
INFOPLIST_FILE = test/automation/tests/interactive/Info.plist;
8887-
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
8887+
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
88888888
LD_RUNPATH_SEARCH_PATHS = (
88898889
"$(inherited)",
88908890
"@executable_path/Frameworks",
@@ -8954,7 +8954,7 @@
89548954
GCC_WARN_UNUSED_FUNCTION = YES;
89558955
GCC_WARN_UNUSED_VARIABLE = YES;
89568956
INFOPLIST_FILE = test/automation/tests/interactive/Info.plist;
8957-
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
8957+
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
89588958
LD_RUNPATH_SEARCH_PATHS = (
89598959
"@loader_path/Frameworks",
89608960
"@executable_path/Frameworks",
@@ -9023,7 +9023,7 @@
90239023
GCC_WARN_UNUSED_FUNCTION = YES;
90249024
GCC_WARN_UNUSED_VARIABLE = YES;
90259025
INFOPLIST_FILE = test/automation/tests/interactive/Info.plist;
9026-
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
9026+
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
90279027
LD_RUNPATH_SEARCH_PATHS = (
90289028
"@loader_path/Frameworks",
90299029
"@executable_path/Frameworks",
@@ -9054,7 +9054,7 @@
90549054
ENABLE_BITCODE = NO;
90559055
GCC_OPTIMIZATION_LEVEL = 0;
90569056
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
9057-
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
9057+
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
90589058
LD_RUNPATH_SEARCH_PATHS = (
90599059
"$(inherited)",
90609060
"@executable_path/Frameworks",
@@ -9083,7 +9083,7 @@
90839083
DEVELOPMENT_TEAM = UBF8T346G9;
90849084
ENABLE_BITCODE = NO;
90859085
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
9086-
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
9086+
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
90879087
LD_RUNPATH_SEARCH_PATHS = (
90889088
"$(inherited)",
90899089
"@executable_path/Frameworks",
@@ -9110,7 +9110,7 @@
91109110
ENABLE_BITCODE = NO;
91119111
GCC_OPTIMIZATION_LEVEL = 0;
91129112
HEADER_SEARCH_PATHS = $SRCROOT;
9113-
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
9113+
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
91149114
LD_RUNPATH_SEARCH_PATHS = (
91159115
"$(inherited)",
91169116
"@executable_path/Frameworks",
@@ -9139,7 +9139,7 @@
91399139
DEVELOPMENT_TEAM = "";
91409140
ENABLE_BITCODE = NO;
91419141
HEADER_SEARCH_PATHS = $SRCROOT;
9142-
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
9142+
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
91439143
LD_RUNPATH_SEARCH_PATHS = (
91449144
"$(inherited)",
91459145
"@executable_path/Frameworks",
@@ -9172,7 +9172,7 @@
91729172
"@loader_path/Frameworks",
91739173
);
91749174
LLVM_LTO = YES_THIN;
9175-
MACOSX_DEPLOYMENT_TARGET = 10.15;
9175+
MACOSX_DEPLOYMENT_TARGET = 11.0;
91769176
MARKETING_VERSION = 1.1.24;
91779177
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
91789178
SWIFT_VERSION = 5.0;
@@ -9194,7 +9194,7 @@
91949194
"@loader_path/Frameworks",
91959195
);
91969196
LLVM_LTO = YES_THIN;
9197-
MACOSX_DEPLOYMENT_TARGET = 10.15;
9197+
MACOSX_DEPLOYMENT_TARGET = 11.0;
91989198
MARKETING_VERSION = 1.1.24;
91999199
SWIFT_VERSION = 5.0;
92009200
};
@@ -9213,7 +9213,7 @@
92139213
ENABLE_BITCODE = NO;
92149214
GCC_OPTIMIZATION_LEVEL = 0;
92159215
HEADER_SEARCH_PATHS = $SRCROOT;
9216-
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
9216+
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
92179217
LD_RUNPATH_SEARCH_PATHS = (
92189218
"$(inherited)",
92199219
"@executable_path/Frameworks",
@@ -9246,7 +9246,7 @@
92469246
DEVELOPMENT_TEAM = "";
92479247
ENABLE_BITCODE = NO;
92489248
HEADER_SEARCH_PATHS = $SRCROOT;
9249-
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
9249+
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
92509250
LD_RUNPATH_SEARCH_PATHS = (
92519251
"$(inherited)",
92529252
"@executable_path/Frameworks",
@@ -9276,7 +9276,7 @@
92769276
DEVELOPMENT_TEAM = "";
92779277
GCC_OPTIMIZATION_LEVEL = 0;
92789278
HEADER_SEARCH_PATHS = $SRCROOT;
9279-
MACOSX_DEPLOYMENT_TARGET = 10.15;
9279+
MACOSX_DEPLOYMENT_TARGET = 11.0;
92809280
PROVISIONING_PROFILE_SPECIFIER = "";
92819281
SWIFT_VERSION = 5.0;
92829282
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/unit-test-host-mac.app/Contents/MacOS/unit-test-host-mac";
@@ -9298,7 +9298,7 @@
92989298
CODE_SIGN_STYLE = Manual;
92999299
DEVELOPMENT_TEAM = "";
93009300
HEADER_SEARCH_PATHS = $SRCROOT;
9301-
MACOSX_DEPLOYMENT_TARGET = 10.15;
9301+
MACOSX_DEPLOYMENT_TARGET = 11.0;
93029302
PROVISIONING_PROFILE_SPECIFIER = "";
93039303
SWIFT_VERSION = 5.0;
93049304
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/unit-test-host-mac.app/Contents/MacOS/unit-test-host-mac";
@@ -9319,7 +9319,7 @@
93199319
CODE_SIGN_STYLE = Manual;
93209320
DEVELOPMENT_TEAM = "";
93219321
ENABLE_BITCODE = NO;
9322-
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
9322+
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
93239323
PROVISIONING_PROFILE_SPECIFIER = "";
93249324
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator xros xrsimulator";
93259325
TARGETED_DEVICE_FAMILY = "1,2,7";
@@ -9335,7 +9335,7 @@
93359335
CODE_SIGN_STYLE = Manual;
93369336
DEVELOPMENT_TEAM = "";
93379337
ENABLE_BITCODE = NO;
9338-
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
9338+
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
93399339
PROVISIONING_PROFILE_SPECIFIER = "";
93409340
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator xros xrsimulator";
93419341
TARGETED_DEVICE_FAMILY = "1,2,7";

‎MSAL/test/app/vision/MSALTestAppVisionViewController.swift

Lines changed: 19 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -142,22 +142,17 @@ extension MSALTestAppVisionViewController {
142142
extension MSALTestAppVisionViewController {
143143

144144
@objc func getDeviceMode(_ sender: UIButton) {
145-
146-
if #available(iOS 13.0, *) {
147-
self.applicationContext?.getDeviceInformation(with: nil, completionBlock: { (deviceInformation, error) in
148-
149-
guard let deviceInfo = deviceInformation else {
150-
self.updateLogging(text: "Device info not returned. Error: \(String(describing: error))")
151-
return
152-
}
153-
154-
let isSharedDevice = deviceInfo.deviceMode == .shared
155-
let modeString = isSharedDevice ? "shared" : "private"
156-
self.updateLogging(text: "Received device info. Device is in the \(modeString) mode.")
157-
})
158-
} else {
159-
self.updateLogging(text: "Running on older iOS. GetDeviceInformation API is unavailable.")
160-
}
145+
self.applicationContext?.getDeviceInformation(with: nil, completionBlock: { (deviceInformation, error) in
146+
147+
guard let deviceInfo = deviceInformation else {
148+
self.updateLogging(text: "Device info not returned. Error: \(String(describing: error))")
149+
return
150+
}
151+
152+
let isSharedDevice = deviceInfo.deviceMode == .shared
153+
let modeString = isSharedDevice ? "shared" : "private"
154+
self.updateLogging(text: "Received device info. Device is in the \(modeString) mode.")
155+
})
161156
}
162157
}
163158

@@ -424,17 +419,14 @@ extension MSALTestAppVisionViewController {
424419
extension MSALTestAppVisionViewController {
425420

426421
func refreshDeviceMode() {
427-
428-
if #available(iOS 13.0, *) {
429-
self.applicationContext?.getDeviceInformation(with: nil, completionBlock: { (deviceInformation, error) in
430-
431-
guard let deviceInfo = deviceInformation else {
432-
return
433-
}
434-
435-
self.currentDeviceMode = deviceInfo.deviceMode
436-
})
437-
}
422+
self.applicationContext?.getDeviceInformation(with: nil, completionBlock: { (deviceInformation, error) in
423+
424+
guard let deviceInfo = deviceInformation else {
425+
return
426+
}
427+
428+
self.currentDeviceMode = deviceInfo.deviceMode
429+
})
438430
}
439431
}
440432

‎Samples/ios/SampleApp/SampleAppiOS.xcodeproj/project.pbxproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -515,6 +515,7 @@
515515
CODE_SIGN_ENTITLEMENTS = SampleAppiOS/SampleAppiOS.entitlements;
516516
DEVELOPMENT_TEAM = UBF8T346G9;
517517
INFOPLIST_FILE = SampleAppiOS/Info.plist;
518+
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
518519
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
519520
PRODUCT_BUNDLE_IDENTIFIER = com.microsoft.MSALSampleApp;
520521
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -528,6 +529,7 @@
528529
CODE_SIGN_ENTITLEMENTS = SampleAppiOS/SampleAppiOS.entitlements;
529530
DEVELOPMENT_TEAM = UBF8T346G9;
530531
INFOPLIST_FILE = SampleAppiOS/Info.plist;
532+
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
531533
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
532534
PRODUCT_BUNDLE_IDENTIFIER = com.microsoft.MSALSampleApp;
533535
PRODUCT_NAME = "$(TARGET_NAME)";

‎Samples/ios/SampleAppiOS-Swift/SampleAppiOS-Swift.xcodeproj/project.pbxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -597,7 +597,7 @@
597597
CODE_SIGN_ENTITLEMENTS = "SampleAppiOS-Swift/SampleAppiOS-Swift.entitlements";
598598
DEVELOPMENT_TEAM = UBF8T346G9;
599599
INFOPLIST_FILE = "SampleAppiOS-Swift/Info.plist";
600-
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
600+
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
601601
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
602602
PRODUCT_BUNDLE_IDENTIFIER = "com.microsoft.SampleAppiOS-Swift";
603603
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -613,7 +613,7 @@
613613
CODE_SIGN_ENTITLEMENTS = "SampleAppiOS-Swift/SampleAppiOS-Swift.entitlements";
614614
DEVELOPMENT_TEAM = UBF8T346G9;
615615
INFOPLIST_FILE = "SampleAppiOS-Swift/Info.plist";
616-
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
616+
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
617617
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
618618
PRODUCT_BUNDLE_IDENTIFIER = "com.microsoft.SampleAppiOS-Swift";
619619
PRODUCT_NAME = "$(TARGET_NAME)";

0 commit comments

Comments
 (0)