Merge pull request #2389 from microsoft/develop

Merge develop to master for release 4.4.1
microsoft · Dec 20, 2021 · b84bc8a · b84bc8a
2 parents 16d6ed7 + 2cf00c3
commit b84bc8a
Show file tree

Hide file tree

Showing 17 changed files with 61 additions and 20 deletions.
diff --git a/AppCenter.podspec b/AppCenter.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
   s.cocoapods_version = '>= 1.10'
   s.name              = 'AppCenter'
-  s.version           = '4.4.0'
+  s.version           = '4.4.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/include/MSACCustomProperties.h b/AppCenter/AppCenter/include/MSACCustomProperties.h
diff --git a/AppCenterCrashes/AppCenterCrashesTests/MSACWrapperExceptionManagerTests.m b/AppCenterCrashes/AppCenterCrashesTests/MSACWrapperExceptionManagerTests.m
@@ -3,6 +3,7 @@
 
 #import "MSACCrashes.h"
 #import "MSACCrashesUtil.h"
+#import "MSACLogger.h"
 #import "MSACTestFrameworks.h"
 #import "MSACUtility+File.h"
 #import "MSACUtility.h"
@@ -89,16 +90,17 @@ - (void)testSaveWrapperExceptionAndCrashReportWhenCrashReporterIsNull {
 
   // If.
   id mockUtility = OCMClassMock([MSACUtility class]);
-  OCMStub(ClassMethod([mockUtility createDirectoryAtURL:OCMOCK_ANY])).andReturn(YES);
 
-  // Then.
+  // When.
   [MSACWrapperExceptionManager setCrashReporter:nil];
   MSACWrapperException *wrapperException = [self getWrapperException];
-  [MSACWrapperExceptionManager saveWrapperExceptionAndCrashReport:wrapperException];
 
-  // When.
+  // Then.
   OCMReject([mockUtility createDirectoryAtURL:OCMOCK_ANY]);
 
+  // When.
+  [MSACWrapperExceptionManager saveWrapperExceptionAndCrashReport:wrapperException];
+
   // Stop mocking.
   [mockUtility stopMocking];
 }
@@ -116,13 +118,45 @@ - (void)testSaveWrapperExceptionAndCrashReportWhenDirectoryWasNotCreated {
   OCMStub([mockCrashReporter crashReportPath]).andReturn(mockPath);
   OCMStub([mockCrashReporter generateLiveReport]).andReturn(mockData);
 
+  // When.
+  [MSACWrapperExceptionManager setCrashReporter:mockCrashReporter];
+  MSACWrapperException *wrapperException = [self getWrapperException];
+
+  // Then.
+  OCMReject([mockUtility createFileAtPath:OCMOCK_ANY contents:OCMOCK_ANY attributes:OCMOCK_ANY]);
+
+  // When.
+  [MSACWrapperExceptionManager saveWrapperExceptionAndCrashReport:wrapperException];
+
+  // Stop mocking.
+  [mockUtility stopMocking];
+  [mockCrashReporter stopMocking];
+}
+
+- (void)testSaveWrapperExceptionAndCrashReportWhenFailedToCreateFile {
+
+  // If.
+  id mockUtility = OCMClassMock([MSACUtility class]);
+  OCMStub(ClassMethod([mockUtility createDirectoryAtURL:OCMOCK_ANY])).andReturn(YES);
+  OCMStub(ClassMethod([mockUtility createFileAtPath:OCMOCK_ANY contents:OCMOCK_ANY attributes:OCMOCK_ANY])).andReturn(NO);
+
+  // Mock crashReporter.
+  id mockCrashReporter = OCMClassMock([PLCrashReporter class]);
+  NSString *mockPath = @"file://mock/live_report.plcrash";
+  NSData *mockData = [NSData new];
+  OCMStub([mockCrashReporter crashReportPath]).andReturn(mockPath);
+  OCMStub([mockCrashReporter generateLiveReport]).andReturn(mockData);
+
+  // Remove file if it exists
+  [[NSFileManager defaultManager] removeItemAtPath:mockPath error:nil];
+
   // When.
   [MSACWrapperExceptionManager setCrashReporter:mockCrashReporter];
   MSACWrapperException *wrapperException = [self getWrapperException];
   [MSACWrapperExceptionManager saveWrapperExceptionAndCrashReport:wrapperException];
 
   // Then.
-  OCMReject([mockUtility createFileAtPathComponent:OCMOCK_ANY withData:OCMOCK_ANY atomically:YES forceOverwrite:YES]);
+  XCTAssertFalse([[NSFileManager defaultManager] fileExistsAtPath:mockPath]);
 
   // Stop mocking.
   [mockUtility stopMocking];

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # App Center SDK for iOS, macOS and tvOS Change Log
 
+## Version 4.4.1
+
+### App Center
+
+* **[Fix]** Fix warning about broken symlink `MSACCustomProperties.h` when integrating via Swift Package Manager.
+
+___
+
 ## Version 4.4.0
 
 ### App Center 

diff --git a/Config/Version.xcconfig b/Config/Version.xcconfig
@@ -1,2 +1,2 @@
 BUILD_NUMBER = 1
-VERSION_STRING = 4.4.0
+VERSION_STRING = 4.4.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: 4.4.0
+module_version: 4.4.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: 4.4.0
+module_version: 4.4.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: 4.4.0
+module_version: 4.4.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: 4.4.0
+module_version: 4.4.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: 4.4.0
+module_version: 4.4.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: 4.4.0
+module_version: 4.4.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: 4.4.0
+module_version: 4.4.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: 4.4.0
+module_version: 4.4.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: 4.4.0
+module_version: 4.4.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: 4.4.0
+module_version: 4.4.1
 author: Microsoft Corp
 author_url: http://www.microsoft.com
 

diff --git a/Package.swift b/Package.swift
@@ -31,7 +31,7 @@ let package = Package(
             path: "AppCenter/AppCenter",
             exclude: ["Support"],
             cSettings: [
-                .define("APP_CENTER_C_VERSION", to:"\"4.4.0\""),
+                .define("APP_CENTER_C_VERSION", to:"\"4.4.1\""),
                 .define("APP_CENTER_C_BUILD", to:"\"1\""),
                 .headerSearchPath("**"),
             ],

diff --git a/[email protected] b/[email protected]
@@ -36,7 +36,7 @@ let package = Package(
             path: "AppCenter/AppCenter",
             exclude: ["Support"],
             cSettings: [
-                .define("APP_CENTER_C_VERSION", to:"\"4.4.0\""),
+                .define("APP_CENTER_C_VERSION", to:"\"4.4.1\""),
                 .define("APP_CENTER_C_BUILD", to:"\"1\""),
                 .headerSearchPath("**"),
             ],