Merge branch 'master' into jamesmcroft/3506-carousel-automation

Author: michael-hawker

Directory.Build.props

@@ -14,8 +14,9 @@
     <IsTestProject>$(MSBuildProjectName.Contains('Test'))</IsTestProject>
     <IsUwpProject Condition="'$(IsDesignProject)' != 'true'">$(MSBuildProjectName.Contains('Uwp'))</IsUwpProject>
     <IsSampleProject>$(MSBuildProjectName.Contains('Sample'))</IsSampleProject>
-    <DefaultTargetPlatformVersion>19041</DefaultTargetPlatformVersion>
-    <DefaultTargetPlatformMinVersion>17763</DefaultTargetPlatformMinVersion>
+    <TargetPlatformBaseVersion>10.0</TargetPlatformBaseVersion>
+    <TargetPlatformRevision>19041</TargetPlatformRevision>
+    <TargetPlatformMinRevision>17763</TargetPlatformMinRevision>
     <PackageOutputPath>$(MSBuildThisFileDirectory)bin\nupkg</PackageOutputPath>
   </PropertyGroup>
 
@@ -88,7 +89,6 @@
   </Choose>
 
   <PropertyGroup Condition="'$(IsUwpProject)' == 'true'">
-
     <!-- 8002 is a strong named -> non-strong-named reference -->
     <!-- This is valid for platforms other than .NET Framework (and is needed for the UWP targets -->
     <NoWarn>$(NoWarn);8002</NoWarn>
@@ -103,4 +103,7 @@
       <Link>stylecop.json</Link>
     </AdditionalFiles>
   </ItemGroup>
+
+  <Import Project="$(MSBuildThisFileDirectory)build\Windows.Toolkit.VisualStudio.Design.props" Condition="'$(IsDesignProject)' == 'true'"/>
+
 </Project>

Directory.Build.targets

@@ -1,33 +1,20 @@
 <Project>
-  <Choose>
-    <When Condition="'$(TargetFramework)' == 'uap10.0' or '$(TargetFramework)' == 'uap10.0.17763' or '$(TargetFramework)' == 'native' or '$(TargetFramework)' == 'net461'">
-      <!-- UAP versions for uap10.0 where TPMV isn't implied -->
-      <PropertyGroup>
-        <TargetPlatformVersion>10.0.$(DefaultTargetPlatformVersion).0</TargetPlatformVersion>
-        <TargetPlatformMinVersion>10.0.$(DefaultTargetPlatformMinVersion).0</TargetPlatformMinVersion>
-      </PropertyGroup>
 
-      <PropertyGroup Condition="'$(DebugType)' == ''">
-        <DebugType>Portable</DebugType>
-      </PropertyGroup>
+  <PropertyGroup>
+    <UseUWP Condition="'$(TargetFramework)' == 'uap10.0' or '$(TargetFramework)' == 'uap10.0.17763' or '$(TargetFramework)' == 'native' or '$(TargetFramework)' == 'net461'">true</UseUWP>
+  </PropertyGroup>
 
-      <ItemGroup>
-        <SDKReference Condition="'$(UseWindowsDesktopSdk)' == 'true' " Include="WindowsDesktop, Version=$(TargetPlatformVersion)">
-          <Name>Windows Desktop Extensions for the UWP</Name>
-        </SDKReference>
-      </ItemGroup>
-    </When>
-  </Choose>
-  
   <Choose>
-    <When Condition="'$(TargetFramework.Contains(`uap10.0`))' == 'false' and '$(TargetFramework)' != 'native' and '$(IsSampleProject)' != 'true'">
+    <When Condition="!$(TargetFramework.Contains(`uap10.0`)) and '$(TargetFramework)' != 'native' and '$(IsSampleProject)' != 'true'">
       <PropertyGroup>
         <SignAssembly>true</SignAssembly>
         <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)toolkit.snk</AssemblyOriginatorKeyFile>
       </PropertyGroup>
     </When>
   </Choose>
 
+  <Import Project="$(MSBuildThisFileDirectory)build\Windows.Toolkit.Uwp.Build.targets" Condition="'$(UseUWP)' == 'true'"/>
+
   <Target Name="AddCommitHashToAssemblyAttributes" BeforeTargets="GetAssemblyAttributes">
     <ItemGroup>
       <AssemblyAttribute Include="System.Reflection.AssemblyMetadataAttribute" Condition=" '$(SourceRevisionId)' != '' ">
@@ -36,4 +23,5 @@
       </AssemblyAttribute>
     </ItemGroup>
   </Target>
+
 </Project>

Microsoft.Toolkit.HighPerformance/Helpers/Internals/RuntimeHelpers.cs

@@ -42,7 +42,7 @@ public static unsafe int ConvertLength<TFrom, TTo>(int length)
             }
             else if (sizeof(TFrom) == 1)
             {
-                return length / sizeof(TTo);
+                return (int)((uint)length / (uint)sizeof(TTo));
             }
             else
             {

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
         /// </summary>
         public bool IsAlwaysActivated { get; set; }
 
-        private static GazePointer _instance = null;
+        private static ThreadLocal<GazePointer> _instance = new ThreadLocal<GazePointer>(() => 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)
         {

Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj

@@ -15,6 +15,8 @@
     </Description>
     <PackageTags>notifications win10 windows 10 tile tiles toast toasts badge xml uwp c# csharp c++</PackageTags>
     <ExtrasImplicitPlatformPackageIsPrivate Condition=" '$(TargetFramework)' == 'native' ">true</ExtrasImplicitPlatformPackageIsPrivate>
+    <DefaultTargetPlatformMinVersion>10240</DefaultTargetPlatformMinVersion>
+    <TargetPlatformMinVersion>10.0.10240.0</TargetPlatformMinVersion>
   </PropertyGroup>
 
   <Choose>

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);
         }
 
+        /// <summary>
+        /// Use the value of specified ExpressionNode to determine if this composition conditional value modifier should be chosen.
+        /// </summary>
+        /// <param name="modifier">The modifier.</param>
+        /// <param name="expressionNode">The root ExpressionNode that represents the ExpressionAnimation.</param>
+        public static void SetCondition(this CompositionConditionalValue modifier, ExpressionNode expressionNode)
+        {
+            modifier.Condition = CreateExpressionAnimationFromNode(modifier.Compositor, expressionNode);
+        }
+
+        /// <summary>
+        /// Use the value of specified ExpressionNode as the value for this composition conditional value
+        /// </summary>
+        /// <param name="modifier">The modifier.</param>
+        /// <param name="expressionNode">The root ExpressionNode that represents the ExpressionAnimation.</param>
+        public static void SetValue(this CompositionConditionalValue modifier, ExpressionNode expressionNode)
+        {
+            modifier.Value = CreateExpressionAnimationFromNode(modifier.Compositor, expressionNode);
+        }
+
         /// <summary>
         /// Creates the expression animation from node.
         /// </summary>