Skip to content

Commit efb858f

Browse files
David BritchDavid Britch
authored andcommitted
Bumped Forms version from 2.3.3 to 2.3.4.
Consolidated Json.NET to 9.0.1. Updated Microsoft.NetCore.UniversalWindowsPlatform to 5.3.3. Added Autofac to iOS and Droid app projects.
1 parent a2e6c9d commit efb858f

17 files changed

Lines changed: 313 additions & 6028 deletions

File tree

src/Mobile/eShopOnContainers/eShopOnContainers.Core/App.xaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,8 @@
134134
Value="FillAndExpand" />
135135
<Setter Property="FontAttributes"
136136
Value="Bold" />
137+
<Setter Property="BackgroundColor"
138+
Value="Transparent" />
137139
<Setter Property="Opacity"
138140
Value="0.6" />
139141
<Setter Property="behaviors:LineColorBehavior.ApplyLineColor"

src/Mobile/eShopOnContainers/eShopOnContainers.Core/eShopOnContainers.Core.csproj

100644100755
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
44
<PropertyGroup>
@@ -263,11 +263,11 @@
263263
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
264264
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
265265
<PropertyGroup>
266-
<ErrorText>Este proyecto hace referencia a los paquetes NuGet que faltan en este equipo. Use la restauración de paquetes NuGet para descargarlos. Para obtener más información, consulte http://go.microsoft.com/fwlink/?LinkID=322105. El archivo que falta es {0}.</ErrorText>
266+
<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>
267267
</PropertyGroup>
268-
<Error Condition="!Exists('..\..\..\..\packages\Xamarin.Forms.2.3.3.175\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Xamarin.Forms.2.3.3.175\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets'))" />
268+
<Error Condition="!Exists('..\..\..\..\packages\Xamarin.Forms.2.3.4.231\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Xamarin.Forms.2.3.4.231\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets'))" />
269269
</Target>
270-
<Import Project="..\..\..\..\packages\Xamarin.Forms.2.3.3.175\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets" Condition="Exists('..\..\..\..\packages\Xamarin.Forms.2.3.3.175\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" />
270+
<Import Project="..\..\..\..\packages\Xamarin.Forms.2.3.4.231\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets" Condition="Exists('..\..\..\..\packages\Xamarin.Forms.2.3.4.231\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" />
271271
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
272272
Other similar extension points exist, see Microsoft.Common.targets.
273273
<Target Name="BeforeBuild">

src/Mobile/eShopOnContainers/eShopOnContainers.Core/project.json

100644100755
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
{
22
"dependencies": {
33
"Acr.UserDialogs": "6.3.3",
4-
"Autofac": "4.4.0",
4+
"Autofac": "4.5.0",
55
"IdentityModel": "1.3.1",
66
"Microsoft.Bcl": "1.1.10",
77
"Microsoft.Bcl.Build": "1.0.21",
88
"Microsoft.Net.Http": "2.2.29",
99
"modernhttpclient": "2.4.2",
10-
"Newtonsoft.Json": "9.0.2-beta1",
10+
"Newtonsoft.Json": "9.0.1",
1111
"SlideOverKit": "2.1.4",
1212
"Splat": "1.6.2",
1313
"Xam.Plugins.Settings": "2.6.0.12-beta",
1414
"Xamarin.FFImageLoading": "2.2.6-pre-256",
1515
"Xamarin.FFImageLoading.Forms": "2.2.6-pre-256",
16-
"Xamarin.Forms": "2.3.3.175",
17-
"Xamarin.Forms.Pages": "2.3.3.175",
16+
"Xamarin.Forms": "2.3.4.231",
17+
"Xamarin.Forms.Pages": "2.3.4.231",
1818
"Xamarin.Forms.Theme.Base": "1.0.0.43-pre1",
1919
"Xamarin.Forms.Theme.Light": "1.0.0.43-pre1"
2020
},

0 commit comments

Comments
 (0)