Merge remote-tracking branch 'origin/main' into develop

# Conflicts: # VERSIONS.txt # nuget/SkiaSharp.Views.WinUI.nuspec # samples/Basic/WinUI/Desktop/SkiaSharpSample.Package/SkiaSharpSample.Package.wapproj # samples/Basic/WinUI/Desktop/SkiaSharpSample/SkiaSharpSample.csproj # scripts/azure-pipelines.yml # source/SkiaSharp.Views.WinUI/SkiaSharp.Views.WinUI/SkiaSharp.Views.WinUI.csproj
mono · Jul 9, 2021 · 2403baa · 2403baa
2 parents b53e6b6 + a52d211
commit 2403baa
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/VERSIONS.txt b/VERSIONS.txt
@@ -22,9 +22,9 @@ System.IO.UnmanagedMemoryStream                 release     4.3.0
 System.Drawing.Common                           release     4.5.1
 SharpVk                                         release     0.4.2
 Uno.UI                                          release     3.7.6
-Microsoft.ProjectReunion                        release     0.8.0-preview
-Microsoft.ProjectReunion.Foundation             release     0.8.0-preview
-Microsoft.ProjectReunion.WinUI                  release     0.8.0-preview
+Microsoft.ProjectReunion                        release     0.8.0
+Microsoft.ProjectReunion.Foundation             release     0.8.0
+Microsoft.ProjectReunion.WinUI                  release     0.8.0
 Microsoft.Maui.Core                             release     6.0.100-preview.5.794
 Microsoft.Maui.Controls                         release     6.0.100-preview.5.794
 Microsoft.Maui.Controls.Compatibility           release     6.0.100-preview.5.794

diff --git a/samples/Basic/WinUI/Desktop/SkiaSharpSample.Package/SkiaSharpSample.Package.wapproj b/samples/Basic/WinUI/Desktop/SkiaSharpSample.Package/SkiaSharpSample.Package.wapproj
@@ -64,10 +64,10 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.ProjectReunion" Version="[0.8.0-preview]">
+    <PackageReference Include="Microsoft.ProjectReunion" Version="[0.8.0]">
       <IncludeAssets>build</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.ProjectReunion.WinUI" Version="[0.8.0-preview]">
+    <PackageReference Include="Microsoft.ProjectReunion.WinUI" Version="[0.8.0]">
       <IncludeAssets>build</IncludeAssets>
     </PackageReference>
   </ItemGroup>

diff --git a/samples/Basic/WinUI/Desktop/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/WinUI/Desktop/SkiaSharpSample/SkiaSharpSample.csproj
@@ -11,9 +11,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.ProjectReunion" Version="0.8.0-preview" />
-    <PackageReference Include="Microsoft.ProjectReunion.Foundation" Version="0.8.0-preview" />
-    <PackageReference Include="Microsoft.ProjectReunion.WinUI" Version="0.8.0-preview" />
+    <PackageReference Include="Microsoft.ProjectReunion" Version="0.8.0" />
+    <PackageReference Include="Microsoft.ProjectReunion.Foundation" Version="0.8.0" />
+    <PackageReference Include="Microsoft.ProjectReunion.WinUI" Version="0.8.0" />
     <Manifest Include="$(ApplicationManifest)" />
   </ItemGroup>
 

diff --git a/source/SkiaSharp.Views.WinUI/SkiaSharp.Views.WinUI/SkiaSharp.Views.WinUI.csproj b/source/SkiaSharp.Views.WinUI/SkiaSharp.Views.WinUI/SkiaSharp.Views.WinUI.csproj
@@ -7,7 +7,7 @@
     <PackagingGroup>SkiaSharp.Views.WinUI</PackagingGroup>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.ProjectReunion" Version="0.8.0-preview" />
+    <PackageReference Include="Microsoft.ProjectReunion" Version="0.8.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\binding\SkiaSharp\SkiaSharp.csproj" />

diff --git a/source/SkiaSharp.Views/SkiaSharp.Views.UWP/SKXamlCanvas.cs b/source/SkiaSharp.Views/SkiaSharp.Views.UWP/SKXamlCanvas.cs
@@ -3,7 +3,7 @@
 using Windows.Graphics.Display;
 
 #if WINDOWS
-using Microsoft.System;
+using Microsoft.UI.Dispatching;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Data;