From 2ba288f3d922306638adb99c6c873fd070cf17d6 Mon Sep 17 00:00:00 2001 From: Andrew Leader Date: Wed, 25 Nov 2020 15:03:08 -0800 Subject: [PATCH 1/6] Reset Notifications min version to 10240 --- .../Microsoft.Toolkit.Uwp.Notifications.csproj | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj b/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj index 414590f4f2b..64b54d1d3c1 100644 --- a/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj +++ b/Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj @@ -15,6 +15,8 @@ notifications win10 windows 10 tile tiles toast toasts badge xml uwp c# csharp c++ true + 10240 + 10.0.10240.0 From e293fe240114404fe502d3fe61d8447dc039a433 Mon Sep 17 00:00:00 2001 From: Pete Ansell Date: Mon, 30 Nov 2020 13:22:37 -0800 Subject: [PATCH 2/6] Create separate instances of GazePointer per (UI) thread, --- .../GazePointer.cs | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazePointer.cs b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazePointer.cs index 177cca3902c..5228c7650db 100644 --- a/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazePointer.cs +++ b/Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazePointer.cs @@ -6,6 +6,7 @@ using System.Collections.Generic; using System.Diagnostics; using System.Linq; +using System.Threading; using System.Threading.Tasks; using Windows.Devices.Input.Preview; using Windows.Foundation; @@ -298,20 +299,9 @@ internal int CursorRadius /// public bool IsAlwaysActivated { get; set; } - private static GazePointer _instance = null; + private static ThreadLocal _instance = new ThreadLocal(() => new GazePointer()); - internal static GazePointer Instance - { - get - { - if (_instance == null) - { - _instance = new GazePointer(); - } - - return _instance; - } - } + internal static GazePointer Instance => _instance.Value; internal void AddRoot(int proxyId) { From 5959d34426eb4cd890381ecc504644209a2fdfb5 Mon Sep 17 00:00:00 2001 From: alvinashcraft Date: Fri, 4 Dec 2020 12:21:06 -0500 Subject: [PATCH 3/6] windows-toolkit#3599 Fix Debug AnyCPU config for XamlIslands.Package unit test project so it builds x86. --- Windows Community Toolkit.sln | 118 +++++++++++++--------------------- 1 file changed, 45 insertions(+), 73 deletions(-) diff --git a/Windows Community Toolkit.sln b/Windows Community Toolkit.sln index 19e1beb3709..0c75200e754 100644 --- a/Windows Community Toolkit.sln +++ b/Windows Community Toolkit.sln @@ -748,9 +748,9 @@ Global {F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Release|x64.Build.0 = Release|x64 {F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Release|x86.ActiveCfg = Release|x86 {F5929F8E-7BC5-4A7B-A92A-AC751F7906E4}.Release|x86.Build.0 = Release|x86 - {DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Debug|Any CPU.Deploy.0 = Debug|Any CPU + {DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Debug|Any CPU.ActiveCfg = Debug|x86 + {DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Debug|Any CPU.Build.0 = Debug|x86 + {DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Debug|Any CPU.Deploy.0 = Debug|x86 {DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Debug|ARM.ActiveCfg = Debug|ARM {DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Debug|ARM.Build.0 = Debug|ARM {DCFBF9F1-2BBE-498D-B6C9-8ADE50C06CDC}.Debug|ARM.Deploy.0 = Debug|ARM @@ -794,6 +794,46 @@ Global {804D0681-52F6-4E61-864A-699F0AB44B20}.Release|x86.ActiveCfg = Release|x86 {804D0681-52F6-4E61-864A-699F0AB44B20}.Release|x86.Build.0 = Release|x86 {804D0681-52F6-4E61-864A-699F0AB44B20}.Release|x86.Deploy.0 = Release|x86 + {6FEDF199-B052-49DD-8F3E-2A9224998E0F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6FEDF199-B052-49DD-8F3E-2A9224998E0F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6FEDF199-B052-49DD-8F3E-2A9224998E0F}.Debug|ARM.ActiveCfg = Debug|Any CPU + {6FEDF199-B052-49DD-8F3E-2A9224998E0F}.Debug|ARM.Build.0 = Debug|Any CPU + {6FEDF199-B052-49DD-8F3E-2A9224998E0F}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {6FEDF199-B052-49DD-8F3E-2A9224998E0F}.Debug|ARM64.Build.0 = Debug|Any CPU + {6FEDF199-B052-49DD-8F3E-2A9224998E0F}.Debug|x64.ActiveCfg = Debug|Any CPU + {6FEDF199-B052-49DD-8F3E-2A9224998E0F}.Debug|x64.Build.0 = Debug|Any CPU + {6FEDF199-B052-49DD-8F3E-2A9224998E0F}.Debug|x86.ActiveCfg = Debug|Any CPU + {6FEDF199-B052-49DD-8F3E-2A9224998E0F}.Debug|x86.Build.0 = Debug|Any CPU + {6FEDF199-B052-49DD-8F3E-2A9224998E0F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6FEDF199-B052-49DD-8F3E-2A9224998E0F}.Release|Any CPU.Build.0 = Release|Any CPU + {6FEDF199-B052-49DD-8F3E-2A9224998E0F}.Release|ARM.ActiveCfg = Release|Any CPU + {6FEDF199-B052-49DD-8F3E-2A9224998E0F}.Release|ARM.Build.0 = Release|Any CPU + {6FEDF199-B052-49DD-8F3E-2A9224998E0F}.Release|ARM64.ActiveCfg = Release|Any CPU + {6FEDF199-B052-49DD-8F3E-2A9224998E0F}.Release|ARM64.Build.0 = Release|Any CPU + {6FEDF199-B052-49DD-8F3E-2A9224998E0F}.Release|x64.ActiveCfg = Release|Any CPU + {6FEDF199-B052-49DD-8F3E-2A9224998E0F}.Release|x64.Build.0 = Release|Any CPU + {6FEDF199-B052-49DD-8F3E-2A9224998E0F}.Release|x86.ActiveCfg = Release|Any CPU + {6FEDF199-B052-49DD-8F3E-2A9224998E0F}.Release|x86.Build.0 = Release|Any CPU + {67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Debug|Any CPU.ActiveCfg = Debug|x86 + {67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Debug|Any CPU.Build.0 = Debug|x86 + {67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Debug|ARM.ActiveCfg = Debug|x86 + {67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Debug|ARM.Build.0 = Debug|x86 + {67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Debug|ARM64.ActiveCfg = Debug|x86 + {67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Debug|ARM64.Build.0 = Debug|x86 + {67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Debug|x64.ActiveCfg = Debug|x86 + {67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Debug|x64.Build.0 = Debug|x86 + {67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Debug|x86.ActiveCfg = Debug|x86 + {67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Debug|x86.Build.0 = Debug|x86 + {67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Release|Any CPU.ActiveCfg = Release|x86 + {67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Release|Any CPU.Build.0 = Release|x86 + {67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Release|ARM.ActiveCfg = Release|x86 + {67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Release|ARM.Build.0 = Release|x86 + {67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Release|ARM64.ActiveCfg = Release|x86 + {67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Release|ARM64.Build.0 = Release|x86 + {67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Release|x64.ActiveCfg = Release|x86 + {67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Release|x64.Build.0 = Release|x86 + {67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Release|x86.ActiveCfg = Release|x86 + {67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Release|x86.Build.0 = Release|x86 {0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Debug|Any CPU.Build.0 = Debug|Any CPU {0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Debug|ARM.ActiveCfg = Debug|Any CPU @@ -804,12 +844,6 @@ Global {0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Debug|x64.Build.0 = Debug|Any CPU {0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Debug|x86.ActiveCfg = Debug|Any CPU {0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Debug|x86.Build.0 = Debug|Any CPU - {0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Native|Any CPU.ActiveCfg = Release|Any CPU - {0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Native|Any CPU.Build.0 = Release|Any CPU - {0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Native|ARM.ActiveCfg = Release|Any CPU - {0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Native|ARM64.ActiveCfg = Release|Any CPU - {0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Native|x64.ActiveCfg = Release|Any CPU - {0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Native|x86.ActiveCfg = Release|Any CPU {0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Release|Any CPU.ActiveCfg = Release|Any CPU {0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Release|ARM.ActiveCfg = Release|Any CPU {0037E4C9-7AF3-4ADD-8156-5AEFA6C36405}.Release|ARM.Build.0 = Release|Any CPU @@ -834,13 +868,6 @@ Global {54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Debug|x86.ActiveCfg = Debug|Any CPU {54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Debug|x86.Build.0 = Debug|Any CPU {54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Debug|x86.Deploy.0 = Debug|Any CPU - {54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Native|Any CPU.ActiveCfg = Release|Any CPU - {54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Native|Any CPU.Build.0 = Release|Any CPU - {54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Native|Any CPU.Deploy.0 = Release|Any CPU - {54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Native|ARM.ActiveCfg = Release|ARM - {54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Native|ARM64.ActiveCfg = Release|ARM64 - {54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Native|x64.ActiveCfg = Release|x64 - {54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Native|x86.ActiveCfg = Release|x86 {54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Release|Any CPU.ActiveCfg = Release|Any CPU {54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Release|ARM.ActiveCfg = Release|Any CPU {54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Release|ARM.Build.0 = Release|Any CPU @@ -854,46 +881,6 @@ Global {54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Release|x86.ActiveCfg = Release|Any CPU {54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Release|x86.Build.0 = Release|Any CPU {54349AB0-9E41-4AA6-849C-EC9CE80CDD2A}.Release|x86.Deploy.0 = Release|Any CPU - {6FEDF199-B052-49DD-8F3E-2A9224998E0F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6FEDF199-B052-49DD-8F3E-2A9224998E0F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6FEDF199-B052-49DD-8F3E-2A9224998E0F}.Debug|ARM.ActiveCfg = Debug|Any CPU - {6FEDF199-B052-49DD-8F3E-2A9224998E0F}.Debug|ARM.Build.0 = Debug|Any CPU - {6FEDF199-B052-49DD-8F3E-2A9224998E0F}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {6FEDF199-B052-49DD-8F3E-2A9224998E0F}.Debug|ARM64.Build.0 = Debug|Any CPU - {6FEDF199-B052-49DD-8F3E-2A9224998E0F}.Debug|x64.ActiveCfg = Debug|Any CPU - {6FEDF199-B052-49DD-8F3E-2A9224998E0F}.Debug|x64.Build.0 = Debug|Any CPU - {6FEDF199-B052-49DD-8F3E-2A9224998E0F}.Debug|x86.ActiveCfg = Debug|Any CPU - {6FEDF199-B052-49DD-8F3E-2A9224998E0F}.Debug|x86.Build.0 = Debug|Any CPU - {6FEDF199-B052-49DD-8F3E-2A9224998E0F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6FEDF199-B052-49DD-8F3E-2A9224998E0F}.Release|Any CPU.Build.0 = Release|Any CPU - {6FEDF199-B052-49DD-8F3E-2A9224998E0F}.Release|ARM.ActiveCfg = Release|Any CPU - {6FEDF199-B052-49DD-8F3E-2A9224998E0F}.Release|ARM.Build.0 = Release|Any CPU - {6FEDF199-B052-49DD-8F3E-2A9224998E0F}.Release|ARM64.ActiveCfg = Release|Any CPU - {6FEDF199-B052-49DD-8F3E-2A9224998E0F}.Release|ARM64.Build.0 = Release|Any CPU - {6FEDF199-B052-49DD-8F3E-2A9224998E0F}.Release|x64.ActiveCfg = Release|Any CPU - {6FEDF199-B052-49DD-8F3E-2A9224998E0F}.Release|x64.Build.0 = Release|Any CPU - {6FEDF199-B052-49DD-8F3E-2A9224998E0F}.Release|x86.ActiveCfg = Release|Any CPU - {6FEDF199-B052-49DD-8F3E-2A9224998E0F}.Release|x86.Build.0 = Release|Any CPU - {67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Debug|Any CPU.ActiveCfg = Debug|x86 - {67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Debug|Any CPU.Build.0 = Debug|x86 - {67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Debug|ARM.ActiveCfg = Debug|x86 - {67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Debug|ARM.Build.0 = Debug|x86 - {67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Debug|ARM64.ActiveCfg = Debug|x86 - {67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Debug|ARM64.Build.0 = Debug|x86 - {67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Debug|x64.ActiveCfg = Debug|x86 - {67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Debug|x64.Build.0 = Debug|x86 - {67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Debug|x86.ActiveCfg = Debug|x86 - {67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Debug|x86.Build.0 = Debug|x86 - {67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Release|Any CPU.ActiveCfg = Release|x86 - {67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Release|Any CPU.Build.0 = Release|x86 - {67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Release|ARM.ActiveCfg = Release|x86 - {67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Release|ARM.Build.0 = Release|x86 - {67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Release|ARM64.ActiveCfg = Release|x86 - {67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Release|ARM64.Build.0 = Release|x86 - {67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Release|x64.ActiveCfg = Release|x86 - {67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Release|x64.Build.0 = Release|x86 - {67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Release|x86.ActiveCfg = Release|x86 - {67FE47A0-CA93-4680-B770-A0A48C1DBC40}.Release|x86.Build.0 = Release|x86 {05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Debug|Any CPU.ActiveCfg = Debug|x86 {05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Debug|ARM.ActiveCfg = Debug|ARM {05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Debug|ARM.Build.0 = Debug|ARM @@ -907,11 +894,6 @@ Global {05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Debug|x86.ActiveCfg = Debug|x86 {05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Debug|x86.Build.0 = Debug|x86 {05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Debug|x86.Deploy.0 = Debug|x86 - {05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Native|Any CPU.ActiveCfg = Release|x64 - {05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Native|ARM.ActiveCfg = Release|ARM - {05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Native|ARM64.ActiveCfg = Release|ARM64 - {05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Native|x64.ActiveCfg = Release|x64 - {05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Native|x86.ActiveCfg = Release|x86 {05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Release|Any CPU.ActiveCfg = Release|x86 {05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Release|Any CPU.Build.0 = Release|x86 {05C83067-FA46-45E2-BEC4-EDEE84AD18D0}.Release|ARM.ActiveCfg = Release|ARM @@ -936,11 +918,6 @@ Global {5F720475-E263-4A5A-8C88-2B805B45B5BC}.Debug|x64.Build.0 = Debug|Any CPU {5F720475-E263-4A5A-8C88-2B805B45B5BC}.Debug|x86.ActiveCfg = Debug|Any CPU {5F720475-E263-4A5A-8C88-2B805B45B5BC}.Debug|x86.Build.0 = Debug|Any CPU - {5F720475-E263-4A5A-8C88-2B805B45B5BC}.Native|Any CPU.ActiveCfg = Debug|Any CPU - {5F720475-E263-4A5A-8C88-2B805B45B5BC}.Native|ARM.ActiveCfg = Debug|Any CPU - {5F720475-E263-4A5A-8C88-2B805B45B5BC}.Native|ARM64.ActiveCfg = Debug|Any CPU - {5F720475-E263-4A5A-8C88-2B805B45B5BC}.Native|x64.ActiveCfg = Debug|Any CPU - {5F720475-E263-4A5A-8C88-2B805B45B5BC}.Native|x86.ActiveCfg = Debug|Any CPU {5F720475-E263-4A5A-8C88-2B805B45B5BC}.Release|Any CPU.ActiveCfg = Release|Any CPU {5F720475-E263-4A5A-8C88-2B805B45B5BC}.Release|Any CPU.Build.0 = Release|Any CPU {5F720475-E263-4A5A-8C88-2B805B45B5BC}.Release|ARM.ActiveCfg = Release|Any CPU @@ -961,11 +938,6 @@ Global {C8182EF0-77FB-4B43-A588-C71748A309C7}.Debug|x64.Build.0 = Debug|Any CPU {C8182EF0-77FB-4B43-A588-C71748A309C7}.Debug|x86.ActiveCfg = Debug|Any CPU {C8182EF0-77FB-4B43-A588-C71748A309C7}.Debug|x86.Build.0 = Debug|Any CPU - {C8182EF0-77FB-4B43-A588-C71748A309C7}.Native|Any CPU.ActiveCfg = Debug|Any CPU - {C8182EF0-77FB-4B43-A588-C71748A309C7}.Native|ARM.ActiveCfg = Debug|Any CPU - {C8182EF0-77FB-4B43-A588-C71748A309C7}.Native|ARM64.ActiveCfg = Debug|Any CPU - {C8182EF0-77FB-4B43-A588-C71748A309C7}.Native|x64.ActiveCfg = Debug|Any CPU - {C8182EF0-77FB-4B43-A588-C71748A309C7}.Native|x86.ActiveCfg = Debug|Any CPU {C8182EF0-77FB-4B43-A588-C71748A309C7}.Release|Any CPU.ActiveCfg = Release|Any CPU {C8182EF0-77FB-4B43-A588-C71748A309C7}.Release|Any CPU.Build.0 = Release|Any CPU {C8182EF0-77FB-4B43-A588-C71748A309C7}.Release|ARM.ActiveCfg = Release|Any CPU @@ -1008,10 +980,10 @@ Global {C79029AF-2E9B-4466-BAC4-1A41B281EAE6} = {B30036C4-D514-4E5B-A323-587A061772CE} {804D0681-52F6-4E61-864A-699F0AB44B20} = {C79029AF-2E9B-4466-BAC4-1A41B281EAE6} {88C6FFBE-322D-4CEA-842B-B2CB281D357D} = {CFA75BE0-5A44-45DE-8114-426A605B062B} - {0037E4C9-7AF3-4ADD-8156-5AEFA6C36405} = {9AD30620-667D-433C-9961-8D885EE7B762} - {54349AB0-9E41-4AA6-849C-EC9CE80CDD2A} = {9AD30620-667D-433C-9961-8D885EE7B762} {6FEDF199-B052-49DD-8F3E-2A9224998E0F} = {F1AFFFA7-28FE-4770-BA48-10D76F3E59BC} {67FE47A0-CA93-4680-B770-A0A48C1DBC40} = {F1AFFFA7-28FE-4770-BA48-10D76F3E59BC} + {0037E4C9-7AF3-4ADD-8156-5AEFA6C36405} = {9AD30620-667D-433C-9961-8D885EE7B762} + {54349AB0-9E41-4AA6-849C-EC9CE80CDD2A} = {9AD30620-667D-433C-9961-8D885EE7B762} {05C83067-FA46-45E2-BEC4-EDEE84AD18D0} = {6FAA1CFE-3368-4FD2-9DBD-F4700F69174C} {6FAA1CFE-3368-4FD2-9DBD-F4700F69174C} = {B30036C4-D514-4E5B-A323-587A061772CE} {5F720475-E263-4A5A-8C88-2B805B45B5BC} = {6FAA1CFE-3368-4FD2-9DBD-F4700F69174C} From 243df4e6f3f5e7ce84335de8182fedec4b4e05ea Mon Sep 17 00:00:00 2001 From: Arcadio Garcia Salvadores Date: Fri, 4 Dec 2020 11:51:41 -0800 Subject: [PATCH 4/6] Add extensions support for CompositionConditionalValue --- .../Expressions/CompositionExtensions.cs | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/CompositionExtensions.cs b/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/CompositionExtensions.cs index bbae7193377..e710b2c7136 100644 --- a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/CompositionExtensions.cs +++ b/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/CompositionExtensions.cs @@ -221,6 +221,26 @@ public static void SetMotion(this InteractionTrackerInertiaMotion modifier, Expr modifier.Motion = CreateExpressionAnimationFromNode(modifier.Compositor, expressionNode); } + /// + /// Use the value of specified ExpressionNode to determine if this composition conditional value modifier should be chosen. + /// + /// The modifier. + /// The root ExpressionNode that represents the ExpressionAnimation. + public static void SetCondition(this CompositionConditionalValue modifier, ExpressionNode expressionNode) + { + modifier.Condition = CreateExpressionAnimationFromNode(modifier.Compositor, expressionNode); + } + + /// + /// Use the value of specified ExpressionNode as the resting value for this composition conditional value + /// + /// The modifier. + /// The root ExpressionNode that represents the ExpressionAnimation. + public static void SetRestingValue(this CompositionConditionalValue modifier, ExpressionNode expressionNode) + { + modifier.Value = CreateExpressionAnimationFromNode(modifier.Compositor, expressionNode); + } + /// /// Creates the expression animation from node. /// From 4005d16a98f62bc5b5e165844b1c6f0f24e45bf2 Mon Sep 17 00:00:00 2001 From: Arcadio Garcia Salvadores Date: Fri, 4 Dec 2020 11:59:03 -0800 Subject: [PATCH 5/6] Cleanup --- .../Expressions/CompositionExtensions.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/CompositionExtensions.cs b/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/CompositionExtensions.cs index e710b2c7136..16f0525b369 100644 --- a/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/CompositionExtensions.cs +++ b/Microsoft.Toolkit.Uwp.UI.Animations/Expressions/CompositionExtensions.cs @@ -232,11 +232,11 @@ public static void SetCondition(this CompositionConditionalValue modifier, Expre } /// - /// Use the value of specified ExpressionNode as the resting value for this composition conditional value + /// Use the value of specified ExpressionNode as the value for this composition conditional value /// /// The modifier. /// The root ExpressionNode that represents the ExpressionAnimation. - public static void SetRestingValue(this CompositionConditionalValue modifier, ExpressionNode expressionNode) + public static void SetValue(this CompositionConditionalValue modifier, ExpressionNode expressionNode) { modifier.Value = CreateExpressionAnimationFromNode(modifier.Compositor, expressionNode); } From 349169a89f7695d2375c5ae31570af4cd0783564 Mon Sep 17 00:00:00 2001 From: Sergio Pedri Date: Sun, 6 Dec 2020 01:20:59 +0100 Subject: [PATCH 6/6] Improved RuntimeHelpers.ConvertLength codegen --- .../Helpers/Internals/RuntimeHelpers.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Microsoft.Toolkit.HighPerformance/Helpers/Internals/RuntimeHelpers.cs b/Microsoft.Toolkit.HighPerformance/Helpers/Internals/RuntimeHelpers.cs index 5a22ef8aff8..4a0d464b0af 100644 --- a/Microsoft.Toolkit.HighPerformance/Helpers/Internals/RuntimeHelpers.cs +++ b/Microsoft.Toolkit.HighPerformance/Helpers/Internals/RuntimeHelpers.cs @@ -42,7 +42,7 @@ public static unsafe int ConvertLength(int length) } else if (sizeof(TFrom) == 1) { - return length / sizeof(TTo); + return (int)((uint)length / (uint)sizeof(TTo)); } else {