diff --git a/.github/workflows/build-beta.yml b/.github/workflows/build-beta.yml index 6feaa886c..add4a3d16 100644 --- a/.github/workflows/build-beta.yml +++ b/.github/workflows/build-beta.yml @@ -3,3 +3,348 @@ name: Build Beta on: workflow_dispatch: + inputs: + ref: + description: 'Branch or tag to build' + required: true + default: 'main' + type: string + +env: + main_app_folder_path: src/App + main_app_project_path: src/App/App.csproj + target-net-version: net8.0 + +jobs: + setup: + name: Setup + runs-on: ubuntu-22.04 + outputs: + rc_branch_exists: ${{ steps.branch-check.outputs.rc_branch_exists }} + hotfix_branch_exists: ${{ steps.branch-check.outputs.hotfix_branch_exists }} + steps: + - name: Checkout repo + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + with: + submodules: 'true' + + - name: Check if special branches exist + id: branch-check + run: | + if [[ $(git ls-remote --heads origin rc) ]]; then + echo "rc_branch_exists=1" >> $GITHUB_OUTPUT + else + echo "rc_branch_exists=0" >> $GITHUB_OUTPUT + fi + + if [[ $(git ls-remote --heads origin hotfix-rc) ]]; then + echo "hotfix_branch_exists=1" >> $GITHUB_OUTPUT + else + echo "hotfix_branch_exists=0" >> $GITHUB_OUTPUT + fi + + ios: + name: Apple iOS + runs-on: macos-13 + needs: setup + env: + ios_folder_path: src/App/Platforms/iOS + app_output_name: App + app_ci_output_filename: App_x64_Debug + steps: + - name: Set XCode version + uses: maxim-lobanov/setup-xcode@60606e260d2fc5762a71e64e74b2174e8ea3c8bd # v1.6.0 + with: + xcode-version: 15.1 + + - name: Setup NuGet + uses: nuget/setup-nuget@296fd3ccf8528660c91106efefe2364482f86d6f # v1.2.0 + with: + nuget-version: 6.4.0 + + - name: Set up .NET + uses: actions/setup-dotnet@3447fd6a9f9e57506b15f895c5b76d3b197dc7c2 # v3.2.0 + with: + dotnet-version: '8.0.x' + + # This step might be obsolete at some point as .NET MAUI workloads + # are starting to come pre-installed on the GH Actions build agents. + - name: Install MAUI Workload + run: dotnet workload install maui --ignore-failed-sources + + - name: Print environment + run: | + nuget help | grep Version + dotnet --info + echo "GitHub ref: $GITHUB_REF" + echo "GitHub event: $GITHUB_EVENT" + + - name: Checkout repo + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + with: + fetch-depth: 0 + ref: ${{ inputs.ref }} + submodules: 'true' + + - name: Login to Azure - CI Subscription + uses: Azure/login@e15b166166a8746d1a47596803bd8c1b595455cf # v1.6.0 + with: + creds: ${{ secrets.AZURE_KV_CI_SERVICE_PRINCIPAL }} + + - name: Retrieve secrets + id: retrieve-secrets + uses: bitwarden/gh-actions/get-keyvault-secrets@main + with: + keyvault: "bitwarden-ci" + secrets: "appcenter-ios-token" + + - name: Download Provisioning Profiles secrets + env: + ACCOUNT_NAME: bitwardenci + CONTAINER_NAME: profiles + run: | + mkdir -p $HOME/secrets + profiles=( + "dist_beta_autofill.mobileprovision" + "dist_beta_bitwarden.mobileprovision" + "dist_beta_extension.mobileprovision" + "dist_beta_share_extension.mobileprovision" + "dist_beta_bitwarden_watch_app.mobileprovision" + "dist_beta_bitwarden_watch_app_extension.mobileprovision" + ) + + for FILE in "${profiles[@]}" + do + az storage blob download --account-name $ACCOUNT_NAME --container-name $CONTAINER_NAME --name $FILE \ + --file $HOME/secrets/$FILE --output none + done + + - name: Download Google Services secret + env: + ACCOUNT_NAME: bitwardenci + CONTAINER_NAME: mobile + FILE: GoogleService-Info.plist + run: | + mkdir -p $HOME/secrets + az storage blob download --account-name $ACCOUNT_NAME --container-name $CONTAINER_NAME --name $FILE \ + --file $HOME/secrets/$FILE --output none + + - name: Increment version + run: | + BUILD_NUMBER=$((100 + $GITHUB_RUN_NUMBER)) + echo "##### Setting CFBundleVersion $BUILD_NUMBER" + + echo "### CFBundleVersion $BUILD_NUMBER" >> $GITHUB_STEP_SUMMARY + + perl -0777 -pi.bak -e 's/CFBundleVersion<\/key>\s*1<\/string>/CFBundleVersion<\/key>\n\t'"$BUILD_NUMBER"'<\/string>/' ./${{ env.ios_folder_path }}/Info.plist + perl -0777 -pi.bak -e 's/CFBundleVersion<\/key>\s*1<\/string>/CFBundleVersion<\/key>\n\t'"$BUILD_NUMBER"'<\/string>/' ./src/iOS.Extension/Info.plist + perl -0777 -pi.bak -e 's/CFBundleVersion<\/key>\s*1<\/string>/CFBundleVersion<\/key>\n\t'"$BUILD_NUMBER"'<\/string>/' ./src/iOS.Autofill/Info.plist + perl -0777 -pi.bak -e 's/CFBundleVersion<\/key>\s*1<\/string>/CFBundleVersion<\/key>\n\t'"$BUILD_NUMBER"'<\/string>/' ./src/iOS.ShareExtension/Info.plist + cd src/watchOS/bitwarden + agvtool new-version -all $BUILD_NUMBER + + - name: Update Entitlements + run: | + echo "##### Updating Entitlements" + perl -0777 -pi.bak -e 's/aps-environment<\/key>\s*development<\/string>/aps-environment<\/key>\n\tbeta<\/string>/' ./${{ env.ios_folder_path }}/Entitlements.plist + + - name: Get certificates + run: | + mkdir -p $HOME/certificates + az keyvault secret show --id https://bitwarden-ci.vault.azure.net/certificates/ios-distribution | + jq -r .value | base64 -d > $HOME/certificates/ios-distribution.p12 + + - name: Set up Keychain + env: + KEYCHAIN_PASSWORD: ${{ secrets.IOS_KEYCHAIN_PASSWORD }} + MOBILE_KEY_PASSWORD: ${{ secrets.IOS_KEY_PASSWORD }} + DIST_CERT_PASSWORD: ${{ secrets.IOS_DIST_CERT_PASSWORD }} + run: | + security create-keychain -p $KEYCHAIN_PASSWORD build.keychain + security default-keychain -s build.keychain + security unlock-keychain -p $KEYCHAIN_PASSWORD build.keychain + security set-keychain-settings -lut 1200 build.keychain + + security import $HOME/certificates/ios-distribution.p12 -k build.keychain -P "" -T /usr/bin/codesign \ + -T /usr/bin/security + security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k $KEYCHAIN_PASSWORD build.keychain + + - name: Set up provisioning profiles + run: | + AUTOFILL_PROFILE_PATH=$HOME/secrets/dist_beta_autofill.mobileprovision + BITWARDEN_PROFILE_PATH=$HOME/secrets/dist_beta_bitwarden.mobileprovision + EXTENSION_PROFILE_PATH=$HOME/secrets/dist_beta_extension.mobileprovision + SHARE_EXTENSION_PROFILE_PATH=$HOME/secrets/dist_beta_share_extension.mobileprovision + WATCH_APP_PROFILE_PATH=$HOME/secrets/dist_beta_bitwarden_watch_app.mobileprovision + WATCH_APP_EXTENSION_PROFILE_PATH=$HOME/secrets/dist_beta_bitwarden_watch_app_extension.mobileprovision + PROFILES_DIR_PATH=$HOME/Library/MobileDevice/Provisioning\ Profiles + + mkdir -p "$PROFILES_DIR_PATH" + + AUTOFILL_UUID=$(grep UUID -A1 -a $AUTOFILL_PROFILE_PATH | grep -io "[-A-F0-9]\{36\}") + cp $AUTOFILL_PROFILE_PATH "$PROFILES_DIR_PATH/$AUTOFILL_UUID.mobileprovision" + + BITWARDEN_UUID=$(grep UUID -A1 -a $BITWARDEN_PROFILE_PATH | grep -io "[-A-F0-9]\{36\}") + cp $BITWARDEN_PROFILE_PATH "$PROFILES_DIR_PATH/$BITWARDEN_UUID.mobileprovision" + + EXTENSION_UUID=$(grep UUID -A1 -a $EXTENSION_PROFILE_PATH | grep -io "[-A-F0-9]\{36\}") + cp $EXTENSION_PROFILE_PATH "$PROFILES_DIR_PATH/$EXTENSION_UUID.mobileprovision" + + SHARE_EXTENSION_UUID=$(grep UUID -A1 -a $SHARE_EXTENSION_PROFILE_PATH | grep -io "[-A-F0-9]\{36\}") + cp $SHARE_EXTENSION_PROFILE_PATH "$PROFILES_DIR_PATH/$SHARE_EXTENSION_UUID.mobileprovision" + + WATCH_APP_UUID=$(grep UUID -A1 -a $WATCH_APP_PROFILE_PATH | grep -io "[-A-F0-9]\{36\}") + cp $WATCH_APP_PROFILE_PATH "$PROFILES_DIR_PATH/$WATCH_APP_UUID.mobileprovision" + + WATCH_APP_EXTENSION_UUID=$(grep UUID -A1 -a $WATCH_APP_EXTENSION_PROFILE_PATH | grep -io "[-A-F0-9]\{36\}") + cp $WATCH_APP_EXTENSION_PROFILE_PATH "$PROFILES_DIR_PATH/$WATCH_APP_EXTENSION_UUID.mobileprovision" + + - name: Restore packages + run: | + dotnet restore + dotnet tool restore + + - name: Setup iOS build CAKE (Testing) + run: dotnet cake build.cake --target iOS --variant beta + + - name: Bulid WatchApp + run: | + echo "##### Build WatchApp with Release Configuration" + xcodebuild archive -workspace ./src/watchOS/bitwarden/bitwarden.xcodeproj/project.xcworkspace -configuration Release -scheme bitwarden\ WatchKit\ App -archivePath ./src/watchOS/bitwarden + + echo "##### Done" + + - name: Archive Build for App Store + shell: pwsh + run: | + Write-Output "##### Archive for Release ios-arm64" + dotnet publish ${{ env.main_app_project_path }} -c Release -f ${{ env.target-net-version }}-ios /p:RuntimeIdentifier=ios-arm64 /p:ArchiveOnBuild=true /p:MtouchUseLlvm=false + + Write-Output "##### Done" + + - name: Archive Build for Mobile Automation + shell: pwsh + run: | + Write-Output "##### Archive Debug for iossimulator-x64" + dotnet build ${{ env.main_app_project_path }} -c Debug -f ${{ env.target-net-version }}-ios /p:RuntimeIdentifier=iossimulator-x64 /p:ArchiveOnBuild=true /p:MtouchUseLlvm=false + + Write-Output "##### Done" + ls ~/Library/Developer/Xcode/Archives + + - name: Export .ipa for App Store + env: + EXPORT_OPTIONS_PATH: ./.github/resources/export-options-app-store.plist + EXPORT_PATH: ./bitwarden-export + run: | + ARCHIVE_PATH="$HOME/Library/Developer/Xcode/Archives/*/*.xcarchive" + + xcodebuild -exportArchive -archivePath $ARCHIVE_PATH -exportPath $EXPORT_PATH \ + -exportOptionsPlist $EXPORT_OPTIONS_PATH + + - name: Export .app for Automation CI + env: + ARCHIVE_PATH: ./${{ env.main_app_folder_path }}/bin/Debug/${{ env.target-net-version }}-ios/iossimulator-x64 + EXPORT_PATH: ./bitwarden-export + run: | + zip -r -q ${{ env.app_ci_output_filename }}.app.zip $ARCHIVE_PATH + mv ${{ env.app_ci_output_filename }}.app.zip $EXPORT_PATH + + - name: Show Bitwarden Export + shell: bash + run: ls -a -R ./bitwarden-export + + - name: Copy all dSYMs files to upload + env: + EXPORT_PATH: ./bitwarden-export + WATCH_ARCHIVE_DSYMS_PATH: ./src/watchOS/bitwarden.xcarchive/dSYMs/ + WATCH_DSYMS_EXPORT_PATH: ./bitwarden-export/Watch_dSYMs + run: | + ARCHIVE_DSYMS_PATH="$HOME/Library/Developer/Xcode/Archives/*/*.xcarchive/dSYMs" + + cp -r -v $ARCHIVE_DSYMS_PATH $EXPORT_PATH + mkdir $WATCH_DSYMS_EXPORT_PATH + cp -r -v $WATCH_ARCHIVE_DSYMS_PATH $WATCH_DSYMS_EXPORT_PATH + + - name: Upload App Store .ipa & dSYMs artifacts + uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1 + with: + name: Bitwarden iOS + path: | + ./bitwarden-export/Bitwarden*.ipa + ./bitwarden-export/dSYMs/*.* + if-no-files-found: error + + - name: Upload .app file for Automation CI + uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1 + with: + name: ${{ env.app_ci_output_filename }}.app.zip + path: ./bitwarden-export/${{ env.app_ci_output_filename }}.app.zip + if-no-files-found: error + + - name: Install AppCenter CLI + run: npm install -g appcenter-cli + + - name: Upload dSYMs to App Center + env: + APPCENTER_IOS_TOKEN: ${{ steps.retrieve-secrets.outputs.appcenter-ios-token }} + run: appcenter crashes upload-symbols -a bitwarden/bitwarden -s "./bitwarden-export/dSYMs" --token $APPCENTER_IOS_TOKEN + + - name: Upload Watch dSYMs to Firebase Crashlytics + run: | + echo "##### Uploading Watch dSYMs to Firebase" + find "$HOME/Library/Developer/XCode/DerivedData" -name "upload-symbols" -exec chmod +x {} \; -exec {} -gsp "./src/watchOS/bitwarden/GoogleService-Info.plist" -p ios "./bitwarden-export/Watch_dSYMs" \; + + - name: Validate app in App Store + env: + APPLE_ID_USERNAME: ${{ secrets.APPLE_ID_USERNAME }} + APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }} + run: | + xcrun altool --validate-app --type ios --file "./bitwarden-export/Bitwarden Beta.ipa" \ + --username "$APPLE_ID_USERNAME" --password "$APPLE_ID_PASSWORD" + shell: bash + + - name: Deploy to App Store + env: + APPLE_ID_USERNAME: ${{ secrets.APPLE_ID_USERNAME }} + APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }} + run: | + xcrun altool --upload-app --type ios --file "./bitwarden-export/Bitwarden Beta.ipa" \ + --username "$APPLE_ID_USERNAME" --password "$APPLE_ID_PASSWORD" + + check-failures: + name: Check for failures + if: always() + runs-on: ubuntu-22.04 + needs: + - setup + - ios + steps: + - name: Check if any job failed + if: | + (github.ref == 'refs/heads/main' + || github.ref == 'refs/heads/rc' + || github.ref == 'refs/heads/hotfix-rc') + && contains(needs.*.result, 'failure') + run: exit 1 + + - name: Login to Azure - CI Subscription + uses: Azure/login@e15b166166a8746d1a47596803bd8c1b595455cf # v1.6.0 + if: failure() + with: + creds: ${{ secrets.AZURE_KV_CI_SERVICE_PRINCIPAL }} + + - name: Retrieve secrets + id: retrieve-secrets + uses: bitwarden/gh-actions/get-keyvault-secrets@main + if: failure() + with: + keyvault: "bitwarden-ci" + secrets: "devops-alerts-slack-webhook-url" + + - name: Notify Slack on failure + uses: act10ns/slack@ed1309ab9862e57e9e583e51c7889486b9a00b0f # v2.0.0 + if: failure() + env: + SLACK_WEBHOOK_URL: ${{ steps.retrieve-secrets.outputs.devops-alerts-slack-webhook-url }} + with: + status: ${{ job.status }} diff --git a/.github/workflows/crowdin-pull.yml b/.github/workflows/crowdin-pull.yml index 7e6969ab3..8e1c8b61e 100644 --- a/.github/workflows/crowdin-pull.yml +++ b/.github/workflows/crowdin-pull.yml @@ -15,7 +15,7 @@ jobs: _CROWDIN_PROJECT_ID: "269690" steps: - name: Checkout repo - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - name: Login to Azure - CI Subscription uses: Azure/login@e15b166166a8746d1a47596803bd8c1b595455cf # v1.6.0 diff --git a/.github/workflows/pr-labeler.yml b/.github/workflows/pr-labeler.yml index 7bb6f0d14..c8e8bef48 100644 --- a/.github/workflows/pr-labeler.yml +++ b/.github/workflows/pr-labeler.yml @@ -12,6 +12,6 @@ jobs: pull-requests: write runs-on: ubuntu-20.04 steps: - - uses: actions/labeler@ac9175f8a1f3625fd0d4fb234536d26811351594 # v4.3.0 + - uses: actions/labeler@8558fd74291d67161a8a78ce36a881fa63b766a9 # v5.0.0 with: sync-labels: true diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a50d41c81..cc364879c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -38,7 +38,7 @@ jobs: fi - name: Checkout repo - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - name: Check Release Version id: version @@ -126,7 +126,7 @@ jobs: if: inputs.fdroid_publish steps: - name: Checkout repo - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 - name: Download F-Droid .apk artifact if: ${{ inputs.release_type != 'Dry Run' }} diff --git a/build.cake b/build.cake index 166995bef..8d559211e 100644 --- a/build.cake +++ b/build.cake @@ -15,16 +15,17 @@ abstract record VariantConfig( string AppName, string AndroidPackageName, string iOSBundleId, - string ApsEnvironment + string ApsEnvironment, + string DistProvisioningProfilePrefix ); const string BASE_BUNDLE_ID_DROID = "com.x8bit.bitwarden"; const string BASE_BUNDLE_ID_IOS = "com.8bit.bitwarden"; -record Dev(): VariantConfig("Bitwarden Dev", $"{BASE_BUNDLE_ID_DROID}.dev", $"{BASE_BUNDLE_ID_IOS}.dev", "development"); -record QA(): VariantConfig("Bitwarden QA", $"{BASE_BUNDLE_ID_DROID}.qa", $"{BASE_BUNDLE_ID_IOS}.qa", "development"); -record Beta(): VariantConfig("Bitwarden Beta", $"{BASE_BUNDLE_ID_DROID}.beta", $"{BASE_BUNDLE_ID_IOS}.beta", "production"); -record Prod(): VariantConfig("Bitwarden", $"{BASE_BUNDLE_ID_DROID}", $"{BASE_BUNDLE_ID_IOS}", "production"); +record Dev(): VariantConfig("Bitwarden Dev", $"{BASE_BUNDLE_ID_DROID}.dev", $"{BASE_BUNDLE_ID_IOS}.dev", "development", "Dist:"); +record QA(): VariantConfig("Bitwarden QA", $"{BASE_BUNDLE_ID_DROID}.qa", $"{BASE_BUNDLE_ID_IOS}.qa", "development", "Dist:"); +record Beta(): VariantConfig("Bitwarden Beta", $"{BASE_BUNDLE_ID_DROID}.beta", $"{BASE_BUNDLE_ID_IOS}.beta", "production", "Dist: Beta"); +record Prod(): VariantConfig("Bitwarden", $"{BASE_BUNDLE_ID_DROID}", $"{BASE_BUNDLE_ID_IOS}", "production", "Dist:"); VariantConfig GetVariant() => variant.ToLower() switch{ "qa" => new QA(), @@ -197,7 +198,8 @@ private void UpdateiOSInfoPlist(string plistPath, VariantConfig buildVariant, Gi var prevBundleId = plist["CFBundleIdentifier"]; var prevBundleName = plist["CFBundleName"]; //var newVersion = CreateBuildNumber(prevVersion).ToString(); - var newVersionName = GetVersionName(prevVersionName, buildVariant, git); + // we need to maintain version formatting here composed of one to three period-separated integers, so we cannot use the GetVersionName method as in Android for non-Prod. + var newVersionName = prevVersionName; var newBundleId = GetiOSBundleId(buildVariant, projectType); var newBundleName = GetiOSBundleName(buildVariant, projectType); @@ -219,6 +221,13 @@ private void UpdateiOSInfoPlist(string plistPath, VariantConfig buildVariant, Gi plist["NSExtension"]["NSExtensionAttributes"]["NSExtensionActivationRule"] = keyText.Replace("com.8bit.bitwarden", buildVariant.iOSBundleId); } + //TODO DEVOPS-1822 testing + if(buildVariant is Beta) + { + plist.Remove("ITSAppUsesNonExemptEncryption"); + plist.Remove("ITSEncryptionExportComplianceCode"); + } + SerializePlist(plistFile, plist); Information($"Changed app name from {prevBundleName} to {newBundleName}"); @@ -228,12 +237,15 @@ private void UpdateiOSInfoPlist(string plistPath, VariantConfig buildVariant, Gi Information($"{plistPath} updated with success!"); } -private void UpdateiOSEntitlementsPlist(string entitlementsPath, VariantConfig buildVariant) +private void UpdateiOSEntitlementsPlist(string entitlementsPath, VariantConfig buildVariant, bool updateApsEnv) { var EntitlementlistFile = File(entitlementsPath); dynamic Entitlements = DeserializePlist(EntitlementlistFile); - Entitlements["aps-environment"] = buildVariant.ApsEnvironment; + if (updateApsEnv) + { + Entitlements["aps-environment"] = buildVariant.ApsEnvironment; + } Entitlements["keychain-access-groups"] = new List() { "$(AppIdentifierPrefix)" + buildVariant.iOSBundleId }; Entitlements["com.apple.security.application-groups"] = new List() { $"group.{buildVariant.iOSBundleId}" };; @@ -272,9 +284,10 @@ private void UpdateWatchPbxproj(string pbxprojPath, string newVersion) const string pattern = @"MARKETING_VERSION = [^;]*;"; fileText = Regex.Replace(fileText, pattern, $"MARKETING_VERSION = {newVersion};"); - + FileWriteText(pbxprojPath, fileText); - Information($"{pbxprojPath} modified successfully."); + + Information($"{pbxprojPath} modified Marketing Version successfully."); } /// @@ -327,7 +340,7 @@ Task("UpdateiOSPlist") var infoPath = Path.Combine(_slnPath, "src", "App", "Platforms", "iOS", "Info.plist"); var entitlementsPath = Path.Combine(_slnPath, "src", "App", "Platforms", "iOS", "Entitlements.plist"); UpdateiOSInfoPlist(infoPath, buildVariant, _gitVersion, iOSProjectType.MainApp); - UpdateiOSEntitlementsPlist(entitlementsPath, buildVariant); + UpdateiOSEntitlementsPlist(entitlementsPath, buildVariant, true); }); Task("UpdateiOSAutofillPlist") @@ -338,7 +351,7 @@ Task("UpdateiOSAutofillPlist") var infoPath = Path.Combine(_slnPath, "src", "iOS.Autofill", "Info.plist"); var entitlementsPath = Path.Combine(_slnPath, "src", "iOS.Autofill", "Entitlements.plist"); UpdateiOSInfoPlist(infoPath, buildVariant, _gitVersion, iOSProjectType.Autofill); - UpdateiOSEntitlementsPlist(entitlementsPath, buildVariant); + UpdateiOSEntitlementsPlist(entitlementsPath, buildVariant, false); }); Task("UpdateiOSExtensionPlist") @@ -349,7 +362,7 @@ Task("UpdateiOSExtensionPlist") var infoPath = Path.Combine(_slnPath, "src", "iOS.Extension", "Info.plist"); var entitlementsPath = Path.Combine(_slnPath, "src", "iOS.Extension", "Entitlements.plist"); UpdateiOSInfoPlist(infoPath, buildVariant, _gitVersion, iOSProjectType.Extension); - UpdateiOSEntitlementsPlist(entitlementsPath, buildVariant); + UpdateiOSEntitlementsPlist(entitlementsPath, buildVariant, false); }); Task("UpdateiOSShareExtensionPlist") @@ -360,7 +373,7 @@ Task("UpdateiOSShareExtensionPlist") var infoPath = Path.Combine(_slnPath, "src", "iOS.ShareExtension", "Info.plist"); var entitlementsPath = Path.Combine(_slnPath, "src", "iOS.ShareExtension", "Entitlements.plist"); UpdateiOSInfoPlist(infoPath, buildVariant, _gitVersion, iOSProjectType.ShareExtension); - UpdateiOSEntitlementsPlist(entitlementsPath, buildVariant); + UpdateiOSEntitlementsPlist(entitlementsPath, buildVariant, false); }); Task("UpdateiOSCodeFiles") @@ -397,6 +410,22 @@ Task("UpdateWatchKitAppInfoPlist") UpdateWatchKitAppInfoPlist(infoPath, buildVariant); }); +Task("UpdateDistProfiles") + .IsDependentOn("UpdateiOSCodeFiles") + .Does(()=> { + var buildVariant = GetVariant(); + + var filesToReplace = new string[] { + Path.Combine(".github", "resources", "export-options-app-store.plist"), + Path.Combine(_slnPath, "src", "watchOS", "bitwarden", "bitwarden.xcodeproj", "project.pbxproj") + }; + + foreach(string path in filesToReplace) + { + ReplaceInFile(path, "Dist:", buildVariant.DistProvisioningProfilePrefix); + } + }); + #endregion iOS #region Main Tasks @@ -418,6 +447,7 @@ Task("iOS") .IsDependentOn("UpdateiOSCodeFiles") .IsDependentOn("UpdateWatchProject") .IsDependentOn("UpdateWatchKitAppInfoPlist") + .IsDependentOn("UpdateDistProfiles") .Does(()=> { Information("iOS app updated"); @@ -437,4 +467,4 @@ Options: }); #endregion Main Tasks -RunTarget(target); \ No newline at end of file +RunTarget(target);