summaryrefslogtreecommitdiff
path: root/PagesGallery
diff options
context:
space:
mode:
authorRui Marinho <me@ruimarinho.net>2016-09-18 19:24:44 +0100
committerJason Smith <jason.smith@xamarin.com>2016-09-18 11:24:44 -0700
commitd4efe0a37ea87967e38a7d0325df8d84e1c125fc (patch)
treee8ea30760f1a011599e73ec1aea9e3e2349edc1f /PagesGallery
parent7d66ed0aada19c7d320186a1a34907d77d38ab0d (diff)
downloadxamarin-forms-d4efe0a37ea87967e38a7d0325df8d84e1c125fc.tar.gz
xamarin-forms-d4efe0a37ea87967e38a7d0325df8d84e1c125fc.tar.bz2
xamarin-forms-d4efe0a37ea87967e38a7d0325df8d84e1c125fc.zip
[Controls] Update Insights and UITest packages and fix warnings (#361)
* [Controls] Update Insights and UITest packages * Update Xamarin.Forms.Platform.Android (Forwarders).csproj
Diffstat (limited to 'PagesGallery')
-rw-r--r--PagesGallery/PagesGallery.Droid/app.config4
-rw-r--r--PagesGallery/PagesGallery.iOS/PagesGallery.iOS.csproj1
-rw-r--r--PagesGallery/PagesGallery/PagesGallery.csproj13
-rw-r--r--PagesGallery/PagesGallery/packages.config6
4 files changed, 24 insertions, 0 deletions
diff --git a/PagesGallery/PagesGallery.Droid/app.config b/PagesGallery/PagesGallery.Droid/app.config
index d536bee7..e4157146 100644
--- a/PagesGallery/PagesGallery.Droid/app.config
+++ b/PagesGallery/PagesGallery.Droid/app.config
@@ -14,6 +14,10 @@
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
</dependentAssembly>
+ <dependentAssembly>
+ <assemblyIdentity name="Mono.Cecil" publicKeyToken="0738eb9f132ed756" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-0.9.6.0" newVersion="0.9.6.0" />
+ </dependentAssembly>
</assemblyBinding>
</runtime>
</configuration> \ No newline at end of file
diff --git a/PagesGallery/PagesGallery.iOS/PagesGallery.iOS.csproj b/PagesGallery/PagesGallery.iOS/PagesGallery.iOS.csproj
index 685e8084..cecb6247 100644
--- a/PagesGallery/PagesGallery.iOS/PagesGallery.iOS.csproj
+++ b/PagesGallery/PagesGallery.iOS/PagesGallery.iOS.csproj
@@ -126,6 +126,7 @@
</ProjectReference>
<ProjectReference Include="..\PagesGallery\PagesGallery.csproj">
<Name>PagesGallery</Name>
+ <Project>{7B5F9E6A-6334-4C74-9B77-A55B3DA60E41}</Project>
</ProjectReference>
</ItemGroup>
<ItemGroup>
diff --git a/PagesGallery/PagesGallery/PagesGallery.csproj b/PagesGallery/PagesGallery/PagesGallery.csproj
index d2d2c346..681f59da 100644
--- a/PagesGallery/PagesGallery/PagesGallery.csproj
+++ b/PagesGallery/PagesGallery/PagesGallery.csproj
@@ -49,6 +49,7 @@
</ItemGroup>
<ItemGroup>
<None Include="GettingStarted.Xamarin" />
+ <None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Xamarin.Forms.Core\Xamarin.Forms.Core.csproj">
@@ -95,6 +96,17 @@
<SubType>Designer</SubType>
</EmbeddedResource>
</ItemGroup>
+ <ItemGroup>
+ <Reference Include="System.Net.Http">
+ <HintPath>..\..\packages\Microsoft.Net.Http.2.2.29\lib\portable-net40+sl4+win8+wp71+wpa81\System.Net.Http.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Net.Http.Extensions">
+ <HintPath>..\..\packages\Microsoft.Net.Http.2.2.29\lib\portable-net40+sl4+win8+wp71+wpa81\System.Net.Http.Extensions.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Net.Http.Primitives">
+ <HintPath>..\..\packages\Microsoft.Net.Http.2.2.29\lib\portable-net40+sl4+win8+wp71+wpa81\System.Net.Http.Primitives.dll</HintPath>
+ </Reference>
+ </ItemGroup>
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
<Import Project="..\..\.nuspec\Xamarin.Forms.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
@@ -104,4 +116,5 @@
<Target Name="AfterBuild">
</Target>
-->
+ <Import Project="..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets" Condition="Exists('..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" />
</Project> \ No newline at end of file
diff --git a/PagesGallery/PagesGallery/packages.config b/PagesGallery/PagesGallery/packages.config
new file mode 100644
index 00000000..316274a4
--- /dev/null
+++ b/PagesGallery/PagesGallery/packages.config
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+ <package id="Microsoft.Bcl" version="1.1.10" targetFramework="portable45-net45+win8+wp8+wpa81" />
+ <package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="portable45-net45+win8+wp8+wpa81" />
+ <package id="Microsoft.Net.Http" version="2.2.29" targetFramework="portable45-net45+win8+wp8+wpa81" />
+</packages> \ No newline at end of file