Skip to content

Commit

Permalink
Upgrade Packages and implement xamarin/Xamarin.Forms#658
Browse files Browse the repository at this point in the history
  • Loading branch information
@johnjore
johnjore committed Apr 19, 2017
1 parent c03e354 commit 0051343
Show file tree
Hide file tree
Showing 23 changed files with 6,253 additions and 4,354 deletions.
28 changes: 15 additions & 13 deletions Kala/Kala.Droid/Kala.Droid.csproj
View file
Expand Up @@ -82,13 +82,14 @@
<Private>True</Private>
</Reference>
<Reference Include="FormsViewGroup, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Xamarin.Forms.2.3.3.193\lib\MonoAndroid10\FormsViewGroup.dll</HintPath>
<HintPath>..\..\packages\Xamarin.Forms.2.3.4.231\lib\MonoAndroid10\FormsViewGroup.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.CSharp" />
<Reference Include="Mono.Android" />
<Reference Include="mscorlib" />
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\..\packages\Newtonsoft.Json.9.0.1\lib\portable-net45+wp80+win8+wpa81\Newtonsoft.Json.dll</HintPath>
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\..\packages\Newtonsoft.Json.10.0.2\lib\netstandard1.3\Newtonsoft.Json.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Plugin.Logger, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
Expand All @@ -109,6 +110,7 @@
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.IO.Compression" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Xml" />
Expand Down Expand Up @@ -145,27 +147,27 @@
<Private>True</Private>
</Reference>
<Reference Include="Xamarin.Forms.Core, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Xamarin.Forms.2.3.3.193\lib\MonoAndroid10\Xamarin.Forms.Core.dll</HintPath>
<HintPath>..\..\packages\Xamarin.Forms.2.3.4.231\lib\MonoAndroid10\Xamarin.Forms.Core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Xamarin.Forms.GoogleMaps, Version=1.7.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Xamarin.Forms.GoogleMaps.1.7.1\lib\MonoAndroid10\Xamarin.Forms.GoogleMaps.dll</HintPath>
<Reference Include="Xamarin.Forms.GoogleMaps, Version=1.8.0.7, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Xamarin.Forms.GoogleMaps.1.8.0\lib\MonoAndroid10\Xamarin.Forms.GoogleMaps.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Xamarin.Forms.GoogleMaps.Android, Version=1.7.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Xamarin.Forms.GoogleMaps.1.7.1\lib\MonoAndroid10\Xamarin.Forms.GoogleMaps.Android.dll</HintPath>
<Reference Include="Xamarin.Forms.GoogleMaps.Android, Version=1.8.0.7, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Xamarin.Forms.GoogleMaps.1.8.0\lib\MonoAndroid10\Xamarin.Forms.GoogleMaps.Android.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Xamarin.Forms.Platform, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Xamarin.Forms.2.3.3.193\lib\MonoAndroid10\Xamarin.Forms.Platform.dll</HintPath>
<HintPath>..\..\packages\Xamarin.Forms.2.3.4.231\lib\MonoAndroid10\Xamarin.Forms.Platform.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Xamarin.Forms.Platform.Android, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Xamarin.Forms.2.3.3.193\lib\MonoAndroid10\Xamarin.Forms.Platform.Android.dll</HintPath>
<HintPath>..\..\packages\Xamarin.Forms.2.3.4.231\lib\MonoAndroid10\Xamarin.Forms.Platform.Android.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Xamarin.Forms.Xaml, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Xamarin.Forms.2.3.3.193\lib\MonoAndroid10\Xamarin.Forms.Xaml.dll</HintPath>
<HintPath>..\..\packages\Xamarin.Forms.2.3.4.231\lib\MonoAndroid10\Xamarin.Forms.Xaml.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Xamarin.GooglePlayServices.Base, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
Expand Down Expand Up @@ -11719,8 +11721,8 @@
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets'))" />
<Error Condition="!Exists('..\..\packages\Xamarin.Forms.2.3.3.193\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Forms.2.3.3.193\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets'))" />
<Error Condition="!Exists('..\..\packages\Xamarin.Forms.2.3.4.231\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Forms.2.3.4.231\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets'))" />
</Target>
<Import Project="..\..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets" Condition="Exists('..\..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets')" />
<Import Project="..\..\packages\Xamarin.Forms.2.3.3.193\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.2.3.3.193\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" />
<Import Project="..\..\packages\Xamarin.Forms.2.3.4.231\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.2.3.4.231\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" />
</Project>
56 changes: 53 additions & 3 deletions Kala/Kala.Droid/packages.config
View file
@@ -1,7 +1,57 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Microsoft.CSharp" version="4.3.0" targetFramework="monoandroid60" />
<package id="Microsoft.NETCore.Platforms" version="1.1.0" targetFramework="monoandroid60" />
<package id="Microsoft.Win32.Primitives" version="4.3.0" targetFramework="monoandroid60" />
<package id="MonoDroid.Toolkit" version="1.1.0.0" targetFramework="monoandroid60" />
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="monoandroid60" />
<package id="NETStandard.Library" version="1.6.1" targetFramework="monoandroid60" />
<package id="Newtonsoft.Json" version="10.0.2" targetFramework="monoandroid60" />
<package id="System.AppContext" version="4.3.0" targetFramework="monoandroid60" />
<package id="System.Collections" version="4.3.0" targetFramework="monoandroid60" />
<package id="System.Collections.Concurrent" version="4.3.0" targetFramework="monoandroid60" />
<package id="System.ComponentModel.TypeConverter" version="4.3.0" targetFramework="monoandroid60" />
<package id="System.Console" version="4.3.0" targetFramework="monoandroid60" />
<package id="System.Diagnostics.Debug" version="4.3.0" targetFramework="monoandroid60" />
<package id="System.Diagnostics.Tools" version="4.3.0" targetFramework="monoandroid60" />
<package id="System.Diagnostics.Tracing" version="4.3.0" targetFramework="monoandroid60" />
<package id="System.Globalization" version="4.3.0" targetFramework="monoandroid60" />
<package id="System.Globalization.Calendars" version="4.3.0" targetFramework="monoandroid60" />
<package id="System.IO" version="4.3.0" targetFramework="monoandroid60" />
<package id="System.IO.Compression" version="4.3.0" targetFramework="monoandroid60" />
<package id="System.IO.Compression.ZipFile" version="4.3.0" targetFramework="monoandroid60" />
<package id="System.IO.FileSystem" version="4.3.0" targetFramework="monoandroid60" />
<package id="System.IO.FileSystem.Primitives" version="4.3.0" targetFramework="monoandroid60" />
<package id="System.Linq" version="4.3.0" targetFramework="monoandroid60" />
<package id="System.Linq.Expressions" version="4.3.0" targetFramework="monoandroid60" />
<package id="System.Net.Http" version="4.3.1" targetFramework="monoandroid60" />
<package id="System.Net.Primitives" version="4.3.0" targetFramework="monoandroid60" />
<package id="System.Net.Sockets" version="4.3.0" targetFramework="monoandroid60" />
<package id="System.ObjectModel" version="4.3.0" targetFramework="monoandroid60" />
<package id="System.Reflection" version="4.3.0" targetFramework="monoandroid60" />
<package id="System.Reflection.Extensions" version="4.3.0" targetFramework="monoandroid60" />
<package id="System.Reflection.Primitives" version="4.3.0" targetFramework="monoandroid60" />
<package id="System.Resources.ResourceManager" version="4.3.0" targetFramework="monoandroid60" />
<package id="System.Runtime" version="4.3.0" targetFramework="monoandroid60" />
<package id="System.Runtime.Extensions" version="4.3.0" targetFramework="monoandroid60" />
<package id="System.Runtime.Handles" version="4.3.0" targetFramework="monoandroid60" />
<package id="System.Runtime.InteropServices" version="4.3.0" targetFramework="monoandroid60" />
<package id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" targetFramework="monoandroid60" />
<package id="System.Runtime.Numerics" version="4.3.0" targetFramework="monoandroid60" />
<package id="System.Runtime.Serialization.Formatters" version="4.3.0" targetFramework="monoandroid60" />
<package id="System.Runtime.Serialization.Primitives" version="4.3.0" targetFramework="monoandroid60" />
<package id="System.Security.Cryptography.Algorithms" version="4.3.0" targetFramework="monoandroid60" />
<package id="System.Security.Cryptography.Encoding" version="4.3.0" targetFramework="monoandroid60" />
<package id="System.Security.Cryptography.Primitives" version="4.3.0" targetFramework="monoandroid60" />
<package id="System.Security.Cryptography.X509Certificates" version="4.3.0" targetFramework="monoandroid60" />
<package id="System.Text.Encoding" version="4.3.0" targetFramework="monoandroid60" />
<package id="System.Text.Encoding.Extensions" version="4.3.0" targetFramework="monoandroid60" />
<package id="System.Text.RegularExpressions" version="4.3.0" targetFramework="monoandroid60" />
<package id="System.Threading" version="4.3.0" targetFramework="monoandroid60" />
<package id="System.Threading.Tasks" version="4.3.0" targetFramework="monoandroid60" />
<package id="System.Threading.Timer" version="4.3.0" targetFramework="monoandroid60" />
<package id="System.Xml.ReaderWriter" version="4.3.0" targetFramework="monoandroid60" />
<package id="System.Xml.XDocument" version="4.3.0" targetFramework="monoandroid60" />
<package id="System.Xml.XmlDocument" version="4.3.0" targetFramework="monoandroid60" />
<package id="wpbest.Plugin.Logger" version="1.0.8" targetFramework="monoandroid60" />
<package id="Xam.Plugins.Settings" version="2.5.4" targetFramework="monoandroid60" />
<package id="Xamarin.Android.Support.Animated.Vector.Drawable" version="23.3.0" targetFramework="monoandroid60" />
Expand All @@ -15,8 +65,8 @@
<package id="Xamarin.FFImageLoading" version="2.2.9" targetFramework="monoandroid60" />
<package id="Xamarin.FFImageLoading.Forms" version="2.2.9" targetFramework="monoandroid60" />
<package id="Xamarin.FFImageLoading.Transformations" version="2.2.9" targetFramework="monoandroid60" />
<package id="Xamarin.Forms" version="2.3.3.193" targetFramework="monoandroid60" />
<package id="Xamarin.Forms.GoogleMaps" version="1.7.1" targetFramework="monoandroid60" />
<package id="Xamarin.Forms" version="2.3.4.231" targetFramework="monoandroid60" />
<package id="Xamarin.Forms.GoogleMaps" version="1.8.0" targetFramework="monoandroid60" />
<package id="Xamarin.GooglePlayServices.Base" version="29.0.0.1" targetFramework="monoandroid60" />
<package id="Xamarin.GooglePlayServices.Basement" version="29.0.0.1" targetFramework="monoandroid60" />
<package id="Xamarin.GooglePlayServices.Maps" version="29.0.0.1" targetFramework="monoandroid60" />
Expand Down
4 changes: 2 additions & 2 deletions Kala/Kala.UWP/Kala.UWP.nuget.targets
View file
Expand Up @@ -5,10 +5,10 @@
</PropertyGroup>
<ImportGroup>
<Import Project="$(NuGetPackageRoot)\Microsoft.Bcl.Build\1.0.21\build\Microsoft.Bcl.Build.targets" Condition="Exists('$(NuGetPackageRoot)\Microsoft.Bcl.Build\1.0.21\build\Microsoft.Bcl.Build.targets')" />
<Import Project="$(NuGetPackageRoot)\Microsoft.Net.Native.Compiler\1.6.0\build\Microsoft.Net.Native.Compiler.targets" Condition="Exists('$(NuGetPackageRoot)\Microsoft.Net.Native.Compiler\1.6.0\build\Microsoft.Net.Native.Compiler.targets')" />
<Import Project="$(NuGetPackageRoot)\Microsoft.Net.Native.Compiler\1.6.1\build\Microsoft.Net.Native.Compiler.targets" Condition="Exists('$(NuGetPackageRoot)\Microsoft.Net.Native.Compiler\1.6.1\build\Microsoft.Net.Native.Compiler.targets')" />
<Import Project="$(NuGetPackageRoot)\Microsoft.Net.Native.SharedLibrary-arm\1.6.0\build\Microsoft.Net.Native.SharedLibrary-arm.targets" Condition="Exists('$(NuGetPackageRoot)\Microsoft.Net.Native.SharedLibrary-arm\1.6.0\build\Microsoft.Net.Native.SharedLibrary-arm.targets')" />
<Import Project="$(NuGetPackageRoot)\Microsoft.Net.Native.SharedLibrary-x64\1.6.0\build\Microsoft.Net.Native.SharedLibrary-x64.targets" Condition="Exists('$(NuGetPackageRoot)\Microsoft.Net.Native.SharedLibrary-x64\1.6.0\build\Microsoft.Net.Native.SharedLibrary-x64.targets')" />
<Import Project="$(NuGetPackageRoot)\Microsoft.Net.Native.SharedLibrary-x86\1.6.0\build\Microsoft.Net.Native.SharedLibrary-x86.targets" Condition="Exists('$(NuGetPackageRoot)\Microsoft.Net.Native.SharedLibrary-x86\1.6.0\build\Microsoft.Net.Native.SharedLibrary-x86.targets')" />
<Import Project="$(NuGetPackageRoot)\Xamarin.Forms\2.3.3.193\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets" Condition="Exists('$(NuGetPackageRoot)\Xamarin.Forms\2.3.3.193\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" />
<Import Project="$(NuGetPackageRoot)\Xamarin.Forms\2.3.4.231\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets" Condition="Exists('$(NuGetPackageRoot)\Xamarin.Forms\2.3.4.231\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" />
</ImportGroup>
</Project>
8 changes: 4 additions & 4 deletions Kala/Kala.UWP/project.json
View file
@@ -1,14 +1,14 @@
{
"dependencies": {
"Microsoft.Bcl.Build": "1.0.21",
"Microsoft.NETCore.UniversalWindowsPlatform": "5.3.0",
"Newtonsoft.Json": "9.0.1",
"Microsoft.NETCore.UniversalWindowsPlatform": "5.3.2",
"Newtonsoft.Json": "10.0.2",
"wpbest.Plugin.Logger": "1.0.8",
"Xam.Plugins.Settings": "2.5.4",
"Xamarin.FFImageLoading.Forms": "2.2.9",
"Xamarin.FFImageLoading.Transformations": "2.2.9",
"Xamarin.Forms": "2.3.3.193",
"Xamarin.Forms.GoogleMaps": "1.7.1"
"Xamarin.Forms": "2.3.4.231",
"Xamarin.Forms.GoogleMaps": "1.8.0"
},
"frameworks": {
"uap10.0": {}
Expand Down

0 comments on commit 0051343

Please sign in to comment.