Update UI v2.5, Xenko v1.8.0-beta

EmptyKeys · Sep 5, 2016 · cdc631b · cdc631b
1 parent b6d3e28
commit cdc631b
Show file tree

Hide file tree

Showing 12 changed files with 36 additions and 35 deletions.
diff --git a/BasicUI_Xenko/BasicUI_Xenko.sln b/BasicUI_Xenko/BasicUI_Xenko.sln
@@ -3,6 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 VisualStudioVersion = 14.0.25420.1
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "BasicUI_Xenko", "BasicUI_Xenko", "{650DFDF3-E237-4050-9753-C4C4776B0A90}"
+	ProjectSection(SolutionItems) = preProject
+		BasicUI_Xenko\BasicUI_Xenko.xkpkg = BasicUI_Xenko\BasicUI_Xenko.xkpkg
+	EndProjectSection
 	ProjectSection(SiliconStudioPackage) = preProject
 		BasicUI_Xenko/BasicUI_Xenko.xkpkg = BasicUI_Xenko/BasicUI_Xenko.xkpkg
 	EndProjectSection

diff --git a/BasicUI_Xenko/BasicUI_Xenko/BasicUI_Xenko.Game/BasicUI_Xenko.Game.csproj b/BasicUI_Xenko/BasicUI_Xenko/BasicUI_Xenko.Game/BasicUI_Xenko.Game.csproj
@@ -96,20 +96,20 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="EmptyKeys.UserInterface, Version=2.4.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EmptyKeysUI_Xenko.2.4.0.0\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\Common\AnyCPU\EmptyKeys.UserInterface.dll</HintPath>
+    <Reference Include="EmptyKeys.UserInterface, Version=2.5.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\EmptyKeysUI_Xenko.2.5.0.0\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\Common\AnyCPU\EmptyKeys.UserInterface.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="EmptyKeys.UserInterface.Core, Version=2.4.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EmptyKeysUI_Xenko.2.4.0.0\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\Common\AnyCPU\EmptyKeys.UserInterface.Core.dll</HintPath>
+    <Reference Include="EmptyKeys.UserInterface.Core, Version=2.5.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\EmptyKeysUI_Xenko.2.5.0.0\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\Common\AnyCPU\EmptyKeys.UserInterface.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="EmptyKeys.UserInterface.Debug, Version=2.4.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EmptyKeysUI_Xenko.2.4.0.0\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\Common\AnyCPU\EmptyKeys.UserInterface.Debug.dll</HintPath>
+    <Reference Include="EmptyKeys.UserInterface.Debug, Version=2.5.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\EmptyKeysUI_Xenko.2.5.0.0\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\Common\AnyCPU\EmptyKeys.UserInterface.Debug.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="EmptyKeys.UserInterface.Xenko, Version=2.4.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EmptyKeysUI_Xenko.2.4.0.0\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\Xenko\AnyCPU\EmptyKeys.UserInterface.Xenko.dll</HintPath>
+    <Reference Include="EmptyKeys.UserInterface.Xenko, Version=2.5.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\EmptyKeysUI_Xenko.2.5.0.0\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\Xenko\AnyCPU\EmptyKeys.UserInterface.Xenko.dll</HintPath>
       <Private>True</Private>
     </Reference>
   </ItemGroup>

diff --git a/BasicUI_Xenko/BasicUI_Xenko/BasicUI_Xenko.Game/packages.config b/BasicUI_Xenko/BasicUI_Xenko/BasicUI_Xenko.Game/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="EmptyKeysUI_Xenko" version="2.4.0.0" targetFramework="portable46-net451+win81+wpa81" />
+  <package id="EmptyKeysUI_Xenko" version="2.5.0.0" targetFramework="portable46-net451+win81+wpa81" />
 </packages>
diff --git a/BasicUI_Xenko/BasicUI_Xenko/BasicUI_Xenko.UserInterface/BasicUI_Xenko.UserInterface.csproj b/BasicUI_Xenko/BasicUI_Xenko/BasicUI_Xenko.UserInterface/BasicUI_Xenko.UserInterface.csproj
@@ -39,20 +39,20 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="EmptyKeys.UserInterface, Version=2.4.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EmptyKeysUI_Xenko.2.4.0.0\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\Common\AnyCPU\EmptyKeys.UserInterface.dll</HintPath>
+    <Reference Include="EmptyKeys.UserInterface, Version=2.5.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\EmptyKeysUI_Xenko.2.5.0.0\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\Common\AnyCPU\EmptyKeys.UserInterface.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="EmptyKeys.UserInterface.Core, Version=2.4.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EmptyKeysUI_Xenko.2.4.0.0\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\Common\AnyCPU\EmptyKeys.UserInterface.Core.dll</HintPath>
+    <Reference Include="EmptyKeys.UserInterface.Core, Version=2.5.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\EmptyKeysUI_Xenko.2.5.0.0\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\Common\AnyCPU\EmptyKeys.UserInterface.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="EmptyKeys.UserInterface.Debug, Version=2.4.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EmptyKeysUI_Xenko.2.4.0.0\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\Common\AnyCPU\EmptyKeys.UserInterface.Debug.dll</HintPath>
+    <Reference Include="EmptyKeys.UserInterface.Debug, Version=2.5.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\EmptyKeysUI_Xenko.2.5.0.0\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\Common\AnyCPU\EmptyKeys.UserInterface.Debug.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="EmptyKeys.UserInterface.Xenko, Version=2.4.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EmptyKeysUI_Xenko.2.4.0.0\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\Xenko\AnyCPU\EmptyKeys.UserInterface.Xenko.dll</HintPath>
+    <Reference Include="EmptyKeys.UserInterface.Xenko, Version=2.5.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\EmptyKeysUI_Xenko.2.5.0.0\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\Xenko\AnyCPU\EmptyKeys.UserInterface.Xenko.dll</HintPath>
       <Private>True</Private>
     </Reference>
   </ItemGroup>

diff --git a/BasicUI_Xenko/BasicUI_Xenko/BasicUI_Xenko.UserInterface/GeneratedUI/BasicUI.xaml.cs b/BasicUI_Xenko/BasicUI_Xenko/BasicUI_Xenko.UserInterface/GeneratedUI/BasicUI.xaml.cs
@@ -24,7 +24,7 @@ namespace EmptyKeys.UserInterface.Generated {
     using EmptyKeys.UserInterface.Themes;
 
 
-    [GeneratedCodeAttribute("Empty Keys UI Generator", "2.4.0.0")]
+    [GeneratedCodeAttribute("Empty Keys UI Generator", "2.5.0.0")]
     public partial class BasicUI : UIRoot {
 
         private Grid e_0;

diff --git a/BasicUI_Xenko/BasicUI_Xenko/BasicUI_Xenko.UserInterface/GeneratedUI/Dictionary.xaml.cs b/BasicUI_Xenko/BasicUI_Xenko/BasicUI_Xenko.UserInterface/GeneratedUI/Dictionary.xaml.cs
@@ -24,7 +24,7 @@ namespace EmptyKeys.UserInterface.Generated {
     using EmptyKeys.UserInterface.Themes;
 
 
-    [GeneratedCodeAttribute("Empty Keys UI Generator", "2.4.0.0")]
+    [GeneratedCodeAttribute("Empty Keys UI Generator", "2.5.0.0")]
     public sealed class Dictionary : ResourceDictionary {
 
         private static Dictionary singleton = new Dictionary();
@@ -132,8 +132,6 @@ public sealed class Dictionary : ResourceDictionary {
             // Resource - [ToolTipText] String
             this.Add("ToolTipText", "Click to open message box");
             ImageManager.Instance.AddImage("Images/EmptyKeysLogoTextSmall");
-            FontManager.Instance.AddFont("Segoe UI", 13.33333F, FontStyle.Regular, "Segoe_UI_10_Regular");
-            FontManager.Instance.AddFont("Segoe UI", 20F, FontStyle.Bold, "Segoe_UI_15_Bold");
         }
     }
 }
diff --git a/BasicUI_Xenko/BasicUI_Xenko/BasicUI_Xenko.UserInterface/packages.config b/BasicUI_Xenko/BasicUI_Xenko/BasicUI_Xenko.UserInterface/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="EmptyKeysUI_Xenko" version="2.4.0.0" targetFramework="portable46-net451+win81+wpa81" />
+  <package id="EmptyKeysUI_Xenko" version="2.5.0.0" targetFramework="portable46-net451+win81+wpa81" />
 </packages>
diff --git a/BasicUI_Xenko/BasicUI_Xenko/BasicUI_Xenko.Windows/BasicUI_Xenko.Windows.csproj b/BasicUI_Xenko/BasicUI_Xenko/BasicUI_Xenko.Windows/BasicUI_Xenko.Windows.csproj
@@ -62,20 +62,20 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="EmptyKeys.UserInterface, Version=2.4.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EmptyKeysUI_Xenko.2.4.0.0\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\Common\AnyCPU\EmptyKeys.UserInterface.dll</HintPath>
+    <Reference Include="EmptyKeys.UserInterface, Version=2.5.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\EmptyKeysUI_Xenko.2.5.0.0\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\Common\AnyCPU\EmptyKeys.UserInterface.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="EmptyKeys.UserInterface.Core, Version=2.4.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EmptyKeysUI_Xenko.2.4.0.0\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\Common\AnyCPU\EmptyKeys.UserInterface.Core.dll</HintPath>
+    <Reference Include="EmptyKeys.UserInterface.Core, Version=2.5.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\EmptyKeysUI_Xenko.2.5.0.0\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\Common\AnyCPU\EmptyKeys.UserInterface.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="EmptyKeys.UserInterface.Debug, Version=2.4.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EmptyKeysUI_Xenko.2.4.0.0\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\Common\AnyCPU\EmptyKeys.UserInterface.Debug.dll</HintPath>
+    <Reference Include="EmptyKeys.UserInterface.Debug, Version=2.5.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\EmptyKeysUI_Xenko.2.5.0.0\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\Common\AnyCPU\EmptyKeys.UserInterface.Debug.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="EmptyKeys.UserInterface.Xenko, Version=2.4.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EmptyKeysUI_Xenko.2.4.0.0\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\Xenko\AnyCPU\EmptyKeys.UserInterface.Xenko.dll</HintPath>
+    <Reference Include="EmptyKeys.UserInterface.Xenko, Version=2.5.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\EmptyKeysUI_Xenko.2.5.0.0\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\Xenko\AnyCPU\EmptyKeys.UserInterface.Xenko.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />

diff --git a/BasicUI_Xenko/BasicUI_Xenko/BasicUI_Xenko.Windows/packages.config b/BasicUI_Xenko/BasicUI_Xenko/BasicUI_Xenko.Windows/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="EmptyKeysUI_Xenko" version="2.4.0.0" targetFramework="net45" />
+  <package id="EmptyKeysUI_Xenko" version="2.5.0.0" targetFramework="net45" />
 </packages>
diff --git a/BasicUI_Xenko/BasicUI_Xenko/BasicUI_Xenko.xkpkg b/BasicUI_Xenko/BasicUI_Xenko/BasicUI_Xenko.xkpkg
@@ -10,7 +10,7 @@ Meta:
     RootNamespace: BasicUI_Xenko
     Dependencies:
         -   Name: Xenko
-            Version: 1.7.0-alpha03
+            Version: 1.8.0-beta
             RootAssets: []
 LocalDependencies: []
 Profiles:

diff --git a/BasicUI_Xenko/UserInterface/UserInterface.csproj b/BasicUI_Xenko/UserInterface/UserInterface.csproj
@@ -32,8 +32,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="EmptyKeys.UserInterface.Designer, Version=2.4.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\EmptyKeysUI_Generator.2.4.0.0\lib\net45\EmptyKeys.UserInterface.Designer.dll</HintPath>
+    <Reference Include="EmptyKeys.UserInterface.Designer, Version=2.5.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\EmptyKeysUI_Generator.2.5.0.0\lib\net45\EmptyKeys.UserInterface.Designer.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />

diff --git a/BasicUI_Xenko/UserInterface/packages.config b/BasicUI_Xenko/UserInterface/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="EmptyKeysUI_Generator" version="2.4.0.0" targetFramework="net45" />
+  <package id="EmptyKeysUI_Generator" version="2.5.0.0" targetFramework="net45" />
 </packages>