Fix Cosmos update exception wrapping

Fixes #25631

Author: roji

src/EFCore.Cosmos/Properties/CosmosStrings.Designer.cs

@@ -265,6 +265,9 @@
   <data name="UpdateConflict" xml:space="preserve">
     <value>Conflicts were detected for item with id '{itemId}'.</value>
   </data>
+  <data name="UpdateStoreException" xml:space="preserve">
+    <value>An error occurred while saving the the item with id '{itemId}'. See the inner exception for details.</value>
+  </data>
   <data name="VisitChildrenMustBeOverridden" xml:space="preserve">
     <value>'VisitChildren' must be overridden in the class deriving from 'SqlExpression'.</value>
   </data>

src/EFCore.Cosmos/Properties/CosmosStrings.resx

@@ -111,9 +111,9 @@ public override int SaveChanges(IList<IUpdateEntry> entries)
                         rowsAffected++;
                     }
                 }
-                catch (CosmosException ex)
+                catch (Exception ex) when (ex is not DbUpdateException and not OperationCanceledException)
                 {
-                    throw ThrowUpdateException(ex, entry);
+                    throw WrapUpdateException(ex, entry);
                 }
             }
 
@@ -175,9 +175,9 @@ public override async Task<int> SaveChangesAsync(
                         rowsAffected++;
                     }
                 }
-                catch (CosmosException ex)
+                catch (Exception ex) when (ex is not DbUpdateException and not OperationCanceledException)
                 {
-                    throw ThrowUpdateException(ex, entry);
+                    throw WrapUpdateException(ex, entry);
                 }
             }
 
@@ -378,25 +378,19 @@ private IUpdateEntry GetRootDocument(InternalEntityEntry entry)
         }
 #pragma warning restore EF1001 // Internal EF Core API usage.
 
-        private Exception ThrowUpdateException(CosmosException exception, IUpdateEntry entry)
+        private Exception WrapUpdateException(Exception exception, IUpdateEntry entry)
         {
             var documentSource = GetDocumentSource(entry.EntityType);
             var id = documentSource.GetId(entry.SharedIdentityEntry ?? entry);
-            throw exception.StatusCode switch
+
+            return exception switch
             {
-                HttpStatusCode.PreconditionFailed =>
-                    new DbUpdateConcurrencyException(CosmosStrings.UpdateConflict(id), exception, new[] { entry }),
-                HttpStatusCode.Conflict =>
-                    new DbUpdateException(CosmosStrings.UpdateConflict(id), exception, new[] { entry }),
-                _ => Rethrow(exception),
+                CosmosException { StatusCode : HttpStatusCode.PreconditionFailed }
+                    => new DbUpdateConcurrencyException(CosmosStrings.UpdateConflict(id), exception, new[] { entry }),
+                CosmosException { StatusCode : HttpStatusCode.Conflict }
+                    => new DbUpdateException(CosmosStrings.UpdateConflict(id), exception, new[] { entry }),
+                _ => new DbUpdateException(CosmosStrings.UpdateStoreException(id), exception, new[] { entry })
             };
         }
-
-        private static Exception Rethrow(Exception ex)
-        {
-            // Re-throw an exception, preserving the original stack and details, without being in the original "catch" block.
-            ExceptionDispatchInfo.Capture(ex).Throw();
-            return ex;
-        }
     }
 }