diff options
| author | kingces95 <kingces95@users.noreply.github.com> | 2016-05-26 12:26:13 -0700 |
|---|---|---|
| committer | Jason Smith <jason.smith@xamarin.com> | 2016-05-26 12:26:13 -0700 |
| commit | 457b74f91a777e28ff11e32fb7d5a29d28aaf59e (patch) | |
| tree | ce4c86f20eff07b431e9fc45ffa49264e1adf10e | |
| parent | b17cb55f5710cfc14a4dbfe0182e94df47d83bd3 (diff) | |
| download | xamarin-forms-457b74f91a777e28ff11e32fb7d5a29d28aaf59e.tar.gz xamarin-forms-457b74f91a777e28ff11e32fb7d5a29d28aaf59e.tar.bz2 xamarin-forms-457b74f91a777e28ff11e32fb7d5a29d28aaf59e.zip | |
XF.Pages MS.Bcl.Build v1.0.14 -> v1.0.21 (#187)
| -rw-r--r-- | Xamarin.Forms.Pages/Xamarin.Forms.Pages.csproj | 16 | ||||
| -rw-r--r-- | Xamarin.Forms.Pages/packages.config | 2 |
2 files changed, 12 insertions, 6 deletions
diff --git a/Xamarin.Forms.Pages/Xamarin.Forms.Pages.csproj b/Xamarin.Forms.Pages/Xamarin.Forms.Pages.csproj index 82e54923..61dadbf9 100644 --- a/Xamarin.Forms.Pages/Xamarin.Forms.Pages.csproj +++ b/Xamarin.Forms.Pages/Xamarin.Forms.Pages.csproj @@ -15,6 +15,8 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <TargetFrameworkProfile>Profile259</TargetFrameworkProfile> <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> + <NuGetPackageImportStamp> + </NuGetPackageImportStamp> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <DebugSymbols>true</DebugSymbols> @@ -84,13 +86,17 @@ </Reference> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> + <None Include="packages.config"> + <SubType>Designer</SubType> + </None> </ItemGroup> <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" /> - <Import Project="..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets" Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" /> - <Target Name="EnsureBclBuildImported" BeforeTargets="BeforeBuild" Condition="'$(BclBuildImported)' == ''"> - <Error Condition="!Exists('..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="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=317567." HelpKeyword="BCLBUILD2001" /> - <Error Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="The build restored NuGet packages. Build the project again to include these packages in the build. For more information, see http://go.microsoft.com/fwlink/?LinkID=317568." HelpKeyword="BCLBUILD2002" /> + <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')" /> + <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\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets'))" /> </Target> <!-- To modify your build process, add your task inside one of the targets below and uncomment it. Other similar extension points exist, see Microsoft.Common.targets. diff --git a/Xamarin.Forms.Pages/packages.config b/Xamarin.Forms.Pages/packages.config index fc6881e9..3cd50593 100644 --- a/Xamarin.Forms.Pages/packages.config +++ b/Xamarin.Forms.Pages/packages.config @@ -1,7 +1,7 @@ <?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.14" 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" /> <package id="Newtonsoft.Json" version="6.0.4" targetFramework="portable45-net45+win8+wp8+wpa81" /> </packages>
\ No newline at end of file |