Merge pull request #1470 from AzureAD/release/1.2.1

Release 1.2.1
AzureAD · Apr 20, 2022 · 9fe7abd · 9fe7abd
2 parents 2825c3f + becbb96
commit 9fe7abd
Show file tree

Hide file tree

Showing 9 changed files with 33 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## [1.2.1]
+* Fixed zipping in release pipeline to preserve symlinks in xcframework
+
 ## [1.2.0]
 * Multi-tenant PkeyAuth support in MSAL (#1438)
 * Add support to wipe cache for all accounts (#1426)

diff --git a/MSAL.podspec b/MSAL.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "MSAL"
-  s.version      = "1.2.0"
+  s.version      = "1.2.1"
   s.summary      = "Microsoft Authentication Library (MSAL) for iOS"
   s.description  = <<-DESC
                    The MSAL library for iOS gives your app the ability to begin using the Microsoft Cloud by supporting Microsoft Azure Active Directory and Microsoft Accounts in a converged experience using industry standard OAuth2 and OpenID Connect. The library also supports Microsoft Azure B2C for those using our hosted identity management service.

diff --git a/MSAL/IdentityCore b/MSAL/IdentityCore
diff --git a/MSAL/resources/ios/Info.plist b/MSAL/resources/ios/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2.0</string>
+	<string>1.2.1</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>

diff --git a/MSAL/resources/mac/Info.plist b/MSAL/resources/mac/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2.0</string>
+	<string>1.2.1</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSHumanReadableCopyright</key>

diff --git a/MSAL/src/MSALPublicClientApplication.m b/MSAL/src/MSALPublicClientApplication.m
@@ -1448,8 +1448,7 @@ - (void)signoutWithAccount:(nonnull MSALAccount *)account
             block(NO, localError, nil);
             return;
         }
-
-
+
 #if !TARGET_OS_IPHONE
         // Clear additional cache locations
         NSDictionary<NSString *, NSDictionary *> *additionalPartnerLocations = MSALWipeCacheForAllAccountsConfig.additionalPartnerLocations;

diff --git a/MSAL/src/MSAL_Internal.h b/MSAL/src/MSAL_Internal.h
@@ -27,7 +27,7 @@
 
 #define MSAL_VER_HIGH       1
 #define MSAL_VER_LOW        2
-#define MSAL_VER_PATCH      0
+#define MSAL_VER_PATCH      1
 
 #define STR_HELPER(x) #x
 #define STR(x) STR_HELPER(x)

diff --git a/MSAL/test/app/MSALTestAppSettings.m b/MSAL/test/app/MSALTestAppSettings.m
@@ -80,7 +80,8 @@ + (void)initialize
 
     for (NSString *host in trustedHosts)
     {
-        __auto_type tenants = @[@"common", @"organizations", @"consumers"];
+        __auto_type tenants = @[@"common", @"organizations", @"consumers", @"f645ad92-e38d-4d1a-b510-d1b09a74a8ca"];
+
 
         for (NSString *tenant in tenants)
         {
@@ -91,7 +92,8 @@ + (void)initialize
 
     s_authorities = authorities;
 
-    s_scopes_available = @[MSAL_APP_SCOPE_USER_READ, @"Tasks.Read", @"https://graph.microsoft.com/.default",@"https://msidlabb2c.onmicrosoft.com/msidlabb2capi/read", @"TASKS.read", @"https://outlook.office365.com/.default"];
+    s_scopes_available = @[MSAL_APP_SCOPE_USER_READ, @"Tasks.Read", @"https://graph.microsoft.com/.default",@"https://msidlabb2c.onmicrosoft.com/msidlabb2capi/read", @"TASKS.read", @"https://outlook.office365.com/.default", @"https://microsoftgraph.chinacloudapi.cn/.default"];
+
 
     __auto_type signinPolicyAuthority = @"https://login.microsoftonline.com/tfp/msidlabb2c.onmicrosoft.com/B2C_1_SignInPolicy";
     __auto_type signupPolicyAuthority = @"https://login.microsoftonline.com/tfp/msidlabb2c.onmicrosoft.com/B2C_1_SignUpPolicy";

diff --git a/azure_pipelines/spm-framework.yml b/azure_pipelines/spm-framework.yml
@@ -91,10 +91,19 @@ jobs:
         -framework $(Build.binariesDirectory)/iOS.xcarchive/Products/Library/Frameworks/MSAL.framework \
         -framework $(Build.binariesDirectory)/iOS-Sim.xcarchive/Products/Library/Frameworks/MSAL.framework \
         -framework $(Build.binariesDirectory)/macOS.xcarchive/Products/Library/Frameworks/MSAL.framework \
-        -output $(Build.binariesDirectory)/MSAL.xcframework
+        -output $(Build.ArtifactStagingDirectory)/MSAL.xcframework
       failOnStderr: true
-  - task: ArchiveFiles@2
-    displayName: Zip xcframework
+  - task: Bash@3
+    displayName: Zip xcframework for codesigning
+    inputs:
+      workingDirectory: $(Build.ArtifactStagingDirectory)
+      targetType: 'inline'
+      script: |
+        # Zipping xcframework. -y : including symlinks (Need to preserve symlinks in xcframework so that codesign validation doesn't fail) -v : verbose logging
+        zip -r $(Build.ArtifactStagingDirectory)/MSAL.zip MSAL.xcframework -y -v
+      failOnStderr: true
+  - task: UseDotNet@2
+    displayName: 'Install .NET Core sdk for signing'
     inputs:
       rootFolderOrFile: '$(Build.binariesDirectory)/MSAL.xcframework'
       includeRootFolder: true
@@ -132,9 +141,15 @@ jobs:
     inputs:
       targetType: 'inline'
       script: |
-        unzip MSAL.zip -d MSAL.xcframework
+        # Codesigning service explodes xcframework in output zip. Need to re-package contents into xcframework
+        # Extract code signature and add it into built xcframework
+        unzip MSAL.zip _CodeSignature\* -d MSAL.xcframework
+        # Delete zip file
         rm MSAL.zip
-        zip -r MSAL.zip MSAL.xcframework
+        # Delete md file created by codesigning service
+        rm *.md
+        # Zip xcframework into zip file with symlinks preserved and delete xcframework
+        zip -r MSAL.zip MSAL.xcframework -y -m
       workingDirectory: '$(Build.ArtifactStagingDirectory)'
       failOnStderr: true
   - task: Bash@3