Remove internal Pair type in favor of generic tuples (#9916)

dotnet · Dec 19, 2024 · 99d03c8 · 99d03c8
1 parent 3e62119
commit 99d03c8
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 65 deletions.
diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/PresentationCore.csproj b/src/Microsoft.DotNet.Wpf/src/PresentationCore/PresentationCore.csproj
@@ -50,7 +50,6 @@
     <Compile Include="$(WpfSharedDir)\MS\Internal\FreezableOperations.cs" />
     <Compile Include="$(WpfSharedDir)\MS\Internal\PointUtil.cs" />
     <Compile Include="$(WpfSharedDir)\MS\Internal\MimeTypeMapper.cs" />
-    <Compile Include="$(WpfSharedDir)\MS\Internal\Pair.cs" />
     <Compile Include="$(WpfSharedDir)\MS\Internal\PartialList.cs" />
     <Compile Include="$(WpfSharedDir)\MS\Internal\LegacyPriorityQueue.cs" />
     <Compile Include="$(WpfSharedDir)\MS\Internal\SequentialUshortCollection.cs" />

diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/InterOp/D3DImage.cs b/src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/InterOp/D3DImage.cs
@@ -735,14 +735,10 @@ private void SendPresent(object sender, EventArgs args)
         /// </summary>
         private object SetIsFrontBufferAvailable(object isAvailableVersionPair)
         {
-            Pair pair = (Pair)isAvailableVersionPair;
-            uint version = (uint)pair.Second;
+            (bool isFrontBufferAvailable, uint version) = (Tuple<bool, uint>)isAvailableVersionPair;
 
-            if (version == _version)
-            {
-                bool isFrontBufferAvailable = (bool)pair.First;
+            if (_version == version)
                 SetValue(IsFrontBufferAvailablePropertyKey, isFrontBufferAvailable);
-            }
 
             // ...just because DispatcherOperationCallback requires returning an object
             return null;
@@ -759,11 +755,9 @@ private object SetIsFrontBufferAvailable(object isAvailableVersionPair)
         // NOTE: Called from the render thread!We must execute the reaction on the UI thread.
         private void Callback(bool isFrontBufferAvailable, uint version)
         {
-            Dispatcher.BeginInvoke(
-                DispatcherPriority.Normal,
-                new DispatcherOperationCallback(SetIsFrontBufferAvailable),
-                new Pair(BooleanBoxes.Box(isFrontBufferAvailable), version)
-                );
+            Tuple<bool, uint> parameters = new(isFrontBufferAvailable, version);
+
+            Dispatcher.BeginInvoke(DispatcherPriority.Normal, new DispatcherOperationCallback(SetIsFrontBufferAvailable), parameters);
         }
 
         internal override void UpdateResource(DUCE.Channel channel, bool skipOnChannelCheck)

diff --git a/src/Microsoft.DotNet.Wpf/src/Shared/MS/Internal/Pair.cs b/src/Microsoft.DotNet.Wpf/src/Shared/MS/Internal/Pair.cs