Merge pull request #1017 from Microsoft/develop

Merge to master for 1.7.1
microsoft · Jun 18, 2018 · 6524e95 · 6524e95
2 parents e676379 + a21016f
commit 6524e95
Show file tree

Hide file tree

Showing 20 changed files with 32 additions and 24 deletions.
diff --git a/AppCenter.podspec b/AppCenter.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name              = 'AppCenter'
-  s.version           = '1.7.0'
+  s.version           = '1.7.1'
 
   s.summary           = 'Visual Studio App Center is your continuous integration, delivery and learning solution for iOS and macOS apps.'
   s.description       = <<-DESC

diff --git a/AppCenter/AppCenter.xcodeproj/project.pbxproj b/AppCenter/AppCenter.xcodeproj/project.pbxproj
@@ -2298,7 +2298,6 @@
 				B2CD74881F22BD910070E7DF /* MSLogDBStorage.m in Sources */,
 				E7D23C7720B6549E00A47D62 /* MSCSModelConstants.m in Sources */,
 				8087362920C134AC004C4157 /* MSEncrypter.m in Sources */,
-				E7D23C7720B6549E00A47D62 /* MSCSModelConstants.m in Sources */,
 				E84B8E361D235226006FD231 /* MSHttpSender.m in Sources */,
 				D38024061E7126F500466558 /* MSServiceAbstract.m in Sources */,
 				B2CD74C41F22BE270070E7DF /* MSUtility+StringFormatting.m in Sources */,

diff --git a/AppCenter/AppCenter/Internals/MSAppCenterPrivate.h b/AppCenter/AppCenter/Internals/MSAppCenterPrivate.h
@@ -19,7 +19,6 @@
  * @discussion This may be called only once per application process lifetime.
  * @param appSecret A unique and secret key used to identify the application.
  */
-// FIXME: Rename to configureWithAppSecret
-- (BOOL)configure:(NSString *)appSecret;
+- (BOOL)configureWithAppSecret:(NSString *)appSecret;
 
 @end
diff --git a/AppCenter/AppCenter/MSAppCenter.m b/AppCenter/AppCenter/MSAppCenter.m
@@ -59,7 +59,7 @@ + (instancetype)sharedInstance {
 #pragma mark - public
 
 + (void)configureWithAppSecret:(NSString *)appSecret {
-  [[self sharedInstance] configure:appSecret];
+  [[self sharedInstance] configureWithAppSecret:appSecret];
 }
 
 + (void)start:(NSString *)appSecret withServices:(NSArray<Class> *)services {
@@ -192,7 +192,7 @@ - (instancetype)init {
  * Configuring without an app secret is valid. If that is the case, the app secret will
  * not be set.
  */
-- (BOOL)configure:(NSString *)appSecret {
+- (BOOL)configureWithAppSecret:(NSString *)appSecret {
   @synchronized(self) {
     BOOL success = false;
     if (self.sdkConfigured) {
@@ -235,7 +235,7 @@ - (BOOL)configure:(NSString *)appSecret {
 
 - (void)start:(NSString *)appSecret withServices:(NSArray<Class> *)services {
   @synchronized(self) {
-    BOOL configured = [self configure:appSecret];
+    BOOL configured = [self configureWithAppSecret:appSecret];
     if (configured && services) {
       MSLogVerbose([MSAppCenter logTag], @"Prepare to start services: %@", [services componentsJoinedByString:@", "]);
       NSArray *sortedServices = [self sortServices:services];

diff --git a/AppCenter/AppCenterTests/MSAppCenterTests.m b/AppCenter/AppCenterTests/MSAppCenterTests.m
@@ -499,7 +499,7 @@ - (void)testAppIsBackgrounded {
 
   // If
   id<MSChannelGroupProtocol> channelGroup = OCMProtocolMock(@protocol(MSChannelGroupProtocol));
-  [self.sut configure:@"AnAppSecret"];
+  [self.sut configureWithAppSecret:@"AnAppSecret"];
   self.sut.channelGroup = channelGroup;
 
   // When
@@ -513,7 +513,7 @@ - (void)testAppIsForegrounded {
 
   // If
   id<MSChannelGroupProtocol> channelGroup = OCMProtocolMock(@protocol(MSChannelGroupProtocol));
-  [self.sut configure:@"AnAppSecret"];
+  [self.sut configureWithAppSecret:@"AnAppSecret"];
   self.sut.channelGroup = channelGroup;
 
   // When

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,15 @@
 # App Center SDK for iOS and macOS Change Log
 
+## Version 1.7.1
+
+This version contains a bug fix. 
+
+### AppCenter
+
+* **[Fix]** Fix duplicate symbol errors discovered when using Xamarin wrapper SDK.
+
+___
+
 ## Version 1.7.0
 
 This version contains a new feature. 

diff --git a/Config/Version.xcconfig b/Config/Version.xcconfig
@@ -1,2 +1,2 @@
 BUILD_NUMBER = 1
-VERSION_STRING = 1.7.0
+VERSION_STRING = 1.7.1
diff --git a/Documentation/iOS/AppCenter/.jazzy.yaml b/Documentation/iOS/AppCenter/.jazzy.yaml
@@ -5,7 +5,7 @@ sdk: iphonesimulator
 theme: ../../Themes/apple
 
 module: AppCenter
-module_version: 1.7.0
+module_version: 1.7.1
 author: Microsoft Corp
 author_url: http://www.microsoft.com
 

diff --git a/Documentation/iOS/AppCenterAnalytics/.jazzy.yaml b/Documentation/iOS/AppCenterAnalytics/.jazzy.yaml
@@ -5,7 +5,7 @@ sdk: iphonesimulator
 theme: ../../Themes/apple
 
 module: AppCenterAnalytics
-module_version: 1.7.0
+module_version: 1.7.1
 author: Microsoft Corp
 author_url: http://www.microsoft.com
 

diff --git a/Documentation/iOS/AppCenterCrashes/.jazzy.yaml b/Documentation/iOS/AppCenterCrashes/.jazzy.yaml
@@ -5,7 +5,7 @@ sdk: iphonesimulator
 theme: ../../Themes/apple
 
 module: AppCenterCrashes
-module_version: 1.7.0
+module_version: 1.7.1
 author: Microsoft Corp
 author_url: http://www.microsoft.com
 

diff --git a/Documentation/iOS/AppCenterDistribute/.jazzy.yaml b/Documentation/iOS/AppCenterDistribute/.jazzy.yaml
@@ -5,7 +5,7 @@ sdk: iphonesimulator
 theme: ../../Themes/apple
 
 module: AppCenterDistribute
-module_version: 1.7.0
+module_version: 1.7.1
 author: Microsoft Corp
 author_url: http://www.microsoft.com
 

diff --git a/Documentation/iOS/AppCenterPush/.jazzy.yaml b/Documentation/iOS/AppCenterPush/.jazzy.yaml
@@ -5,7 +5,7 @@ sdk: iphonesimulator
 theme: ../../Themes/apple
 
 module: AppCenterPush
-module_version: 1.7.0
+module_version: 1.7.1
 author: Microsoft Corp
 author_url: http://www.microsoft.com
 

diff --git a/Documentation/macOS/AppCenter/.jazzy.yaml b/Documentation/macOS/AppCenter/.jazzy.yaml
@@ -5,7 +5,7 @@ sdk: macosx
 theme: ../../Themes/apple
 
 module: AppCenter
-module_version: 1.7.0
+module_version: 1.7.1
 author: Microsoft Corp
 author_url: http://www.microsoft.com
 

diff --git a/Documentation/macOS/AppCenterAnalytics/.jazzy.yaml b/Documentation/macOS/AppCenterAnalytics/.jazzy.yaml
@@ -5,7 +5,7 @@ sdk: macosx
 theme: ../../Themes/apple
 
 module: AppCenterAnalytics
-module_version: 1.7.0
+module_version: 1.7.1
 author: Microsoft Corp
 author_url: http://www.microsoft.com
 

diff --git a/Documentation/macOS/AppCenterCrashes/.jazzy.yaml b/Documentation/macOS/AppCenterCrashes/.jazzy.yaml
@@ -5,7 +5,7 @@ sdk: macosx
 theme: ../../Themes/apple
 
 module: AppCenterCrashes
-module_version: 1.7.0
+module_version: 1.7.1
 author: Microsoft Corp
 author_url: http://www.microsoft.com
 

diff --git a/Documentation/macOS/AppCenterPush/.jazzy.yaml b/Documentation/macOS/AppCenterPush/.jazzy.yaml
@@ -5,7 +5,7 @@ sdk: macosx
 theme: ../../Themes/apple
 
 module: AppCenterPush
-module_version: 1.7.0
+module_version: 1.7.1
 author: Microsoft Corp
 author_url: http://www.microsoft.com
 

diff --git a/Documentation/tvOS/AppCenter/.jazzy.yaml b/Documentation/tvOS/AppCenter/.jazzy.yaml
@@ -5,7 +5,7 @@ sdk: appletvsimulator
 theme: ../../Themes/apple
 
 module: AppCenter
-module_version: 1.7.0
+module_version: 1.7.1
 author: Microsoft Corp
 author_url: http://www.microsoft.com
 

diff --git a/Documentation/tvOS/AppCenterAnalytics/.jazzy.yaml b/Documentation/tvOS/AppCenterAnalytics/.jazzy.yaml
@@ -5,7 +5,7 @@ sdk: appletvsimulator
 theme: ../../Themes/apple
 
 module: AppCenterAnalytics
-module_version: 1.7.0
+module_version: 1.7.1
 author: Microsoft Corp
 author_url: http://www.microsoft.com
 

diff --git a/Documentation/tvOS/AppCenterCrashes/.jazzy.yaml b/Documentation/tvOS/AppCenterCrashes/.jazzy.yaml
@@ -5,7 +5,7 @@ sdk: appletvsimulator
 theme: ../../Themes/apple
 
 module: AppCenterCrashes
-module_version: 1.7.0
+module_version: 1.7.1
 author: Microsoft Corp
 author_url: http://www.microsoft.com
 

diff --git a/TestApps/Sasquatch/SasquatchSwift/AppDelegate.swift b/TestApps/Sasquatch/SasquatchSwift/AppDelegate.swift
@@ -25,9 +25,9 @@ class AppDelegate: UIResponder, UIApplicationDelegate, MSCrashesDelegate, MSDist
     let useOneCollector = UserDefaults.standard.bool(forKey: "isOneCollectorEnabled");
     if useOneCollector {
       #if DEBUG
-      MSAppCenter.start("token=1dd3a9a64e144fcbbd4ce31c5def22e0-e57d4574-c5e7-4f89-a745-b2e850b54185-7090;appsecret=0dbca56b-b9ae-4d53-856a-7c2856137d85", withServices: [MSAnalytics.self, MSCrashes.self, MSPush.self])
+      MSAppCenter.start("target=1dd3a9a64e144fcbbd4ce31c5def22e0-e57d4574-c5e7-4f89-a745-b2e850b54185-7090;appsecret=0dbca56b-b9ae-4d53-856a-7c2856137d85", withServices: [MSAnalytics.self, MSCrashes.self, MSPush.self])
       #else
-      MSAppCenter.start("token=1dd3a9a64e144fcbbd4ce31c5def22e0-e57d4574-c5e7-4f89-a745-b2e850b54185-7090;appsecret=0dbca56b-b9ae-4d53-856a-7c2856137d85", withServices: [MSAnalytics.self, MSCrashes.self, MSDistribute.self, MSPush.self])
+      MSAppCenter.start("target=1dd3a9a64e144fcbbd4ce31c5def22e0-e57d4574-c5e7-4f89-a745-b2e850b54185-7090;appsecret=0dbca56b-b9ae-4d53-856a-7c2856137d85", withServices: [MSAnalytics.self, MSCrashes.self, MSDistribute.self, MSPush.self])
       #endif
     }
     else {