Updated DirectN nuget package.

aelyo-softworks · Mar 22, 2024 · ea5ef54 · ea5ef54
1 parent edbff50
commit ea5ef54
Show file tree

Hide file tree

Showing 11 changed files with 33 additions and 42 deletions.
diff --git a/Wice.DevTools/Wice.DevTools.csproj b/Wice.DevTools/Wice.DevTools.csproj
@@ -60,7 +60,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="DirectN">
-      <Version>1.15.0.2</Version>
+      <Version>1.16.0</Version>
     </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

diff --git a/Wice.Samples.Gallery/Wice.Samples.Gallery.csproj b/Wice.Samples.Gallery/Wice.Samples.Gallery.csproj
@@ -205,10 +205,10 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="DirectN">
-      <Version>1.15.0.2</Version>
+      <Version>1.16.0</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.Windows.SDK.Contracts">
-      <Version>10.0.22621.2428</Version>
+      <Version>10.0.22621.3233</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>

diff --git a/Wice.Tests/Wice.Tests.csproj b/Wice.Tests/Wice.Tests.csproj
@@ -96,10 +96,10 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="DirectN">
-      <Version>1.15.0.2</Version>
+      <Version>1.16.0</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.Windows.SDK.Contracts">
-      <Version>10.0.22621.2428</Version>
+      <Version>10.0.22621.3233</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>

diff --git a/Wice/Interop/ICompositorInterop.cs b/Wice/Interop/ICompositorInterop.cs
diff --git a/Wice/Properties/AssemblyVersionInfo.cs b/Wice/Properties/AssemblyVersionInfo.cs
@@ -1,5 +1,5 @@
 using System.Reflection;
 
-[assembly: AssemblyVersion("1.2.0.0")]
-[assembly: AssemblyFileVersion("1.2.0.0")]
-[assembly: AssemblyInformationalVersion("1.2.0.0")]
+[assembly: AssemblyVersion("1.2.1.0")]
+[assembly: AssemblyFileVersion("1.2.1.0")]
+[assembly: AssemblyInformationalVersion("1.2.1.0")]
diff --git a/Wice/Utilities/WinRTUtilities.cs b/Wice/Utilities/WinRTUtilities.cs
@@ -73,6 +73,24 @@ public static T WinRTCast<T>(this object obj, bool throwOnError = true) where T
 #endif
         }
 
+        public static T WinRTCast<T>(this IntPtr unk, bool throwOnError = true) where T : class
+        {
+            if (unk == IntPtr.Zero)
+                return default;
+
+            if (throwOnError)
+                return WinRTCast<T>(Marshal.GetObjectForIUnknown(unk), throwOnError);
+
+            try
+            {
+                return WinRTCast<T>(Marshal.GetObjectForIUnknown(unk), false);
+            }
+            catch
+            {
+                return default;
+            }
+        }
+
         public static T ComCast<T>(this object obj, bool throwOnError = true) where T : class
         {
             if (obj == null)

diff --git a/Wice/Wice.csproj b/Wice/Wice.csproj
@@ -82,7 +82,6 @@
     <Compile Include="EditorHost.cs" />
     <Compile Include="EventTrigger.cs" />
     <Compile Include="Interop\ICompositionTarget.cs" />
-    <Compile Include="Interop\ICompositorInterop.cs" />
     <Compile Include="Interop\IGeometrySource2DWinRT.cs" />
     <Compile Include="Interop\IGraphicsEffectSourceWinRT.cs" />
     <Compile Include="Interop\IGraphicsEffectWinRT.cs" />
@@ -370,10 +369,10 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="DirectN">
-      <Version>1.15.0.2</Version>
+      <Version>1.16.0</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.Windows.SDK.Contracts">
-      <Version>10.0.22621.2428</Version>
+      <Version>10.0.22621.3233</Version>
     </PackageReference>
     <PackageReference Include="System.Numerics.Vectors">
       <Version>4.5.0</Version>

diff --git a/Wice/Window.cs b/Wice/Window.cs
@@ -1007,8 +1007,8 @@ protected virtual CompositionGraphicsDevice CreateCompositionDevice()
         {
             var interop = CompositorController.Compositor.ComCast<ICompositorInterop>();
             var d2d1 = _d2D1Device.Value;
-            var hr = interop.CreateGraphicsDevice(d2d1.Object, out var obj);
-            var dev = obj.WinRTCast<CompositionGraphicsDevice>();
+            var hr = interop.CreateGraphicsDevice(d2d1.Object, out var unk);
+            var dev = unk.WinRTCast<CompositionGraphicsDevice>();
             if (hr.Value < 0)
             {
                 try

diff --git a/WiceCore.Samples.Gallery/WiceCore.Samples.Gallery.csproj b/WiceCore.Samples.Gallery/WiceCore.Samples.Gallery.csproj
@@ -159,7 +159,7 @@
     <Compile Include="..\Wice.Samples.Gallery\Samples\Text\RichTextBox\RichTextBoxSample.cs" Link="Samples\Text\RichTextBox\RichTextBoxSample.cs" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="DirectNCore" Version="1.15.0.2" />
+    <PackageReference Include="DirectNCore" Version="1.16.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\WiceCore\WiceCore.csproj" />

diff --git a/WiceCore.Tests/WiceCore.Tests.csproj b/WiceCore.Tests/WiceCore.Tests.csproj
@@ -37,6 +37,6 @@
     <EmbeddedResource Include="..\Wice.Tests\pg61797.txt" Link="pg61797.txt" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="DirectNCore" Version="1.15.0.2" />
+    <PackageReference Include="DirectNCore" Version="1.16.0" />
   </ItemGroup>
 </Project>
diff --git a/WiceCore/WiceCore.csproj b/WiceCore/WiceCore.csproj
@@ -320,7 +320,6 @@
     <Compile Include="..\Wice\PointerDragEventArgs.cs" Link="PointerDragEventArgs.cs" />
     <Compile Include="..\Wice\DragEventArgs.cs" Link="DragEventArgs.cs" />
     <Compile Include="..\Wice\Interop\ICompositionTarget.cs" Link="Interop\ICompositionTarget.cs" />
-    <Compile Include="..\Wice\Interop\ICompositorInterop.cs" Link="Interop\ICompositorInterop.cs" />
     <Compile Include="..\Wice\Utilities\Extensions.cs" Link="Utilities\Extensions.cs" />
     <Compile Include="..\Wice\Interop\IPropertyValueStatics.cs" Link="Interop\IPropertyValueStatics.cs" />
     <Compile Include="..\Wice\Interop\IPropertyValueStaticsExtensions.cs" Link="Interop\IPropertyValueStaticsExtensions.cs" />
@@ -332,6 +331,6 @@
     <Compile Include="..\Wice\PointerUpdateEventArgs.cs" Link="PointerUpdateEventArgs.cs" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="DirectNCore" Version="1.15.0.2" />
+    <PackageReference Include="DirectNCore" Version="1.16.0" />
   </ItemGroup>
 </Project>