Merge pull request #15 from microsoftgraph/vidadhee/VersionUpdate

Minor changes to version, request header and readme

Author: dadheech115

MSGraphSDK/MSGraphSDK/Common/MSConstants.h

@@ -45,7 +45,8 @@ typedef NS_ENUM(NSInteger, MSExpectedResponseCodes)
 
 extern NSString *const MSGraphBaseURL;
 extern NSString *const MSHeaderSdkVersion;
-extern NSString *const MSGraphSdkVersionHeaderPrefix;
+extern NSString *const MSGraphiOSSdkVersionHeaderPrefix;
+extern NSString *const MSGraphMacSdkVersionHeaderPrefix;
 
 extern NSString *const MSErrorDomain;
 

MSGraphSDK/MSGraphSDK/Common/MSConstants.m

@@ -6,7 +6,9 @@
 
 NSString *const MSGraphBaseURL = @"https://graph.microsoft.com/v1.0";
 NSString *const MSHeaderSdkVersion = @"SdkVersion";
-NSString *const MSGraphSdkVersionHeaderPrefix = @"graph-ios-";
+NSString *const MSGraphiOSSdkVersionHeaderPrefix = @"graph-objc-ios-";
+NSString *const MSGraphMacSdkVersionHeaderPrefix = @"graph-objc-mac-";
+
 
 NSString *const MSErrorDomain = @"com.microsoft.graph.errors";
 

MSGraphSDK/MSGraphSDK/Common/Session Tasks/MSURLSessionTask.m

@@ -69,7 +69,13 @@ - (void)setSDKVersionRequestHeader
 {
     NSDictionary *info = [[NSBundle bundleForClass:[self class]] infoDictionary];
     NSString *version = [info objectForKey:@"CFBundleShortVersionString"];
-    [_request setValue:[NSString stringWithFormat:@"%@%@", MSGraphSdkVersionHeaderPrefix, version] forHTTPHeaderField:MSHeaderSdkVersion];
+    if (TARGET_OS_OSX)
+    {
+        [_request setValue:[NSString stringWithFormat:@"%@%@", MSGraphMacSdkVersionHeaderPrefix, version] forHTTPHeaderField:MSHeaderSdkVersion];
+    }else
+    {
+        [_request setValue:[NSString stringWithFormat:@"%@%@", MSGraphiOSSdkVersionHeaderPrefix, version] forHTTPHeaderField:MSHeaderSdkVersion];
+    }
 }
 
 - (void)taskCompletedWithData:(id)data response:(NSURLResponse *)response andError:(NSError *)error

MSGraphSDK/MSGraphSDK/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.1.1</string>
+	<string>0.1.2</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>

MSGraphSDK/MSGraphSDKTests/SessionTask/MSURLSessionTaskTests.m

@@ -154,7 +154,12 @@ - (void)testSetVersionAsRequestHeader{
     [sessionTask setSDKVersionRequestHeader];
     NSDictionary *info = [[NSBundle bundleForClass:[MSURLSessionTask class]] infoDictionary];
     NSString *version = [info objectForKey:@"CFBundleShortVersionString"];
-    NSString *headerVersionString = [NSString stringWithFormat:@"%@%@", MSGraphSdkVersionHeaderPrefix, version];
+    NSString *headerVersionString ;
+    if (TARGET_OS_OSX){
+        headerVersionString = [NSString stringWithFormat:@"%@%@", MSGraphMacSdkVersionHeaderPrefix, version];
+    }else{
+        headerVersionString = [NSString stringWithFormat:@"%@%@", MSGraphiOSSdkVersionHeaderPrefix, version];
+    }
     XCTAssertEqualObjects([sessionTask.request valueForHTTPHeaderField:MSHeaderSdkVersion],headerVersionString);
 }
 @end

README.md

@@ -6,7 +6,7 @@ This client library is a release candidate and is still in preview status - plea
 
 
 
-Note that for the preview, only iOS is supported. macOS support will be provided later.
+This library supports both iOS and MacOS platforms.