зеркало из https://github.com/jsuarezruiz/HotUI.git
Fixed compilation issues on windows.
This commit is contained in:
Jon Lipsky
Родитель
9c7e0b43fe
Коммит
19130da653
97
HotUI.sln
97
HotUI.sln
|
|
@ -11,16 +11,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Sample", "Sample", "{C3FDCD
|
|||
EndProject
|
||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Platforms", "Platforms", "{AB9AD206-4B1E-4B0C-88A2-5C769314E8A4}"
|
||||
EndProject
|
||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Forms", "Forms", "{3D79CEB1-37D9-4BA3-ACF3-DC9A89C92571}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HotUI.Forms.Sample", "sample\Forms\HotUI.Forms.Sample\HotUI.Forms.Sample.csproj", "{618C336D-1E53-49B9-A554-7D2B9671DEC5}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HotUI.Forms", "src\HotUI.Forms\HotUI.Forms.csproj", "{92415B8D-D51B-46A1-A6E6-EF8C3B749067}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HotUI.Forms.Sample.Android", "sample\Forms\HotUI.Forms.Sample.Android\HotUI.Forms.Sample.Android.csproj", "{9D3CC647-89F9-4BD5-B5E8-29100F640FCA}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HotUI.Forms.Sample.iOS", "sample\Forms\HotUI.Forms.Sample.iOS\HotUI.Forms.Sample.iOS.csproj", "{1E09C5C6-52C2-448D-80E8-A00858BBFF4B}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HotUI.iOS", "src\HotUI.iOS\HotUI.iOS.csproj", "{9DF36DBF-AFE6-438D-B7A6-1B5FB3D1D6D1}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HotUI.iOS.Sample", "sample\HotUI.iOS.Sample\HotUI.iOS.Sample.csproj", "{12BE5947-A64A-4968-96A6-5CA3CE36C244}"
|
||||
|
|
@ -135,34 +127,6 @@ Global
|
|||
{1817646E-E71E-48CF-80A4-3030EF870D61}.Release|x64.Build.0 = Release|Any CPU
|
||||
{1817646E-E71E-48CF-80A4-3030EF870D61}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{1817646E-E71E-48CF-80A4-3030EF870D61}.Release|x86.Build.0 = Release|Any CPU
|
||||
{618C336D-1E53-49B9-A554-7D2B9671DEC5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{618C336D-1E53-49B9-A554-7D2B9671DEC5}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{618C336D-1E53-49B9-A554-7D2B9671DEC5}.Debug|ARM.ActiveCfg = Debug|Any CPU
|
||||
{618C336D-1E53-49B9-A554-7D2B9671DEC5}.Debug|ARM.Build.0 = Debug|Any CPU
|
||||
{618C336D-1E53-49B9-A554-7D2B9671DEC5}.Debug|ARM64.ActiveCfg = Debug|Any CPU
|
||||
{618C336D-1E53-49B9-A554-7D2B9671DEC5}.Debug|ARM64.Build.0 = Debug|Any CPU
|
||||
{618C336D-1E53-49B9-A554-7D2B9671DEC5}.Debug|iPhone.ActiveCfg = Debug|Any CPU
|
||||
{618C336D-1E53-49B9-A554-7D2B9671DEC5}.Debug|iPhone.Build.0 = Debug|Any CPU
|
||||
{618C336D-1E53-49B9-A554-7D2B9671DEC5}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
|
||||
{618C336D-1E53-49B9-A554-7D2B9671DEC5}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
|
||||
{618C336D-1E53-49B9-A554-7D2B9671DEC5}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||
{618C336D-1E53-49B9-A554-7D2B9671DEC5}.Debug|x64.Build.0 = Debug|Any CPU
|
||||
{618C336D-1E53-49B9-A554-7D2B9671DEC5}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{618C336D-1E53-49B9-A554-7D2B9671DEC5}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{618C336D-1E53-49B9-A554-7D2B9671DEC5}.Release|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{618C336D-1E53-49B9-A554-7D2B9671DEC5}.Release|Any CPU.Build.0 = Debug|Any CPU
|
||||
{618C336D-1E53-49B9-A554-7D2B9671DEC5}.Release|ARM.ActiveCfg = Release|Any CPU
|
||||
{618C336D-1E53-49B9-A554-7D2B9671DEC5}.Release|ARM.Build.0 = Release|Any CPU
|
||||
{618C336D-1E53-49B9-A554-7D2B9671DEC5}.Release|ARM64.ActiveCfg = Release|Any CPU
|
||||
{618C336D-1E53-49B9-A554-7D2B9671DEC5}.Release|ARM64.Build.0 = Release|Any CPU
|
||||
{618C336D-1E53-49B9-A554-7D2B9671DEC5}.Release|iPhone.ActiveCfg = Release|Any CPU
|
||||
{618C336D-1E53-49B9-A554-7D2B9671DEC5}.Release|iPhone.Build.0 = Release|Any CPU
|
||||
{618C336D-1E53-49B9-A554-7D2B9671DEC5}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
|
||||
{618C336D-1E53-49B9-A554-7D2B9671DEC5}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
|
||||
{618C336D-1E53-49B9-A554-7D2B9671DEC5}.Release|x64.ActiveCfg = Release|Any CPU
|
||||
{618C336D-1E53-49B9-A554-7D2B9671DEC5}.Release|x64.Build.0 = Release|Any CPU
|
||||
{618C336D-1E53-49B9-A554-7D2B9671DEC5}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{618C336D-1E53-49B9-A554-7D2B9671DEC5}.Release|x86.Build.0 = Release|Any CPU
|
||||
{92415B8D-D51B-46A1-A6E6-EF8C3B749067}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{92415B8D-D51B-46A1-A6E6-EF8C3B749067}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{92415B8D-D51B-46A1-A6E6-EF8C3B749067}.Debug|ARM.ActiveCfg = Debug|Any CPU
|
||||
|
|
@ -191,63 +155,6 @@ Global
|
|||
{92415B8D-D51B-46A1-A6E6-EF8C3B749067}.Release|x64.Build.0 = Release|Any CPU
|
||||
{92415B8D-D51B-46A1-A6E6-EF8C3B749067}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{92415B8D-D51B-46A1-A6E6-EF8C3B749067}.Release|x86.Build.0 = Release|Any CPU
|
||||
{9D3CC647-89F9-4BD5-B5E8-29100F640FCA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{9D3CC647-89F9-4BD5-B5E8-29100F640FCA}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{9D3CC647-89F9-4BD5-B5E8-29100F640FCA}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
|
||||
{9D3CC647-89F9-4BD5-B5E8-29100F640FCA}.Debug|ARM.ActiveCfg = Debug|Any CPU
|
||||
{9D3CC647-89F9-4BD5-B5E8-29100F640FCA}.Debug|ARM.Build.0 = Debug|Any CPU
|
||||
{9D3CC647-89F9-4BD5-B5E8-29100F640FCA}.Debug|ARM.Deploy.0 = Debug|Any CPU
|
||||
{9D3CC647-89F9-4BD5-B5E8-29100F640FCA}.Debug|ARM64.ActiveCfg = Debug|Any CPU
|
||||
{9D3CC647-89F9-4BD5-B5E8-29100F640FCA}.Debug|ARM64.Build.0 = Debug|Any CPU
|
||||
{9D3CC647-89F9-4BD5-B5E8-29100F640FCA}.Debug|ARM64.Deploy.0 = Debug|Any CPU
|
||||
{9D3CC647-89F9-4BD5-B5E8-29100F640FCA}.Debug|iPhone.ActiveCfg = Debug|Any CPU
|
||||
{9D3CC647-89F9-4BD5-B5E8-29100F640FCA}.Debug|iPhone.Build.0 = Debug|Any CPU
|
||||
{9D3CC647-89F9-4BD5-B5E8-29100F640FCA}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
|
||||
{9D3CC647-89F9-4BD5-B5E8-29100F640FCA}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||
{9D3CC647-89F9-4BD5-B5E8-29100F640FCA}.Debug|x64.Build.0 = Debug|Any CPU
|
||||
{9D3CC647-89F9-4BD5-B5E8-29100F640FCA}.Debug|x64.Deploy.0 = Debug|Any CPU
|
||||
{9D3CC647-89F9-4BD5-B5E8-29100F640FCA}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||
{9D3CC647-89F9-4BD5-B5E8-29100F640FCA}.Debug|x86.Build.0 = Debug|Any CPU
|
||||
{9D3CC647-89F9-4BD5-B5E8-29100F640FCA}.Debug|x86.Deploy.0 = Debug|Any CPU
|
||||
{9D3CC647-89F9-4BD5-B5E8-29100F640FCA}.Release|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{9D3CC647-89F9-4BD5-B5E8-29100F640FCA}.Release|Any CPU.Build.0 = Debug|Any CPU
|
||||
{9D3CC647-89F9-4BD5-B5E8-29100F640FCA}.Release|Any CPU.Deploy.0 = Debug|Any CPU
|
||||
{9D3CC647-89F9-4BD5-B5E8-29100F640FCA}.Release|ARM.ActiveCfg = Release|Any CPU
|
||||
{9D3CC647-89F9-4BD5-B5E8-29100F640FCA}.Release|ARM.Build.0 = Release|Any CPU
|
||||
{9D3CC647-89F9-4BD5-B5E8-29100F640FCA}.Release|ARM.Deploy.0 = Release|Any CPU
|
||||
{9D3CC647-89F9-4BD5-B5E8-29100F640FCA}.Release|ARM64.ActiveCfg = Release|Any CPU
|
||||
{9D3CC647-89F9-4BD5-B5E8-29100F640FCA}.Release|ARM64.Build.0 = Release|Any CPU
|
||||
{9D3CC647-89F9-4BD5-B5E8-29100F640FCA}.Release|ARM64.Deploy.0 = Release|Any CPU
|
||||
{9D3CC647-89F9-4BD5-B5E8-29100F640FCA}.Release|iPhone.ActiveCfg = Release|Any CPU
|
||||
{9D3CC647-89F9-4BD5-B5E8-29100F640FCA}.Release|iPhone.Build.0 = Release|Any CPU
|
||||
{9D3CC647-89F9-4BD5-B5E8-29100F640FCA}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
|
||||
{9D3CC647-89F9-4BD5-B5E8-29100F640FCA}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
|
||||
{9D3CC647-89F9-4BD5-B5E8-29100F640FCA}.Release|x64.ActiveCfg = Release|Any CPU
|
||||
{9D3CC647-89F9-4BD5-B5E8-29100F640FCA}.Release|x64.Build.0 = Release|Any CPU
|
||||
{9D3CC647-89F9-4BD5-B5E8-29100F640FCA}.Release|x64.Deploy.0 = Release|Any CPU
|
||||
{9D3CC647-89F9-4BD5-B5E8-29100F640FCA}.Release|x86.ActiveCfg = Release|Any CPU
|
||||
{9D3CC647-89F9-4BD5-B5E8-29100F640FCA}.Release|x86.Build.0 = Release|Any CPU
|
||||
{9D3CC647-89F9-4BD5-B5E8-29100F640FCA}.Release|x86.Deploy.0 = Release|Any CPU
|
||||
{1E09C5C6-52C2-448D-80E8-A00858BBFF4B}.Debug|Any CPU.ActiveCfg = Debug|iPhoneSimulator
|
||||
{1E09C5C6-52C2-448D-80E8-A00858BBFF4B}.Debug|Any CPU.Build.0 = Debug|iPhoneSimulator
|
||||
{1E09C5C6-52C2-448D-80E8-A00858BBFF4B}.Debug|ARM.ActiveCfg = Debug|iPhone
|
||||
{1E09C5C6-52C2-448D-80E8-A00858BBFF4B}.Debug|ARM64.ActiveCfg = Debug|iPhone
|
||||
{1E09C5C6-52C2-448D-80E8-A00858BBFF4B}.Debug|iPhone.ActiveCfg = Debug|iPhone
|
||||
{1E09C5C6-52C2-448D-80E8-A00858BBFF4B}.Debug|iPhone.Build.0 = Debug|iPhone
|
||||
{1E09C5C6-52C2-448D-80E8-A00858BBFF4B}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
|
||||
{1E09C5C6-52C2-448D-80E8-A00858BBFF4B}.Debug|iPhoneSimulator.Build.0 = Debug|iPhoneSimulator
|
||||
{1E09C5C6-52C2-448D-80E8-A00858BBFF4B}.Debug|x64.ActiveCfg = Debug|iPhone
|
||||
{1E09C5C6-52C2-448D-80E8-A00858BBFF4B}.Debug|x86.ActiveCfg = Debug|iPhone
|
||||
{1E09C5C6-52C2-448D-80E8-A00858BBFF4B}.Release|Any CPU.ActiveCfg = Debug|iPhoneSimulator
|
||||
{1E09C5C6-52C2-448D-80E8-A00858BBFF4B}.Release|Any CPU.Build.0 = Debug|iPhoneSimulator
|
||||
{1E09C5C6-52C2-448D-80E8-A00858BBFF4B}.Release|ARM.ActiveCfg = Release|iPhoneSimulator
|
||||
{1E09C5C6-52C2-448D-80E8-A00858BBFF4B}.Release|ARM64.ActiveCfg = Release|iPhoneSimulator
|
||||
{1E09C5C6-52C2-448D-80E8-A00858BBFF4B}.Release|iPhone.ActiveCfg = Release|iPhone
|
||||
{1E09C5C6-52C2-448D-80E8-A00858BBFF4B}.Release|iPhone.Build.0 = Release|iPhone
|
||||
{1E09C5C6-52C2-448D-80E8-A00858BBFF4B}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
|
||||
{1E09C5C6-52C2-448D-80E8-A00858BBFF4B}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
|
||||
{1E09C5C6-52C2-448D-80E8-A00858BBFF4B}.Release|x64.ActiveCfg = Release|iPhoneSimulator
|
||||
{1E09C5C6-52C2-448D-80E8-A00858BBFF4B}.Release|x86.ActiveCfg = Release|iPhoneSimulator
|
||||
{9DF36DBF-AFE6-438D-B7A6-1B5FB3D1D6D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{9DF36DBF-AFE6-438D-B7A6-1B5FB3D1D6D1}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{9DF36DBF-AFE6-438D-B7A6-1B5FB3D1D6D1}.Debug|ARM.ActiveCfg = Debug|Any CPU
|
||||
|
|
@ -764,11 +671,7 @@ Global
|
|||
EndGlobalSection
|
||||
GlobalSection(NestedProjects) = preSolution
|
||||
{B2AB3B6E-89C6-4223-ACFF-4E3C027868A9} = {AB9AD206-4B1E-4B0C-88A2-5C769314E8A4}
|
||||
{3D79CEB1-37D9-4BA3-ACF3-DC9A89C92571} = {C3FDCDB7-0C29-472D-A406-E2F21A4B0EAE}
|
||||
{618C336D-1E53-49B9-A554-7D2B9671DEC5} = {3D79CEB1-37D9-4BA3-ACF3-DC9A89C92571}
|
||||
{92415B8D-D51B-46A1-A6E6-EF8C3B749067} = {AB9AD206-4B1E-4B0C-88A2-5C769314E8A4}
|
||||
{9D3CC647-89F9-4BD5-B5E8-29100F640FCA} = {3D79CEB1-37D9-4BA3-ACF3-DC9A89C92571}
|
||||
{1E09C5C6-52C2-448D-80E8-A00858BBFF4B} = {3D79CEB1-37D9-4BA3-ACF3-DC9A89C92571}
|
||||
{9DF36DBF-AFE6-438D-B7A6-1B5FB3D1D6D1} = {AB9AD206-4B1E-4B0C-88A2-5C769314E8A4}
|
||||
{12BE5947-A64A-4968-96A6-5CA3CE36C244} = {C3FDCDB7-0C29-472D-A406-E2F21A4B0EAE}
|
||||
{D058A769-9AE6-438F-960C-2ECC287F6D1E} = {C3FDCDB7-0C29-472D-A406-E2F21A4B0EAE}
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ namespace HotUI.Forms.Sample.Droid {
|
|||
|
||||
Xamarin.Essentials.Platform.Init (this, savedInstanceState);
|
||||
global::Xamarin.Forms.Forms.Init (this, savedInstanceState);
|
||||
LoadApplication (new App ());
|
||||
LoadApplication (new HotUI.Forms.Sample.App());
|
||||
}
|
||||
public override void OnRequestPermissionsResult (int requestCode, string [] permissions, [GeneratedEnum] Android.Content.PM.Permission [] grantResults)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
using System.Collections.Generic;
|
||||
using Android.Widget;
|
||||
using AView = Android.Views.View;
|
||||
using AOrientation = Android.Widget.Orientation;
|
||||
|
||||
namespace HotUI.Android.Handlers
|
||||
{
|
||||
|
|
@ -11,7 +12,7 @@ namespace HotUI.Android.Handlers
|
|||
|
||||
public HStackHandler() : base(AndroidContext.CurrentContext)
|
||||
{
|
||||
Orientation = Orientation.Vertical;
|
||||
Orientation = AOrientation.Vertical;
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
using System.Collections.Generic;
|
||||
using Android.Widget;
|
||||
using AView = Android.Views.View;
|
||||
using AOrientation = Android.Widget.Orientation;
|
||||
|
||||
namespace HotUI.Android.Handlers
|
||||
{
|
||||
|
|
@ -11,7 +12,7 @@ namespace HotUI.Android.Handlers
|
|||
|
||||
public VStackHandler() : base(AndroidContext.CurrentContext)
|
||||
{
|
||||
Orientation = Orientation.Vertical;
|
||||
Orientation = AOrientation.Vertical;
|
||||
}
|
||||
|
||||
public AView View => this;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
using Windows.UI.Xaml.Controls;
|
||||
// ReSharper disable ClassNeverInstantiated.Global
|
||||
using UWPOrientation = Windows.UI.Xaml.Controls.Orientation;
|
||||
|
||||
namespace HotUI.UWP.Handlers
|
||||
{
|
||||
|
|
@ -8,7 +9,7 @@ namespace HotUI.UWP.Handlers
|
|||
|
||||
public HStackHandler()
|
||||
{
|
||||
Orientation = Orientation.Horizontal;
|
||||
Orientation = UWPOrientation.Horizontal;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,5 +1,6 @@
|
|||
using Windows.UI.Xaml.Controls;
|
||||
// ReSharper disable ClassNeverInstantiated.Global
|
||||
using UWPOrientation = Windows.UI.Xaml.Controls.Orientation;
|
||||
|
||||
namespace HotUI.UWP.Handlers
|
||||
{
|
||||
|
|
@ -7,7 +8,7 @@ namespace HotUI.UWP.Handlers
|
|||
{
|
||||
public VStackHandler()
|
||||
{
|
||||
Orientation = Orientation.Vertical;
|
||||
Orientation = UWPOrientation.Vertical;
|
||||
}
|
||||
}
|
||||
}
|
||||
Загрузка…
Ссылка в новой задаче