summaryrefslogtreecommitdiff
path: root/Xamarin.Forms.Controls
diff options
context:
space:
mode:
authorRui Marinho <me@ruimarinho.net>2016-09-18 18:24:44 (GMT)
committerJason Smith <jason.smith@xamarin.com>2016-09-18 18:24:44 (GMT)
commitd4efe0a37ea87967e38a7d0325df8d84e1c125fc (patch)
treee8ea30760f1a011599e73ec1aea9e3e2349edc1f /Xamarin.Forms.Controls
parent7d66ed0aada19c7d320186a1a34907d77d38ab0d (diff)
downloadxamarin-forms-d4efe0a37ea87967e38a7d0325df8d84e1c125fc.zip
xamarin-forms-d4efe0a37ea87967e38a7d0325df8d84e1c125fc.tar.gz
xamarin-forms-d4efe0a37ea87967e38a7d0325df8d84e1c125fc.tar.bz2
[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 'Xamarin.Forms.Controls')
-rw-r--r--Xamarin.Forms.Controls/Xamarin.Forms.Controls.csproj14
-rw-r--r--Xamarin.Forms.Controls/packages.config2
2 files changed, 7 insertions, 9 deletions
diff --git a/Xamarin.Forms.Controls/Xamarin.Forms.Controls.csproj b/Xamarin.Forms.Controls/Xamarin.Forms.Controls.csproj
index 7ad923e..200e5f8 100644
--- a/Xamarin.Forms.Controls/Xamarin.Forms.Controls.csproj
+++ b/Xamarin.Forms.Controls/Xamarin.Forms.Controls.csproj
@@ -272,7 +272,6 @@
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable 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('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
- <Error Condition="!Exists('..\packages\Xamarin.Insights.1.11.4\build\portable-win+net45+wp80+windows8+wpa+MonoAndroid10+MonoTouch10\Xamarin.Insights.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Xamarin.Insights.1.11.4\build\portable-win+net45+wp80+windows8+wpa+MonoAndroid10+MonoTouch10\Xamarin.Insights.targets'))" />
</Target>
<ItemGroup>
<EmbeddedResource Include="ControlGalleryPages\LayoutAddPerformance.xaml">
@@ -287,12 +286,6 @@
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
- <Reference Include="Xamarin.Insights, Version=1.11.0.0, Culture=neutral, processorArchitecture=MSIL">
- <HintPath>..\packages\Xamarin.Insights.1.11.4\lib\portable-win+net45+wp80+windows8+wpa+MonoAndroid10+MonoTouch10\Xamarin.Insights.dll</HintPath>
- <Private>True</Private>
- </Reference>
- </ItemGroup>
- <ItemGroup>
<None Include="app.config" />
<EmbeddedResource Include="controlgallery.config" />
<None Include="packages.config" />
@@ -307,11 +300,16 @@
<SubType>Designer</SubType>
</EmbeddedResource>
</ItemGroup>
- <Import Project="..\packages\Xamarin.Insights.1.11.4\build\portable-win+net45+wp80+windows8+wpa+MonoAndroid10+MonoTouch10\Xamarin.Insights.targets" Condition="Exists('..\packages\Xamarin.Insights.1.11.4\build\portable-win+net45+wp80+windows8+wpa+MonoAndroid10+MonoTouch10\Xamarin.Insights.targets')" />
+ <ItemGroup>
+ <Reference Include="Xamarin.Insights">
+ <HintPath>..\packages\Xamarin.Insights.1.12.3\lib\portable-win+net45+wp80+windows8+wpa+MonoAndroid10+MonoTouch10\Xamarin.Insights.dll</HintPath>
+ </Reference>
+ </ItemGroup>
<Target Name="BeforeBuild">
<CreateItem Include="blank.config">
<Output TaskParameter="Include" ItemName="ConfigFile" />
</CreateItem>
<Copy SourceFiles="@(ConfigFile)" DestinationFiles="controlgallery.config" Condition="!Exists('controlgallery.config')" />
</Target>
+ <Import Project="..\packages\Xamarin.Insights.1.12.3\build\portable-win+net45+wp80+windows8+wpa+MonoAndroid10+MonoTouch10\Xamarin.Insights.targets" Condition="Exists('..\packages\Xamarin.Insights.1.12.3\build\portable-win+net45+wp80+windows8+wpa+MonoAndroid10+MonoTouch10\Xamarin.Insights.targets')" />
</Project>
diff --git a/Xamarin.Forms.Controls/packages.config b/Xamarin.Forms.Controls/packages.config
index 7692cf9..d5db6b3 100644
--- a/Xamarin.Forms.Controls/packages.config
+++ b/Xamarin.Forms.Controls/packages.config
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="Xamarin.Insights" version="1.11.4" targetFramework="portable45-net45+win8+wp8+wpa81" />
+ <package id="Xamarin.Insights" version="1.12.3" targetFramework="portable45-net45+win8+wp8+wpa81" />
</packages> \ No newline at end of file