feat: Add support for WinAppSDK 1.0-experimental1

unoplatform · Oct 13, 2021 · 31f45ea · 31f45ea
1 parent 981ab0d
commit 31f45ea
Show file tree

Hide file tree

Showing 28 changed files with 513 additions and 183 deletions.
diff --git a/...p-winui-net6/UnoWinUIQuickStart.Windows.Desktop/UnoWinUIQuickStart.Windows.Desktop.csproj b/...p-winui-net6/UnoWinUIQuickStart.Windows.Desktop/UnoWinUIQuickStart.Windows.Desktop.csproj
@@ -15,7 +15,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.ProjectReunion" Version="0.8.1" />
+		<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.0.0-experimental1" />
 		<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
 		<PackageReference Include="Uno.Core" Version="2.4.0" />
 	</ItemGroup>

diff --git a/...-winui-net6/UnoWinUIQuickStart.Windows.Package/UnoWinUIQuickStart.Windows.Package.wapproj b/...-winui-net6/UnoWinUIQuickStart.Windows.Package/UnoWinUIQuickStart.Windows.Package.wapproj
@@ -67,16 +67,16 @@
 	<!--PackageReference.GeneratePathProperty does not support NUGET_PACKAGES env var...-->
 	<NuGetPackageRoot Condition="'$(NuGetPackageRoot)'==''">$(NUGET_PACKAGES)</NuGetPackageRoot>
 	<NuGetPackageRoot Condition="'$(NuGetPackageRoot)'==''">$(UserProfile)\.nuget\packages</NuGetPackageRoot>
-	<PkgMicrosoft_ProjectReunion Condition="'$(PkgMicrosoft_ProjectReunion)'==''">$([MSBuild]::NormalizeDirectory('$(NuGetPackageRoot)', 'Microsoft.ProjectReunion', '0.8.1'))</PkgMicrosoft_ProjectReunion>
-	<PkgMicrosoft_ProjectReunion Condition="!Exists($(PkgMicrosoft_ProjectReunion))">$(SolutionDir)packages\Microsoft.ProjectReunion.0.8.1\</PkgMicrosoft_ProjectReunion>
-	<PkgMicrosoft_ProjectReunion_WinUI Condition="'$(PkgMicrosoft_ProjectReunion_WinUI)'==''">$([MSBuild]::NormalizeDirectory('$(NuGetPackageRoot)', 'Microsoft.ProjectReunion.WinUI', '0.8.1'))</PkgMicrosoft_ProjectReunion_WinUI>
-	<PkgMicrosoft_ProjectReunion_WinUI Condition="!Exists($(PkgMicrosoft_ProjectReunion_WinUI))">$(SolutionDir)packages\Microsoft.ProjectReunion.WinUI.0.8.1\</PkgMicrosoft_ProjectReunion_WinUI>
-	<Microsoft_ProjectReunion_AppXReference_props>$([MSBuild]::NormalizeDirectory('$(PkgMicrosoft_ProjectReunion)', 'build'))Microsoft.ProjectReunion.AppXReference.props</Microsoft_ProjectReunion_AppXReference_props>
+	<PkgMicrosoft_ProjectReunion Condition="'$(PkgMicrosoft_ProjectReunion)'==''">$([MSBuild]::NormalizeDirectory('$(NuGetPackageRoot)', 'Microsoft.WindowsAppSDK', '1.0.0-experimental1'))</PkgMicrosoft_ProjectReunion>
+	<PkgMicrosoft_ProjectReunion Condition="!Exists($(PkgMicrosoft_ProjectReunion))">$(SolutionDir)packages\Microsoft.WindowsAppSDK.1.0.0-experimental1\</PkgMicrosoft_ProjectReunion>
+	<PkgMicrosoft_ProjectReunion_WinUI Condition="'$(PkgMicrosoft_ProjectReunion_WinUI)'==''">$([MSBuild]::NormalizeDirectory('$(NuGetPackageRoot)', 'Microsoft.WindowsAppSDK.WinUI', '1.0.0-experimental1'))</PkgMicrosoft_ProjectReunion_WinUI>
+	<PkgMicrosoft_ProjectReunion_WinUI Condition="!Exists($(PkgMicrosoft_ProjectReunion_WinUI))">$(SolutionDir)packages\Microsoft.WindowsAppSDK.WinUI.1.0.0-experimental1\</PkgMicrosoft_ProjectReunion_WinUI>
+	<Microsoft_ProjectReunion_AppXReference_props>$([MSBuild]::NormalizeDirectory('$(PkgMicrosoft_ProjectReunion)', 'build'))Microsoft.WindowsAppSDK.AppXReference.props</Microsoft_ProjectReunion_AppXReference_props>
 	<Microsoft_WinUI_AppX_targets>$([MSBuild]::NormalizeDirectory('$(PkgMicrosoft_ProjectReunion_WinUI)', 'build'))Microsoft.WinUI.AppX.targets</Microsoft_WinUI_AppX_targets>
 	<EntryPointProjectUniqueName>..\UnoWinUIQuickStart.Windows.Desktop\UnoWinUIQuickStart.Windows.Desktop.csproj</EntryPointProjectUniqueName>
   </PropertyGroup>
   <ItemGroup>
-	<PackageReference Include="Microsoft.ProjectReunion" Version="[0.8.1]">
+	<PackageReference Include="Microsoft.WindowsAppSDK" Version="[1.0.0-experimental1]">
 	  <IncludeAssets>build</IncludeAssets>
 	</PackageReference>
   </ItemGroup>

diff --git a/...unoapp-winui/UnoWinUIQuickStart.Windows.Desktop/UnoWinUIQuickStart.Windows.Desktop.csproj b/...unoapp-winui/UnoWinUIQuickStart.Windows.Desktop/UnoWinUIQuickStart.Windows.Desktop.csproj
@@ -15,7 +15,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.ProjectReunion" Version="0.8.1" />
+		<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.0.0-experimental1" />
 		<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
 		<PackageReference Include="Uno.Core" Version="2.4.0" />
 	</ItemGroup>

diff --git a/...noapp-winui/UnoWinUIQuickStart.Windows.Package/UnoWinUIQuickStart.Windows.Package.wapproj b/...noapp-winui/UnoWinUIQuickStart.Windows.Package/UnoWinUIQuickStart.Windows.Package.wapproj
@@ -67,16 +67,16 @@
 	<!--PackageReference.GeneratePathProperty does not support NUGET_PACKAGES env var...-->
 	<NuGetPackageRoot Condition="'$(NuGetPackageRoot)'==''">$(NUGET_PACKAGES)</NuGetPackageRoot>
 	<NuGetPackageRoot Condition="'$(NuGetPackageRoot)'==''">$(UserProfile)\.nuget\packages</NuGetPackageRoot>
-	<PkgMicrosoft_ProjectReunion Condition="'$(PkgMicrosoft_ProjectReunion)'==''">$([MSBuild]::NormalizeDirectory('$(NuGetPackageRoot)', 'Microsoft.ProjectReunion', '0.8.1'))</PkgMicrosoft_ProjectReunion>
-	<PkgMicrosoft_ProjectReunion Condition="!Exists($(PkgMicrosoft_ProjectReunion))">$(SolutionDir)packages\Microsoft.ProjectReunion.0.8.1\</PkgMicrosoft_ProjectReunion>
-	<PkgMicrosoft_ProjectReunion_WinUI Condition="'$(PkgMicrosoft_ProjectReunion_WinUI)'==''">$([MSBuild]::NormalizeDirectory('$(NuGetPackageRoot)', 'Microsoft.ProjectReunion.WinUI', '0.8.1'))</PkgMicrosoft_ProjectReunion_WinUI>
-	<PkgMicrosoft_ProjectReunion_WinUI Condition="!Exists($(PkgMicrosoft_ProjectReunion_WinUI))">$(SolutionDir)packages\Microsoft.ProjectReunion.WinUI.0.8.1\</PkgMicrosoft_ProjectReunion_WinUI>
-	<Microsoft_ProjectReunion_AppXReference_props>$([MSBuild]::NormalizeDirectory('$(PkgMicrosoft_ProjectReunion)', 'build'))Microsoft.ProjectReunion.AppXReference.props</Microsoft_ProjectReunion_AppXReference_props>
+	<PkgMicrosoft_ProjectReunion Condition="'$(PkgMicrosoft_ProjectReunion)'==''">$([MSBuild]::NormalizeDirectory('$(NuGetPackageRoot)', 'Microsoft.WindowsAppSDK', '1.0.0-experimental1'))</PkgMicrosoft_ProjectReunion>
+	<PkgMicrosoft_ProjectReunion Condition="!Exists($(PkgMicrosoft_ProjectReunion))">$(SolutionDir)packages\Microsoft.WindowsAppSDK.0.8.1\</PkgMicrosoft_ProjectReunion>
+	<PkgMicrosoft_ProjectReunion_WinUI Condition="'$(PkgMicrosoft_ProjectReunion_WinUI)'==''">$([MSBuild]::NormalizeDirectory('$(NuGetPackageRoot)', 'Microsoft.WindowsAppSDK.WinUI', '1.0.0-experimental1'))</PkgMicrosoft_ProjectReunion_WinUI>
+	<PkgMicrosoft_ProjectReunion_WinUI Condition="!Exists($(PkgMicrosoft_ProjectReunion_WinUI))">$(SolutionDir)packages\Microsoft.WindowsAppSDK.WinUI.1.0.0-experimental1\</PkgMicrosoft_ProjectReunion_WinUI>
+	<Microsoft_ProjectReunion_AppXReference_props>$([MSBuild]::NormalizeDirectory('$(PkgMicrosoft_ProjectReunion)', 'build'))Microsoft.WindowsAppSDK.AppXReference.props</Microsoft_ProjectReunion_AppXReference_props>
 	<Microsoft_WinUI_AppX_targets>$([MSBuild]::NormalizeDirectory('$(PkgMicrosoft_ProjectReunion_WinUI)', 'build'))Microsoft.WinUI.AppX.targets</Microsoft_WinUI_AppX_targets>
 	<EntryPointProjectUniqueName>..\UnoWinUIQuickStart.Windows.Desktop\UnoWinUIQuickStart.Windows.Desktop.csproj</EntryPointProjectUniqueName>
   </PropertyGroup>
   <ItemGroup>
-	<PackageReference Include="Microsoft.ProjectReunion" Version="[0.8.1]">
+	<PackageReference Include="Microsoft.WindowsAppSDK" Version="[1.0.0-experimental1]">
 	  <IncludeAssets>build</IncludeAssets>
 	</PackageReference>
   </ItemGroup>

diff --git a/src/SourceGenerators/Uno.UI.SourceGenerators/DependencyObject/DependencyObjectGenerator.cs b/src/SourceGenerators/Uno.UI.SourceGenerators/DependencyObject/DependencyObjectGenerator.cs
@@ -832,7 +832,7 @@ private static void GenerateDependencyObjectImplementation(IndentedStringBuilder
 				builder.AppendLineInvariant(@"public Windows.UI.Core.CoreDispatcher Dispatcher => Windows.UI.Core.CoreDispatcher.Main;");
 
 				builder.AppendLineInvariant(@"#if HAS_UNO_WINUI");
-				builder.AppendLineInvariant(@"public global::Microsoft.System.DispatcherQueue DispatcherQueue => global::Microsoft.System.DispatcherQueue.GetForCurrentThread();");
+				builder.AppendLineInvariant(@"public global::Microsoft.UI.Dispatching.DispatcherQueue DispatcherQueue => global::Microsoft.UI.Dispatching.DispatcherQueue.GetForCurrentThread();");
 				builder.AppendLineInvariant(@"#endif");
 
 				using (builder.BlockInvariant($"private DependencyObjectStore __Store"))

diff --git a/src/Uno.UI.Toolkit/Uno.UI.Toolkit.csproj b/src/Uno.UI.Toolkit/Uno.UI.Toolkit.csproj
@@ -89,12 +89,12 @@
 	</ItemGroup>
 
 	<ItemGroup Condition="'$(TargetFramework)'=='net5.0-windows10.0.18362.0' or '$(TargetFramework)'=='uap10.0.17763'">
-		<PackageReference Include="Microsoft.ProjectReunion" Condition="'$(UNO_UWP_BUILD)'!='true'">
-			<Version>0.5.6</Version>
+		<PackageReference Include="Microsoft.WindowsAppSDK" Condition="'$(UNO_UWP_BUILD)'!='true'">
+			<Version>1.0.0-experimental1</Version>
 		</PackageReference>
 
-		<FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" RuntimeFrameworkVersion="10.0.18362.16" Condition="'$(UNO_UWP_BUILD)'!='true'" />
-		<FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" TargetingPackVersion="10.0.18362.16" Condition="'$(UNO_UWP_BUILD)'!='true'" />
+		<FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" RuntimeFrameworkVersion="10.0.18362.21" Condition="'$(UNO_UWP_BUILD)'!='true'" />
+		<FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" TargetingPackVersion="10.0.18362.21" Condition="'$(UNO_UWP_BUILD)'!='true'" />
 
 		<Compile Include="$(MSBuildThisFileDirectory)..\Uno.UI\Extensions\DependencyObjectExtensions.cs">
 			<Link>Uno.UI\Extensions\%(RecursiveDir)%(FileName)%(Extension)</Link>

diff --git a/src/Uno.UI/Microsoft/UI/Xaml/Controls/Repeater/FlowLayoutAlgorithm.cs b/src/Uno.UI/Microsoft/UI/Xaml/Controls/Repeater/FlowLayoutAlgorithm.cs
@@ -11,7 +11,12 @@
 
 namespace Microsoft.UI.Xaml.Controls
 {
-	internal partial class FlowLayoutAlgorithm : OrientationBasedMeasures
+	#if HAS_UNO_WINUI
+	public
+#else
+	internal
+#endif
+	partial class FlowLayoutAlgorithm : OrientationBasedMeasures
 	{
 		private enum GenerateDirection
 		{
@@ -59,7 +64,7 @@ public void UninitializeForContext(VirtualizingLayoutContext context)
 			context.LayoutStateCore = null;
 		}
 
-		public Size Measure(
+		internal Size Measure(
 			Size availableSize,
 			VirtualizingLayoutContext context,
 			bool isWrapping,

diff --git a/src/Uno.UI/Microsoft/UI/Xaml/Controls/Repeater/IFlowLayoutAlgorithmDelegates.cs b/src/Uno.UI/Microsoft/UI/Xaml/Controls/Repeater/IFlowLayoutAlgorithmDelegates.cs
@@ -5,7 +5,12 @@
 
 namespace Microsoft.UI.Xaml.Controls
 {
-	internal partial interface IFlowLayoutAlgorithmDelegates
+#if HAS_UNO_WINUI
+	public
+#else
+	internal
+#endif
+	partial interface IFlowLayoutAlgorithmDelegates
 	{
 		Size Algorithm_GetMeasureSize(int index, Size availableSize, VirtualizingLayoutContext context);
 

diff --git a/src/Uno.UI/System/DispatcherQueue.cs b/src/Uno.UI/System/DispatcherQueue.cs
@@ -2,7 +2,7 @@
 using System;
 using Windows.UI.Core;
 
-namespace Microsoft.System
+namespace Microsoft.UI.Dispatching
 {
 	public partial class DispatcherQueue
 	{

diff --git a/src/Uno.UI/System/DispatcherQueueTimer.Android.cs b/src/Uno.UI/System/DispatcherQueueTimer.Android.cs
@@ -5,7 +5,7 @@
 using Android.OS;
 using Java.Lang;
 
-namespace Microsoft.System
+namespace Microsoft.UI.Dispatching
 {
 	partial class DispatcherQueueTimer
 	{

diff --git a/src/Uno.UI/System/DispatcherQueueTimer.cs b/src/Uno.UI/System/DispatcherQueueTimer.cs
@@ -7,7 +7,7 @@
 using Uno.Logging;
 using Windows.Foundation;
 
-namespace Microsoft.System
+namespace Microsoft.UI.Dispatching
 {
 	public partial class DispatcherQueueTimer
 	{

diff --git a/src/Uno.UI/System/DispatcherQueueTimer.iOSmacOS.cs b/src/Uno.UI/System/DispatcherQueueTimer.iOSmacOS.cs
@@ -5,7 +5,7 @@
 using System.Threading;
 using Foundation;
 
-namespace Microsoft.System
+namespace Microsoft.UI.Dispatching
 {
     partial class DispatcherQueueTimer
 	{

diff --git a/src/Uno.UI/System/DispatcherQueueTimer.net.cs b/src/Uno.UI/System/DispatcherQueueTimer.net.cs
@@ -6,7 +6,7 @@
 using System.Threading.Tasks;
 using Windows.System.Threading;
 
-namespace Microsoft.System
+namespace Microsoft.UI.Dispatching
 {
 	partial class DispatcherQueueTimer
 	{

diff --git a/src/Uno.UI/System/DispatcherQueueTimer.netstdref.cs b/src/Uno.UI/System/DispatcherQueueTimer.netstdref.cs
@@ -6,7 +6,7 @@
 using System.Threading.Tasks;
 using Windows.System.Threading;
 
-namespace Microsoft.System
+namespace Microsoft.UI.Dispatching
 {
 	partial class DispatcherQueueTimer
 	{

diff --git a/src/Uno.UI/System/DispatcherQueueTimer.skia.cs b/src/Uno.UI/System/DispatcherQueueTimer.skia.cs
@@ -6,7 +6,7 @@
 using System.Threading.Tasks;
 using Windows.System.Threading;
 
-namespace Microsoft.System
+namespace Microsoft.UI.Dispatching
 {
 	partial class DispatcherQueueTimer
 	{

diff --git a/src/Uno.UI/System/DispatcherQueueTimer.wasm.cs b/src/Uno.UI/System/DispatcherQueueTimer.wasm.cs
@@ -6,7 +6,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace Microsoft.System
+namespace Microsoft.UI.Dispatching
 {
 	partial class DispatcherQueueTimer
 	{

diff --git a/src/Uno.UI/UI/Xaml/DependencyObject.cs b/src/Uno.UI/UI/Xaml/DependencyObject.cs
@@ -14,7 +14,7 @@ public partial interface DependencyObject
 		CoreDispatcher Dispatcher { get; }
 
 #if HAS_UNO_WINUI
-		public global::Microsoft.System.DispatcherQueue DispatcherQueue { get; }
+		public global::Microsoft.UI.Dispatching.DispatcherQueue DispatcherQueue { get; }
 #endif
 		object GetValue(DependencyProperty dp);
 

diff --git a/src/Uno.UI/UI/Xaml/Media/Animation/PointerUpThemeAnimation.cs b/src/Uno.UI/UI/Xaml/Media/Animation/PointerUpThemeAnimation.cs
diff --git a/src/Uno.UWP/Microsoft/Graphics/DirectXAlphaMode.cs b/src/Uno.UWP/Microsoft/Graphics/DirectXAlphaMode.cs
@@ -0,0 +1,17 @@
+#if HAS_UNO_WINUI
+using System;
+using Microsoft.Foundation;
+using Windows.Foundation.Metadata;
+
+namespace Microsoft.Graphics.DirectX
+{
+	[ContractVersion(typeof(LiftedContract), 65536u)]
+	public enum DirectXAlphaMode
+	{
+		Unspecified,
+		Premultiplied,
+		Straight,
+		Ignore
+	}
+}
+#endif
diff --git a/src/Uno.UWP/Microsoft/Graphics/DirectXColorSpace.cs b/src/Uno.UWP/Microsoft/Graphics/DirectXColorSpace.cs
@@ -0,0 +1,38 @@
+#if HAS_UNO_WINUI
+using Microsoft.Foundation;
+using Windows.Foundation.Metadata;
+
+namespace Microsoft.Graphics.DirectX
+{
+	[ContractVersion(typeof(LiftedContract), 65536u)]
+	public enum DirectXColorSpace
+	{
+		RgbFullG22NoneP709,
+		RgbFullG10NoneP709,
+		RgbStudioG22NoneP709,
+		RgbStudioG22NoneP2020,
+		Reserved,
+		YccFullG22NoneP709X601,
+		YccStudioG22LeftP601,
+		YccFullG22LeftP601,
+		YccStudioG22LeftP709,
+		YccFullG22LeftP709,
+		YccStudioG22LeftP2020,
+		YccFullG22LeftP2020,
+		RgbFullG2084NoneP2020,
+		YccStudioG2084LeftP2020,
+		RgbStudioG2084NoneP2020,
+		YccStudioG22TopLeftP2020,
+		YccStudioG2084TopLeftP2020,
+		RgbFullG22NoneP2020,
+		YccStudioGHlgTopLeftP2020,
+		YccFullGHlgTopLeftP2020,
+		RgbStudioG24NoneP709,
+		RgbStudioG24NoneP2020,
+		YccStudioG24LeftP709,
+		YccStudioG24LeftP2020,
+		YccStudioG24TopLeftP2020
+	}
+
+}
+#endif