Skip to content

Commit

Permalink
Merge pull request #1592 from AzureAD/release/6.0.2
Browse files Browse the repository at this point in the history
Release/6.0.2
  • Loading branch information
mipetriu authored Apr 7, 2022
2 parents ab016db + 2a847ba commit 7e0fc8d
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 10 deletions.
2 changes: 1 addition & 1 deletion ADAL.podspec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Pod::Spec.new do |s|
s.name = "ADAL"
s.module_name = "ADAL"
s.version = "6.0.1"
s.version = "6.0.2"
s.summary = "The ADAL SDK for iOS gives you the ability to add Azure Identity authentication to your application"

s.description = <<-DESC
Expand Down
12 changes: 6 additions & 6 deletions ADAL/ADAL.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -3183,7 +3183,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "/usr/bin/python \"${PROJECT_DIR}/tools/update_build_version.py\" \"${PROJECT_DIR}/src/ADAL_Internal.h\" \"${SRCROOT}/${INFOPLIST_FILE}\"\n";
shellScript = "/usr/bin/python3 \"${PROJECT_DIR}/tools/update_build_version.py\" \"${PROJECT_DIR}/src/ADAL_Internal.h\" \"${SRCROOT}/${INFOPLIST_FILE}\"\n";
showEnvVarsInLog = 0;
};
6079EB5D1D79559500E95AB1 /* ShellScript */ = {
Expand All @@ -3199,7 +3199,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "/usr/bin/python \"${PROJECT_DIR}/tools/update_build_version.py\" \"${PROJECT_DIR}/src/ADAL_Internal.h\" \"${SRCROOT}/${INFOPLIST_FILE}\"";
shellScript = "/usr/bin/python3 \"${PROJECT_DIR}/tools/update_build_version.py\" \"${PROJECT_DIR}/src/ADAL_Internal.h\" \"${SRCROOT}/${INFOPLIST_FILE}\"\n";
showEnvVarsInLog = 0;
};
B2000C7220EC3B680092790A /* ShellScript */ = {
Expand Down Expand Up @@ -4079,7 +4079,7 @@
DEVELOPMENT_TEAM = "";
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
MARKETING_VERSION = 6.0.0;
MARKETING_VERSION = 6.0.2;
};
name = Debug;
};
Expand All @@ -4090,7 +4090,7 @@
CODE_SIGN_IDENTITY = "iPhone Developer";
DEVELOPMENT_TEAM = "";
GCC_PREPROCESSOR_DEFINITIONS = "";
MARKETING_VERSION = 6.0.0;
MARKETING_VERSION = 6.0.2;
};
name = Release;
};
Expand All @@ -4101,7 +4101,7 @@
CODE_SIGN_IDENTITY = "";
DEVELOPMENT_TEAM = "";
GCC_OPTIMIZATION_LEVEL = 0;
MARKETING_VERSION = 6.0.0;
MARKETING_VERSION = 6.0.2;
};
name = Debug;
};
Expand All @@ -4111,7 +4111,7 @@
buildSettings = {
CODE_SIGN_IDENTITY = "";
DEVELOPMENT_TEAM = "";
MARKETING_VERSION = 6.0.0;
MARKETING_VERSION = 6.0.2;
};
name = Release;
};
Expand Down
2 changes: 1 addition & 1 deletion ADAL/resources/ios/Framework/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>$(MARKETING_VERSION)</string>
<string>6.0.2</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
Expand Down
2 changes: 1 addition & 1 deletion ADAL/resources/mac/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>6.0.1</string>
<string>6.0.2</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
Expand Down
2 changes: 1 addition & 1 deletion ADAL/src/ADAL_Internal.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

#define ADAL_VER_HIGH 6
#define ADAL_VER_LOW 0
#define ADAL_VER_PATCH 1
#define ADAL_VER_PATCH 2

#define STR_HELPER(x) #x
#define STR(x) STR_HELPER(x)
Expand Down
5 changes: 5 additions & 0 deletions changelog.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
Version 6.0.2
------
* Update python version in order to support macOS 12.3
------

Version 6.0.1 (Jan.10.2022)
------
* Fix crash when decoding back cache object
Expand Down

0 comments on commit 7e0fc8d

Please sign in to comment.