Skip to content
This repository was archived by the owner on Nov 17, 2023. It is now read-only.

Commit ddff0ce

Browse files
committed
Update to Xamarin.Forms 4.1, with package refs.
1 parent b6032b1 commit ddff0ce

File tree

15 files changed

+16758
-9241
lines changed

15 files changed

+16758
-9241
lines changed

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

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,20 @@
44
<TargetFramework>netstandard2.0</TargetFramework>
55
</PropertyGroup>
66

7+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
8+
<DebugType>pdbonly</DebugType>
9+
<DebugSymbols>true</DebugSymbols>
10+
</PropertyGroup>
11+
712
<ItemGroup>
8-
<PackageReference Include="System.ComponentModel.Annotations" Version="4.4.1" />
9-
<PackageReference Include="Acr.UserDialogs" Version="6.5.1" />
10-
<PackageReference Include="SlideOverKit" Version="2.1.5" />
13+
<PackageReference Include="Acr.UserDialogs" Version="7.0.4" />
14+
<PackageReference Include="SlideOverKit" Version="2.1.6.2" />
1115
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
1216
<PackageReference Include="PCLCrypto" Version="2.0.147" />
17+
<PackageReference Include="Xamarin.Forms" Version="4.1.0.673156" />
1318
<PackageReference Include="Xamarin.FFImageLoading.Forms" Version="2.3.4" />
14-
<PackageReference Include="Xamarin.Forms" Version="3.0.0.482510" />
1519
<PackageReference Include="IdentityModel" Version="3.0.0" />
20+
<PackageReference Include="System.ComponentModel.Annotations" Version="4.5.0" />
1621
</ItemGroup>
1722
<ItemGroup>
1823
<Folder Include="Services\Permissions\" />

src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Renderers/SlideDownMenuPageRenderer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public class SlideDownMenuPageRenderer : PageRenderer, ISlideOverKitPageRenderer
1919

2020
public SlideDownMenuPageRenderer(Context context) : base(context)
2121
{
22-
new SlideOverKitDroidHandler().Init(this);
22+
new SlideOverKitDroidHandler().Init(this, context);
2323
}
2424

2525
protected override void OnElementChanged(ElementChangedEventArgs<Page> e)

src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/Resource.Designer.cs

Lines changed: 8859 additions & 4658 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/values/styles.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,4 @@
2929
<style name="AppCompatDialogStyle" parent="Theme.AppCompat.Light.Dialog">
3030
<item name="colorAccent">#00857D</item>
3131
</style>
32-
</resources>
32+
</resources>

src/Mobile/eShopOnContainers/eShopOnContainers.Droid/eShopOnContainers.Droid.csproj

Lines changed: 26 additions & 193 deletions
Large diffs are not rendered by default.

src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/Resources/Resource.Designer.cs

Lines changed: 7794 additions & 3644 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/eShopOnContainers.TestRunner.Droid.csproj

Lines changed: 15 additions & 194 deletions
Large diffs are not rendered by default.

src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/packages.config

Lines changed: 0 additions & 96 deletions
This file was deleted.

src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Windows/eShopOnContainers.TestRunner.Windows.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -131,18 +131,18 @@
131131
<Version>6.1.5</Version>
132132
</PackageReference>
133133
<PackageReference Include="xunit.runner.devices">
134-
<Version>2.3.3</Version>
134+
<Version>2.5.25</Version>
135135
</PackageReference>
136136
</ItemGroup>
137137
<PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
138138
<VisualStudioVersion>14.0</VisualStudioVersion>
139139
</PropertyGroup>
140140
<Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
141-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
141+
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
142142
Other similar extension points exist, see Microsoft.Common.targets.
143143
<Target Name="BeforeBuild">
144144
</Target>
145145
<Target Name="AfterBuild">
146146
</Target>
147147
-->
148-
</Project>
148+
</Project>

src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.iOS/Info.plist

Lines changed: 3 additions & 1 deletion
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
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
33
<plist version="1.0">
44
<dict>
@@ -30,5 +30,7 @@
3030
<string>UIInterfaceOrientationLandscapeLeft</string>
3131
<string>UIInterfaceOrientationLandscapeRight</string>
3232
</array>
33+
<key>CFBundleName</key>
34+
<string>eShopOnContainers.TestRunner.iOS</string>
3335
</dict>
3436
</plist>

0 commit comments

Comments
 (0)