Skip to content

Commit

Permalink
Merge pull request microsoft#506 from Microsoft/develop
Browse files Browse the repository at this point in the history 
Merge develop into master
  • Loading branch information
@jaeklim
jaeklim authored Apr 27, 2017
2 parents 9b3529e + c87de3e commit 4751260
Show file tree
Hide file tree
Showing 2 changed files with 46 additions and 8 deletions.
16 changes: 14 additions & 2 deletions Puppet/Puppet.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -545,6 +545,7 @@
380A4D951DD6892F00E99219 = {
CreatedOnToolsVersion = 7.3.1;
DevelopmentTeam = L4RARDNZ2Y;
ProvisioningStyle = Manual;
};
5CE258361EA5097100DA8FB9 = {
CreatedOnToolsVersion = 8.3.1;
Expand All @@ -555,6 +556,7 @@
E82E1B5E1D1CA58D00D281C1 = {
CreatedOnToolsVersion = 7.3.1;
DevelopmentTeam = L4RARDNZ2Y;
ProvisioningStyle = Manual;
};
};
};
Expand Down Expand Up @@ -821,12 +823,15 @@
buildSettings = {
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
DEVELOPMENT_TEAM = L4RARDNZ2Y;
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
INFOPLIST_FILE = PuppetWidget/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.microsoft.azure.mobile.puppet.PuppetWidget;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "efe8c6b2-d14d-4958-ba71-8817551a535b";
PROVISIONING_PROFILE_SPECIFIER = "MobileCenter PuppetWidget Extension";
SKIP_INSTALL = YES;
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../MobileCenter/MobileCenter/** $(SRCROOT)/../MobileCenterAnalytics/MobileCenterAnalytics/** $(SRCROOT)/../MobileCenterCrashes/MobileCenterCrashes/**";
};
Expand All @@ -837,12 +842,15 @@
buildSettings = {
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
DEVELOPMENT_TEAM = L4RARDNZ2Y;
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
INFOPLIST_FILE = PuppetWidget/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.microsoft.azure.mobile.puppet.PuppetWidget;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "efe8c6b2-d14d-4958-ba71-8817551a535b";
PROVISIONING_PROFILE_SPECIFIER = "MobileCenter PuppetWidget Extension";
SKIP_INSTALL = YES;
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../MobileCenter/MobileCenter/** $(SRCROOT)/../MobileCenterAnalytics/MobileCenterAnalytics/** $(SRCROOT)/../MobileCenterCrashes/MobileCenterCrashes/**";
};
Expand Down Expand Up @@ -995,6 +1003,7 @@
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = L4RARDNZ2Y;
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
Expand All @@ -1005,7 +1014,8 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.microsoft.azure.mobile.puppet;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
PROVISIONING_PROFILE = "bb861002-b29b-4a0e-bdcc-08d1f7e5d38e";
PROVISIONING_PROFILE_SPECIFIER = "MobileCenter Puppet App";
SWIFT_VERSION = 3.0;
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../MobileCenter/MobileCenter/** $(SRCROOT)/../MobileCenterAnalytics/MobileCenterAnalytics/** $(SRCROOT)/../MobileCenterCrashes/MobileCenterCrashes/** $(SRCROOT)/../MobileCenterDistribute/MobileCenterDistribute/**";
};
Expand All @@ -1020,6 +1030,7 @@
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = YES;
DEVELOPMENT_TEAM = L4RARDNZ2Y;
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_WARN_MULTIPLE_DEFINITION_TYPES_FOR_SELECTOR = NO;
Expand All @@ -1029,7 +1040,8 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.microsoft.azure.mobile.puppet;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
PROVISIONING_PROFILE = "bb861002-b29b-4a0e-bdcc-08d1f7e5d38e";
PROVISIONING_PROFILE_SPECIFIER = "MobileCenter Puppet App";
SWIFT_VERSION = 3.0;
USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../MobileCenter/MobileCenter/** $(SRCROOT)/../MobileCenterAnalytics/MobileCenterAnalytics/** $(SRCROOT)/../MobileCenterCrashes/MobileCenterCrashes/** $(SRCROOT)/../MobileCenterDistribute/MobileCenterDistribute/**";
};
Expand Down
38 changes: 32 additions & 6 deletions Sasquatch/Sasquatch.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -699,30 +699,32 @@
84226C461E88FF4A00798417 = {
CreatedOnToolsVersion = 8.2.1;
DevelopmentTeam = L4RARDNZ2Y;
ProvisioningStyle = Manual;
};
84226C7F1E8908C900798417 = {
CreatedOnToolsVersion = 8.2.1;
DevelopmentTeam = L4RARDNZ2Y;
ProvisioningStyle = Manual;
};
D31EF9281E9517B500450162 = {
CreatedOnToolsVersion = 8.3;
DevelopmentTeam = L4RARDNZ2Y;
ProvisioningStyle = Automatic;
ProvisioningStyle = Manual;
};
D31EF9341E9517B600450162 = {
CreatedOnToolsVersion = 8.3;
DevelopmentTeam = L4RARDNZ2Y;
ProvisioningStyle = Automatic;
ProvisioningStyle = Manual;
};
D31EF9531E9517C500450162 = {
CreatedOnToolsVersion = 8.3;
DevelopmentTeam = L4RARDNZ2Y;
ProvisioningStyle = Automatic;
ProvisioningStyle = Manual;
};
D31EF95F1E9517C600450162 = {
CreatedOnToolsVersion = 8.3;
DevelopmentTeam = L4RARDNZ2Y;
ProvisioningStyle = Automatic;
ProvisioningStyle = Manual;
};
};
};
Expand Down Expand Up @@ -1140,6 +1142,8 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.microsoft.azure.mobile.sasquatchobjc;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "d8be61aa-f111-41ee-b5c9-e2e9f07b7b25";
PROVISIONING_PROFILE_SPECIFIER = "MobileCenter Sasquatch ObjC App";
SWIFT_OBJC_BRIDGING_HEADER = "Sasquatch/Sasquatch-Bridging-Header.h";
SWIFT_VERSION = 3.0;
};
Expand All @@ -1158,6 +1162,8 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.microsoft.azure.mobile.sasquatchobjc;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "d8be61aa-f111-41ee-b5c9-e2e9f07b7b25";
PROVISIONING_PROFILE_SPECIFIER = "MobileCenter Sasquatch ObjC App";
SWIFT_OBJC_BRIDGING_HEADER = "Sasquatch/Sasquatch-Bridging-Header.h";
SWIFT_VERSION = 3.0;
};
Expand All @@ -1167,13 +1173,15 @@
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
DEVELOPMENT_TEAM = "";
DEVELOPMENT_TEAM = L4RARDNZ2Y;
HEADER_SEARCH_PATHS = "$(SRCROOT)/../CrashLibIOS/CrashLibIOS";
INFOPLIST_FILE = SasquatchSwift/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.microsoft.azure.mobile.sasquatchswift;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "330f70fc-98c3-461f-9a7a-526f7f1865a3";
PROVISIONING_PROFILE_SPECIFIER = "MobileCenter Sasquatch Swift App";
SWIFT_OBJC_BRIDGING_HEADER = "Sasquatch/Sasquatch-Bridging-Header.h";
SWIFT_VERSION = 3.0;
};
Expand All @@ -1183,13 +1191,15 @@
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
DEVELOPMENT_TEAM = "";
DEVELOPMENT_TEAM = L4RARDNZ2Y;
HEADER_SEARCH_PATHS = "$(SRCROOT)/../CrashLibIOS/CrashLibIOS";
INFOPLIST_FILE = SasquatchSwift/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.microsoft.azure.mobile.sasquatchswift;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "330f70fc-98c3-461f-9a7a-526f7f1865a3";
PROVISIONING_PROFILE_SPECIFIER = "MobileCenter Sasquatch Swift App";
SWIFT_OBJC_BRIDGING_HEADER = "Sasquatch/Sasquatch-Bridging-Header.h";
SWIFT_VERSION = 3.0;
};
Expand All @@ -1205,6 +1215,8 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.microsoft.azure.mobile.sasquatchobjc.watchkitapp.watchkitextension;
PRODUCT_NAME = "${TARGET_NAME}";
PROVISIONING_PROFILE = "1717e4c9-547f-4b57-8720-a38d51f555f7";
PROVISIONING_PROFILE_SPECIFIER = "MobileCenter Sasquatch Watch ObjC Extension";
SDKROOT = watchos;
SKIP_INSTALL = YES;
TARGETED_DEVICE_FAMILY = 4;
Expand All @@ -1222,6 +1234,8 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.microsoft.azure.mobile.sasquatchobjc.watchkitapp.watchkitextension;
PRODUCT_NAME = "${TARGET_NAME}";
PROVISIONING_PROFILE = "1717e4c9-547f-4b57-8720-a38d51f555f7";
PROVISIONING_PROFILE_SPECIFIER = "MobileCenter Sasquatch Watch ObjC Extension";
SDKROOT = watchos;
SKIP_INSTALL = YES;
TARGETED_DEVICE_FAMILY = 4;
Expand All @@ -1239,6 +1253,8 @@
INFOPLIST_FILE = SasquatchWatchObjC/Info.plist;
PRODUCT_BUNDLE_IDENTIFIER = com.microsoft.azure.mobile.sasquatchobjc.watchkitapp;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "1657f08f-c937-477b-b91c-3e77bec3f728";
PROVISIONING_PROFILE_SPECIFIER = "MobileCenter Sasquatch Watch ObjC App";
SDKROOT = watchos;
SKIP_INSTALL = YES;
TARGETED_DEVICE_FAMILY = 4;
Expand All @@ -1256,6 +1272,8 @@
INFOPLIST_FILE = SasquatchWatchObjC/Info.plist;
PRODUCT_BUNDLE_IDENTIFIER = com.microsoft.azure.mobile.sasquatchobjc.watchkitapp;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "1657f08f-c937-477b-b91c-3e77bec3f728";
PROVISIONING_PROFILE_SPECIFIER = "MobileCenter Sasquatch Watch ObjC App";
SDKROOT = watchos;
SKIP_INSTALL = YES;
TARGETED_DEVICE_FAMILY = 4;
Expand All @@ -1273,6 +1291,8 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.microsoft.azure.mobile.sasquatchswift.watchkitapp.watchkitextension;
PRODUCT_NAME = "${TARGET_NAME}";
PROVISIONING_PROFILE = "f8916a7a-bdf2-43a9-aa3a-ed5132cf2d05";
PROVISIONING_PROFILE_SPECIFIER = "MobileCenter Sasquatch Watch Swift Extension";
SDKROOT = watchos;
SKIP_INSTALL = YES;
SWIFT_VERSION = 3.0;
Expand All @@ -1291,6 +1311,8 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.microsoft.azure.mobile.sasquatchswift.watchkitapp.watchkitextension;
PRODUCT_NAME = "${TARGET_NAME}";
PROVISIONING_PROFILE = "f8916a7a-bdf2-43a9-aa3a-ed5132cf2d05";
PROVISIONING_PROFILE_SPECIFIER = "MobileCenter Sasquatch Watch Swift Extension";
SDKROOT = watchos;
SKIP_INSTALL = YES;
SWIFT_VERSION = 3.0;
Expand All @@ -1310,6 +1332,8 @@
INFOPLIST_FILE = SasquatchWatchSwift/Info.plist;
PRODUCT_BUNDLE_IDENTIFIER = com.microsoft.azure.mobile.sasquatchswift.watchkitapp;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "78baa111-ff48-4e7c-b27c-d6d6b51f325d";
PROVISIONING_PROFILE_SPECIFIER = "MobileCenter Sasquatch Watch Swift App";
SDKROOT = watchos;
SKIP_INSTALL = YES;
SWIFT_VERSION = 3.0;
Expand All @@ -1329,6 +1353,8 @@
INFOPLIST_FILE = SasquatchWatchSwift/Info.plist;
PRODUCT_BUNDLE_IDENTIFIER = com.microsoft.azure.mobile.sasquatchswift.watchkitapp;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "78baa111-ff48-4e7c-b27c-d6d6b51f325d";
PROVISIONING_PROFILE_SPECIFIER = "MobileCenter Sasquatch Watch Swift App";
SDKROOT = watchos;
SKIP_INSTALL = YES;
SWIFT_VERSION = 3.0;
Expand Down

0 comments on commit 4751260

Please sign in to comment.