Merge branch 'master' into develop
# Conflicts: # MvvmCross-AndroidSupport/MvvmCross.Droid.Support.Compat/MvvmCross.Droid.Support.Compat.csproj # MvvmCross-AndroidSupport/MvvmCross.Droid.Support.Compat/packages.config # MvvmCross-AndroidSupport/MvvmCross.Droid.Support.Core.UI/MvvmCross.Droid.Support.Core.UI.csproj # MvvmCross-AndroidSupport/MvvmCross.Droid.Support.Core.UI/packages.config # MvvmCross-AndroidSupport/MvvmCross.Droid.Support.Core.Utils/MvvmCross.Droid.Support.Core.Utils.csproj # MvvmCross-AndroidSupport/MvvmCross.Droid.Support.Core.Utils/packages.config # MvvmCross-AndroidSupport/MvvmCross.Droid.Support.Design/MvvmCross.Droid.Support.Design.csproj # MvvmCross-AndroidSupport/MvvmCross.Droid.Support.Design/packages.config # MvvmCross-AndroidSupport/MvvmCross.Droid.Support.Fragment/MvvmCross.Droid.Support.Fragment.csproj # MvvmCross-AndroidSupport/MvvmCross.Droid.Support.Fragment/packages.config # MvvmCross-AndroidSupport/MvvmCross.Droid.Support.Media.Compat/MvvmCross.Droid.Support.Media.Compat.csproj # MvvmCross-AndroidSupport/MvvmCross.Droid.Support.Media.Compat/packages.config # MvvmCross-AndroidSupport/MvvmCross.Droid.Support.V14.Preference/MvvmCross.Droid.Support.V14.Preference.csproj # MvvmCross-AndroidSupport/MvvmCross.Droid.Support.V14.Preference/packages.config # MvvmCross-AndroidSupport/MvvmCross.Droid.Support.V17.Leanback/MvvmCross.Droid.Support.V17.Leanback.csproj # MvvmCross-AndroidSupport/MvvmCross.Droid.Support.V17.Leanback/packages.config # MvvmCross-AndroidSupport/MvvmCross.Droid.Support.V7.AppCompat/MvvmCross.Droid.Support.V7.AppCompat.csproj # MvvmCross-AndroidSupport/MvvmCross.Droid.Support.V7.AppCompat/packages.config # MvvmCross-AndroidSupport/MvvmCross.Droid.Support.V7.Preference/MvvmCross.Droid.Support.V7.Preference.csproj # MvvmCross-AndroidSupport/MvvmCross.Droid.Support.V7.Preference/packages.config # MvvmCross-AndroidSupport/MvvmCross.Droid.Support.V7.RecyclerView/MvvmCross.Droid.Support.V7.RecyclerView.csproj # MvvmCross-AndroidSupport/MvvmCross.Droid.Support.V7.RecyclerView/packages.config # MvvmCross-Forms/MvvmCross.Forms.Droid/MvvmCross.Forms.Droid.csproj # MvvmCross-Forms/MvvmCross.Forms.Droid/packages.config # MvvmCross-Forms/MvvmCross.Forms.Mac/MvvmCross.Forms.Mac.csproj # MvvmCross-Forms/MvvmCross.Forms.Mac/packages.config # MvvmCross-Forms/MvvmCross.Forms.Uwp/project.json # MvvmCross-Forms/MvvmCross.Forms.iOS/MvvmCross.Forms.iOS.csproj # MvvmCross-Forms/MvvmCross.Forms.iOS/packages.config # MvvmCross-Forms/MvvmCross.Forms/MvvmCross.Forms.csproj # MvvmCross-Forms/MvvmCross.Forms/packages.config # MvvmCross-Plugins/Accelerometer/MvvmCross.Plugins.Accelerometer.Droid/MvvmCross.Plugins.Accelerometer.Droid.csproj # MvvmCross-Plugins/Color/MvvmCross.Plugins.Color.Droid/MvvmCross.Plugins.Color.Droid.csproj # MvvmCross-Plugins/DownloadCache/MvvmCross.Plugins.DownloadCache.Droid/MvvmCross.Plugins.DownloadCache.Droid.csproj # MvvmCross-Plugins/DownloadCache/MvvmCross.Plugins.DownloadCache.Droid/packages.config # MvvmCross-Plugins/DownloadCache/MvvmCross.Plugins.DownloadCache/MvvmCross.Plugins.DownloadCache.csproj # MvvmCross-Plugins/DownloadCache/MvvmCross.Plugins.DownloadCache/packages.config # MvvmCross-Plugins/Email/MvvmCross.Plugins.Email.Droid/MvvmCross.Plugins.Email.Droid.csproj # MvvmCross-Plugins/File/MvvmCross.Plugins.File.Droid/MvvmCross.Plugins.File.Droid.csproj # MvvmCross-Plugins/Location/MvvmCross.Plugins.Location.Droid/MvvmCross.Plugins.Location.Droid.csproj # MvvmCross-Plugins/Location/MvvmCross.Plugins.Location.Fused.Droid/MvvmCross.Plugins.Location.Fused.Droid.csproj # MvvmCross-Plugins/Location/MvvmCross.Plugins.Location.Fused.Droid/packages.config # MvvmCross-Plugins/Network/MvvmCross.Plugins.Network.Droid/MvvmCross.Plugins.Network.Droid.csproj # MvvmCross-Plugins/PhoneCall/MvvmCross.Plugins.PhoneCall.Droid/MvvmCross.Plugins.PhoneCall.Droid.csproj # MvvmCross-Plugins/PictureChooser/MvvmCross.Plugins.PictureChooser.Droid/MvvmCross.Plugins.PictureChooser.Droid.csproj # MvvmCross-Plugins/PictureChooser/MvvmCross.Plugins.PictureChooser.Droid/packages.config # MvvmCross-Plugins/ResourceLoader/MvvmCross.Plugins.ResourceLoader.Droid/MvvmCross.Plugins.ResourceLoader.Droid.csproj # MvvmCross-Plugins/ResourceLoader/MvvmCross.Plugins.ResourceLoader.Test/MvvmCross.Plugins.ResourceLoader.Test.csproj # MvvmCross-Plugins/ResourceLoader/MvvmCross.Plugins.ResourceLoader.Test/packages.config # MvvmCross-Plugins/Share/MvvmCross.Plugins.Share.Droid/MvvmCross.Plugins.Share.Droid.csproj # MvvmCross-Plugins/Visibility/MvvmCross.Plugins.Visibility.Droid/MvvmCross.Plugins.Visibility.Droid.csproj # MvvmCross-Plugins/WebBrowser/MvvmCross.Plugins.WebBrowser.Droid/MvvmCross.Plugins.WebBrowser.Droid.csproj # MvvmCross/Binding/Droid/MvvmCross.Binding.Droid.csproj # MvvmCross/Droid/Droid/MvvmCross.Droid.csproj # MvvmCross/Platform/Droid/MvvmCross.Platform.Droid.csproj # TestProjects/Playground/Playground.Droid/Playground.Droid.csproj # TestProjects/Playground/Playground.Forms.Droid/Playground.Forms.Droid.csproj # TestProjects/Playground/Playground.Forms.Mac/Playground.Forms.Mac.csproj # TestProjects/Playground/Playground.Forms.Mac/packages.config # TestProjects/Playground/Playground.Forms.UI/Playground.Forms.UI.csproj # TestProjects/Playground/Playground.Forms.Uwp/Playground.Forms.Uwp.csproj # TestProjects/Playground/Playground.Forms.iOS/Playground.Forms.iOS.csproj # TestProjects/Playground/Playground.Forms.iOS/packages.config # docs/_documentation/fundamentals/logging.md # docs/_documentation/fundamentals/mvvmcross-overview.md # docs/_documentation/fundamentals/mvxinteraction.md # docs/_documentation/fundamentals/mvxnotifytask.md # docs/_documentation/fundamentals/navigation.md # docs/_documentation/platform/forms/xamarin-forms.md # docs/_documentation/platform/ios-tables-and-cells.md # docs/_documentation/plugins/3rd-party-plugins.md # docs/_documentation/plugins/downloadcache.md # docs/_documentation/presenters/view-presenters.md # nuspec/MvvmCross.Droid.Support.Core.UI.nuspec # nuspec/MvvmCross.Droid.Support.Core.Utils.nuspec # nuspec/MvvmCross.Droid.Support.Design.nuspec # nuspec/MvvmCross.Droid.Support.Fragment.nuspec # nuspec/MvvmCross.Droid.Support.V14.Preference.nuspec # nuspec/MvvmCross.Droid.Support.V17.Leanback.nuspec # nuspec/MvvmCross.Droid.Support.V7.AppCompat.nuspec # nuspec/MvvmCross.Droid.Support.V7.Preference.nuspec # nuspec/MvvmCross.Droid.Support.V7.RecyclerView.nuspec # nuspec/MvvmCross.Forms.nuspec # nuspec/MvvmCross.Plugin.DownloadCache.nuspec # nuspec/MvvmCross.Plugin.Location.Fused.nuspec # nuspec/MvvmCross.Plugin.PictureChooser.nuspec
This commit is contained in:
Коммит
ceb4a1f17d
|
@ -65,24 +65,23 @@
|
|||
<Reference Include="System.AppContext, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\packages\System.AppContext.4.3.0\lib\net46\System.AppContext.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Collections.Immutable, Version=1.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\packages\System.Collections.Immutable.1.3.1\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
<Reference Include="System.Collections.Immutable, Version=1.2.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\packages\System.Collections.Immutable.1.4.0\lib\netstandard2.0\System.Collections.Immutable.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Composition.AttributedModel, Version=1.0.31.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\packages\System.Composition.AttributedModel.1.0.31\lib\portable-net45+win8+wp8+wpa81\System.Composition.AttributedModel.dll</HintPath>
|
||||
<Reference Include="System.Composition.AttributedModel, Version=1.0.32.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\packages\System.Composition.AttributedModel.1.1.0\lib\netstandard2.0\System.Composition.AttributedModel.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Composition.Convention, Version=1.0.31.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\packages\System.Composition.Convention.1.0.31\lib\portable-net45+win8+wp8+wpa81\System.Composition.Convention.dll</HintPath>
|
||||
<Reference Include="System.Composition.Convention, Version=1.0.32.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\packages\System.Composition.Convention.1.1.0\lib\netstandard2.0\System.Composition.Convention.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Composition.Hosting, Version=1.0.31.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\packages\System.Composition.Hosting.1.0.31\lib\portable-net45+win8+wp8+wpa81\System.Composition.Hosting.dll</HintPath>
|
||||
<Reference Include="System.Composition.Hosting, Version=1.0.32.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\packages\System.Composition.Hosting.1.1.0\lib\netstandard2.0\System.Composition.Hosting.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Composition.Runtime, Version=1.0.31.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\packages\System.Composition.Runtime.1.0.31\lib\portable-net45+win8+wp8+wpa81\System.Composition.Runtime.dll</HintPath>
|
||||
<Reference Include="System.Composition.Runtime, Version=1.0.32.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\packages\System.Composition.Runtime.1.1.0\lib\netstandard2.0\System.Composition.Runtime.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Composition.TypedParts, Version=1.0.31.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\packages\System.Composition.TypedParts.1.0.31\lib\portable-net45+win8+wp8+wpa81\System.Composition.TypedParts.dll</HintPath>
|
||||
<Reference Include="System.Composition.TypedParts, Version=1.0.32.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\packages\System.Composition.TypedParts.1.1.0\lib\netstandard2.0\System.Composition.TypedParts.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Console, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\packages\System.Console.4.3.0\lib\net46\System.Console.dll</HintPath>
|
||||
|
@ -103,12 +102,12 @@
|
|||
<HintPath>..\..\packages\System.IO.FileSystem.Primitives.4.3.0\lib\net46\System.IO.FileSystem.Primitives.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Numerics" />
|
||||
<Reference Include="System.Reflection.Metadata, Version=1.4.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\packages\System.Reflection.Metadata.1.4.2\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
<Reference Include="System.Reflection.Metadata, Version=1.4.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\packages\System.Reflection.Metadata.1.5.0\lib\netstandard2.0\System.Reflection.Metadata.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Security.Cryptography.Algorithms, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\packages\System.Security.Cryptography.Algorithms.4.3.0\lib\net461\System.Security.Cryptography.Algorithms.dll</HintPath>
|
||||
<HintPath>..\..\packages\System.Security.Cryptography.Algorithms.4.3.1\lib\net461\System.Security.Cryptography.Algorithms.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="System.Security.Cryptography.Encoding, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll</HintPath>
|
||||
|
@ -116,22 +115,25 @@
|
|||
<Reference Include="System.Security.Cryptography.Primitives, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Security.Cryptography.X509Certificates, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\packages\System.Security.Cryptography.X509Certificates.4.3.0\lib\net461\System.Security.Cryptography.X509Certificates.dll</HintPath>
|
||||
<Reference Include="System.Security.Cryptography.X509Certificates, Version=4.1.1.2, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\packages\System.Security.Cryptography.X509Certificates.4.3.2\lib\net461\System.Security.Cryptography.X509Certificates.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="System.Text.Encoding.CodePages, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\packages\System.Text.Encoding.CodePages.4.3.0\lib\net46\System.Text.Encoding.CodePages.dll</HintPath>
|
||||
<Reference Include="System.Text.Encoding.CodePages, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\packages\System.Text.Encoding.CodePages.4.4.0\lib\net461\System.Text.Encoding.CodePages.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.Threading.Thread, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\packages\System.Threading.Thread.4.3.0\lib\net46\System.Threading.Thread.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="System.ValueTuple, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\packages\System.ValueTuple.4.3.1\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
|
||||
<Reference Include="System.ValueTuple, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\packages\System.ValueTuple.4.4.0\lib\net461\System.ValueTuple.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="System.Xml" />
|
||||
<Reference Include="System.Xml.Linq" />
|
||||
<Reference Include="System.Xml.ReaderWriter, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\packages\System.Xml.ReaderWriter.4.3.0\lib\net46\System.Xml.ReaderWriter.dll</HintPath>
|
||||
<HintPath>..\..\packages\System.Xml.ReaderWriter.4.3.1\lib\net46\System.Xml.ReaderWriter.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="System.Xml.XmlDocument, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\packages\System.Xml.XmlDocument.4.3.0\lib\net46\System.Xml.XmlDocument.dll</HintPath>
|
||||
|
|
|
@ -4,19 +4,19 @@
|
|||
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Composition.AttributedModel" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-1.0.31.0" newVersion="1.0.31.0" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-1.0.32.0" newVersion="1.0.32.0" />
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Composition.Runtime" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-1.0.31.0" newVersion="1.0.31.0" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-1.0.32.0" newVersion="1.0.32.0" />
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Composition.TypedParts" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-1.0.31.0" newVersion="1.0.31.0" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-1.0.32.0" newVersion="1.0.32.0" />
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Composition.Hosting" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-1.0.31.0" newVersion="1.0.31.0" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-1.0.32.0" newVersion="1.0.32.0" />
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="Microsoft.CodeAnalysis" publicKeyToken="31bf3856ad364e35" culture="neutral" />
|
||||
|
@ -28,11 +28,11 @@
|
|||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-1.2.1.0" newVersion="1.2.1.0" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-1.2.2.0" newVersion="1.2.2.0" />
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Reflection.Metadata" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-1.4.1.0" newVersion="1.4.1.0" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-1.4.2.0" newVersion="1.4.2.0" />
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="Microsoft.CodeAnalysis.Workspaces" publicKeyToken="31bf3856ad364e35" culture="neutral" />
|
||||
|
@ -78,6 +78,10 @@
|
|||
<assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="System.Text.Encoding.CodePages" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
|
||||
</dependentAssembly>
|
||||
</assemblyBinding>
|
||||
</runtime>
|
||||
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>
|
||||
|
|
|
@ -12,13 +12,13 @@
|
|||
<package id="System.AppContext" version="4.3.0" targetFramework="net461" />
|
||||
<package id="System.Collections" version="4.3.0" targetFramework="net45" />
|
||||
<package id="System.Collections.Concurrent" version="4.3.0" targetFramework="net461" />
|
||||
<package id="System.Collections.Immutable" version="1.3.1" targetFramework="net45" />
|
||||
<package id="System.Composition" version="1.0.31" targetFramework="net461" />
|
||||
<package id="System.Composition.AttributedModel" version="1.0.31" targetFramework="net461" />
|
||||
<package id="System.Composition.Convention" version="1.0.31" targetFramework="net461" />
|
||||
<package id="System.Composition.Hosting" version="1.0.31" targetFramework="net461" />
|
||||
<package id="System.Composition.Runtime" version="1.0.31" targetFramework="net461" />
|
||||
<package id="System.Composition.TypedParts" version="1.0.31" targetFramework="net461" />
|
||||
<package id="System.Collections.Immutable" version="1.4.0" targetFramework="net461" />
|
||||
<package id="System.Composition" version="1.1.0" targetFramework="net461" />
|
||||
<package id="System.Composition.AttributedModel" version="1.1.0" targetFramework="net461" />
|
||||
<package id="System.Composition.Convention" version="1.1.0" targetFramework="net461" />
|
||||
<package id="System.Composition.Hosting" version="1.1.0" targetFramework="net461" />
|
||||
<package id="System.Composition.Runtime" version="1.1.0" targetFramework="net461" />
|
||||
<package id="System.Composition.TypedParts" version="1.1.0" targetFramework="net461" />
|
||||
<package id="System.Console" version="4.3.0" targetFramework="net461" />
|
||||
<package id="System.Diagnostics.Debug" version="4.3.0" targetFramework="net45" />
|
||||
<package id="System.Diagnostics.FileVersionInfo" version="4.3.0" targetFramework="net461" />
|
||||
|
@ -34,7 +34,7 @@
|
|||
<package id="System.Linq.Expressions" version="4.3.0" targetFramework="net461" />
|
||||
<package id="System.Reflection" version="4.3.0" targetFramework="net45" />
|
||||
<package id="System.Reflection.Extensions" version="4.3.0" targetFramework="net45" />
|
||||
<package id="System.Reflection.Metadata" version="1.4.2" targetFramework="net45" />
|
||||
<package id="System.Reflection.Metadata" version="1.5.0" targetFramework="net461" />
|
||||
<package id="System.Reflection.Primitives" version="4.3.0" targetFramework="net45" />
|
||||
<package id="System.Resources.ResourceManager" version="4.3.0" targetFramework="net45" />
|
||||
<package id="System.Runtime" version="4.3.0" targetFramework="net45" />
|
||||
|
@ -42,19 +42,19 @@
|
|||
<package id="System.Runtime.Handles" version="4.3.0" targetFramework="net461" />
|
||||
<package id="System.Runtime.InteropServices" version="4.3.0" targetFramework="net45" />
|
||||
<package id="System.Runtime.Numerics" version="4.3.0" targetFramework="net461" />
|
||||
<package id="System.Security.Cryptography.Algorithms" version="4.3.0" targetFramework="net461" />
|
||||
<package id="System.Security.Cryptography.Algorithms" version="4.3.1" targetFramework="net461" />
|
||||
<package id="System.Security.Cryptography.Encoding" version="4.3.0" targetFramework="net461" />
|
||||
<package id="System.Security.Cryptography.Primitives" version="4.3.0" targetFramework="net461" />
|
||||
<package id="System.Security.Cryptography.X509Certificates" version="4.3.0" targetFramework="net461" />
|
||||
<package id="System.Security.Cryptography.X509Certificates" version="4.3.2" targetFramework="net461" />
|
||||
<package id="System.Text.Encoding" version="4.3.0" targetFramework="net45" />
|
||||
<package id="System.Text.Encoding.CodePages" version="4.3.0" targetFramework="net461" />
|
||||
<package id="System.Text.Encoding.CodePages" version="4.4.0" targetFramework="net461" />
|
||||
<package id="System.Text.Encoding.Extensions" version="4.3.0" targetFramework="net45" />
|
||||
<package id="System.Threading" version="4.3.0" targetFramework="net45" />
|
||||
<package id="System.Threading.Tasks" version="4.3.0" targetFramework="net461" />
|
||||
<package id="System.Threading.Tasks.Parallel" version="4.3.0" targetFramework="net461" />
|
||||
<package id="System.Threading.Thread" version="4.3.0" targetFramework="net461" />
|
||||
<package id="System.ValueTuple" version="4.3.1" targetFramework="net461" />
|
||||
<package id="System.Xml.ReaderWriter" version="4.3.0" targetFramework="net461" />
|
||||
<package id="System.ValueTuple" version="4.4.0" targetFramework="net461" />
|
||||
<package id="System.Xml.ReaderWriter" version="4.3.1" targetFramework="net461" />
|
||||
<package id="System.Xml.XDocument" version="4.3.0" targetFramework="net461" />
|
||||
<package id="System.Xml.XmlDocument" version="4.3.0" targetFramework="net461" />
|
||||
<package id="System.Xml.XPath" version="4.3.0" targetFramework="net461" />
|
||||
|
|
|
@ -80,23 +80,23 @@
|
|||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="Xamarin.Forms.Core, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\..\..\packages\Xamarin.Forms.2.5.0.91635\lib\portable-win+net45+wp80+win81+wpa81\Xamarin.Forms.Core.dll</HintPath>
|
||||
<HintPath>..\..\..\..\packages\Xamarin.Forms.2.5.0.280555\lib\portable-win+net45+wp80+win81+wpa81\Xamarin.Forms.Core.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Xamarin.Forms.Platform, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\..\..\packages\Xamarin.Forms.2.5.0.91635\lib\portable-win+net45+wp80+win81+wpa81\Xamarin.Forms.Platform.dll</HintPath>
|
||||
<HintPath>..\..\..\..\packages\Xamarin.Forms.2.5.0.280555\lib\portable-win+net45+wp80+win81+wpa81\Xamarin.Forms.Platform.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Xamarin.Forms.Xaml, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\..\..\packages\Xamarin.Forms.2.5.0.91635\lib\portable-win+net45+wp80+win81+wpa81\Xamarin.Forms.Xaml.dll</HintPath>
|
||||
<HintPath>..\..\..\..\packages\Xamarin.Forms.2.5.0.280555\lib\portable-win+net45+wp80+win81+wpa81\Xamarin.Forms.Xaml.dll</HintPath>
|
||||
</Reference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="packages.config" />
|
||||
</ItemGroup>
|
||||
<Import Project="..\..\..\..\packages\Xamarin.Forms.2.5.0.91635\build\portable-win+net45+wp80+win81+wpa81\Xamarin.Forms.targets" Condition="Exists('..\..\..\..\packages\Xamarin.Forms.2.5.0.91635\build\portable-win+net45+wp80+win81+wpa81\Xamarin.Forms.targets')" />
|
||||
<Import Project="..\..\..\..\packages\Xamarin.Forms.2.5.0.280555\build\portable-win+net45+wp80+win81+wpa81\Xamarin.Forms.targets" Condition="Exists('..\..\..\..\packages\Xamarin.Forms.2.5.0.280555\build\portable-win+net45+wp80+win81+wpa81\Xamarin.Forms.targets')" />
|
||||
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
|
||||
<PropertyGroup>
|
||||
<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.Forms.2.5.0.91635\build\portable-win+net45+wp80+win81+wpa81\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Xamarin.Forms.2.5.0.91635\build\portable-win+net45+wp80+win81+wpa81\Xamarin.Forms.targets'))" />
|
||||
<Error Condition="!Exists('..\..\..\..\packages\Xamarin.Forms.2.5.0.280555\build\portable-win+net45+wp80+win81+wpa81\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Xamarin.Forms.2.5.0.280555\build\portable-win+net45+wp80+win81+wpa81\Xamarin.Forms.targets'))" />
|
||||
</Target>
|
||||
</Project>
|
|
@ -1,4 +1,4 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="Xamarin.Forms" version="2.5.0.91635" targetFramework="portable45-net45+win8" />
|
||||
<package id="Xamarin.Forms" version="2.5.0.280555" targetFramework="portable45-net45+win8" />
|
||||
</packages>
|
|
@ -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.2.5.0.280555\build\netstandard1.0\Xamarin.Forms.props" Condition="Exists('..\..\..\..\packages\Xamarin.Forms.2.5.0.280555\build\netstandard1.0\Xamarin.Forms.props')" />
|
||||
<PropertyGroup>
|
||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
|
||||
|
@ -15,7 +16,7 @@
|
|||
<AndroidUseLatestPlatformSdk>false</AndroidUseLatestPlatformSdk>
|
||||
<AssemblyName>pagerenderexample.Droid</AssemblyName>
|
||||
<AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
|
||||
<TargetFrameworkVersion>v8.0</TargetFrameworkVersion>
|
||||
<TargetFrameworkVersion>v8.1</TargetFrameworkVersion>
|
||||
<AndroidTlsProvider>
|
||||
</AndroidTlsProvider>
|
||||
<NuGetPackageImportStamp>
|
||||
|
@ -42,8 +43,9 @@
|
|||
<ConsolePause>false</ConsolePause>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="FormsViewGroup, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\..\..\packages\Xamarin.Forms.2.4.0.74863\lib\MonoAndroid10\FormsViewGroup.dll</HintPath>
|
||||
<Reference Include="FormsViewGroup">
|
||||
<HintPath>..\..\..\..\packages\Xamarin.Forms.2.5.0.280555\lib\MonoAndroid10\FormsViewGroup.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.Core" />
|
||||
|
@ -92,17 +94,21 @@
|
|||
<Reference Include="Xamarin.Android.Support.Vector.Drawable, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\..\..\packages\Xamarin.Android.Support.Vector.Drawable.25.4.0.2\lib\MonoAndroid70\Xamarin.Android.Support.Vector.Drawable.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Xamarin.Forms.Core, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\..\..\packages\Xamarin.Forms.2.4.0.74863\lib\MonoAndroid10\Xamarin.Forms.Core.dll</HintPath>
|
||||
<Reference Include="Xamarin.Forms.Core">
|
||||
<HintPath>..\..\..\..\packages\Xamarin.Forms.2.5.0.280555\lib\MonoAndroid10\Xamarin.Forms.Core.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.4.0.74863\lib\MonoAndroid10\Xamarin.Forms.Platform.dll</HintPath>
|
||||
<Reference Include="Xamarin.Forms.Platform">
|
||||
<HintPath>..\..\..\..\packages\Xamarin.Forms.2.5.0.280555\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.4.0.74863\lib\MonoAndroid10\Xamarin.Forms.Platform.Android.dll</HintPath>
|
||||
<Reference Include="Xamarin.Forms.Platform.Android">
|
||||
<HintPath>..\..\..\..\packages\Xamarin.Forms.2.5.0.280555\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.4.0.74863\lib\MonoAndroid10\Xamarin.Forms.Xaml.dll</HintPath>
|
||||
<Reference Include="Xamarin.Forms.Xaml">
|
||||
<HintPath>..\..\..\..\packages\Xamarin.Forms.2.5.0.280555\lib\MonoAndroid10\Xamarin.Forms.Xaml.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
|
@ -204,7 +210,8 @@
|
|||
<Error Condition="!Exists('..\..\..\..\packages\Xamarin.Android.Support.Transition.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Transition.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Xamarin.Android.Support.Transition.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Transition.targets'))" />
|
||||
<Error Condition="!Exists('..\..\..\..\packages\Xamarin.Android.Support.Animated.Vector.Drawable.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Animated.Vector.Drawable.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Xamarin.Android.Support.Animated.Vector.Drawable.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Animated.Vector.Drawable.targets'))" />
|
||||
<Error Condition="!Exists('..\..\..\..\packages\Xamarin.Forms.2.5.0.91635\build\netstandard1.0\Xamarin.Forms.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Xamarin.Forms.2.5.0.91635\build\netstandard1.0\Xamarin.Forms.props'))" />
|
||||
<Error Condition="!Exists('..\..\..\..\packages\Xamarin.Forms.2.5.0.91635\build\netstandard1.0\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Xamarin.Forms.2.5.0.91635\build\netstandard1.0\Xamarin.Forms.targets'))" />
|
||||
<Error Condition="!Exists('..\..\..\..\packages\Xamarin.Forms.2.5.0.280555\build\netstandard1.0\Xamarin.Forms.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Xamarin.Forms.2.5.0.280555\build\netstandard1.0\Xamarin.Forms.props'))" />
|
||||
<Error Condition="!Exists('..\..\..\..\packages\Xamarin.Forms.2.5.0.280555\build\netstandard1.0\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Xamarin.Forms.2.5.0.280555\build\netstandard1.0\Xamarin.Forms.targets'))" />
|
||||
</Target>
|
||||
<Import Project="..\..\..\..\packages\Xamarin.Build.Download.0.4.5\build\Xamarin.Build.Download.targets" Condition="Exists('..\..\..\..\packages\Xamarin.Build.Download.0.4.5\build\Xamarin.Build.Download.targets')" />
|
||||
<Import Project="..\..\..\..\packages\Xamarin.Android.Support.Vector.Drawable.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Vector.Drawable.targets" Condition="Exists('..\..\..\..\packages\Xamarin.Android.Support.Vector.Drawable.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Vector.Drawable.targets')" />
|
||||
|
@ -224,5 +231,5 @@
|
|||
<Import Project="..\..\..\..\packages\Xamarin.Android.Support.v7.RecyclerView.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.v7.RecyclerView.targets" Condition="Exists('..\..\..\..\packages\Xamarin.Android.Support.v7.RecyclerView.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.v7.RecyclerView.targets')" />
|
||||
<Import Project="..\..\..\..\packages\Xamarin.Android.Support.Transition.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Transition.targets" Condition="Exists('..\..\..\..\packages\Xamarin.Android.Support.Transition.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Transition.targets')" />
|
||||
<Import Project="..\..\..\..\packages\Xamarin.Android.Support.Animated.Vector.Drawable.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Animated.Vector.Drawable.targets" Condition="Exists('..\..\..\..\packages\Xamarin.Android.Support.Animated.Vector.Drawable.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Animated.Vector.Drawable.targets')" />
|
||||
<Import Project="..\..\..\..\packages\Xamarin.Forms.2.5.0.91635\build\netstandard1.0\Xamarin.Forms.targets" Condition="Exists('..\..\..\..\packages\Xamarin.Forms.2.5.0.91635\build\netstandard1.0\Xamarin.Forms.targets')" />
|
||||
<Import Project="..\..\..\..\packages\Xamarin.Forms.2.5.0.280555\build\netstandard1.0\Xamarin.Forms.targets" Condition="Exists('..\..\..\..\packages\Xamarin.Forms.2.5.0.280555\build\netstandard1.0\Xamarin.Forms.targets')" />
|
||||
</Project>
|
|
@ -1,4 +1,4 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="Xamarin.Android.Support.Animated.Vector.Drawable" version="25.4.0.2" targetFramework="monoandroid71" />
|
||||
<package id="Xamarin.Android.Support.Annotations" version="25.4.0.2" targetFramework="monoandroid71" />
|
||||
|
@ -17,5 +17,5 @@
|
|||
<package id="Xamarin.Android.Support.v7.RecyclerView" version="25.4.0.2" targetFramework="monoandroid71" />
|
||||
<package id="Xamarin.Android.Support.Vector.Drawable" version="25.4.0.2" targetFramework="monoandroid71" />
|
||||
<package id="Xamarin.Build.Download" version="0.4.5" targetFramework="monoandroid71" />
|
||||
<package id="Xamarin.Forms" version="2.5.0.91635" targetFramework="monoandroid71" />
|
||||
<package id="Xamarin.Forms" version="2.5.0.280555" targetFramework="monoandroid80" />
|
||||
</packages>
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"dependencies": {
|
||||
"Microsoft.NETCore.UniversalWindowsPlatform": "5.2.2",
|
||||
"Xamarin.Forms": "2.5.0.91635"
|
||||
"Xamarin.Forms": "2.5.0.280555"
|
||||
},
|
||||
"frameworks": {
|
||||
"uap10.0.10240": {}
|
||||
|
|
|
@ -1,6 +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.2.5.0.91635\build\netstandard1.0\Xamarin.Forms.props" Condition="Exists('..\..\..\..\packages\Xamarin.Forms.2.5.0.91635\build\netstandard1.0\Xamarin.Forms.props')" />
|
||||
<Import Project="..\..\..\..\packages\Xamarin.Forms.2.5.0.280555\build\netstandard1.0\Xamarin.Forms.props" Condition="Exists('..\..\..\..\packages\Xamarin.Forms.2.5.0.280555\build\netstandard1.0\Xamarin.Forms.props')" />
|
||||
<PropertyGroup>
|
||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||
<Platform Condition=" '$(Platform)' == '' ">iPhoneSimulator</Platform>
|
||||
|
@ -73,16 +73,16 @@
|
|||
<Reference Include="System" />
|
||||
<Reference Include="System.Core" />
|
||||
<Reference Include="Xamarin.Forms.Core, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\..\..\packages\Xamarin.Forms.2.5.0.91635\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll</HintPath>
|
||||
<HintPath>..\..\..\..\packages\Xamarin.Forms.2.5.0.280555\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Xamarin.Forms.Platform, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\..\..\packages\Xamarin.Forms.2.5.0.91635\lib\Xamarin.iOS10\Xamarin.Forms.Platform.dll</HintPath>
|
||||
<HintPath>..\..\..\..\packages\Xamarin.Forms.2.5.0.280555\lib\Xamarin.iOS10\Xamarin.Forms.Platform.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Xamarin.Forms.Platform.iOS, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\..\..\packages\Xamarin.Forms.2.5.0.91635\lib\Xamarin.iOS10\Xamarin.Forms.Platform.iOS.dll</HintPath>
|
||||
<HintPath>..\..\..\..\packages\Xamarin.Forms.2.5.0.280555\lib\Xamarin.iOS10\Xamarin.Forms.Platform.iOS.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Xamarin.Forms.Xaml, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<HintPath>..\..\..\..\packages\Xamarin.Forms.2.5.0.91635\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.dll</HintPath>
|
||||
<HintPath>..\..\..\..\packages\Xamarin.Forms.2.5.0.280555\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Xamarin.iOS" />
|
||||
</ItemGroup>
|
||||
|
@ -158,8 +158,8 @@
|
|||
<PropertyGroup>
|
||||
<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.Forms.2.5.0.91635\build\netstandard1.0\Xamarin.Forms.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Xamarin.Forms.2.5.0.91635\build\netstandard1.0\Xamarin.Forms.props'))" />
|
||||
<Error Condition="!Exists('..\..\..\..\packages\Xamarin.Forms.2.5.0.91635\build\netstandard1.0\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Xamarin.Forms.2.5.0.91635\build\netstandard1.0\Xamarin.Forms.targets'))" />
|
||||
<Error Condition="!Exists('..\..\..\..\packages\Xamarin.Forms.2.5.0.280555\build\netstandard1.0\Xamarin.Forms.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Xamarin.Forms.2.5.0.280555\build\netstandard1.0\Xamarin.Forms.props'))" />
|
||||
<Error Condition="!Exists('..\..\..\..\packages\Xamarin.Forms.2.5.0.280555\build\netstandard1.0\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Xamarin.Forms.2.5.0.280555\build\netstandard1.0\Xamarin.Forms.targets'))" />
|
||||
</Target>
|
||||
<Import Project="..\..\..\..\packages\Xamarin.Forms.2.5.0.91635\build\netstandard1.0\Xamarin.Forms.targets" Condition="Exists('..\..\..\..\packages\Xamarin.Forms.2.5.0.91635\build\netstandard1.0\Xamarin.Forms.targets')" />
|
||||
<Import Project="..\..\..\..\packages\Xamarin.Forms.2.5.0.280555\build\netstandard1.0\Xamarin.Forms.targets" Condition="Exists('..\..\..\..\packages\Xamarin.Forms.2.5.0.280555\build\netstandard1.0\Xamarin.Forms.targets')" />
|
||||
</Project>
|
|
@ -1,4 +1,4 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="Xamarin.Forms" version="2.5.0.91635" targetFramework="xamarinios10" />
|
||||
<package id="Xamarin.Forms" version="2.5.0.280555" targetFramework="xamarinios10" />
|
||||
</packages>
|
|
@ -0,0 +1,114 @@
|
|||
---
|
||||
layout: documentation
|
||||
title: Linking
|
||||
category: Fundamentals
|
||||
order: 15
|
||||
---
|
||||
|
||||
When writing Xamarin Apps it is a well known fact that when building your code in certain configurations there is a process called Linking that will be run.
|
||||
What this does is to look at the Intermediate Language (IL) output for your App, walk through it, then it will perform mark and sweep operations to remove code that is never used at runtime.
|
||||
|
||||
This process is done to cut down on the size of the resulting assembly. This is very useful when consuming large third party assemblies, such as MvvmCross.
|
||||
|
||||
One thing the Mono Linker is not very good at is to figure out when code is used through reflection. Since MvvmCross bindings heavily rely on reflection a lot of the time the Mono Linker does not realise a piece of code is used and happily strips it out. Only for the developer to figure out at runtime that something either simply does not respond to a touch event or for the developer to experience crashes with funny stack traces.
|
||||
|
||||
## Typical Exceptions
|
||||
Typical exceptions which you will encounter when the Linker is enabled would be:
|
||||
* FileNotFoundException - this will occur if the Linker deems the entire assembly not used, it will not get included in the generated App
|
||||
* NullReferenceException - this typically is thrown when a method is attempted to be found via reflection and simply isn't there
|
||||
* MissingMethodException - same as above, typically when the constructor of a class is removed
|
||||
|
||||
## How to deal with this?
|
||||
There are a couple of different ways to deal with code being removed in the Linking process.
|
||||
|
||||
### Preserve Attribute
|
||||
If you encounter these issues in your own code the easiest way is to use the `[Preserve]` attribute. In Xamarin.iOS this comes from the [`Foundation` name space](https://developer.xamarin.com/api/type/Foundation.PreserveAttribute/). In Xamarin.Android this is located in the [`Android.Runtime` name space](https://developer.xamarin.com/api/type/Android.Runtime.PreserveAttribute/).
|
||||
|
||||
For portable targets such as Portable Class Libraries and .NET Standard libraries, these are not there out of the box. In such cases you can add your own `PreserveAttribute` class.
|
||||
|
||||
```csharp
|
||||
[System.AttributeUsage(System.AttributeTargets.All)]
|
||||
class PreserveAttribute : System.Attribute {
|
||||
public PreserveAttribute () {}
|
||||
public bool AllMembers { get; set; }
|
||||
public bool Conditional { get; set; }
|
||||
}
|
||||
```
|
||||
|
||||
Then you can simply apply this attribute on classes you need to be preserved like
|
||||
|
||||
```csharp
|
||||
[Preserve]
|
||||
public class MyClass {
|
||||
```
|
||||
|
||||
To also preserve members
|
||||
|
||||
```csharp
|
||||
[Preserve(AllMembers = true)]
|
||||
public class MyClass {
|
||||
private bool someMember;
|
||||
```
|
||||
|
||||
If you want your entire assembly to be preserved you can do
|
||||
|
||||
```csharp
|
||||
[assembly:Preserve]
|
||||
```
|
||||
|
||||
This only works on code you write yourself as you need to add the attribute.
|
||||
|
||||
### Hinting the linker with LinkerPleaseInclude.cs
|
||||
|
||||
Another way to have the linker understand that you are using a piece of code that is otherwise removed, is to hint the linker about the usage.
|
||||
|
||||
Previously when NuGet allowed adding .cs files as content, we added a `LinkerPleaseInclude.cs` file as part of the `MvvmCross` NuGet package. We cannot do this anymore, hence you need to manage this yourself.
|
||||
|
||||
The gist of this file is to describe the parts used of a class to hint the linker not to remove this code.
|
||||
|
||||
Let us say you are using a `UIButton` in a Xamarin.iOS App and you are binding a `ICommand` to that button. The MvvmCross binding engine will through reflection weak subscribe to the `TouchUpInside` event and invoke the `ICommand` when you tap that button. Since the Linker cannot see any of this, you would typically need to add a section to your `LinkerPleaseInclude.cs` file. This would typically look as follows.
|
||||
|
||||
```csharp
|
||||
using Foundation;
|
||||
using UIKit;
|
||||
|
||||
namespace My.Awesome.App
|
||||
{
|
||||
[Preserve(AllMembers = true)]
|
||||
public class LinkerPleaseInclude
|
||||
{
|
||||
public Include(UIButton button)
|
||||
{
|
||||
button.TouchUpInside += (s, e) =>
|
||||
button.SetTitle(button.Title(UIControlState.Normal), UIControlState.Normal);
|
||||
}
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
This will hint that both the `TouchUpInside` event is used and that we also use `SetTitle` and `Title(UIControlState)` to set the title for that button.
|
||||
|
||||
You will need to add sections to this file as needed.
|
||||
|
||||
> You can find some good defaults in our [ContentFiles in our GitHub repository](https://github.com/MvvmCross/MvvmCross/tree/develop/ContentFiles).
|
||||
|
||||
LinkerPleaseInclude files need to be added per platform and need to be compiled. However, these are never invoked, so don't worry if you write code that does not make sense in them. The code is just there to hint the linker.
|
||||
|
||||
### Skipping assemblies
|
||||
|
||||
As a last resort you could instruct the Linker to skip certain assemblies. This can be done by adding semi-colon `;` delimited list of assemblies to the `AndroidLinkSkip` property in a Xamarin.Android project either by editing the `.csproj` file adding to the first `PropertyGroup` as follows.
|
||||
|
||||
```xml
|
||||
<PropertyGroup>
|
||||
<AndroidLinkSkip>MvvmCross;MvvmCross.Plugin.Messenger</AndroidLinkSkip>
|
||||
```
|
||||
|
||||
Or on a Android project you can go to **Options > Android Build > Linker** and add to the *Ignore assemblies* field.
|
||||
|
||||
To do something similar for an Xamarin.iOS app, you can go to **Options > iOS Build** and add some additional *mtouch* arguments for each of the assemblies you want to skip.
|
||||
|
||||
```
|
||||
--linkskip=MvvmCross --linkskip=MvvmCross.Plugin.Messenger
|
||||
```
|
||||
|
||||
> Please note, the *Ignore assemblies* field and the *mtouch arguments* are configuration specific, so make sure you do this for each configuration you want to skip assemblies.
|
|
@ -5,7 +5,7 @@ category: Fundamentals
|
|||
order: 7
|
||||
---
|
||||
|
||||
A great option to log messages, info and errors to the console or other outputs is the built in MvxLog! It is very extendable and easy to use.
|
||||
A great option to log messages, info and errors to the console or other outputs is MvxLog! It is very extendable and easy to use.
|
||||
|
||||
You just need to inject it in your ViewModel, something like:
|
||||
|
||||
|
|
|
@ -21,3 +21,4 @@ Mvx.Microphone | Access the device's microphone | Android, iOS | [Github](https:
|
|||
Mvx.Picasso | Target Bindings for Picasso | Android | [Github](https://github.com/willsb/Mvx.Picasso)
|
||||
ExRam.MvvmCross.ObservableBinding | Support MvvmCross-Bindings to IObservable<T>-properties in view models. | All | [Github](https://github.com/ExRam/ExRam.MvvmCross.ObservableBinding)
|
||||
FFImageLoading | Load images quickly and easy (even using data binding) using MvxCachedImageView | Android, iOS, Mac, Windows, Tizen | [Github](https://github.com/luberda-molinet/FFImageLoading/wiki/MvvmCross)
|
||||
Mvx.Brightness | Access the device's brightness | Android, iOS | [Nuget](https://www.nuget.org/packages/Mvx.Brightness/)
|
||||
|
|
|
@ -72,8 +72,8 @@ var serializer = Mvx.Resolve<IMvxJsonConverter>();
|
|||
|
||||
var exampleObject = new ExampleObject()
|
||||
{
|
||||
Name = "Fred bloggs
|
||||
DateOfBirth = new DateTime(1972,7,13)
|
||||
Name = "Fred bloggs",
|
||||
DateOfBirth = new DateTime(1972,7,13)
|
||||
};
|
||||
|
||||
var jsonText = serializer.SerializeObject(exampleObject);
|
||||
|
|
|
@ -19,12 +19,6 @@ The `IMvxMessenger` API includes:
|
|||
|
||||
The basic use of the `Messenger` is:
|
||||
|
||||
- Add the following to `app.cs` in the `Initialize()` method, this will make the messenger accessible through injection.
|
||||
|
||||
```
|
||||
Mvx.LazyConstructAndRegisterSingleton<IMvxMessenger, MvxMessengerHub>();
|
||||
```
|
||||
|
||||
- define one or more Message classes for communication between components. These should inherit from `MvxMessage` - e.g.:
|
||||
|
||||
```c#
|
||||
|
|
|
@ -0,0 +1,15 @@
|
|||
---
|
||||
layout: post
|
||||
title: MvvmCross 5.7.0
|
||||
date: 2018-03-14 22:30:00 +0100
|
||||
categories:
|
||||
- mvvmcross
|
||||
- release
|
||||
---
|
||||
|
||||
This is a service release to the MvvmCross 5 series. This update contains the following:
|
||||
|
||||
- Updates TargetFramework for Android projects to v8.1
|
||||
- Updates Android Support packages to version 27.0.2
|
||||
- Updates Android Google Play services to version 60.1142.0
|
||||
- Updates Xamarin.Forms to version 2.5.0.280555
|
Загрузка…
Ссылка в новой задаче