Merge pull request #1807 from microsoft/release/5.0.7

Start new 5.0.7 version

Author: MikhailSuendukov

.azurepipelines/build-release-packages-1es.yml

@@ -28,8 +28,74 @@ extends:
     sdl:
       sourceAnalysisPool: 1ES-PT-Windows-2022
     stages:
+
+    - stage: DownloadExternalPipelineArtifacts
+      pool:
+        name: Azure Pipelines
+        image: macos-14
+        os: macOS
+      jobs:
+      - job: downloadExternalArtifacts
+        displayName: DownloadExternalPipelineArtifacts
+        templateContext:
+          outputs:
+          - output: pipelineArtifact
+            displayName: 'Publish Artifact: framework'
+            path: '$(Build.ArtifactStagingDirectory)'
+            artifactName: external-artifacts
+        steps:
+        - checkout: self
+          fetchTags: false
+
+        - task: DownloadPipelineArtifact@2
+          displayName: 'Download apple artifacts'
+          inputs:
+            buildType: 'specific'
+            project: 'SDK'
+            pipeline: 'AppCenter-SDK-Apple Build Frameworks and Documentation 1ES'
+            buildVersionToDownload: 'latestFromBranch'
+            patterns:  '**/Release/!(*carthage*)*.zip'
+            targetPath: '$(Build.SourcesDirectory)/externals/apple_unflattened'
+
+        - task: DownloadPipelineArtifact@2
+          displayName: 'Download android artifacts'
+          inputs:
+            buildType: 'specific'
+            project: 'SDK'
+            buildVersionToDownload: 'latestFromBranch'
+            pipeline: 'AppCenter-SDK-Android Publish Maven 1ES'
+            patterns:  '**/Release/appcenter/**/*.aar'
+            targetPath: '$(Build.SourcesDirectory)/externals/android_unflattened'
+
+        - task: Bash@3
+          displayName: 'Flatten Android artifacts'  
+          inputs:
+            targetType: 'inline'
+            script: |
+              echo "Flattening Android artifacts:"
+              mkdir -p $(Build.SourcesDirectory)/externals/android
+              find $(Build.SourcesDirectory)/externals/android_unflattened -name '*.aar' -exec mv {} $(Build.SourcesDirectory)/externals/android/ \; 
+              rm -rf $(Build.SourcesDirectory)/externals/android_unflattened
+        
+        - task: Bash@3
+          displayName: 'Flatten Apple artifacts'  
+          inputs:
+            targetType: 'inline'
+            script: |
+              echo "Flattening Apple artifacts:"
+              mkdir -p $(Build.SourcesDirectory)/externals/apple
+              find $(Build.SourcesDirectory)/externals/apple_unflattened -name '*.zip' -exec mv {} $(Build.SourcesDirectory)/externals/apple/ \;
+              rm -rf $(Build.SourcesDirectory)/externals/apple_unflattened  
+
+        - task: CopyFiles@2
+          displayName: 'Copy artifacts'
+          inputs:
+            SourceFolder: '$(Build.SourcesDirectory)/externals'
+            TargetFolder: '$(Build.ArtifactStagingDirectory)'
+
     - stage: BuildWindowsAssemblies
-      dependsOn: []
+      dependsOn: 
+      - DownloadExternalPipelineArtifacts
       jobs:
       - job: sdkBuildJob
         displayName: BuildWindowsAssemblies
@@ -44,12 +110,11 @@ extends:
         - checkout: self
           fetchTags: false
 
-        - task: AzureKeyVault@2
+        - task: DownloadPipelineArtifact@2
           inputs:
-            azureSubscription: 'AC - Dev Infra & Build Pool'
-            KeyVaultName: 'mobile-center-sdk'
-            SecretsFilter: 'appcenter-sdk-blob-storage-access-secret'
-            RunAsPreJob: false
+            artifact: 'external-artifacts'
+            targetPath: '$(Build.SourcesDirectory)/externals'
+          displayName: 'Download pipeline artifacts'
 
         - task: PowerShell@2
           displayName: 'Set Release Version'
@@ -62,21 +127,20 @@ extends:
           displayName: 'Prepare Assemblies'
           inputs:
             target: PrepareAssemblies
-            arguments: '--StorageAuthParams="$(appcenter-sdk-blob-storage-access-secret)"'
             Version: 2.2.0
 
-
         - task: CopyFiles@2
           displayName: 'Copy Assemblies'
           inputs:
             SourceFolder: '$(Build.SourcesDirectory)\bin'
             TargetFolder: '$(Build.ArtifactStagingDirectory)'
 
     - stage: BuildDotNetAssemblies
-      dependsOn: []
+      dependsOn: 
+      - DownloadExternalPipelineArtifacts
       pool:
         name: Azure Pipelines
-        image: macos-12
+        image: macos-14
         os: macOS
         demands:
         - msbuild
@@ -92,6 +156,12 @@ extends:
         - checkout: self
           fetchTags: false
 
+        - task: DownloadPipelineArtifact@2
+          inputs:
+            artifact: 'external-artifacts'
+            targetPath: '$(Build.SourcesDirectory)/externals'
+          displayName: 'Download pipeline artifacts' 
+    
         - task: Bash@3
           displayName: 'Set Release Version'
           inputs:
@@ -106,13 +176,6 @@ extends:
             jdkArchitectureOption: x64
             jdkSourceOption: PreInstalled
 
-        - task: AzureKeyVault@2
-          inputs:
-            azureSubscription: 'AC - Dev Infra & Build Pool'
-            KeyVaultName: 'mobile-center-sdk'
-            SecretsFilter: 'appcenter-sdk-blob-storage-access-secret'
-            RunAsPreJob: false
-
         - task: UseDotNet@2
           displayName: 'Install .NET SDK'
           inputs:
@@ -126,7 +189,6 @@ extends:
           displayName: 'Prepare DotNet Assemblies'
           inputs:
             target: PrepareAssemblies
-            arguments: '--StorageAuthParams="$(appcenter-sdk-blob-storage-access-secret)"'
             Version: 2.2.0
 
         - task: Bash@3
@@ -146,7 +208,7 @@ extends:
           displayName: 'Prepare Xamarin Assemblies'
           inputs:
             target: PrepareAssemblies
-            arguments: '--MacPlatformId="mac-xamarin" --StorageAuthParams="$(appcenter-sdk-blob-storage-access-secret)"'
+            arguments: '--MacPlatformId="mac-xamarin"'
             Version: 2.2.0
 
         - task: CopyFiles@2
@@ -223,16 +285,25 @@ extends:
             .\scripts\strong-named-sign.cmd "$(Build.ArtifactStagingDirectory)\assemblies" "$(Agent.TempDirectory)\appcenter-pair-key.snk"
           displayName: 'Sign assemblies with strong naming'
 
+        - task: AzureKeyVault@2
+          displayName: 'Get MSI Client and Tenant IDs for App Center - Code Signing (PME) Service Connection'
+          inputs:
+            azureSubscription: AC - Dev Infra & Build Pool
+            keyVaultName: mobile-center-sdk
+            secretsFilter: codesigning-esrp-client-id, codesigning-msi-client-id, codesigning-msi-tenant-id
+            runAsPreJob: false
+
         - task: EsrpCodeSigning@5
           displayName: 'Sign Assemblies'
           inputs:
-            ConnectedServiceName: 'App Center - Code Signing (WIF)'
+            ConnectedServiceName: 'App Center - Code Signing (PME)'
             FolderPath: '$(Build.ArtifactStagingDirectory)\assemblies'
-            AppRegistrationClientId: '56ecf8eb-6143-4da0-9a53-716e9c2e6e86'
-            AppRegistrationTenantId: '72f988bf-86f1-41af-91ab-2d7cd011db47'
-            AuthAKVName: 'code-signing-poduction'
-            AuthCertName: 'appcenter-codesigning-auth'
-            AuthSignCertName: 'CodeSigning-Certificate-Managed'            
+            UseMSIAuthentication: true
+            AppRegistrationClientId: $(codesigning-msi-client-id)
+            AppRegistrationTenantId: $(codesigning-msi-tenant-id)
+            EsrpClientId: $(codesigning-esrp-client-id)
+            AuthAKVName: 'ac-code-signing'
+            AuthSignCertName: 'CodeSigning-Certificate-Managed'
             Pattern: '*.dll,*.winmd'
             signConfigType: inlineSignParams
             inlineOperation: |
@@ -302,13 +373,6 @@ extends:
           env:
             AzureServicesAuthConnectionString: 'runAs=App;AppId=$(appcenter-sdk-managed-identity-clientid)'
 
-        - task: AzureKeyVault@2
-          inputs:
-            azureSubscription: 'AC - Dev Infra & Build Pool'
-            KeyVaultName: 'mobile-center-sdk'
-            SecretsFilter: 'appcenter-sdk-blob-storage-access-secret'
-            RunAsPreJob: false
-
         - task: Cake@2
           displayName: 'Pack NuGets'
           inputs:
@@ -320,12 +384,13 @@ extends:
           displayName: 'Sign Packages'
           enabled: true
           inputs:
-            ConnectedServiceName: 'App Center - Code Signing (WIF)'
-            AppRegistrationClientId: '56ecf8eb-6143-4da0-9a53-716e9c2e6e86'
-            AppRegistrationTenantId: '72f988bf-86f1-41af-91ab-2d7cd011db47'
-            AuthAKVName: 'code-signing-poduction'
-            AuthCertName: 'appcenter-codesigning-auth'
-            AuthSignCertName: 'CodeSigning-Certificate-Managed'           
+            ConnectedServiceName: 'App Center - Code Signing (PME)'
+            UseMSIAuthentication: true
+            AppRegistrationClientId: $(codesigning-msi-client-id)
+            AppRegistrationTenantId: $(codesigning-msi-tenant-id)
+            EsrpClientId: $(codesigning-esrp-client-id)
+            AuthAKVName: 'ac-code-signing'
+            AuthSignCertName: 'CodeSigning-Certificate-Managed'
             FolderPath: '$(System.DefaultWorkingDirectory)/'
             Pattern: 'Microsoft.AppCenter*.nupkg'
             signConfigType: inlineSignParams

AppCenter-Demo.sln

@@ -5,22 +5,10 @@ VisualStudioVersion = 16.0.29209.152
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Apps", "Apps", "{274AB35C-68B4-4EFA-803B-8A7CFEC25EFC}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Contoso.Forms.Demo", "Contoso.Forms.Demo", "{91CEE2C9-F64C-45C9-9353-B1EC87D13C6D}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Contoso.Forms.Demo", "Apps\Contoso.Forms.Demo\Contoso.Forms.Demo\Contoso.Forms.Demo.csproj", "{8E7B51FC-8A9B-49F7-A40D-4D12BBF893B6}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Contoso.Forms.Demo.Droid", "Apps\Contoso.Forms.Demo\Contoso.Forms.Demo.Droid\Contoso.Forms.Demo.Droid.csproj", "{3B39B339-86C4-47EF-8F85-811220494CA6}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Contoso.Forms.Demo.iOS", "Apps\Contoso.Forms.Demo\Contoso.Forms.Demo.iOS\Contoso.Forms.Demo.iOS.csproj", "{EB8F7B8E-5013-4C0C-9C32-59ADC5FDFDBD}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Contoso.Forms.Demo.UWP", "Apps\Contoso.Forms.Demo\Contoso.Forms.Demo.UWP\Contoso.Forms.Demo.UWP.csproj", "{665362D9-5EE2-45DE-A907-25DC86999A68}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Contoso.UtilClassLibrary", "Apps\Contoso.UtilClassLibrary\Contoso.UtilClassLibrary.csproj", "{2AF3281C-D928-4886-9C68-775DADA56789}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Contoso.UWP.Demo", "Apps\Contoso.UWP.Demo\Contoso.UWP.Demo.csproj", "{612D30FE-E1F1-4CEE-8256-911C03A16890}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Contoso.Forms.Demo.MacOS", "Apps\Contoso.Forms.Demo\Contoso.Forms.Demo.MacOS\Contoso.Forms.Demo.MacOS.csproj", "{85B05946-0E5A-4AFE-88E8-079D6AA9D3D6}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Ad-Hoc|Any CPU = Ad-Hoc|Any CPU