diff --git a/.editorconfig b/.editorconfig
index d0b321b7d3..2d9d943985 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -213,6 +213,9 @@ dotnet_diagnostic.IDE0100.severity = warning
 # Simplify LINQ expression.
 dotnet_diagnostic.IDE0120.severity = warning
 
+# Use tuple to swap values.
+dotnet_diagnostic.IDE0180.severity = warning
+
 # Naming rule violation.
 dotnet_diagnostic.IDE1006.severity = warning
 
diff --git a/OpenRA.Mods.Common/Util.cs b/OpenRA.Mods.Common/Util.cs
index 3d1bf17163..501df13546 100644
--- a/OpenRA.Mods.Common/Util.cs
+++ b/OpenRA.Mods.Common/Util.cs
@@ -142,10 +142,8 @@ namespace OpenRA.Mods.Common
 			for (var i = 0; i < items.Length - 1; i++)
 			{
 				var j = random.Next(items.Length - i);
-				var item = items[i + j];
-				items[i + j] = items[i];
-				items[i] = item;
-				yield return item;
+				(items[i], items[i + j]) = (items[i + j], items[i]);
+				yield return items[i];
 			}
 
 			if (items.Length > 0)
diff --git a/OpenRA.Platforms.Default/Texture.cs b/OpenRA.Platforms.Default/Texture.cs
index 80e4449e59..2f4950f99c 100644
--- a/OpenRA.Platforms.Default/Texture.cs
+++ b/OpenRA.Platforms.Default/Texture.cs
@@ -148,9 +148,7 @@ namespace OpenRA.Platforms.Default
 				{
 					for (var i = 0; i < 4 * Size.Width * Size.Height; i += 4)
 					{
-						var temp = data[i];
-						data[i] = data[i + 2];
-						data[i + 2] = temp;
+						(data[i + 2], data[i]) = (data[i], data[i + 2]);
 					}
 				}