Fix build pipeline MAUI version (#3354)

(cherry picked from commit 3262fdc9ec)

.github/workflows/build.yml

@@ -85,11 +85,6 @@ jobs:
       - name: Set up MSBuild
         uses: microsoft/setup-msbuild@6fb02220983dee41ce7ae257b6f4d8f9bf5ed4ce # v2.0.0
 
-      # 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: Setup Windows builder
         run: choco install checksum --no-progress
 
@@ -145,7 +140,7 @@ jobs:
 
       - name: Increment version
         run: |
-          BUILD_NUMBER=$((3000 + $GITHUB_RUN_NUMBER))
+          BUILD_NUMBER=$((11000 + $GITHUB_RUN_NUMBER))
           echo "##### Setting Android Version Code to $BUILD_NUMBER" | tee -a $GITHUB_STEP_SUMMARY
 
           sed -i "s/android:versionCode=\"1\"/android:versionCode=\"$BUILD_NUMBER\"/" \
@@ -312,11 +307,6 @@ jobs:
       - name: Set up MSBuild
         uses: microsoft/setup-msbuild@6fb02220983dee41ce7ae257b6f4d8f9bf5ed4ce # v2.0.0
 
-      # 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: Setup Windows builder
         run: choco install checksum --no-progress
 
@@ -354,7 +344,7 @@ jobs:
 
       - name: Increment version
         run: |
-          BUILD_NUMBER=$((3000 + $GITHUB_RUN_NUMBER))
+          BUILD_NUMBER=$((11000 + $GITHUB_RUN_NUMBER))
           echo "##### Setting F-Droid Version Code to $BUILD_NUMBER" | tee -a $GITHUB_STEP_SUMMARY
 
           sed -i "s/android:versionCode=\"1\"/android:versionCode=\"$BUILD_NUMBER\"/" \
@@ -519,7 +509,7 @@ jobs:
 
       - name: Increment version
         run: |
-          BUILD_NUMBER=$((100 + $GITHUB_RUN_NUMBER))
+          BUILD_NUMBER=$((8000 + $GITHUB_RUN_NUMBER))
           echo "##### Setting iOS CFBundleVersion to $BUILD_NUMBER" | tee -a $GITHUB_STEP_SUMMARY
 
           perl -0777 -pi.bak -e 's/<key>CFBundleVersion<\/key>\s*<string>1<\/string>/<key>CFBundleVersion<\/key>\n\t<string>'"$BUILD_NUMBER"'<\/string>/' ./${{ env.ios_folder_path }}/Info.plist

src/Core/Services/CipherService.cs

@@ -114,7 +114,7 @@ namespace Bit.Core.Services
         public async Task<Cipher> EncryptAsync(CipherView model, SymmetricCryptoKey key = null,
             Cipher originalCipher = null)
         {
-            // Adjust password history
+            // Adjust password history and attachments
             if (model.Id != null)
             {
                 if (originalCipher == null)
@@ -169,6 +169,9 @@ namespace Bit.Core.Services
                             }
                         }
                     }
+
+                    //adjust attachments
+                    model.Attachments = existingCipher.Attachments;
                 }
                 if (!model.PasswordHistory?.Any() ?? false)
                 {