Skip to content

Commit 8a3e9f2

Browse files
objorkeobjorke
committed
Update packages
1 parent d60406b commit 8a3e9f2

32 files changed

+262
-433
lines changed

‎CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ All notable changes to this project will be documented in this file.
44
## [Unreleased]
55

66
### Changed
7+
- Update to Xamarin.Forms 4.3.0
78
- OxyPlot.Xamarin.Android targets latest Android platform
89

910
### Removed

‎Source/Examples/Xamarin.Android/ExampleBrowser/ExampleBrowser.csproj

+14-11
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,17 @@
1313
<AndroidApplication>true</AndroidApplication>
1414
<AndroidResgenFile>Resources\Resource.Designer.cs</AndroidResgenFile>
1515
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
16-
<AndroidSupportedAbis>armeabi</AndroidSupportedAbis>
1716
<MandroidI18n />
1817
<AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
1918
<DeployExternal>True</DeployExternal>
2019
<ProductVersion>8.0.30703</ProductVersion>
2120
<SchemaVersion>2.0</SchemaVersion>
22-
<AndroidUseLatestPlatformSdk>true</AndroidUseLatestPlatformSdk>
23-
<TargetFrameworkVersion>v8.1</TargetFrameworkVersion>
21+
<TargetFrameworkVersion>v9.0</TargetFrameworkVersion>
22+
<AndroidEnableSGenConcurrent>true</AndroidEnableSGenConcurrent>
23+
<AndroidUseAapt2>true</AndroidUseAapt2>
24+
<AndroidHttpClientHandlerType>Xamarin.Android.Net.AndroidClientHandler</AndroidHttpClientHandlerType>
25+
<NuGetPackageImportStamp>
26+
</NuGetPackageImportStamp>
2427
</PropertyGroup>
2528
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2629
<DebugSymbols>True</DebugSymbols>
@@ -52,10 +55,10 @@
5255
<Reference Include="System.IO.Compression" />
5356
<Reference Include="System.Net.Http" />
5457
<Reference Include="OxyPlot">
55-
<HintPath>..\..\..\packages\OxyPlot.Core.2.0.0-unstable1035\lib\netstandard1.0\OxyPlot.dll</HintPath>
58+
<HintPath>..\..\..\packages\OxyPlot.Core.2.0.0\lib\netstandard1.0\OxyPlot.dll</HintPath>
5659
</Reference>
5760
<Reference Include="ExampleLibrary">
58-
<HintPath>..\..\..\packages\OxyPlot.ExampleLibrary.2.0.0-unstable1035\lib\netstandard1.0\ExampleLibrary.dll</HintPath>
61+
<HintPath>..\..\..\packages\OxyPlot.ExampleLibrary.2.0.0\lib\netstandard1.0\ExampleLibrary.dll</HintPath>
5962
</Reference>
6063
</ItemGroup>
6164
<ItemGroup>
@@ -74,12 +77,6 @@
7477
<ItemGroup>
7578
<AndroidResource Include="Resources\Values\Strings.xml" />
7679
</ItemGroup>
77-
<ItemGroup>
78-
<ProjectReference Include="..\..\..\OxyPlot.Xamarin.Android\OxyPlot.Xamarin.Android.csproj">
79-
<Project>{3296D69F-F4B7-44A5-AEB9-7A179E65F8DD}</Project>
80-
<Name>OxyPlot.Xamarin.Android</Name>
81-
</ProjectReference>
82-
</ItemGroup>
8380
<ItemGroup>
8481
<None Include="Properties\AndroidManifest.xml" />
8582
<AndroidResource Include="Resources\Drawable\icon.png" />
@@ -88,5 +85,11 @@
8885
<ItemGroup>
8986
<Folder Include="Assets\" />
9087
</ItemGroup>
88+
<ItemGroup>
89+
<ProjectReference Include="..\..\..\OxyPlot.Xamarin.Android\OxyPlot.Xamarin.Android.csproj">
90+
<Project>{3296D69F-F4B7-44A5-AEB9-7A179E65F8DD}</Project>
91+
<Name>OxyPlot.Xamarin.Android</Name>
92+
</ProjectReference>
93+
</ItemGroup>
9194
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
9295
</Project>

‎Source/Examples/Xamarin.Android/ExampleBrowser/Properties/AndroidManifest.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="preferExternal" android:versionName="Alpha" package="OxyPlot.OxyPlot" android:versionCode="1">
33
<application android:label="OxyPlot Example Browser" android:icon="@drawable/icon"></application>
4-
<uses-sdk />
4+
<uses-sdk android:targetSdkVersion="28" />
55
<uses-permission android:name="android.permission.INTERNET" />
66
</manifest>

‎Source/Examples/Xamarin.Android/ExampleBrowser/Resources/Resource.Designer.cs

+9-12
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Source/Examples/Xamarin.Android/ExampleBrowser/packages.config

+13-13
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Microsoft.NETCore.Platforms" version="1.1.0" targetFramework="monoandroid81" />
3+
<package id="Microsoft.NETCore.Platforms" version="3.0.0" targetFramework="monoandroid81" />
44
<package id="Microsoft.Win32.Primitives" version="4.3.0" targetFramework="monoandroid81" />
5-
<package id="NETStandard.Library" version="1.6.1" targetFramework="monoandroid81" />
6-
<package id="OxyPlot.Core" version="2.0.0-unstable1035" targetFramework="monoandroid81" />
7-
<package id="OxyPlot.ExampleLibrary" version="2.0.0-unstable1035" targetFramework="monoandroid81" />
5+
<package id="NETStandard.Library" version="2.0.3" targetFramework="monoandroid81" />
6+
<package id="OxyPlot.Core" version="2.0.0" targetFramework="monoandroid81" />
7+
<package id="OxyPlot.ExampleLibrary" version="2.0.0" targetFramework="monoandroid81" />
88
<package id="System.AppContext" version="4.3.0" targetFramework="monoandroid81" />
99
<package id="System.Collections" version="4.3.0" targetFramework="monoandroid81" />
1010
<package id="System.Collections.Concurrent" version="4.3.0" targetFramework="monoandroid81" />
11-
<package id="System.Console" version="4.3.0" targetFramework="monoandroid81" />
11+
<package id="System.Console" version="4.3.1" targetFramework="monoandroid81" />
1212
<package id="System.Diagnostics.Debug" version="4.3.0" targetFramework="monoandroid81" />
1313
<package id="System.Diagnostics.Tools" version="4.3.0" targetFramework="monoandroid81" />
1414
<package id="System.Diagnostics.Tracing" version="4.3.0" targetFramework="monoandroid81" />
@@ -21,32 +21,32 @@
2121
<package id="System.IO.FileSystem.Primitives" version="4.3.0" targetFramework="monoandroid81" />
2222
<package id="System.Linq" version="4.3.0" targetFramework="monoandroid81" />
2323
<package id="System.Linq.Expressions" version="4.3.0" targetFramework="monoandroid81" />
24-
<package id="System.Net.Http" version="4.3.0" targetFramework="monoandroid81" />
25-
<package id="System.Net.Primitives" version="4.3.0" targetFramework="monoandroid81" />
24+
<package id="System.Net.Http" version="4.3.4" targetFramework="monoandroid81" />
25+
<package id="System.Net.Primitives" version="4.3.1" targetFramework="monoandroid81" />
2626
<package id="System.Net.Requests" version="4.3.0" targetFramework="monoandroid81" />
2727
<package id="System.Net.Sockets" version="4.3.0" targetFramework="monoandroid81" />
2828
<package id="System.ObjectModel" version="4.3.0" targetFramework="monoandroid81" />
2929
<package id="System.Reflection" version="4.3.0" targetFramework="monoandroid81" />
3030
<package id="System.Reflection.Extensions" version="4.3.0" targetFramework="monoandroid81" />
3131
<package id="System.Reflection.Primitives" version="4.3.0" targetFramework="monoandroid81" />
3232
<package id="System.Resources.ResourceManager" version="4.3.0" targetFramework="monoandroid81" />
33-
<package id="System.Runtime" version="4.3.0" targetFramework="monoandroid81" />
34-
<package id="System.Runtime.Extensions" version="4.3.0" targetFramework="monoandroid81" />
33+
<package id="System.Runtime" version="4.3.1" targetFramework="monoandroid81" />
34+
<package id="System.Runtime.Extensions" version="4.3.1" targetFramework="monoandroid81" />
3535
<package id="System.Runtime.Handles" version="4.3.0" targetFramework="monoandroid81" />
3636
<package id="System.Runtime.InteropServices" version="4.3.0" targetFramework="monoandroid81" />
3737
<package id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" targetFramework="monoandroid81" />
3838
<package id="System.Runtime.Numerics" version="4.3.0" targetFramework="monoandroid81" />
39-
<package id="System.Security.Cryptography.Algorithms" version="4.3.0" targetFramework="monoandroid81" />
39+
<package id="System.Security.Cryptography.Algorithms" version="4.3.1" targetFramework="monoandroid81" />
4040
<package id="System.Security.Cryptography.Encoding" version="4.3.0" targetFramework="monoandroid81" />
4141
<package id="System.Security.Cryptography.Primitives" version="4.3.0" targetFramework="monoandroid81" />
42-
<package id="System.Security.Cryptography.X509Certificates" version="4.3.0" targetFramework="monoandroid81" />
42+
<package id="System.Security.Cryptography.X509Certificates" version="4.3.2" targetFramework="monoandroid81" />
4343
<package id="System.Text.Encoding" version="4.3.0" targetFramework="monoandroid81" />
4444
<package id="System.Text.Encoding.Extensions" version="4.3.0" targetFramework="monoandroid81" />
45-
<package id="System.Text.RegularExpressions" version="4.3.0" targetFramework="monoandroid81" />
45+
<package id="System.Text.RegularExpressions" version="4.3.1" targetFramework="monoandroid81" />
4646
<package id="System.Threading" version="4.3.0" targetFramework="monoandroid81" />
4747
<package id="System.Threading.Tasks" version="4.3.0" targetFramework="monoandroid81" />
4848
<package id="System.Threading.Timer" version="4.3.0" targetFramework="monoandroid81" />
49-
<package id="System.Xml.ReaderWriter" version="4.3.0" targetFramework="monoandroid81" />
49+
<package id="System.Xml.ReaderWriter" version="4.3.1" targetFramework="monoandroid81" />
5050
<package id="System.Xml.XDocument" version="4.3.0" targetFramework="monoandroid81" />
5151
<package id="System.Xml.XmlSerializer" version="4.3.0" targetFramework="monoandroid81" />
5252
</packages>

‎Source/Examples/Xamarin.Forms/SimpleDemo/SimpleDemo.Android/Properties/AndroidManifest.xml

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="com.oxyplot.SimpleDemo">
3-
<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="27" />
4-
<application android:label="SimpleDemo.Android">
5-
</application>
3+
<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="27" />
4+
<application android:label="SimpleDemo.Android"></application>
65
</manifest>

‎Source/Examples/Xamarin.Forms/SimpleDemo/SimpleDemo.Android/SimpleDemo.Android.csproj

+7-20
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,10 @@
1515
<AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
1616
<MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
1717
<MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
18-
<AndroidUseLatestPlatformSdk>false</AndroidUseLatestPlatformSdk>
19-
<TargetFrameworkVersion>v8.1</TargetFrameworkVersion>
18+
<TargetFrameworkVersion>v9.0</TargetFrameworkVersion>
19+
<AndroidEnableSGenConcurrent>true</AndroidEnableSGenConcurrent>
20+
<AndroidUseAapt2>true</AndroidUseAapt2>
21+
<AndroidHttpClientHandlerType>Xamarin.Android.Net.AndroidClientHandler</AndroidHttpClientHandlerType>
2022
<NuGetPackageImportStamp>
2123
</NuGetPackageImportStamp>
2224
</PropertyGroup>
@@ -48,24 +50,9 @@
4850
<Reference Include="System.Xml" />
4951
</ItemGroup>
5052
<ItemGroup>
51-
<PackageReference Include="Xamarin.Forms">
52-
<Version>3.1.0.637273</Version>
53-
</PackageReference>
54-
<PackageReference Include="Xamarin.Android.Support.Design">
55-
<Version>27.0.2.1</Version>
56-
</PackageReference>
57-
<PackageReference Include="Xamarin.Android.Support.v7.AppCompat">
58-
<Version>27.0.2.1</Version>
59-
</PackageReference>
60-
<PackageReference Include="Xamarin.Android.Support.v4">
61-
<Version>27.0.2.1</Version>
62-
</PackageReference>
63-
<PackageReference Include="Xamarin.Android.Support.v7.CardView">
64-
<Version>27.0.2.1</Version>
65-
</PackageReference>
66-
<PackageReference Include="Xamarin.Android.Support.v7.MediaRouter">
67-
<Version>27.0.2.1</Version>
68-
</PackageReference>
53+
<PackageReference Include="Xamarin.Forms" Version="4.3.0.908675" />
54+
<PackageReference Include="Xamarin.Android.Support.Core.Utils" Version="28.0.0.3" />
55+
<PackageReference Include="Xamarin.Essentials" Version="1.3.1" />
6956
</ItemGroup>
7057
<ItemGroup>
7158
<Compile Include="MainActivity.cs" />

‎Source/Examples/Xamarin.Forms/SimpleDemo/SimpleDemo.MacOS/SimpleDemo.MacOS.csproj

+4-15
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\..\..\..\packages\Xamarin.Forms.3.1.0.637273\build\netstandard2.0\Xamarin.Forms.props" Condition="Exists('..\..\..\..\packages\Xamarin.Forms.3.1.0.637273\build\netstandard2.0\Xamarin.Forms.props')" />
43
<PropertyGroup>
54
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
65
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -53,18 +52,10 @@
5352
<Reference Include="System" />
5453
<Reference Include="System.Core" />
5554
<Reference Include="Xamarin.Mac" />
56-
<Reference Include="Xamarin.Forms.Core">
57-
<HintPath>..\..\..\..\packages\Xamarin.Forms.3.1.0.637273\lib\Xamarin.Mac\Xamarin.Forms.Core.dll</HintPath>
58-
</Reference>
59-
<Reference Include="Xamarin.Forms.Platform">
60-
<HintPath>..\..\..\..\packages\Xamarin.Forms.3.1.0.637273\lib\Xamarin.Mac\Xamarin.Forms.Platform.dll</HintPath>
61-
</Reference>
62-
<Reference Include="Xamarin.Forms.Platform.macOS">
63-
<HintPath>..\..\..\..\packages\Xamarin.Forms.3.1.0.637273\lib\Xamarin.Mac\Xamarin.Forms.Platform.macOS.dll</HintPath>
64-
</Reference>
65-
<Reference Include="Xamarin.Forms.Xaml">
66-
<HintPath>..\..\..\..\packages\Xamarin.Forms.3.1.0.637273\lib\Xamarin.Mac\Xamarin.Forms.Xaml.dll</HintPath>
67-
</Reference>
55+
</ItemGroup>
56+
<ItemGroup>
57+
<PackageReference Include="Xamarin.Essentials" Version="1.3.1" />
58+
<PackageReference Include="Xamarin.Forms" Version="4.3.0.908675" />
6859
</ItemGroup>
6960
<ItemGroup>
7061
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Contents.json" />
@@ -86,7 +77,6 @@
8677
<ItemGroup>
8778
<None Include="Info.plist" />
8879
<None Include="Entitlements.plist" />
89-
<None Include="packages.config" />
9080
</ItemGroup>
9181
<ItemGroup>
9282
<Compile Include="Main.cs" />
@@ -107,5 +97,4 @@
10797
</ProjectReference>
10898
</ItemGroup>
10999
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Mac\Xamarin.Mac.CSharp.targets" />
110-
<Import Project="..\..\..\..\packages\Xamarin.Forms.3.1.0.637273\build\netstandard2.0\Xamarin.Forms.targets" Condition="Exists('..\..\..\..\packages\Xamarin.Forms.3.1.0.637273\build\netstandard2.0\Xamarin.Forms.targets')" />
111100
</Project>

‎Source/Examples/Xamarin.Forms/SimpleDemo/SimpleDemo.MacOS/packages.config

+1-1
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="Xamarin.Forms" version="3.1.0.637273" targetFramework="xamarinmac20" />
3+
<package id="Xamarin.Forms" version="4.3.0.908675" targetFramework="xamarinmac20" />
44
</packages>

‎Source/Examples/Xamarin.Forms/SimpleDemo/SimpleDemo.iOS/SimpleDemo.iOS.csproj

+7-4
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
<RootNamespace>SimpleDemo.iOS</RootNamespace>
1313
<IPhoneResourcePrefix>Resources</IPhoneResourcePrefix>
1414
<AssemblyName>SimpleDemo.iOS</AssemblyName>
15+
<MtouchEnableSGenConc>true</MtouchEnableSGenConc>
16+
<MtouchHttpClientHandler>NSUrlSessionHandler</MtouchHttpClientHandler>
1517
<NuGetPackageImportStamp>
1618
</NuGetPackageImportStamp>
1719
</PropertyGroup>
@@ -144,13 +146,15 @@
144146
<Reference Include="System" />
145147
<Reference Include="System.Xml" />
146148
<Reference Include="System.Core" />
149+
<Reference Include="System.IO.Compression" />
150+
<Reference Include="System.Net.Http" />
147151
<Reference Include="Xamarin.iOS" />
148152
</ItemGroup>
149153
<ItemGroup>
150-
<PackageReference Include="Xamarin.Forms">
151-
<Version>3.1.0.637273</Version>
152-
</PackageReference>
154+
<PackageReference Include="Xamarin.Forms" Version="4.3.0.908675" />
155+
<PackageReference Include="Xamarin.Essentials" Version="1.3.1" />
153156
</ItemGroup>
157+
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
154158
<ItemGroup>
155159
<ProjectReference Include="..\SimpleDemo\SimpleDemo.csproj">
156160
<Project>{292A7A42-1A55-45EF-9DAA-4A7368CB956F}</Project>
@@ -161,5 +165,4 @@
161165
<Name>OxyPlot.Xamarin.Forms.Platform.iOS</Name>
162166
</ProjectReference>
163167
</ItemGroup>
164-
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
165168
</Project>

‎Source/Examples/Xamarin.Forms/SimpleDemo/SimpleDemo/SimpleDemo.csproj

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
32
<PropertyGroup>
43
<TargetFramework>netstandard2.0</TargetFramework>
54
</PropertyGroup>
6-
75
<ItemGroup>
8-
<PackageReference Include="Xamarin.Forms" Version="3.1.0.637273" />
9-
<PackageReference Include="OxyPlot.Core" Version="2.0.0-unstable1035" />
6+
<PackageReference Include="OxyPlot.Core" Version="2.0.0" />
7+
<PackageReference Include="Xamarin.Forms" Version="4.3.0.908675" />
8+
<PackageReference Include="Xamarin.Essentials" Version="1.3.1" />
109
</ItemGroup>
1110
<ItemGroup>
1211
<ProjectReference Include="..\..\..\..\OxyPlot.Xamarin.Forms\OxyPlot.Xamarin.Forms.csproj" />

0 commit comments

Comments
 (0)