diff options
| author | Jason Smith <jason.smith@xamarin.com> | 2016-04-24 12:25:26 -0400 |
|---|---|---|
| committer | Rui Marinho <me@ruimarinho.net> | 2016-04-24 12:25:26 -0400 |
| commit | 5907152c50ee2c658b266f2804e6b383bb15a6f1 (patch) | |
| tree | 9beb907623359723456c5c03b08922bebc4f41f3 /Xamarin.Forms.ControlGallery.iOS | |
| parent | feac1ba3ed6df5e27b3fa2076bd15c190cbacd1c (diff) | |
| download | xamarin-forms-5907152c50ee2c658b266f2804e6b383bb15a6f1.tar.gz xamarin-forms-5907152c50ee2c658b266f2804e6b383bb15a6f1.tar.bz2 xamarin-forms-5907152c50ee2c658b266f2804e6b383bb15a6f1.zip | |
Evolve feature branch (#117)
* Initial import of evolve features
* [Android] Add Xamarin.Forms.Platform.Android.AppLinks project
* [iOS] Fix issues with c# 6 features on iOS AppLinks
* Added naive stanza to update-docs-windows.bat to produce Pages docs. Not tested. (#69)
* Update packages
* Add AppLinks android nuspec and fix linker issues
* Fix build
* Fix nusepc
* Fix nuspec
* Update android support nugets to 23.2.1
* Update Xamarin.UITest
* Add CardView
* [iOS] Fix app link for CoreSpotlight
* [Android] Update AppLinks android support libs
* Add Newtonsoft.Json dependency to nuspec
* Fix NRE when setting ControlTemplate to null
* Move to ModernHttpClient for download
* Try fix build
* Preserve android app links
* Fix margin issue
* General coding and simple fixes
Diffstat (limited to 'Xamarin.Forms.ControlGallery.iOS')
| -rw-r--r-- | Xamarin.Forms.ControlGallery.iOS/app.config | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Xamarin.Forms.ControlGallery.iOS/app.config b/Xamarin.Forms.ControlGallery.iOS/app.config index b1d2a5a3..83b882b7 100644 --- a/Xamarin.Forms.ControlGallery.iOS/app.config +++ b/Xamarin.Forms.ControlGallery.iOS/app.config @@ -6,6 +6,10 @@ <assemblyIdentity name="Mono.Cecil" publicKeyToken="0738eb9f132ed756" culture="neutral" /> <bindingRedirect oldVersion="0.0.0.0-0.9.6.0" newVersion="0.9.6.0" /> </dependentAssembly> + <dependentAssembly> + <assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> + <bindingRedirect oldVersion="0.0.0.0-1.5.0.0" newVersion="1.5.0.0" /> + </dependentAssembly> </assemblyBinding> </runtime> </configuration>
\ No newline at end of file |