Merge pull request #1219 from SherpasGroup/fix-teams-updating

gautamdsheth · web-flow · commit 18aa2ad05228 · 2026-02-12T21:45:31.000+02:00
Fix for conflict detection when updating teams
diff --git a/src/lib/PnP.Framework/Utilities/Graph/GraphHelper.cs b/src/lib/PnP.Framework/Utilities/Graph/GraphHelper.cs
@@ -81,7 +81,8 @@ bool canPatch
                 if (!string.IsNullOrEmpty(alreadyExistsErrorMessage) &&
                     !string.IsNullOrEmpty(matchingFieldName) &&
                     !string.IsNullOrEmpty(matchingFieldValue) &&
-                    ex.InnerException.Message.Contains(alreadyExistsErrorMessage))
+                    (ex.InnerException?.Message.Contains(alreadyExistsErrorMessage) == true ||
+                     ex.InnerException?.InnerException?.Message.Contains(alreadyExistsErrorMessage) == true))
                 {
                     try
                     {

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,8 @@ bool canPatch`
`81`	`81`	`if (!string.IsNullOrEmpty(alreadyExistsErrorMessage) &&`
`82`	`82`	`!string.IsNullOrEmpty(matchingFieldName) &&`
`83`	`83`	`!string.IsNullOrEmpty(matchingFieldValue) &&`
`84`		`- ex.InnerException.Message.Contains(alreadyExistsErrorMessage))`
	`84`	`+ (ex.InnerException?.Message.Contains(alreadyExistsErrorMessage) == true \|\|`
	`85`	`+ ex.InnerException?.InnerException?.Message.Contains(alreadyExistsErrorMessage) == true))`
`85`	`86`	`{`
`86`	`87`	`try`
`87`	`88`	`{`