Skip to content
This repository was archived by the owner on Apr 18, 2023. It is now read-only.

Commit 1bee32a

Browse files
author
Vikas Dadheech
committed
Change for support for Mac platform
1 parent 686c8ed commit 1bee32a

File tree

5 files changed

+34
-16
lines changed

5 files changed

+34
-16
lines changed

‎MSGraphCoreSDK/MSGraphCoreSDK.xcodeproj/project.pbxproj‎

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,7 @@
126126
E547CE2221DC8551008D0925 /* MSObjectTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MSObjectTests.m; sourceTree = "<group>"; };
127127
E547CE2621DC9CF6008D0925 /* MSTimeOfDayTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MSTimeOfDayTests.m; sourceTree = "<group>"; };
128128
E55DFCBD21DCD21C00DE305D /* NSDate+MSSerializationTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSDate+MSSerializationTests.m"; sourceTree = "<group>"; };
129+
E55DFCF921DDD87D00DE305D /* MSGraphCoreSDK copy-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "MSGraphCoreSDK copy-Info.plist"; path = "/Users/vikasdadheech/msgraph-sdk-objc/MSGraphCoreSDK/MSGraphCoreSDK copy-Info.plist"; sourceTree = "<absolute>"; };
129130
E566782D2150BC4F00C6B7AE /* MSRedirectHandlerTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MSRedirectHandlerTests.m; sourceTree = "<group>"; };
130131
E566782F2150E1AF00C6B7AE /* MSAuthenticationHandlerTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MSAuthenticationHandlerTests.m; sourceTree = "<group>"; };
131132
E56FDB8B21D36A98001DFE68 /* MSURLSessionDownloadTask.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MSURLSessionDownloadTask.h; sourceTree = "<group>"; };
@@ -445,6 +446,7 @@
445446
E5069AD7211C1AD500432372 /* MSGraphCoreSDKTests */,
446447
E5DC73DB211412BF0040BAB6 /* Products */,
447448
E5B6DB8821497C2700836E1D /* Frameworks */,
449+
E55DFCF921DDD87D00DE305D /* MSGraphCoreSDK copy-Info.plist */,
448450
);
449451
sourceTree = "<group>";
450452
};
@@ -729,10 +731,15 @@
729731
isa = XCBuildConfiguration;
730732
buildSettings = {
731733
CODE_SIGN_STYLE = Automatic;
732-
FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/MSGraphCoreSDKTests/Frameworks";
734+
DEVELOPMENT_TEAM = "";
735+
FRAMEWORK_SEARCH_PATHS = (
736+
"$(SDKROOT)",
737+
"$(inherited)",
738+
"$(PROJECT_DIR)/MSGraphCoreSDKTests/Frameworks",
739+
);
733740
HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/MSGraphCoreSDKTests/Frameworks/";
734741
INFOPLIST_FILE = MSGraphCoreSDKTests/Info.plist;
735-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
742+
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks @executable_path/../Frameworks @loader_path/../Frameworks";
736743
LIBRARY_SEARCH_PATHS = (
737744
"$(inherited)",
738745
"$(PROJECT_DIR)/MSGraphCoreSDKTests/Frameworks/OCMock",
@@ -749,10 +756,15 @@
749756
isa = XCBuildConfiguration;
750757
buildSettings = {
751758
CODE_SIGN_STYLE = Automatic;
752-
FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/MSGraphCoreSDKTests/Frameworks";
759+
DEVELOPMENT_TEAM = "";
760+
FRAMEWORK_SEARCH_PATHS = (
761+
"$(SDKROOT)",
762+
"$(inherited)",
763+
"$(PROJECT_DIR)/MSGraphCoreSDKTests/Frameworks",
764+
);
753765
HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/MSGraphCoreSDKTests/Frameworks/";
754766
INFOPLIST_FILE = MSGraphCoreSDKTests/Info.plist;
755-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
767+
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks @executable_path/../Frameworks @loader_path/../Frameworks";
756768
LIBRARY_SEARCH_PATHS = (
757769
"$(inherited)",
758770
"$(PROJECT_DIR)/MSGraphCoreSDKTests/Frameworks/OCMock",
@@ -821,6 +833,8 @@
821833
MTL_ENABLE_DEBUG_INFO = YES;
822834
ONLY_ACTIVE_ARCH = YES;
823835
SDKROOT = iphoneos;
836+
SUPPORTED_PLATFORMS = "iphonesimulator iphoneos macosx\n";
837+
VALID_ARCHS = "arm64 armv7 armv7s i386 x86_64";
824838
VERSIONING_SYSTEM = "apple-generic";
825839
VERSION_INFO_PREFIX = "";
826840
};
@@ -875,7 +889,9 @@
875889
IPHONEOS_DEPLOYMENT_TARGET = 11.3;
876890
MTL_ENABLE_DEBUG_INFO = NO;
877891
SDKROOT = iphoneos;
892+
SUPPORTED_PLATFORMS = "iphonesimulator iphoneos macosx\n";
878893
VALIDATE_PRODUCT = YES;
894+
VALID_ARCHS = "arm64 armv7 armv7s i386 x86_64";
879895
VERSIONING_SYSTEM = "apple-generic";
880896
VERSION_INFO_PREFIX = "";
881897
};
@@ -898,8 +914,9 @@
898914
PRODUCT_BUNDLE_IDENTIFIER = com.Microsoft.MSGraph.MSGraphSDK;
899915
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
900916
SKIP_INSTALL = YES;
901-
SUPPORTED_PLATFORMS = "iphonesimulator iphoneos";
917+
SUPPORTED_PLATFORMS = "macosx iphoneos iphonesimulator";
902918
TARGETED_DEVICE_FAMILY = "1,2";
919+
VALID_ARCHS = "arm64 armv7 armv7s i386 x86_64";
903920
};
904921
name = Debug;
905922
};
@@ -920,8 +937,9 @@
920937
PRODUCT_BUNDLE_IDENTIFIER = com.Microsoft.MSGraph.MSGraphSDK;
921938
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
922939
SKIP_INSTALL = YES;
923-
SUPPORTED_PLATFORMS = "iphonesimulator iphoneos";
940+
SUPPORTED_PLATFORMS = "macosx iphoneos iphonesimulator";
924941
TARGETED_DEVICE_FAMILY = "1,2";
942+
VALID_ARCHS = "arm64 armv7 armv7s i386 x86_64";
925943
};
926944
name = Release;
927945
};

‎MSGraphCoreSDK/MSGraphCoreSDK/Authentication/MSAuthenticationProvider.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
//
44

55
#import <Foundation/Foundation.h>
6-
#import <UIKit/UIKit.h>
6+
//#import <UIKit/UIKit.h>
77

88
typedef void(^MSAuthenticationCompletion)(NSMutableURLRequest *request, NSError *error);
99

‎MSGraphCoreSDK/MSGraphCoreSDK/Middleware/Protocols/MSGraphMiddleware.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
//
44

55
#import <Foundation/Foundation.h>
6-
#import <UIKit/UIKit.h>
6+
//#import <UIKit/UIKit.h>
77

88
@class MSURLSessionTask;
99

‎MSGraphCoreSDK/MSGraphCoreSDKTests/MSGraphWorkloadsTests.m‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ - (void)testDriveItemSearchRequest{
9494
id mockNSTask = OCMClassMock([NSURLSessionDataTask class]);
9595
OCMStub([_mockHttpMiddleware dataTaskWithRequest:[OCMArg any] completionHandler:[OCMArg any]]).andReturn(mockNSTask);
9696

97-
OCMStub([mockNSTask resume])
97+
OCMStub([(NSURLSessionTask *)mockNSTask resume])
9898
.andDo(^(NSInvocation *invocation){
9999
XCTAssertEqualObjects(@"Bearer abcdefg", [dataTask.request.allHTTPHeaderFields objectForKey:@"Authorization"]);
100100
[dataTask taskCompletedWithData:self.responseData response:self->_OKresponse andError:nil];
@@ -124,7 +124,7 @@ - (void)testUserPhotoDownload{
124124
id mockNSTask = OCMClassMock([NSURLSessionDownloadTask class]);
125125
OCMStub([_mockHttpMiddleware downloadTaskWithRequest:[OCMArg any] progress:[OCMArg anyObjectRef] completionHandler:[OCMArg any]]).andReturn(mockNSTask);
126126

127-
OCMStub([mockNSTask resume]).andDo(^(NSInvocation *invocation){
127+
OCMStub([(NSURLSessionTask *)mockNSTask resume]).andDo(^(NSInvocation *invocation){
128128
XCTAssertEqualObjects(@"Bearer abcdefg", [downloadTask.request.allHTTPHeaderFields objectForKey:@"Authorization"]);
129129
[downloadTask taskCompletedWithData:[NSURL URLWithString:downloadPath] response:self->_OKresponse andError:nil];
130130
});
@@ -151,7 +151,7 @@ - (void)testUserPhotoUploadFromFile{
151151
id mockNSTask = OCMClassMock([NSURLSessionUploadTask class]);
152152
OCMStub([_mockHttpMiddleware uploadTaskWithRequest:[OCMArg any] fromFile:[OCMArg any] progress:[OCMArg anyObjectRef] completionHandler:[OCMArg any]]).andReturn(mockNSTask);
153153

154-
OCMStub([mockNSTask resume]).andDo(^(NSInvocation *invocation){
154+
OCMStub([(NSURLSessionTask *)mockNSTask resume]).andDo(^(NSInvocation *invocation){
155155
XCTAssertEqualObjects(@"Bearer abcdefg", [uploadTask.request.allHTTPHeaderFields objectForKey:@"Authorization"]);
156156
[uploadTask taskCompletedWithData:nil response:self->_OKresponse andError:nil];
157157
});
@@ -178,7 +178,7 @@ - (void)testUserPhotoUploadFromData{
178178
id mockNSTask = OCMClassMock([NSURLSessionUploadTask class]);
179179
OCMStub([_mockHttpMiddleware uploadTaskWithRequest:[OCMArg any] fromData:[OCMArg any] progress:[OCMArg anyObjectRef] completionHandler:[OCMArg any]]).andReturn(mockNSTask);
180180

181-
OCMStub([mockNSTask resume]).andDo(^(NSInvocation *invocation){
181+
OCMStub([(NSURLSessionTask *)mockNSTask resume]).andDo(^(NSInvocation *invocation){
182182
XCTAssertEqualObjects(@"Bearer abcdefg", [uploadTask.request.allHTTPHeaderFields objectForKey:@"Authorization"]);
183183
[uploadTask taskCompletedWithData:nil response:self->_OKresponse andError:nil];
184184
});

‎MSGraphCoreSDK/MSGraphCoreSDKTests/Middleware/Implementations/MSURLSessionManagerTests.m‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ - (void)testMSHTTPProviderForMiddlewareExecutionWithDataTask{
264264
[invocation getArgument:&completionHandler atIndex:3];
265265
completionHandler([NSData new],response,nil);
266266
});
267-
OCMStub([mockNSTask resume])
267+
OCMStub([(NSURLSessionTask *)mockNSTask resume])
268268
.andDo(^(NSInvocation *invocation){
269269
});
270270

@@ -298,7 +298,7 @@ - (void)testMSHTTPProviderForMiddlewareExecutionWithDownloadTask{
298298
[invocation getArgument:&completionHandler atIndex:4];
299299
completionHandler([NSURL URLWithString:@"https://foo"],response,nil);
300300
});
301-
OCMStub([mockNSTask resume])
301+
OCMStub([(NSURLSessionTask *)mockNSTask resume])
302302
.andDo(^(NSInvocation *invocation){
303303

304304
});
@@ -334,7 +334,7 @@ - (void)testMSHTTPProviderForMiddlewareExecutionWithUploadTaskFromData{
334334
[invocation getArgument:&completionHandler atIndex:5];
335335
completionHandler([NSData new],response,nil);
336336
});
337-
OCMStub([mockNSTask resume])
337+
OCMStub([(NSURLSessionTask *)mockNSTask resume])
338338
.andDo(^(NSInvocation *invocation){
339339
});
340340

@@ -370,7 +370,7 @@ - (void)testMSHTTPProviderForMiddlewareExecutionWithUploadTaskFromFile{
370370
[invocation getArgument:&completionHandler atIndex:5];
371371
completionHandler([NSData new],response,nil);
372372
});
373-
OCMStub([mockNSTask resume])
373+
OCMStub([(NSURLSessionTask *)mockNSTask resume])
374374
.andDo(^(NSInvocation *invocation){
375375
});
376376

0 commit comments

Comments
 (0)