Updated Xamarin forms and replaced main page with grid instead of master
This commit is contained in:
@@ -1,5 +1,6 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<Import Project="..\packages\Xamarin.Forms.4.1.0.581479\build\Xamarin.Forms.props" Condition="Exists('..\packages\Xamarin.Forms.4.1.0.581479\build\Xamarin.Forms.props')" />
|
||||
<Import Project="..\packages\Grpc.Tools.1.21.0\build\Grpc.Tools.props" Condition="Exists('..\packages\Grpc.Tools.1.21.0\build\Grpc.Tools.props')" />
|
||||
<Import Project="..\packages\Xamarin.Forms.3.6.0.344457\build\Xamarin.Forms.props" Condition="Exists('..\packages\Xamarin.Forms.3.6.0.344457\build\Xamarin.Forms.props')" />
|
||||
<PropertyGroup>
|
||||
@@ -48,22 +49,22 @@
|
||||
</Reference>
|
||||
<Reference Include="Mono.Posix" />
|
||||
<Reference Include="Xamarin.Forms.Core">
|
||||
<HintPath>..\packages\Xamarin.Forms.3.6.0.344457\lib\netstandard2.0\Xamarin.Forms.Core.dll</HintPath>
|
||||
<HintPath>..\packages\Xamarin.Forms.4.1.0.581479\lib\netstandard2.0\Xamarin.Forms.Core.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Xamarin.Forms.Platform">
|
||||
<HintPath>..\packages\Xamarin.Forms.3.6.0.344457\lib\netstandard2.0\Xamarin.Forms.Platform.dll</HintPath>
|
||||
<HintPath>..\packages\Xamarin.Forms.4.1.0.581479\lib\netstandard2.0\Xamarin.Forms.Platform.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Xamarin.Forms.Xaml">
|
||||
<HintPath>..\packages\Xamarin.Forms.3.6.0.344457\lib\netstandard2.0\Xamarin.Forms.Xaml.dll</HintPath>
|
||||
<HintPath>..\packages\Xamarin.Forms.4.1.0.581479\lib\netstandard2.0\Xamarin.Forms.Xaml.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="OpenTK">
|
||||
<HintPath>..\packages\Xamarin.Forms.Platform.GTK.3.6.0.344457\lib\net45\OpenTK.dll</HintPath>
|
||||
<HintPath>..\packages\OpenTK.3.0.1\lib\net20\OpenTK.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="webkit-sharp">
|
||||
<HintPath>..\packages\Xamarin.Forms.Platform.GTK.3.6.0.344457\lib\net45\webkit-sharp.dll</HintPath>
|
||||
<HintPath>..\packages\Xamarin.Forms.Platform.GTK.4.1.0.581479\lib\net45\webkit-sharp.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Xamarin.Forms.Platform.GTK">
|
||||
<HintPath>..\packages\Xamarin.Forms.Platform.GTK.3.6.0.344457\lib\net45\Xamarin.Forms.Platform.GTK.dll</HintPath>
|
||||
<HintPath>..\packages\Xamarin.Forms.Platform.GTK.4.1.0.581479\lib\net45\Xamarin.Forms.Platform.GTK.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Reflection">
|
||||
<HintPath>..\packages\System.Reflection.4.3.0\lib\net462\System.Reflection.dll</HintPath>
|
||||
@@ -492,4 +493,5 @@
|
||||
<Import Project="..\packages\VideoLAN.LibVLC.Mac.3.1.2\build\VideoLAN.LibVLC.Mac.targets" Condition="Exists('..\packages\VideoLAN.LibVLC.Mac.3.1.2\build\VideoLAN.LibVLC.Mac.targets')" />
|
||||
<Import Project="..\packages\Grpc.Tools.1.21.0\build\Grpc.Tools.targets" Condition="Exists('..\packages\Grpc.Tools.1.21.0\build\Grpc.Tools.targets')" />
|
||||
<Import Project="..\packages\Grpc.Core.1.21.0\build\net45\Grpc.Core.targets" Condition="Exists('..\packages\Grpc.Core.1.21.0\build\net45\Grpc.Core.targets')" />
|
||||
<Import Project="..\packages\Xamarin.Forms.4.1.0.581479\build\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.4.1.0.581479\build\Xamarin.Forms.targets')" />
|
||||
</Project>
|
||||
@@ -1,91 +1,25 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<configuration>
|
||||
<dllmap
|
||||
os="linux"
|
||||
dll="opengl32.dll"
|
||||
target="libGL.so.1"/>
|
||||
<dllmap
|
||||
os="linux"
|
||||
dll="glu32.dll"
|
||||
target="libGLU.so.1"/>
|
||||
<dllmap
|
||||
os="linux"
|
||||
dll="openal32.dll"
|
||||
target="libopenal.so.1"/>
|
||||
<dllmap
|
||||
os="linux"
|
||||
dll="alut.dll"
|
||||
target="libalut.so.0"/>
|
||||
<dllmap
|
||||
os="linux"
|
||||
dll="opencl.dll"
|
||||
target="libOpenCL.so"/>
|
||||
<dllmap
|
||||
os="linux"
|
||||
dll="libX11"
|
||||
target="libX11.so.6"/>
|
||||
<dllmap
|
||||
os="linux"
|
||||
dll="libXi"
|
||||
target="libXi.so.6"/>
|
||||
<dllmap
|
||||
os="linux"
|
||||
dll="SDL2.dll"
|
||||
target="libSDL2-2.0.so.0"/>
|
||||
<dllmap
|
||||
os="osx"
|
||||
dll="opengl32.dll"
|
||||
target="/System/Library/Frameworks/OpenGL.framework/OpenGL"/>
|
||||
<dllmap
|
||||
os="osx"
|
||||
dll="openal32.dll"
|
||||
target="/System/Library/Frameworks/OpenAL.framework/OpenAL"/>
|
||||
<dllmap
|
||||
os="osx"
|
||||
dll="alut.dll"
|
||||
target="/System/Library/Frameworks/OpenAL.framework/OpenAL"/>
|
||||
<dllmap
|
||||
os="osx"
|
||||
dll="libGLES.dll"
|
||||
target="/System/Library/Frameworks/OpenGLES.framework/OpenGLES"/>
|
||||
<dllmap
|
||||
os="osx"
|
||||
dll="libGLESv1_CM.dll"
|
||||
target="/System/Library/Frameworks/OpenGLES.framework/OpenGLES"/>
|
||||
<dllmap
|
||||
os="osx"
|
||||
dll="libGLESv2.dll"
|
||||
target="/System/Library/Frameworks/OpenGLES.framework/OpenGLES"/>
|
||||
<dllmap
|
||||
os="osx"
|
||||
dll="opencl.dll"
|
||||
target="/System/Library/Frameworks/OpenCL.framework/OpenCL"/>
|
||||
<dllmap
|
||||
os="osx"
|
||||
dll="SDL2.dll"
|
||||
target="libSDL2.dylib"/><!-- XQuartz compatibility (X11 on Mac) -->
|
||||
<dllmap
|
||||
os="osx"
|
||||
dll="libGL.so.1"
|
||||
target="/usr/X11/lib/libGL.dylib"/>
|
||||
<dllmap
|
||||
os="osx"
|
||||
dll="libX11"
|
||||
target="/usr/X11R6/lib/libX11.dylib"/>
|
||||
<dllmap
|
||||
os="osx"
|
||||
dll="libXcursor.so.1"
|
||||
target="/usr/X11/lib/libXcursor.dylib"/>
|
||||
<dllmap
|
||||
os="osx"
|
||||
dll="libXi"
|
||||
target="/usr/X11/lib/libXi.dylib"/>
|
||||
<dllmap
|
||||
os="osx"
|
||||
dll="libXinerama"
|
||||
target="/usr/X11/lib/libXinerama.dylib"/>
|
||||
<dllmap
|
||||
os="osx"
|
||||
dll="libXrandr.so.2"
|
||||
target="/usr/X11/lib/libXrandr.dylib"/>
|
||||
</configuration>
|
||||
<dllmap os="linux" dll="opengl32.dll" target="libGL.so.1"/>
|
||||
<dllmap os="linux" dll="glu32.dll" target="libGLU.so.1"/>
|
||||
<dllmap os="linux" dll="openal32.dll" target="libopenal.so.1"/>
|
||||
<dllmap os="linux" dll="alut.dll" target="libalut.so.0"/>
|
||||
<dllmap os="linux" dll="opencl.dll" target="libOpenCL.so"/>
|
||||
<dllmap os="linux" dll="libX11" target="libX11.so.6"/>
|
||||
<dllmap os="linux" dll="libXi" target="libXi.so.6"/>
|
||||
<dllmap os="linux" dll="SDL2.dll" target="libSDL2-2.0.so.0"/>
|
||||
<dllmap os="osx" dll="opengl32.dll" target="/System/Library/Frameworks/OpenGL.framework/OpenGL"/>
|
||||
<dllmap os="osx" dll="openal32.dll" target="/System/Library/Frameworks/OpenAL.framework/OpenAL" />
|
||||
<dllmap os="osx" dll="alut.dll" target="/System/Library/Frameworks/OpenAL.framework/OpenAL" />
|
||||
<dllmap os="osx" dll="libGLES.dll" target="/System/Library/Frameworks/OpenGLES.framework/OpenGLES" />
|
||||
<dllmap os="osx" dll="libGLESv1_CM.dll" target="/System/Library/Frameworks/OpenGLES.framework/OpenGLES" />
|
||||
<dllmap os="osx" dll="libGLESv2.dll" target="/System/Library/Frameworks/OpenGLES.framework/OpenGLES" />
|
||||
<dllmap os="osx" dll="opencl.dll" target="/System/Library/Frameworks/OpenCL.framework/OpenCL"/>
|
||||
<dllmap os="osx" dll="SDL2.dll" target="libSDL2.dylib"/>
|
||||
<!-- XQuartz compatibility (X11 on Mac) -->
|
||||
<dllmap os="osx" dll="libGL.so.1" target="/usr/X11/lib/libGL.dylib"/>
|
||||
<dllmap os="osx" dll="libX11" target="/usr/X11/lib/libX11.dylib"/>
|
||||
<dllmap os="osx" dll="libXcursor.so.1" target="/usr/X11/lib/libXcursor.dylib"/>
|
||||
<dllmap os="osx" dll="libXi" target="/usr/X11/lib/libXi.dylib"/>
|
||||
<dllmap os="osx" dll="libXinerama" target="/usr/X11/lib/libXinerama.dylib"/>
|
||||
<dllmap os="osx" dll="libXrandr.so.2" target="/usr/X11/lib/libXrandr.dylib"/>
|
||||
</configuration>
|
||||
|
||||
@@ -12,6 +12,7 @@
|
||||
<package id="Microsoft.Bcl" version="1.1.8" targetFramework="net47" />
|
||||
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net47" />
|
||||
<package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net47" />
|
||||
<package id="OpenTK" version="3.0.1" targetFramework="net47" />
|
||||
<package id="Sharpnado.Forms.HorizontalListView" version="1.2.0" targetFramework="net47" />
|
||||
<package id="System.Interactive.Async" version="3.2.0" targetFramework="net47" />
|
||||
<package id="System.Reflection" version="4.3.0" targetFramework="net47" />
|
||||
@@ -22,7 +23,7 @@
|
||||
<package id="taglib-sharp-netstandard2.0" version="2.1.0" targetFramework="net47" />
|
||||
<package id="VideoLAN.LibVLC.Mac" version="3.1.2" targetFramework="net47" />
|
||||
<package id="Xam.Plugins.Settings" version="3.1.1" targetFramework="net47" />
|
||||
<package id="Xamarin.Forms" version="3.6.0.344457" targetFramework="net47" />
|
||||
<package id="Xamarin.Forms" version="4.1.0.581479" targetFramework="net47" />
|
||||
<package id="Xamarin.Forms.DataGrid" version="3.1.0" targetFramework="net47" />
|
||||
<package id="Xamarin.Forms.Platform.GTK" version="3.6.0.344457" targetFramework="net47" />
|
||||
<package id="Xamarin.Forms.Platform.GTK" version="4.1.0.581479" targetFramework="net47" />
|
||||
</packages>
|
||||
Reference in New Issue
Block a user