Update to OxyPlot 2.0.0-unstable0956
This commit is contained in:
Родитель
2dedab7dcd
Коммит
5a4673d682
|
@ -0,0 +1,5 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="OxyPlot.Core" version="2.0.0-unstable0956" targetFramework="monoandroid403" />
|
||||
<package id="OxyPlot.ExampleLibrary" version="2.0.0-unstable0956" targetFramework="monoandroid403" />
|
||||
</packages>
|
|
@ -20,6 +20,7 @@ namespace SimpleDemo.Droid
|
|||
base.OnCreate(bundle);
|
||||
|
||||
global::Xamarin.Forms.Forms.Init(this, bundle);
|
||||
OxyPlot.Xamarin.Forms.Platform.Android.PlotViewRenderer.Init();
|
||||
LoadApplication(new App());
|
||||
}
|
||||
}
|
||||
|
|
|
@ -133,6 +133,10 @@
|
|||
<AndroidResource Include="Resources\values\styles.xml" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\..\..\..\OxyPlot.Xamarin.Forms.Platform.Android\OxyPlot.Xamarin.Forms.Platform.Android.csproj">
|
||||
<Project>{a40ad708-3ff5-42fc-92b0-8d93ff1db58f}</Project>
|
||||
<Name>OxyPlot.Xamarin.Forms.Platform.Android</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\SimpleDemo\SimpleDemo.csproj">
|
||||
<Project>{7f63f896-92ca-4b3d-b61d-de628dba7cf9}</Project>
|
||||
<Name>SimpleDemo</Name>
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
{
|
||||
"dependencies": {
|
||||
"Microsoft.NETCore.UniversalWindowsPlatform": "5.2.2",
|
||||
"OxyPlot.Windows": "2.0.0-unstable0956",
|
||||
"Xamarin.Forms": "2.3.3.180"
|
||||
},
|
||||
"frameworks": {
|
||||
|
|
|
@ -23,6 +23,7 @@ namespace SimpleDemo.iOS
|
|||
public override bool FinishedLaunching(UIApplication app, NSDictionary options)
|
||||
{
|
||||
global::Xamarin.Forms.Forms.Init();
|
||||
OxyPlot.Xamarin.Forms.Platform.iOS.PlotViewRenderer.Init();
|
||||
LoadApplication(new App());
|
||||
|
||||
return base.FinishedLaunching(app, options);
|
||||
|
|
|
@ -138,6 +138,12 @@
|
|||
<Reference Include="Xamarin.iOS" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\..\..\..\OxyPlot.Xamarin.Forms.Platform.iOS\OxyPlot.Xamarin.Forms.Platform.iOS.csproj">
|
||||
<Project>{6b6e500b-b75c-4a27-a73e-9f4de5fe6ed3}</Project>
|
||||
<Name>OxyPlot.Xamarin.Forms.Platform.iOS</Name>
|
||||
<IsAppExtension>false</IsAppExtension>
|
||||
<IsWatchApp>false</IsWatchApp>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\SimpleDemo\SimpleDemo.csproj">
|
||||
<Project>{7f63f896-92ca-4b3d-b61d-de628dba7cf9}</Project>
|
||||
<Name>SimpleDemo</Name>
|
||||
|
|
|
@ -45,8 +45,8 @@
|
|||
</None>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="OxyPlot, Version=1.0.0.0, Culture=neutral, PublicKeyToken=638079a8f0bd61e9, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\..\..\packages\OxyPlot.Core.1.0.0\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1+Xamarin.iOS10\OxyPlot.dll</HintPath>
|
||||
<Reference Include="OxyPlot, Version=2.0.0.0, Culture=neutral, PublicKeyToken=638079a8f0bd61e9, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\..\..\packages\OxyPlot.Core.2.0.0-unstable0956\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1+Xamarin.iOS10\OxyPlot.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="Xamarin.Forms.Core, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="OxyPlot.Core" version="1.0.0" targetFramework="portable45-net45+win8+wp8+wpa81" />
|
||||
<package id="OxyPlot.Core" version="2.0.0-unstable0956" targetFramework="portable45-net45+win8+wp8+wpa81" />
|
||||
<package id="Xamarin.Forms" version="2.3.3.180" targetFramework="portable45-net45+win8+wp8+wpa81" />
|
||||
</packages>
|
|
@ -12,7 +12,7 @@
|
|||
<requireLicenseAcceptance>false</requireLicenseAcceptance>
|
||||
<tags>xamarin mac monomac unified-api plotting plot charting chart</tags>
|
||||
<dependencies>
|
||||
<dependency id="OxyPlot.Core" version="1.0.0"/>
|
||||
<dependency id="OxyPlot.Core" version="2.0.0-unstable0956"/>
|
||||
</dependencies>
|
||||
</metadata>
|
||||
<files>
|
||||
|
|
|
@ -41,8 +41,8 @@
|
|||
<ItemGroup>
|
||||
<Reference Include="Mono.Android" />
|
||||
<Reference Include="mscorlib" />
|
||||
<Reference Include="OxyPlot, Version=1.0.0.0, Culture=neutral, PublicKeyToken=638079a8f0bd61e9, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\OxyPlot.Core.1.0.0\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1+Xamarin.iOS10\OxyPlot.dll</HintPath>
|
||||
<Reference Include="OxyPlot, Version=2.0.0.0, Culture=neutral, PublicKeyToken=638079a8f0bd61e9, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\OxyPlot.Core.2.0.0-unstable0956\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1+Xamarin.iOS10\OxyPlot.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="System" />
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
<requireLicenseAcceptance>false</requireLicenseAcceptance>
|
||||
<tags>xamarin android plotting plot charting chart</tags>
|
||||
<dependencies>
|
||||
<dependency id="OxyPlot.Core" version="1.0.0"/>
|
||||
<dependency id="OxyPlot.Core" version="2.0.0-unstable0956"/>
|
||||
</dependencies>
|
||||
</metadata>
|
||||
<files>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="OxyPlot.Core" version="1.0.0" targetFramework="monoandroid403" />
|
||||
<package id="OxyPlot.Core" version="2.0.0-unstable0956" targetFramework="monoandroid60" />
|
||||
</packages>
|
|
@ -44,8 +44,8 @@
|
|||
</Reference>
|
||||
<Reference Include="Mono.Android" />
|
||||
<Reference Include="mscorlib" />
|
||||
<Reference Include="OxyPlot, Version=1.0.0.0, Culture=neutral, PublicKeyToken=638079a8f0bd61e9, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\OxyPlot.Core.1.0.0\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1+Xamarin.iOS10\OxyPlot.dll</HintPath>
|
||||
<Reference Include="OxyPlot, Version=2.0.0.0, Culture=neutral, PublicKeyToken=638079a8f0bd61e9, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\OxyPlot.Core.2.0.0-unstable0956\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1+Xamarin.iOS10\OxyPlot.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="System" />
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="OxyPlot.Core" version="1.0.0" targetFramework="monoandroid60" />
|
||||
<package id="OxyPlot.Core" version="2.0.0-unstable0956" targetFramework="monoandroid60" />
|
||||
<package id="Xamarin.Android.Support.Animated.Vector.Drawable" version="23.3.0" targetFramework="MonoAndroid60" />
|
||||
<package id="Xamarin.Android.Support.Design" version="23.3.0" targetFramework="MonoAndroid60" />
|
||||
<package id="Xamarin.Android.Support.v4" version="23.3.0" targetFramework="MonoAndroid60" />
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
{
|
||||
"dependencies": {
|
||||
"Microsoft.NETCore.UniversalWindowsPlatform": "5.2.2",
|
||||
"OxyPlot.Core": "1.0.0",
|
||||
"OxyPlot.Windows": "1.0.0",
|
||||
"OxyPlot.Core": "2.0.0-unstable0956",
|
||||
"OxyPlot.Windows": "2.0.0-unstable0956",
|
||||
"Xamarin.Forms": "2.3.3.180"
|
||||
},
|
||||
"frameworks": {
|
||||
|
|
|
@ -99,12 +99,12 @@
|
|||
<Reference Include="Microsoft.Phone.Controls.Toolkit">
|
||||
<HintPath>..\packages\WPtoolkit.4.2013.08.16\lib\wp8\Microsoft.Phone.Controls.Toolkit.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="OxyPlot, Version=1.0.0.0, Culture=neutral, PublicKeyToken=638079a8f0bd61e9, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\OxyPlot.Core.1.0.0\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1+Xamarin.iOS10\OxyPlot.dll</HintPath>
|
||||
<Reference Include="OxyPlot, Version=2.0.0.0, Culture=neutral, PublicKeyToken=638079a8f0bd61e9, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\OxyPlot.Core.2.0.0-unstable0956\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1+Xamarin.iOS10\OxyPlot.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="OxyPlot.WP8, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\OxyPlot.WP8.1.0.0\lib\windowsphone8\OxyPlot.WP8.dll</HintPath>
|
||||
<Reference Include="OxyPlot.WP8, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\OxyPlot.Windows.2.0.0-unstable0956\lib\windowsphone8\OxyPlot.WP8.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="Xamarin.Forms.Core, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
|
|
|
@ -1,7 +1,8 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="OxyPlot.Core" version="1.0.0" targetFramework="wp8" />
|
||||
<package id="OxyPlot.WP8" version="1.0.0" targetFramework="wp8" />
|
||||
<package id="OxyPlot.Core" version="2.0.0-unstable0956" targetFramework="wp8" />
|
||||
<package id="OxyPlot.Windows" version="2.0.0-unstable0956" targetFramework="wp8" />
|
||||
<package id="OxyPlot.WP8" version="2.0.0-unstable0956" targetFramework="wp8" />
|
||||
<package id="WPtoolkit" version="4.2013.08.16" targetFramework="wp80" />
|
||||
<package id="Xamarin.Forms" version="2.3.3.180" targetFramework="wp8" />
|
||||
</packages>
|
|
@ -35,8 +35,8 @@
|
|||
<DocumentationFile>..\..\Output\Xamarin.Forms.Platform.iOS\OxyPlot.Xamarin.Forms.Platform.iOS.XML</DocumentationFile>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="OxyPlot, Version=1.0.0.0, Culture=neutral, PublicKeyToken=638079a8f0bd61e9, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\OxyPlot.Core.1.0.0\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1+Xamarin.iOS10\OxyPlot.dll</HintPath>
|
||||
<Reference Include="OxyPlot, Version=2.0.0.0, Culture=neutral, PublicKeyToken=638079a8f0bd61e9, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\OxyPlot.Core.2.0.0-unstable0956\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1+Xamarin.iOS10\OxyPlot.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="System" />
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="OxyPlot.Core" version="1.0.0" targetFramework="xamarinios10" />
|
||||
<package id="OxyPlot.Core" version="2.0.0-unstable0956" targetFramework="xamarinios10" />
|
||||
<package id="Xamarin.Forms" version="2.3.3.180" targetFramework="xamarinios10" />
|
||||
</packages>
|
|
@ -48,8 +48,8 @@
|
|||
<Import Project="..\packages\Xamarin.Forms.1.0.6186\build\portable-win+net45+wp80+MonoAndroid10+MonoTouch10\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.1.0.6186\build\portable-win+net45+wp80+MonoAndroid10+MonoTouch10\Xamarin.Forms.targets')" />
|
||||
<Import Project="..\packages\Xamarin.Forms.2.2.0.31\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.2.2.0.31\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Xamarin.Forms.targets')" />
|
||||
<ItemGroup>
|
||||
<Reference Include="OxyPlot, Version=1.0.0.0, Culture=neutral, PublicKeyToken=638079a8f0bd61e9, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\OxyPlot.Core.1.0.0\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1+Xamarin.iOS10\OxyPlot.dll</HintPath>
|
||||
<Reference Include="OxyPlot, Version=2.0.0.0, Culture=neutral, PublicKeyToken=638079a8f0bd61e9, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\OxyPlot.Core.2.0.0-unstable0956\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1+Xamarin.iOS10\OxyPlot.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="Xamarin.Forms.Core, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
|
|
|
@ -22,15 +22,15 @@
|
|||
<dependency id="Xamarin.Forms" version="2.3.3.180" />
|
||||
</group>
|
||||
<group targetFramework="uap10.0">
|
||||
<dependency id="OxyPlot.Windows" version="1.0.0"/>
|
||||
<dependency id="OxyPlot.Windows" version="2.0.0-unstable0956"/>
|
||||
<dependency id="Xamarin.Forms" version="2.3.3.180" />
|
||||
</group>
|
||||
<group targetFramework="windowsphone8">
|
||||
<dependency id="OxyPlot.WP8" version="1.0.0"/>
|
||||
<dependency id="OxyPlot.WP8" version="2.0.0-unstable0956"/>
|
||||
<dependency id="Xamarin.Forms" version="2.3.3.180" />
|
||||
</group>
|
||||
<group>
|
||||
<dependency id="OxyPlot.Core" version="1.0.0"/>
|
||||
<dependency id="OxyPlot.Core" version="2.0.0-unstable0956"/>
|
||||
<dependency id="Xamarin.Forms" version="2.3.3.180" />
|
||||
</group>
|
||||
</dependencies>
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="OxyPlot.Core" version="1.0.0" targetFramework="portable45-net45+win8+wp8+wpa81" />
|
||||
<package id="OxyPlot.Core" version="2.0.0-unstable0956" targetFramework="portable45-net45+win8+wp8+wpa81" />
|
||||
<package id="Xamarin.Forms" version="2.3.3.180" targetFramework="portable45-net45+win8+wp8+wpa81" />
|
||||
</packages>
|
|
@ -12,7 +12,7 @@
|
|||
<requireLicenseAcceptance>false</requireLicenseAcceptance>
|
||||
<tags>xamarin mac unified-api plotting plot charting chart</tags>
|
||||
<dependencies>
|
||||
<dependency id="OxyPlot.Core" version="1.0.0"/>
|
||||
<dependency id="OxyPlot.Core" version="2.0.0-unstable0956"/>
|
||||
</dependencies>
|
||||
</metadata>
|
||||
<files>
|
||||
|
|
|
@ -32,8 +32,8 @@
|
|||
<DocumentationFile>..\..\Output\Xamarin.iOS\OxyPlot.Xamarin.iOS.xml</DocumentationFile>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="OxyPlot, Version=1.0.0.0, Culture=neutral, PublicKeyToken=638079a8f0bd61e9, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\OxyPlot.Core.1.0.0\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1+Xamarin.iOS10\OxyPlot.dll</HintPath>
|
||||
<Reference Include="OxyPlot, Version=2.0.0.0, Culture=neutral, PublicKeyToken=638079a8f0bd61e9, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\OxyPlot.Core.2.0.0-unstable0956\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1+Xamarin.iOS10\OxyPlot.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="System" />
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
<requireLicenseAcceptance>false</requireLicenseAcceptance>
|
||||
<tags>xamarin iOS plotting plot charting chart</tags>
|
||||
<dependencies>
|
||||
<dependency id="OxyPlot.Core" version="1.0.0"/>
|
||||
<dependency id="OxyPlot.Core" version="2.0.0-unstable0956"/>
|
||||
</dependencies>
|
||||
</metadata>
|
||||
<files>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="OxyPlot.Core" version="1.0.0" targetFramework="xamarinios10" />
|
||||
<package id="OxyPlot.Core" version="2.0.0-unstable0956" targetFramework="xamarinios10" />
|
||||
</packages>
|
Загрузка…
Ссылка в новой задаче