Update to v2.6

EmptyKeys · Feb 17, 2017 · 5f88c72 · 5f88c72
1 parent fe8d7a4
commit 5f88c72
Show file tree

Hide file tree

Showing 7 changed files with 3,584 additions and 28 deletions.
diff --git a/EmptyKeys.UserInterface.Core/Rect.cs b/EmptyKeys.UserInterface.Core/Rect.cs
@@ -215,6 +215,16 @@ public bool Contains(PointF point)
             return ((((X <= point.X) && (point.X < (X + Width))) && (Y <= point.Y)) && (point.Y < (Y + Height)));
         }
 
+        /// <summary>
+        /// Determines whether the specified rectangle intersects with this rectangle.
+        /// </summary>
+        /// <param name="rectangle">The rectangle.</param>
+        /// <returns></returns>
+        public bool Intersects(Rect rectangle)
+        {
+            return rectangle.Left < Right && Left < rectangle.Right && rectangle.Top < Bottom && Top < rectangle.Bottom;
+        }
+
         /// <summary>
         /// Determines whether the specified <see cref="System.Object" />, is equal to this instance.
         /// </summary>

diff --git a/EmptyKeys.UserInterface.Xenko/EmptyKeys.UserInterface.Xenko.csproj b/EmptyKeys.UserInterface.Xenko/EmptyKeys.UserInterface.Xenko.csproj
@@ -2,7 +2,7 @@
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
-    <MinimumVisualStudioVersion>10.0</MinimumVisualStudioVersion>
+    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{6DCC8AE4-8BB8-4526-B733-EB76FAB1393F}</ProjectGuid>
@@ -13,8 +13,9 @@
     <DefaultLanguage>en-US</DefaultLanguage>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <TargetFrameworkProfile>Profile151</TargetFrameworkProfile>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <TargetFrameworkProfile>
+    </TargetFrameworkProfile>
+    <TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
     <SccProjectName>SAK</SccProjectName>
     <SccLocalPath>SAK</SccLocalPath>
     <SccAuxPath>SAK</SccAuxPath>
@@ -92,6 +93,9 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="project.json" />
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
   <Import Project="$(SiliconStudioPackageProps)" Condition="Exists('$(SiliconStudioPackageProps)')" />
   <Import Project="$(SiliconStudioXenkoDir)\Targets\SiliconStudio.Common.targets" Condition="Exists('$(SiliconStudioXenkoDir)\Targets\SiliconStudio.Common.targets')" />

diff --git a/EmptyKeys.UserInterface.Xenko/XenkoAssetManager.cs b/EmptyKeys.UserInterface.Xenko/XenkoAssetManager.cs
@@ -4,7 +4,7 @@
 using System.Text;
 using System.Threading.Tasks;
 using EmptyKeys.UserInterface.Media;
-using SiliconStudio.Core.Serialization.Assets;
+using SiliconStudio.Core.Serialization.Contents;
 using SiliconStudio.Xenko.Audio;
 using SiliconStudio.Xenko.Graphics;
 using SiliconStudio.Xenko.Rendering;

diff --git a/EmptyKeys.UserInterface.Xenko/project.json b/EmptyKeys.UserInterface.Xenko/project.json
@@ -0,0 +1,10 @@
+{
+  "supports": {},
+  "dependencies": {
+    "NETStandard.Library": "1.6.0",
+    "Microsoft.NETCore.Portable.Compatibility": "1.0.1"
+  },
+  "frameworks": {
+    "netstandard1.4": {}
+  }
+}