Skip to content

Commit cdc631b

Browse files
committed
Update UI v2.5, Xenko v1.8.0-beta
1 parent b6d3e28 commit cdc631b

File tree

12 files changed

+36
-35
lines changed

12 files changed

+36
-35
lines changed

BasicUI_Xenko/BasicUI_Xenko.sln

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
33
VisualStudioVersion = 14.0.25420.1
44
MinimumVisualStudioVersion = 10.0.40219.1
55
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "BasicUI_Xenko", "BasicUI_Xenko", "{650DFDF3-E237-4050-9753-C4C4776B0A90}"
6+
ProjectSection(SolutionItems) = preProject
7+
BasicUI_Xenko\BasicUI_Xenko.xkpkg = BasicUI_Xenko\BasicUI_Xenko.xkpkg
8+
EndProjectSection
69
ProjectSection(SiliconStudioPackage) = preProject
710
BasicUI_Xenko/BasicUI_Xenko.xkpkg = BasicUI_Xenko/BasicUI_Xenko.xkpkg
811
EndProjectSection

BasicUI_Xenko/BasicUI_Xenko/BasicUI_Xenko.Game/BasicUI_Xenko.Game.csproj

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -96,20 +96,20 @@
9696
</ProjectReference>
9797
</ItemGroup>
9898
<ItemGroup>
99-
<Reference Include="EmptyKeys.UserInterface, Version=2.4.0.0, Culture=neutral, processorArchitecture=MSIL">
100-
<HintPath>..\..\packages\EmptyKeysUI_Xenko.2.4.0.0\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\Common\AnyCPU\EmptyKeys.UserInterface.dll</HintPath>
99+
<Reference Include="EmptyKeys.UserInterface, Version=2.5.0.0, Culture=neutral, processorArchitecture=MSIL">
100+
<HintPath>..\..\packages\EmptyKeysUI_Xenko.2.5.0.0\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\Common\AnyCPU\EmptyKeys.UserInterface.dll</HintPath>
101101
<Private>True</Private>
102102
</Reference>
103-
<Reference Include="EmptyKeys.UserInterface.Core, Version=2.4.0.0, Culture=neutral, processorArchitecture=MSIL">
104-
<HintPath>..\..\packages\EmptyKeysUI_Xenko.2.4.0.0\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\Common\AnyCPU\EmptyKeys.UserInterface.Core.dll</HintPath>
103+
<Reference Include="EmptyKeys.UserInterface.Core, Version=2.5.0.0, Culture=neutral, processorArchitecture=MSIL">
104+
<HintPath>..\..\packages\EmptyKeysUI_Xenko.2.5.0.0\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\Common\AnyCPU\EmptyKeys.UserInterface.Core.dll</HintPath>
105105
<Private>True</Private>
106106
</Reference>
107-
<Reference Include="EmptyKeys.UserInterface.Debug, Version=2.4.0.0, Culture=neutral, processorArchitecture=MSIL">
108-
<HintPath>..\..\packages\EmptyKeysUI_Xenko.2.4.0.0\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\Common\AnyCPU\EmptyKeys.UserInterface.Debug.dll</HintPath>
107+
<Reference Include="EmptyKeys.UserInterface.Debug, Version=2.5.0.0, Culture=neutral, processorArchitecture=MSIL">
108+
<HintPath>..\..\packages\EmptyKeysUI_Xenko.2.5.0.0\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\Common\AnyCPU\EmptyKeys.UserInterface.Debug.dll</HintPath>
109109
<Private>True</Private>
110110
</Reference>
111-
<Reference Include="EmptyKeys.UserInterface.Xenko, Version=2.4.0.0, Culture=neutral, processorArchitecture=MSIL">
112-
<HintPath>..\..\packages\EmptyKeysUI_Xenko.2.4.0.0\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\Xenko\AnyCPU\EmptyKeys.UserInterface.Xenko.dll</HintPath>
111+
<Reference Include="EmptyKeys.UserInterface.Xenko, Version=2.5.0.0, Culture=neutral, processorArchitecture=MSIL">
112+
<HintPath>..\..\packages\EmptyKeysUI_Xenko.2.5.0.0\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\Xenko\AnyCPU\EmptyKeys.UserInterface.Xenko.dll</HintPath>
113113
<Private>True</Private>
114114
</Reference>
115115
</ItemGroup>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="EmptyKeysUI_Xenko" version="2.4.0.0" targetFramework="portable46-net451+win81+wpa81" />
3+
<package id="EmptyKeysUI_Xenko" version="2.5.0.0" targetFramework="portable46-net451+win81+wpa81" />
44
</packages>

BasicUI_Xenko/BasicUI_Xenko/BasicUI_Xenko.UserInterface/BasicUI_Xenko.UserInterface.csproj

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,20 +39,20 @@
3939
<Compile Include="Properties\AssemblyInfo.cs" />
4040
</ItemGroup>
4141
<ItemGroup>
42-
<Reference Include="EmptyKeys.UserInterface, Version=2.4.0.0, Culture=neutral, processorArchitecture=MSIL">
43-
<HintPath>..\..\packages\EmptyKeysUI_Xenko.2.4.0.0\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\Common\AnyCPU\EmptyKeys.UserInterface.dll</HintPath>
42+
<Reference Include="EmptyKeys.UserInterface, Version=2.5.0.0, Culture=neutral, processorArchitecture=MSIL">
43+
<HintPath>..\..\packages\EmptyKeysUI_Xenko.2.5.0.0\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\Common\AnyCPU\EmptyKeys.UserInterface.dll</HintPath>
4444
<Private>True</Private>
4545
</Reference>
46-
<Reference Include="EmptyKeys.UserInterface.Core, Version=2.4.0.0, Culture=neutral, processorArchitecture=MSIL">
47-
<HintPath>..\..\packages\EmptyKeysUI_Xenko.2.4.0.0\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\Common\AnyCPU\EmptyKeys.UserInterface.Core.dll</HintPath>
46+
<Reference Include="EmptyKeys.UserInterface.Core, Version=2.5.0.0, Culture=neutral, processorArchitecture=MSIL">
47+
<HintPath>..\..\packages\EmptyKeysUI_Xenko.2.5.0.0\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\Common\AnyCPU\EmptyKeys.UserInterface.Core.dll</HintPath>
4848
<Private>True</Private>
4949
</Reference>
50-
<Reference Include="EmptyKeys.UserInterface.Debug, Version=2.4.0.0, Culture=neutral, processorArchitecture=MSIL">
51-
<HintPath>..\..\packages\EmptyKeysUI_Xenko.2.4.0.0\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\Common\AnyCPU\EmptyKeys.UserInterface.Debug.dll</HintPath>
50+
<Reference Include="EmptyKeys.UserInterface.Debug, Version=2.5.0.0, Culture=neutral, processorArchitecture=MSIL">
51+
<HintPath>..\..\packages\EmptyKeysUI_Xenko.2.5.0.0\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\Common\AnyCPU\EmptyKeys.UserInterface.Debug.dll</HintPath>
5252
<Private>True</Private>
5353
</Reference>
54-
<Reference Include="EmptyKeys.UserInterface.Xenko, Version=2.4.0.0, Culture=neutral, processorArchitecture=MSIL">
55-
<HintPath>..\..\packages\EmptyKeysUI_Xenko.2.4.0.0\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\Xenko\AnyCPU\EmptyKeys.UserInterface.Xenko.dll</HintPath>
54+
<Reference Include="EmptyKeys.UserInterface.Xenko, Version=2.5.0.0, Culture=neutral, processorArchitecture=MSIL">
55+
<HintPath>..\..\packages\EmptyKeysUI_Xenko.2.5.0.0\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\Xenko\AnyCPU\EmptyKeys.UserInterface.Xenko.dll</HintPath>
5656
<Private>True</Private>
5757
</Reference>
5858
</ItemGroup>

BasicUI_Xenko/BasicUI_Xenko/BasicUI_Xenko.UserInterface/GeneratedUI/BasicUI.xaml.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ namespace EmptyKeys.UserInterface.Generated {
2424
using EmptyKeys.UserInterface.Themes;
2525

2626

27-
[GeneratedCodeAttribute("Empty Keys UI Generator", "2.4.0.0")]
27+
[GeneratedCodeAttribute("Empty Keys UI Generator", "2.5.0.0")]
2828
public partial class BasicUI : UIRoot {
2929

3030
private Grid e_0;

BasicUI_Xenko/BasicUI_Xenko/BasicUI_Xenko.UserInterface/GeneratedUI/Dictionary.xaml.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ namespace EmptyKeys.UserInterface.Generated {
2424
using EmptyKeys.UserInterface.Themes;
2525

2626

27-
[GeneratedCodeAttribute("Empty Keys UI Generator", "2.4.0.0")]
27+
[GeneratedCodeAttribute("Empty Keys UI Generator", "2.5.0.0")]
2828
public sealed class Dictionary : ResourceDictionary {
2929

3030
private static Dictionary singleton = new Dictionary();
@@ -132,8 +132,6 @@ private void InitializeResources() {
132132
// Resource - [ToolTipText] String
133133
this.Add("ToolTipText", "Click to open message box");
134134
ImageManager.Instance.AddImage("Images/EmptyKeysLogoTextSmall");
135-
FontManager.Instance.AddFont("Segoe UI", 13.33333F, FontStyle.Regular, "Segoe_UI_10_Regular");
136-
FontManager.Instance.AddFont("Segoe UI", 20F, FontStyle.Bold, "Segoe_UI_15_Bold");
137135
}
138136
}
139137
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="EmptyKeysUI_Xenko" version="2.4.0.0" targetFramework="portable46-net451+win81+wpa81" />
3+
<package id="EmptyKeysUI_Xenko" version="2.5.0.0" targetFramework="portable46-net451+win81+wpa81" />
44
</packages>

BasicUI_Xenko/BasicUI_Xenko/BasicUI_Xenko.Windows/BasicUI_Xenko.Windows.csproj

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -62,20 +62,20 @@
6262
<WarningLevel>4</WarningLevel>
6363
</PropertyGroup>
6464
<ItemGroup>
65-
<Reference Include="EmptyKeys.UserInterface, Version=2.4.0.0, Culture=neutral, processorArchitecture=MSIL">
66-
<HintPath>..\..\packages\EmptyKeysUI_Xenko.2.4.0.0\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\Common\AnyCPU\EmptyKeys.UserInterface.dll</HintPath>
65+
<Reference Include="EmptyKeys.UserInterface, Version=2.5.0.0, Culture=neutral, processorArchitecture=MSIL">
66+
<HintPath>..\..\packages\EmptyKeysUI_Xenko.2.5.0.0\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\Common\AnyCPU\EmptyKeys.UserInterface.dll</HintPath>
6767
<Private>True</Private>
6868
</Reference>
69-
<Reference Include="EmptyKeys.UserInterface.Core, Version=2.4.0.0, Culture=neutral, processorArchitecture=MSIL">
70-
<HintPath>..\..\packages\EmptyKeysUI_Xenko.2.4.0.0\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\Common\AnyCPU\EmptyKeys.UserInterface.Core.dll</HintPath>
69+
<Reference Include="EmptyKeys.UserInterface.Core, Version=2.5.0.0, Culture=neutral, processorArchitecture=MSIL">
70+
<HintPath>..\..\packages\EmptyKeysUI_Xenko.2.5.0.0\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\Common\AnyCPU\EmptyKeys.UserInterface.Core.dll</HintPath>
7171
<Private>True</Private>
7272
</Reference>
73-
<Reference Include="EmptyKeys.UserInterface.Debug, Version=2.4.0.0, Culture=neutral, processorArchitecture=MSIL">
74-
<HintPath>..\..\packages\EmptyKeysUI_Xenko.2.4.0.0\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\Common\AnyCPU\EmptyKeys.UserInterface.Debug.dll</HintPath>
73+
<Reference Include="EmptyKeys.UserInterface.Debug, Version=2.5.0.0, Culture=neutral, processorArchitecture=MSIL">
74+
<HintPath>..\..\packages\EmptyKeysUI_Xenko.2.5.0.0\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\Common\AnyCPU\EmptyKeys.UserInterface.Debug.dll</HintPath>
7575
<Private>True</Private>
7676
</Reference>
77-
<Reference Include="EmptyKeys.UserInterface.Xenko, Version=2.4.0.0, Culture=neutral, processorArchitecture=MSIL">
78-
<HintPath>..\..\packages\EmptyKeysUI_Xenko.2.4.0.0\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\Xenko\AnyCPU\EmptyKeys.UserInterface.Xenko.dll</HintPath>
77+
<Reference Include="EmptyKeys.UserInterface.Xenko, Version=2.5.0.0, Culture=neutral, processorArchitecture=MSIL">
78+
<HintPath>..\..\packages\EmptyKeysUI_Xenko.2.5.0.0\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\Xenko\AnyCPU\EmptyKeys.UserInterface.Xenko.dll</HintPath>
7979
<Private>True</Private>
8080
</Reference>
8181
<Reference Include="System" />
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="EmptyKeysUI_Xenko" version="2.4.0.0" targetFramework="net45" />
3+
<package id="EmptyKeysUI_Xenko" version="2.5.0.0" targetFramework="net45" />
44
</packages>

BasicUI_Xenko/BasicUI_Xenko/BasicUI_Xenko.xkpkg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Meta:
1010
RootNamespace: BasicUI_Xenko
1111
Dependencies:
1212
- Name: Xenko
13-
Version: 1.7.0-alpha03
13+
Version: 1.8.0-beta
1414
RootAssets: []
1515
LocalDependencies: []
1616
Profiles:

0 commit comments

Comments
 (0)