Skip to content

Commit ec084f1

Browse files
colbylwilliamscolbylwilliams
authored
Merge branch 'master' into feature/93-create-empty-child-directories
2 parents 1c3745c + 4bf2817 commit ec084f1

110 files changed

Lines changed: 5158 additions & 1325 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -116,14 +116,11 @@ project.lock.json
116116
[Pp]rivateKeys.cs
117117
[Pp]rivateKeys.swift
118118

119-
120119
*.paw
121120

122121
*.xcbkptlist
123122
*.xcuserstate
124123
# *.xcworkspacedata
125124

126-
AzureData Sample/scripts/test-all.sh
127-
128125
Azure.framework.zip
129-
package.sh
126+
Package.resolved

‎Azure.xcworkspace/contents.xcworkspacedata‎

Lines changed: 36 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎AzureAuth.podspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Pod::Spec.new do |s|
22

33
s.name = 'AzureAuth'
4-
s.version = '0.1.3'
4+
s.version = '0.1.5'
55
s.summary = 'Microsoft Azure App Service Auth client SDK for iOS.'
66

77
s.description = 'Microsoft Azure App Service Auth client SDK for iOS, macOS, watchOS, tvOS.'

‎AzureAuth/AzureAuth.xcodeproj/project.pbxproj‎

Lines changed: 24 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -544,9 +544,9 @@
544544
DEFINES_MODULE = YES;
545545
DEVELOPMENT_TEAM = "";
546546
DYLIB_COMPATIBILITY_VERSION = 1;
547-
DYLIB_CURRENT_VERSION = 1;
547+
DYLIB_CURRENT_VERSION = 16;
548548
DYLIB_INSTALL_NAME_BASE = "@rpath";
549-
INFOPLIST_FILE = "$(SRCROOT)/Source/Info.plist";
549+
INFOPLIST_FILE = Source/Info.plist;
550550
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
551551
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
552552
PRODUCT_BUNDLE_IDENTIFIER = com.azure.auth;
@@ -568,9 +568,9 @@
568568
DEFINES_MODULE = YES;
569569
DEVELOPMENT_TEAM = "";
570570
DYLIB_COMPATIBILITY_VERSION = 1;
571-
DYLIB_CURRENT_VERSION = 1;
571+
DYLIB_CURRENT_VERSION = 16;
572572
DYLIB_INSTALL_NAME_BASE = "@rpath";
573-
INFOPLIST_FILE = "$(SRCROOT)/Source/Info.plist";
573+
INFOPLIST_FILE = Source/Info.plist;
574574
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
575575
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
576576
PRODUCT_BUNDLE_IDENTIFIER = com.azure.auth;
@@ -588,7 +588,7 @@
588588
buildSettings = {
589589
CODE_SIGN_STYLE = Automatic;
590590
DEVELOPMENT_TEAM = "";
591-
INFOPLIST_FILE = "$(SRCROOT)/Tests/Info.plist";
591+
INFOPLIST_FILE = Tests/Info.plist;
592592
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
593593
PRODUCT_BUNDLE_IDENTIFIER = com.azure.auth.tests;
594594
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -604,7 +604,7 @@
604604
buildSettings = {
605605
CODE_SIGN_STYLE = Automatic;
606606
DEVELOPMENT_TEAM = "";
607-
INFOPLIST_FILE = "$(SRCROOT)/Tests/Info.plist";
607+
INFOPLIST_FILE = Tests/Info.plist;
608608
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
609609
PRODUCT_BUNDLE_IDENTIFIER = com.azure.auth.tests;
610610
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -624,9 +624,9 @@
624624
DEFINES_MODULE = YES;
625625
DEVELOPMENT_TEAM = "";
626626
DYLIB_COMPATIBILITY_VERSION = 1;
627-
DYLIB_CURRENT_VERSION = 1;
627+
DYLIB_CURRENT_VERSION = 16;
628628
DYLIB_INSTALL_NAME_BASE = "@rpath";
629-
INFOPLIST_FILE = "$(SRCROOT)/Source/Info.plist";
629+
INFOPLIST_FILE = Source/Info.plist;
630630
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
631631
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
632632
PRODUCT_BUNDLE_IDENTIFIER = com.azure.auth;
@@ -648,9 +648,9 @@
648648
DEFINES_MODULE = YES;
649649
DEVELOPMENT_TEAM = "";
650650
DYLIB_COMPATIBILITY_VERSION = 1;
651-
DYLIB_CURRENT_VERSION = 1;
651+
DYLIB_CURRENT_VERSION = 16;
652652
DYLIB_INSTALL_NAME_BASE = "@rpath";
653-
INFOPLIST_FILE = "$(SRCROOT)/Source/Info.plist";
653+
INFOPLIST_FILE = Source/Info.plist;
654654
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
655655
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
656656
PRODUCT_BUNDLE_IDENTIFIER = com.azure.auth;
@@ -696,7 +696,7 @@
696696
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
697697
CODE_SIGN_IDENTITY = "iPhone Developer";
698698
COPY_PHASE_STRIP = NO;
699-
CURRENT_PROJECT_VERSION = 1;
699+
CURRENT_PROJECT_VERSION = 16;
700700
DEBUG_INFORMATION_FORMAT = dwarf;
701701
ENABLE_STRICT_OBJC_MSGSEND = YES;
702702
ENABLE_TESTABILITY = YES;
@@ -721,7 +721,6 @@
721721
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
722722
SWIFT_VERSION = 4.0;
723723
VERSIONING_SYSTEM = "apple-generic";
724-
VERSION_INFO_PREFIX = "";
725724
};
726725
name = Debug;
727726
};
@@ -758,7 +757,7 @@
758757
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
759758
CODE_SIGN_IDENTITY = "iPhone Developer";
760759
COPY_PHASE_STRIP = NO;
761-
CURRENT_PROJECT_VERSION = 1;
760+
CURRENT_PROJECT_VERSION = 16;
762761
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
763762
ENABLE_NS_ASSERTIONS = NO;
764763
ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -776,7 +775,6 @@
776775
SWIFT_VERSION = 4.0;
777776
VALIDATE_PRODUCT = YES;
778777
VERSIONING_SYSTEM = "apple-generic";
779-
VERSION_INFO_PREFIX = "";
780778
};
781779
name = Release;
782780
};
@@ -789,9 +787,9 @@
789787
DEFINES_MODULE = YES;
790788
DEVELOPMENT_TEAM = "";
791789
DYLIB_COMPATIBILITY_VERSION = 1;
792-
DYLIB_CURRENT_VERSION = 1;
790+
DYLIB_CURRENT_VERSION = 16;
793791
DYLIB_INSTALL_NAME_BASE = "@rpath";
794-
INFOPLIST_FILE = "$(SRCROOT)/Source/Info.plist";
792+
INFOPLIST_FILE = Source/Info.plist;
795793
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
796794
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
797795
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
@@ -813,9 +811,9 @@
813811
DEFINES_MODULE = YES;
814812
DEVELOPMENT_TEAM = "";
815813
DYLIB_COMPATIBILITY_VERSION = 1;
816-
DYLIB_CURRENT_VERSION = 1;
814+
DYLIB_CURRENT_VERSION = 16;
817815
DYLIB_INSTALL_NAME_BASE = "@rpath";
818-
INFOPLIST_FILE = "$(SRCROOT)/Source/Info.plist";
816+
INFOPLIST_FILE = Source/Info.plist;
819817
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
820818
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
821819
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
@@ -833,7 +831,7 @@
833831
buildSettings = {
834832
CODE_SIGN_STYLE = Automatic;
835833
DEVELOPMENT_TEAM = "";
836-
INFOPLIST_FILE = "$(SRCROOT)/Tests/Info.plist";
834+
INFOPLIST_FILE = Tests/Info.plist;
837835
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
838836
PRODUCT_BUNDLE_IDENTIFIER = com.azure.auth.tests;
839837
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -847,7 +845,7 @@
847845
buildSettings = {
848846
CODE_SIGN_STYLE = Automatic;
849847
DEVELOPMENT_TEAM = "";
850-
INFOPLIST_FILE = "$(SRCROOT)/Tests/Info.plist";
848+
INFOPLIST_FILE = Tests/Info.plist;
851849
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
852850
PRODUCT_BUNDLE_IDENTIFIER = com.azure.auth.tests;
853851
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -866,10 +864,10 @@
866864
DEFINES_MODULE = YES;
867865
DEVELOPMENT_TEAM = "";
868866
DYLIB_COMPATIBILITY_VERSION = 1;
869-
DYLIB_CURRENT_VERSION = 1;
867+
DYLIB_CURRENT_VERSION = 16;
870868
DYLIB_INSTALL_NAME_BASE = "@rpath";
871869
FRAMEWORK_VERSION = A;
872-
INFOPLIST_FILE = "$(SRCROOT)/Source/Info.plist";
870+
INFOPLIST_FILE = Source/Info.plist;
873871
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
874872
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
875873
MACOSX_DEPLOYMENT_TARGET = 10.12;
@@ -892,10 +890,10 @@
892890
DEFINES_MODULE = YES;
893891
DEVELOPMENT_TEAM = "";
894892
DYLIB_COMPATIBILITY_VERSION = 1;
895-
DYLIB_CURRENT_VERSION = 1;
893+
DYLIB_CURRENT_VERSION = 16;
896894
DYLIB_INSTALL_NAME_BASE = "@rpath";
897895
FRAMEWORK_VERSION = A;
898-
INFOPLIST_FILE = "$(SRCROOT)/Source/Info.plist";
896+
INFOPLIST_FILE = Source/Info.plist;
899897
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
900898
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
901899
MACOSX_DEPLOYMENT_TARGET = 10.12;
@@ -915,7 +913,7 @@
915913
CODE_SIGN_STYLE = Automatic;
916914
COMBINE_HIDPI_IMAGES = YES;
917915
DEVELOPMENT_TEAM = "";
918-
INFOPLIST_FILE = "$(SRCROOT)/Tests/Info.plist";
916+
INFOPLIST_FILE = Tests/Info.plist;
919917
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
920918
MACOSX_DEPLOYMENT_TARGET = 10.13;
921919
PRODUCT_BUNDLE_IDENTIFIER = com.azure.auth.tests;
@@ -932,7 +930,7 @@
932930
CODE_SIGN_STYLE = Automatic;
933931
COMBINE_HIDPI_IMAGES = YES;
934932
DEVELOPMENT_TEAM = "";
935-
INFOPLIST_FILE = "$(SRCROOT)/Tests/Info.plist";
933+
INFOPLIST_FILE = Tests/Info.plist;
936934
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
937935
MACOSX_DEPLOYMENT_TARGET = 10.13;
938936
PRODUCT_BUNDLE_IDENTIFIER = com.azure.auth.tests;

‎AzureAuth/AzureAuth.xcodeproj/xcshareddata/xcschemes/AzureAuth iOS.xcscheme‎

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,9 @@
33
LastUpgradeVersion = "0930"
44
version = "1.3">
55
<BuildAction
6-
parallelizeBuildables = "NO"
6+
parallelizeBuildables = "YES"
77
buildImplicitDependencies = "YES">
88
<BuildActionEntries>
9-
<BuildActionEntry
10-
buildForTesting = "YES"
11-
buildForRunning = "YES"
12-
buildForProfiling = "YES"
13-
buildForArchiving = "YES"
14-
buildForAnalyzing = "YES">
15-
<BuildableReference
16-
BuildableIdentifier = "primary"
17-
BlueprintIdentifier = "93F80547202BB20300D0B4F4"
18-
BuildableName = "AzureCore.framework"
19-
BlueprintName = "AzureCore iOS"
20-
ReferencedContainer = "container:../AzureCore/AzureCore.xcodeproj">
21-
</BuildableReference>
22-
</BuildActionEntry>
239
<BuildActionEntry
2410
buildForTesting = "YES"
2511
buildForRunning = "YES"

‎AzureAuth/AzureAuth.xcodeproj/xcshareddata/xcschemes/AzureAuth macOS.xcscheme‎

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,9 @@
33
LastUpgradeVersion = "0930"
44
version = "1.3">
55
<BuildAction
6-
parallelizeBuildables = "NO"
6+
parallelizeBuildables = "YES"
77
buildImplicitDependencies = "YES">
88
<BuildActionEntries>
9-
<BuildActionEntry
10-
buildForTesting = "YES"
11-
buildForRunning = "YES"
12-
buildForProfiling = "YES"
13-
buildForArchiving = "YES"
14-
buildForAnalyzing = "YES">
15-
<BuildableReference
16-
BuildableIdentifier = "primary"
17-
BlueprintIdentifier = "93F80613202BB5F600D0B4F4"
18-
BuildableName = "AzureCore.framework"
19-
BlueprintName = "AzureCore macOS"
20-
ReferencedContainer = "container:../AzureCore/AzureCore.xcodeproj">
21-
</BuildableReference>
22-
</BuildActionEntry>
239
<BuildActionEntry
2410
buildForTesting = "YES"
2511
buildForRunning = "YES"

‎AzureAuth/AzureAuth.xcodeproj/xcshareddata/xcschemes/AzureAuth tvOS.xcscheme‎

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,9 @@
33
LastUpgradeVersion = "0930"
44
version = "1.3">
55
<BuildAction
6-
parallelizeBuildables = "NO"
6+
parallelizeBuildables = "YES"
77
buildImplicitDependencies = "YES">
88
<BuildActionEntries>
9-
<BuildActionEntry
10-
buildForTesting = "YES"
11-
buildForRunning = "YES"
12-
buildForProfiling = "YES"
13-
buildForArchiving = "YES"
14-
buildForAnalyzing = "YES">
15-
<BuildableReference
16-
BuildableIdentifier = "primary"
17-
BlueprintIdentifier = "930A01EE202BBA09002BD1FE"
18-
BuildableName = "AzureCore.framework"
19-
BlueprintName = "AzureCore tvOS"
20-
ReferencedContainer = "container:../AzureCore/AzureCore.xcodeproj">
21-
</BuildableReference>
22-
</BuildActionEntry>
239
<BuildActionEntry
2410
buildForTesting = "YES"
2511
buildForRunning = "YES"

‎AzureAuth/AzureAuth.xcodeproj/xcshareddata/xcschemes/AzureAuth watchOS.xcscheme‎

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,6 @@
66
parallelizeBuildables = "NO"
77
buildImplicitDependencies = "YES">
88
<BuildActionEntries>
9-
<BuildActionEntry
10-
buildForTesting = "YES"
11-
buildForRunning = "YES"
12-
buildForProfiling = "YES"
13-
buildForArchiving = "YES"
14-
buildForAnalyzing = "YES">
15-
<BuildableReference
16-
BuildableIdentifier = "primary"
17-
BlueprintIdentifier = "930A020A202BBA16002BD1FE"
18-
BuildableName = "AzureCore.framework"
19-
BlueprintName = "AzureCore watchOS"
20-
ReferencedContainer = "container:../AzureCore/AzureCore.xcodeproj">
21-
</BuildableReference>
22-
</BuildActionEntry>
239
<BuildActionEntry
2410
buildForTesting = "YES"
2511
buildForRunning = "YES"
@@ -42,16 +28,6 @@
4228
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
4329
shouldUseLaunchSchemeArgsEnv = "YES">
4430
<Testables>
45-
<TestableReference
46-
skipped = "NO">
47-
<BuildableReference
48-
BuildableIdentifier = "primary"
49-
BlueprintIdentifier = "93F80653202BB71500D0B4F4"
50-
BuildableName = "AzureAuth watchOS Tests.xctest"
51-
BlueprintName = "AzureAuth watchOS Tests"
52-
ReferencedContainer = "container:AzureAuth.xcodeproj">
53-
</BuildableReference>
54-
</TestableReference>
5531
</Testables>
5632
<MacroExpansion>
5733
<BuildableReference

‎AzureAuth/Source/Info.plist‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
<key>CFBundlePackageType</key>
1818
<string>FMWK</string>
1919
<key>CFBundleShortVersionString</key>
20-
<string>0.1.3</string>
20+
<string>0.1.5</string>
2121
<key>CFBundleSignature</key>
2222
<string>????</string>
2323
<key>CFBundleVersion</key>
24-
<string>$(CURRENT_PROJECT_VERSION)</string>
24+
<string>16</string>
2525
<key>NSPrincipalClass</key>
2626
<string></string>
2727
</dict>

‎AzureAuth/Tests/Info.plist‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
<key>CFBundlePackageType</key>
1616
<string>BNDL</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>1.0</string>
18+
<string>0.1.5</string>
1919
<key>CFBundleVersion</key>
20-
<string>1</string>
20+
<string>16</string>
2121
</dict>
2222
</plist>

0 commit comments

Comments
 (0)