diff --git a/eShopOnContainers-MobileApps.sln b/eShopOnContainers-MobileApps.sln
index ecc3fdb6b..74c882912 100755
--- a/eShopOnContainers-MobileApps.sln
+++ b/eShopOnContainers-MobileApps.sln
@@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
-VisualStudioVersion = 15.0.26730.8
+VisualStudioVersion = 15.0.26730.16
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{932D8224-11F6-4D07-B109-DA28AD288A63}"
EndProject
@@ -16,7 +16,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Mobile Apps", "Mobile Apps"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{A857AD10-40FF-4303-BEC2-FF1C58D5735E}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "eShopOnContainers.Core", "src\Mobile\eShopOnContainers\eShopOnContainers.Core\eShopOnContainers.Core.csproj", "{67F9D3A8-F71E-4428-913F-C37AE82CDB24}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "eShopOnContainers.Core", "src\Mobile\eShopOnContainers\eShopOnContainers.Core\eShopOnContainers.Core.csproj", "{BA96A12C-4EE3-46C4-BB3F-F811B554CD01}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "eShopOnContainers.Droid", "src\Mobile\eShopOnContainers\eShopOnContainers.Droid\eShopOnContainers.Droid.csproj", "{62DBB163-9CA9-4818-B48B-13233DF37C24}"
EndProject
@@ -30,7 +30,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Targets", "Targets", "{9CC7
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Mobile Apps", "Mobile Apps", "{B7B1D395-4E06-4036-BE86-C216756B9367}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "eShopOnContainers.UnitTests", "src\Mobile\eShopOnContainers\eShopOnContainers.UnitTests\eShopOnContainers.UnitTests.csproj", "{F7B6A162-BC4D-4924-B16A-713F9B0344E7}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "eShopOnContainers.UnitTests", "src\Mobile\eShopOnContainers\eShopOnContainers.UnitTests\eShopOnContainers.UnitTests.csproj", "{6E4285E7-7611-4440-A1B5-3513EBB13807}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "eShopOnContainers.TestRunner.Droid", "src\Mobile\eShopOnContainers\eShopOnContainers.TestRunner.Droid\eShopOnContainers.TestRunner.Droid.csproj", "{A289A7F0-ACD8-42AE-87B6-AB1AFD310BF1}"
EndProject
@@ -66,54 +66,54 @@ Global
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
- {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
- {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Ad-Hoc|ARM.ActiveCfg = Release|Any CPU
- {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Ad-Hoc|ARM.Build.0 = Release|Any CPU
- {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
- {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
- {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
- {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
- {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Ad-Hoc|x64.ActiveCfg = Release|Any CPU
- {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Ad-Hoc|x64.Build.0 = Release|Any CPU
- {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Ad-Hoc|x86.ActiveCfg = Release|Any CPU
- {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Ad-Hoc|x86.Build.0 = Release|Any CPU
- {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
- {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.AppStore|Any CPU.Build.0 = Release|Any CPU
- {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.AppStore|ARM.ActiveCfg = Release|Any CPU
- {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.AppStore|ARM.Build.0 = Release|Any CPU
- {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.AppStore|iPhone.ActiveCfg = Release|Any CPU
- {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.AppStore|iPhone.Build.0 = Release|Any CPU
- {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
- {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
- {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.AppStore|x64.ActiveCfg = Release|Any CPU
- {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.AppStore|x64.Build.0 = Release|Any CPU
- {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.AppStore|x86.ActiveCfg = Release|Any CPU
- {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.AppStore|x86.Build.0 = Release|Any CPU
- {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Debug|ARM.ActiveCfg = Debug|Any CPU
- {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Debug|ARM.Build.0 = Debug|Any CPU
- {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Debug|iPhone.ActiveCfg = Debug|Any CPU
- {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Debug|iPhone.Build.0 = Debug|Any CPU
- {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
- {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
- {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Debug|x64.ActiveCfg = Debug|Any CPU
- {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Debug|x64.Build.0 = Debug|Any CPU
- {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Debug|x86.ActiveCfg = Debug|Any CPU
- {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Debug|x86.Build.0 = Debug|Any CPU
- {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Release|Any CPU.Build.0 = Release|Any CPU
- {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Release|ARM.ActiveCfg = Release|Any CPU
- {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Release|ARM.Build.0 = Release|Any CPU
- {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Release|iPhone.ActiveCfg = Release|Any CPU
- {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Release|iPhone.Build.0 = Release|Any CPU
- {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
- {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
- {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Release|x64.ActiveCfg = Release|Any CPU
- {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Release|x64.Build.0 = Release|Any CPU
- {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Release|x86.ActiveCfg = Release|Any CPU
- {67F9D3A8-F71E-4428-913F-C37AE82CDB24}.Release|x86.Build.0 = Release|Any CPU
+ {BA96A12C-4EE3-46C4-BB3F-F811B554CD01}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
+ {BA96A12C-4EE3-46C4-BB3F-F811B554CD01}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
+ {BA96A12C-4EE3-46C4-BB3F-F811B554CD01}.Ad-Hoc|ARM.ActiveCfg = Release|Any CPU
+ {BA96A12C-4EE3-46C4-BB3F-F811B554CD01}.Ad-Hoc|ARM.Build.0 = Release|Any CPU
+ {BA96A12C-4EE3-46C4-BB3F-F811B554CD01}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
+ {BA96A12C-4EE3-46C4-BB3F-F811B554CD01}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
+ {BA96A12C-4EE3-46C4-BB3F-F811B554CD01}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
+ {BA96A12C-4EE3-46C4-BB3F-F811B554CD01}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
+ {BA96A12C-4EE3-46C4-BB3F-F811B554CD01}.Ad-Hoc|x64.ActiveCfg = Release|Any CPU
+ {BA96A12C-4EE3-46C4-BB3F-F811B554CD01}.Ad-Hoc|x64.Build.0 = Release|Any CPU
+ {BA96A12C-4EE3-46C4-BB3F-F811B554CD01}.Ad-Hoc|x86.ActiveCfg = Release|Any CPU
+ {BA96A12C-4EE3-46C4-BB3F-F811B554CD01}.Ad-Hoc|x86.Build.0 = Release|Any CPU
+ {BA96A12C-4EE3-46C4-BB3F-F811B554CD01}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
+ {BA96A12C-4EE3-46C4-BB3F-F811B554CD01}.AppStore|Any CPU.Build.0 = Release|Any CPU
+ {BA96A12C-4EE3-46C4-BB3F-F811B554CD01}.AppStore|ARM.ActiveCfg = Release|Any CPU
+ {BA96A12C-4EE3-46C4-BB3F-F811B554CD01}.AppStore|ARM.Build.0 = Release|Any CPU
+ {BA96A12C-4EE3-46C4-BB3F-F811B554CD01}.AppStore|iPhone.ActiveCfg = Release|Any CPU
+ {BA96A12C-4EE3-46C4-BB3F-F811B554CD01}.AppStore|iPhone.Build.0 = Release|Any CPU
+ {BA96A12C-4EE3-46C4-BB3F-F811B554CD01}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
+ {BA96A12C-4EE3-46C4-BB3F-F811B554CD01}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
+ {BA96A12C-4EE3-46C4-BB3F-F811B554CD01}.AppStore|x64.ActiveCfg = Release|Any CPU
+ {BA96A12C-4EE3-46C4-BB3F-F811B554CD01}.AppStore|x64.Build.0 = Release|Any CPU
+ {BA96A12C-4EE3-46C4-BB3F-F811B554CD01}.AppStore|x86.ActiveCfg = Release|Any CPU
+ {BA96A12C-4EE3-46C4-BB3F-F811B554CD01}.AppStore|x86.Build.0 = Release|Any CPU
+ {BA96A12C-4EE3-46C4-BB3F-F811B554CD01}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {BA96A12C-4EE3-46C4-BB3F-F811B554CD01}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {BA96A12C-4EE3-46C4-BB3F-F811B554CD01}.Debug|ARM.ActiveCfg = Debug|Any CPU
+ {BA96A12C-4EE3-46C4-BB3F-F811B554CD01}.Debug|ARM.Build.0 = Debug|Any CPU
+ {BA96A12C-4EE3-46C4-BB3F-F811B554CD01}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+ {BA96A12C-4EE3-46C4-BB3F-F811B554CD01}.Debug|iPhone.Build.0 = Debug|Any CPU
+ {BA96A12C-4EE3-46C4-BB3F-F811B554CD01}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+ {BA96A12C-4EE3-46C4-BB3F-F811B554CD01}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+ {BA96A12C-4EE3-46C4-BB3F-F811B554CD01}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {BA96A12C-4EE3-46C4-BB3F-F811B554CD01}.Debug|x64.Build.0 = Debug|Any CPU
+ {BA96A12C-4EE3-46C4-BB3F-F811B554CD01}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {BA96A12C-4EE3-46C4-BB3F-F811B554CD01}.Debug|x86.Build.0 = Debug|Any CPU
+ {BA96A12C-4EE3-46C4-BB3F-F811B554CD01}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {BA96A12C-4EE3-46C4-BB3F-F811B554CD01}.Release|Any CPU.Build.0 = Release|Any CPU
+ {BA96A12C-4EE3-46C4-BB3F-F811B554CD01}.Release|ARM.ActiveCfg = Release|Any CPU
+ {BA96A12C-4EE3-46C4-BB3F-F811B554CD01}.Release|ARM.Build.0 = Release|Any CPU
+ {BA96A12C-4EE3-46C4-BB3F-F811B554CD01}.Release|iPhone.ActiveCfg = Release|Any CPU
+ {BA96A12C-4EE3-46C4-BB3F-F811B554CD01}.Release|iPhone.Build.0 = Release|Any CPU
+ {BA96A12C-4EE3-46C4-BB3F-F811B554CD01}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+ {BA96A12C-4EE3-46C4-BB3F-F811B554CD01}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+ {BA96A12C-4EE3-46C4-BB3F-F811B554CD01}.Release|x64.ActiveCfg = Release|Any CPU
+ {BA96A12C-4EE3-46C4-BB3F-F811B554CD01}.Release|x64.Build.0 = Release|Any CPU
+ {BA96A12C-4EE3-46C4-BB3F-F811B554CD01}.Release|x86.ActiveCfg = Release|Any CPU
+ {BA96A12C-4EE3-46C4-BB3F-F811B554CD01}.Release|x86.Build.0 = Release|Any CPU
{62DBB163-9CA9-4818-B48B-13233DF37C24}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
{62DBB163-9CA9-4818-B48B-13233DF37C24}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
{62DBB163-9CA9-4818-B48B-13233DF37C24}.Ad-Hoc|Any CPU.Deploy.0 = Release|Any CPU
@@ -283,54 +283,54 @@ Global
{C3C1E2CF-B1F7-4654-BBDC-50143DB22E0B}.Release|x86.ActiveCfg = Release|x86
{C3C1E2CF-B1F7-4654-BBDC-50143DB22E0B}.Release|x86.Build.0 = Release|x86
{C3C1E2CF-B1F7-4654-BBDC-50143DB22E0B}.Release|x86.Deploy.0 = Release|x86
- {F7B6A162-BC4D-4924-B16A-713F9B0344E7}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
- {F7B6A162-BC4D-4924-B16A-713F9B0344E7}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
- {F7B6A162-BC4D-4924-B16A-713F9B0344E7}.Ad-Hoc|ARM.ActiveCfg = Release|Any CPU
- {F7B6A162-BC4D-4924-B16A-713F9B0344E7}.Ad-Hoc|ARM.Build.0 = Release|Any CPU
- {F7B6A162-BC4D-4924-B16A-713F9B0344E7}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
- {F7B6A162-BC4D-4924-B16A-713F9B0344E7}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
- {F7B6A162-BC4D-4924-B16A-713F9B0344E7}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
- {F7B6A162-BC4D-4924-B16A-713F9B0344E7}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
- {F7B6A162-BC4D-4924-B16A-713F9B0344E7}.Ad-Hoc|x64.ActiveCfg = Release|Any CPU
- {F7B6A162-BC4D-4924-B16A-713F9B0344E7}.Ad-Hoc|x64.Build.0 = Release|Any CPU
- {F7B6A162-BC4D-4924-B16A-713F9B0344E7}.Ad-Hoc|x86.ActiveCfg = Release|Any CPU
- {F7B6A162-BC4D-4924-B16A-713F9B0344E7}.Ad-Hoc|x86.Build.0 = Release|Any CPU
- {F7B6A162-BC4D-4924-B16A-713F9B0344E7}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
- {F7B6A162-BC4D-4924-B16A-713F9B0344E7}.AppStore|Any CPU.Build.0 = Release|Any CPU
- {F7B6A162-BC4D-4924-B16A-713F9B0344E7}.AppStore|ARM.ActiveCfg = Release|Any CPU
- {F7B6A162-BC4D-4924-B16A-713F9B0344E7}.AppStore|ARM.Build.0 = Release|Any CPU
- {F7B6A162-BC4D-4924-B16A-713F9B0344E7}.AppStore|iPhone.ActiveCfg = Release|Any CPU
- {F7B6A162-BC4D-4924-B16A-713F9B0344E7}.AppStore|iPhone.Build.0 = Release|Any CPU
- {F7B6A162-BC4D-4924-B16A-713F9B0344E7}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
- {F7B6A162-BC4D-4924-B16A-713F9B0344E7}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
- {F7B6A162-BC4D-4924-B16A-713F9B0344E7}.AppStore|x64.ActiveCfg = Release|Any CPU
- {F7B6A162-BC4D-4924-B16A-713F9B0344E7}.AppStore|x64.Build.0 = Release|Any CPU
- {F7B6A162-BC4D-4924-B16A-713F9B0344E7}.AppStore|x86.ActiveCfg = Release|Any CPU
- {F7B6A162-BC4D-4924-B16A-713F9B0344E7}.AppStore|x86.Build.0 = Release|Any CPU
- {F7B6A162-BC4D-4924-B16A-713F9B0344E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {F7B6A162-BC4D-4924-B16A-713F9B0344E7}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {F7B6A162-BC4D-4924-B16A-713F9B0344E7}.Debug|ARM.ActiveCfg = Debug|Any CPU
- {F7B6A162-BC4D-4924-B16A-713F9B0344E7}.Debug|ARM.Build.0 = Debug|Any CPU
- {F7B6A162-BC4D-4924-B16A-713F9B0344E7}.Debug|iPhone.ActiveCfg = Debug|Any CPU
- {F7B6A162-BC4D-4924-B16A-713F9B0344E7}.Debug|iPhone.Build.0 = Debug|Any CPU
- {F7B6A162-BC4D-4924-B16A-713F9B0344E7}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
- {F7B6A162-BC4D-4924-B16A-713F9B0344E7}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
- {F7B6A162-BC4D-4924-B16A-713F9B0344E7}.Debug|x64.ActiveCfg = Debug|Any CPU
- {F7B6A162-BC4D-4924-B16A-713F9B0344E7}.Debug|x64.Build.0 = Debug|Any CPU
- {F7B6A162-BC4D-4924-B16A-713F9B0344E7}.Debug|x86.ActiveCfg = Debug|Any CPU
- {F7B6A162-BC4D-4924-B16A-713F9B0344E7}.Debug|x86.Build.0 = Debug|Any CPU
- {F7B6A162-BC4D-4924-B16A-713F9B0344E7}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {F7B6A162-BC4D-4924-B16A-713F9B0344E7}.Release|Any CPU.Build.0 = Release|Any CPU
- {F7B6A162-BC4D-4924-B16A-713F9B0344E7}.Release|ARM.ActiveCfg = Release|Any CPU
- {F7B6A162-BC4D-4924-B16A-713F9B0344E7}.Release|ARM.Build.0 = Release|Any CPU
- {F7B6A162-BC4D-4924-B16A-713F9B0344E7}.Release|iPhone.ActiveCfg = Release|Any CPU
- {F7B6A162-BC4D-4924-B16A-713F9B0344E7}.Release|iPhone.Build.0 = Release|Any CPU
- {F7B6A162-BC4D-4924-B16A-713F9B0344E7}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
- {F7B6A162-BC4D-4924-B16A-713F9B0344E7}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
- {F7B6A162-BC4D-4924-B16A-713F9B0344E7}.Release|x64.ActiveCfg = Release|Any CPU
- {F7B6A162-BC4D-4924-B16A-713F9B0344E7}.Release|x64.Build.0 = Release|Any CPU
- {F7B6A162-BC4D-4924-B16A-713F9B0344E7}.Release|x86.ActiveCfg = Release|Any CPU
- {F7B6A162-BC4D-4924-B16A-713F9B0344E7}.Release|x86.Build.0 = Release|Any CPU
+ {6E4285E7-7611-4440-A1B5-3513EBB13807}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
+ {6E4285E7-7611-4440-A1B5-3513EBB13807}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
+ {6E4285E7-7611-4440-A1B5-3513EBB13807}.Ad-Hoc|ARM.ActiveCfg = Release|Any CPU
+ {6E4285E7-7611-4440-A1B5-3513EBB13807}.Ad-Hoc|ARM.Build.0 = Release|Any CPU
+ {6E4285E7-7611-4440-A1B5-3513EBB13807}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
+ {6E4285E7-7611-4440-A1B5-3513EBB13807}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
+ {6E4285E7-7611-4440-A1B5-3513EBB13807}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
+ {6E4285E7-7611-4440-A1B5-3513EBB13807}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
+ {6E4285E7-7611-4440-A1B5-3513EBB13807}.Ad-Hoc|x64.ActiveCfg = Release|Any CPU
+ {6E4285E7-7611-4440-A1B5-3513EBB13807}.Ad-Hoc|x64.Build.0 = Release|Any CPU
+ {6E4285E7-7611-4440-A1B5-3513EBB13807}.Ad-Hoc|x86.ActiveCfg = Release|Any CPU
+ {6E4285E7-7611-4440-A1B5-3513EBB13807}.Ad-Hoc|x86.Build.0 = Release|Any CPU
+ {6E4285E7-7611-4440-A1B5-3513EBB13807}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
+ {6E4285E7-7611-4440-A1B5-3513EBB13807}.AppStore|Any CPU.Build.0 = Release|Any CPU
+ {6E4285E7-7611-4440-A1B5-3513EBB13807}.AppStore|ARM.ActiveCfg = Release|Any CPU
+ {6E4285E7-7611-4440-A1B5-3513EBB13807}.AppStore|ARM.Build.0 = Release|Any CPU
+ {6E4285E7-7611-4440-A1B5-3513EBB13807}.AppStore|iPhone.ActiveCfg = Release|Any CPU
+ {6E4285E7-7611-4440-A1B5-3513EBB13807}.AppStore|iPhone.Build.0 = Release|Any CPU
+ {6E4285E7-7611-4440-A1B5-3513EBB13807}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
+ {6E4285E7-7611-4440-A1B5-3513EBB13807}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
+ {6E4285E7-7611-4440-A1B5-3513EBB13807}.AppStore|x64.ActiveCfg = Release|Any CPU
+ {6E4285E7-7611-4440-A1B5-3513EBB13807}.AppStore|x64.Build.0 = Release|Any CPU
+ {6E4285E7-7611-4440-A1B5-3513EBB13807}.AppStore|x86.ActiveCfg = Release|Any CPU
+ {6E4285E7-7611-4440-A1B5-3513EBB13807}.AppStore|x86.Build.0 = Release|Any CPU
+ {6E4285E7-7611-4440-A1B5-3513EBB13807}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {6E4285E7-7611-4440-A1B5-3513EBB13807}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {6E4285E7-7611-4440-A1B5-3513EBB13807}.Debug|ARM.ActiveCfg = Debug|Any CPU
+ {6E4285E7-7611-4440-A1B5-3513EBB13807}.Debug|ARM.Build.0 = Debug|Any CPU
+ {6E4285E7-7611-4440-A1B5-3513EBB13807}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+ {6E4285E7-7611-4440-A1B5-3513EBB13807}.Debug|iPhone.Build.0 = Debug|Any CPU
+ {6E4285E7-7611-4440-A1B5-3513EBB13807}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+ {6E4285E7-7611-4440-A1B5-3513EBB13807}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+ {6E4285E7-7611-4440-A1B5-3513EBB13807}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {6E4285E7-7611-4440-A1B5-3513EBB13807}.Debug|x64.Build.0 = Debug|Any CPU
+ {6E4285E7-7611-4440-A1B5-3513EBB13807}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {6E4285E7-7611-4440-A1B5-3513EBB13807}.Debug|x86.Build.0 = Debug|Any CPU
+ {6E4285E7-7611-4440-A1B5-3513EBB13807}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {6E4285E7-7611-4440-A1B5-3513EBB13807}.Release|Any CPU.Build.0 = Release|Any CPU
+ {6E4285E7-7611-4440-A1B5-3513EBB13807}.Release|ARM.ActiveCfg = Release|Any CPU
+ {6E4285E7-7611-4440-A1B5-3513EBB13807}.Release|ARM.Build.0 = Release|Any CPU
+ {6E4285E7-7611-4440-A1B5-3513EBB13807}.Release|iPhone.ActiveCfg = Release|Any CPU
+ {6E4285E7-7611-4440-A1B5-3513EBB13807}.Release|iPhone.Build.0 = Release|Any CPU
+ {6E4285E7-7611-4440-A1B5-3513EBB13807}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+ {6E4285E7-7611-4440-A1B5-3513EBB13807}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+ {6E4285E7-7611-4440-A1B5-3513EBB13807}.Release|x64.ActiveCfg = Release|Any CPU
+ {6E4285E7-7611-4440-A1B5-3513EBB13807}.Release|x64.Build.0 = Release|Any CPU
+ {6E4285E7-7611-4440-A1B5-3513EBB13807}.Release|x86.ActiveCfg = Release|Any CPU
+ {6E4285E7-7611-4440-A1B5-3513EBB13807}.Release|x86.Build.0 = Release|Any CPU
{A289A7F0-ACD8-42AE-87B6-AB1AFD310BF1}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
{A289A7F0-ACD8-42AE-87B6-AB1AFD310BF1}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
{A289A7F0-ACD8-42AE-87B6-AB1AFD310BF1}.Ad-Hoc|Any CPU.Deploy.0 = Release|Any CPU
@@ -506,16 +506,19 @@ Global
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{F61357CE-1CC2-410E-8776-B16EEBC98EB8} = {932D8224-11F6-4D07-B109-DA28AD288A63}
- {67F9D3A8-F71E-4428-913F-C37AE82CDB24} = {778289CA-31F7-4464-8C2A-612EE846F8A7}
+ {BA96A12C-4EE3-46C4-BB3F-F811B554CD01} = {778289CA-31F7-4464-8C2A-612EE846F8A7}
{62DBB163-9CA9-4818-B48B-13233DF37C24} = {9CC7814B-72A6-465B-A61C-57B512DEE303}
{6EEB23DC-7063-4444-9AF8-90DF24F549C0} = {9CC7814B-72A6-465B-A61C-57B512DEE303}
{C3C1E2CF-B1F7-4654-BBDC-50143DB22E0B} = {9CC7814B-72A6-465B-A61C-57B512DEE303}
{778289CA-31F7-4464-8C2A-612EE846F8A7} = {F61357CE-1CC2-410E-8776-B16EEBC98EB8}
{9CC7814B-72A6-465B-A61C-57B512DEE303} = {F61357CE-1CC2-410E-8776-B16EEBC98EB8}
{B7B1D395-4E06-4036-BE86-C216756B9367} = {A857AD10-40FF-4303-BEC2-FF1C58D5735E}
- {F7B6A162-BC4D-4924-B16A-713F9B0344E7} = {B7B1D395-4E06-4036-BE86-C216756B9367}
+ {6E4285E7-7611-4440-A1B5-3513EBB13807} = {B7B1D395-4E06-4036-BE86-C216756B9367}
{A289A7F0-ACD8-42AE-87B6-AB1AFD310BF1} = {B7B1D395-4E06-4036-BE86-C216756B9367}
{B68C2B56-7581-46AE-B55D-D25DDFD3BFE3} = {B7B1D395-4E06-4036-BE86-C216756B9367}
{A7337243-33B8-463A-87AD-944B75EFD820} = {B7B1D395-4E06-4036-BE86-C216756B9367}
EndGlobalSection
+ GlobalSection(ExtensibilityGlobals) = postSolution
+ SolutionGuid = {8A9E878A-C296-4615-97AB-7A4505148872}
+ EndGlobalSection
EndGlobal
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Marketing/CampaignMockService.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Marketing/CampaignMockService.cs
index 65490db45..88bd3a5ee 100644
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Marketing/CampaignMockService.cs
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Marketing/CampaignMockService.cs
@@ -45,6 +45,8 @@
public async Task<CampaignItem> GetCampaignByIdAsync(int campaignId, string token)
{
+ await Task.Delay(500);
+
return _mockCampaign.SingleOrDefault(c => c.Id == campaignId);
}
}
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/eShopOnContainers.Core.csproj b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/eShopOnContainers.Core.csproj
index 90c478422..e31d06f37 100644
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/eShopOnContainers.Core.csproj
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/eShopOnContainers.Core.csproj
@@ -1,34 +1,235 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <TargetFramework>netstandard2.0</TargetFramework>
- <PackageTargetFallback>portable-net45+win8+wpa81+wp8</PackageTargetFallback>
- <DebugType>full</DebugType>
- <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ProjectGuid>{BA96A12C-4EE3-46C4-BB3F-F811B554CD01}</ProjectGuid>
+ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+ <UseMSBuildEngine>true</UseMSBuildEngine>
+ <OutputType>Library</OutputType>
+ <RootNamespace>eShopOnContainers.Core</RootNamespace>
+ <AssemblyName>eShopOnContainers.Core</AssemblyName>
+ <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+ <TargetFrameworkProfile>Profile111</TargetFrameworkProfile>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <DebugSymbols>true</DebugSymbols>
+ <DebugType>full</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>bin\Debug</OutputPath>
+ <DefineConstants>DEBUG;</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <Optimize>true</Optimize>
+ <OutputPath>bin\Release</OutputPath>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
</PropertyGroup>
-
<ItemGroup>
- <PackageReference Include="Acr.UserDialogs" Version="6.3.3" />
- <PackageReference Include="Autofac" Version="4.5.0" />
- <PackageReference Include="IdentityModel" Version="2.10.0" />
- <PackageReference Include="Microsoft.NETCore.Platforms" Version="2.0.0" />
- <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
- <PackageReference Include="PCLCrypto" Version="2.0.147" />
- <PackageReference Include="SlideOverKit" Version="2.1.4" />
- <PackageReference Include="Splat" Version="1.6.2" />
- <PackageReference Include="System.ComponentModel.Annotations" Version="4.4.0" />
- <PackageReference Include="Xam.Plugin.Geolocator" Version="3.0.4" />
- <PackageReference Include="Xam.Plugins.Settings" Version="2.6.0.12-beta" />
- <PackageReference Include="Xamarin.FFImageLoading.Forms" Version="2.2.9" />
- <PackageReference Include="Xamarin.Forms" Version="2.3.4.231" />
+ <Compile Include="Properties\AssemblyInfo.cs" />
+ <Compile Include="App.xaml.cs">
+ <DependentUpon>App.xaml</DependentUpon>
+ </Compile>
+ <Compile Include="Animations\FadeToAnimation.cs" />
+ <Compile Include="Animations\StoryBoard.cs" />
+ <Compile Include="Animations\Base\AnimationBase.cs" />
+ <Compile Include="Animations\Base\EasingType.cs" />
+ <Compile Include="Controls\AddBasketButton.xaml.cs" />
+ <Compile Include="Controls\CustomTabbedPage.cs" />
+ <Compile Include="Controls\ToggleButton.cs" />
+ <Compile Include="Behaviors\EventToCommandBehavior.cs" />
+ <Compile Include="Behaviors\LineColorBehavior.cs" />
+ <Compile Include="Behaviors\Base\BindableBehavior.cs" />
+ <Compile Include="Converters\CountToBoolConverter.cs" />
+ <Compile Include="Converters\DatetimeConverter.cs" />
+ <Compile Include="Converters\DoubleConverter.cs" />
+ <Compile Include="Converters\FirstValidationErrorConverter.cs" />
+ <Compile Include="Converters\ImageConverter.cs" />
+ <Compile Include="Converters\InverseBoolConverter.cs" />
+ <Compile Include="Converters\InverseCountToBoolConverter.cs" />
+ <Compile Include="Converters\ItemsToHeightConverter.cs" />
+ <Compile Include="Converters\ItemTappedEventArgsConverter.cs" />
+ <Compile Include="Converters\StringNullOrEmptyBoolConverter.cs" />
+ <Compile Include="Converters\ToUpperConverter.cs" />
+ <Compile Include="Converters\WebNavigatedEventArgsConverter.cs" />
+ <Compile Include="Converters\WebNavigatingEventArgsConverter.cs" />
+ <Compile Include="Helpers\EasingHelper.cs" />
+ <Compile Include="Helpers\RandomNumberGenerator.cs" />
+ <Compile Include="Helpers\ServicesHelper.cs" />
+ <Compile Include="Helpers\Settings.cs" />
+ <Compile Include="Views\Templates\BasketItemTemplate.xaml.cs" />
+ <Compile Include="Views\Templates\CampaignTemplate.xaml.cs" />
+ <Compile Include="Views\Templates\OrderItemTemplate.xaml.cs" />
+ <Compile Include="Views\Templates\OrderTemplate.xaml.cs" />
+ <Compile Include="Views\Templates\ProductTemplate.xaml.cs" />
+ <Compile Include="Views\BasketView.xaml.cs" />
+ <Compile Include="Views\CampaignDetailsView.xaml.cs" />
+ <Compile Include="Views\CampaignView.xaml.cs" />
+ <Compile Include="Views\CatalogView.xaml.cs" />
+ <Compile Include="Views\CheckoutView.xaml.cs" />
+ <Compile Include="Views\CustomNavigationView.xaml.cs" />
+ <Compile Include="Views\FiltersView.xaml.cs" />
+ <Compile Include="Views\LoginView.xaml.cs" />
+ <Compile Include="Views\MainView.xaml.cs" />
+ <Compile Include="Views\OrderDetailView.xaml.cs" />
+ <Compile Include="Views\ProfileView.xaml.cs" />
+ <Compile Include="Views\SettingsView.xaml.cs" />
+ <Compile Include="Extensions\ObservableExtension.cs" />
+ <Compile Include="Exceptions\ServiceAuthenticationException.cs" />
+ <Compile Include="Models\Basket\BasketCheckout.cs" />
+ <Compile Include="Models\Basket\BasketItem.cs" />
+ <Compile Include="Models\Basket\CustomerBasket.cs" />
+ <Compile Include="Models\Catalog\CatalogBrand.cs" />
+ <Compile Include="Models\Catalog\CatalogItem.cs" />
+ <Compile Include="Models\Catalog\CatalogRoot.cs" />
+ <Compile Include="Models\Catalog\CatalogType.cs" />
+ <Compile Include="Models\Location\Location.cs" />
+ <Compile Include="Models\Marketing\Campaign.cs" />
+ <Compile Include="Models\Marketing\CampaignItem.cs" />
+ <Compile Include="Models\Marketing\CampaignRoot.cs" />
+ <Compile Include="Models\Navigation\TabParameter.cs" />
+ <Compile Include="Models\Orders\CancelOrderCommand.cs" />
+ <Compile Include="Models\Orders\CardType.CS" />
+ <Compile Include="Models\Orders\Order.cs" />
+ <Compile Include="Models\Orders\OrderItem.cs" />
+ <Compile Include="Models\Orders\OrderStatus.cs" />
+ <Compile Include="Models\Token\UserToken.cs" />
+ <Compile Include="Models\User\Address.cs" />
+ <Compile Include="Models\User\LogoutParameter.cs" />
+ <Compile Include="Models\User\PaymentInfo.cs" />
+ <Compile Include="Models\User\UserInfo.cs" />
+ <Compile Include="Triggers\BeginAnimation.cs" />
+ <Compile Include="Services\Basket\BasketMockService.cs" />
+ <Compile Include="Services\Basket\BasketService.cs" />
+ <Compile Include="Services\Basket\IBasketService.cs" />
+ <Compile Include="Services\Catalog\CatalogMockService.cs" />
+ <Compile Include="Services\Catalog\CatalogService.cs" />
+ <Compile Include="Services\Catalog\ICatalogService.cs" />
+ <Compile Include="Services\Common\Common.cs" />
+ <Compile Include="Services\Dialog\DialogService.cs" />
+ <Compile Include="Services\Dialog\IDialogService.cs" />
+ <Compile Include="Services\Identity\IdentityService.cs" />
+ <Compile Include="Services\Identity\IIdentityService.cs" />
+ <Compile Include="Services\Location\ILocationService.cs" />
+ <Compile Include="Services\Location\LocationService.cs" />
+ <Compile Include="Services\Marketing\CampaignMockService.cs" />
+ <Compile Include="Services\Marketing\CampaignService.cs" />
+ <Compile Include="Services\Marketing\ICampaignService.cs" />
+ <Compile Include="Services\Navigation\INavigationService.cs" />
+ <Compile Include="Services\Navigation\NavigationService.cs" />
+ <Compile Include="Services\OpenUrl\IOpenUrlService.cs" />
+ <Compile Include="Services\OpenUrl\OpenUrlService.cs" />
+ <Compile Include="Services\Order\IOrderService.cs" />
+ <Compile Include="Services\Order\OrderMockService.cs" />
+ <Compile Include="Services\Order\OrderService.cs" />
+ <Compile Include="Services\RequestProvider\HttpRequestExceptionEx.cs" />
+ <Compile Include="Services\RequestProvider\IRequestProvider.cs" />
+ <Compile Include="Services\RequestProvider\RequestProvider.cs" />
+ <Compile Include="Services\User\IUserService.cs" />
+ <Compile Include="Services\User\UserMockService.cs" />
+ <Compile Include="Services\User\UserService.cs" />
+ <Compile Include="ViewModels\Base\ExtendedBindableObject.cs" />
+ <Compile Include="ViewModels\Base\MessageKeys.cs" />
+ <Compile Include="ViewModels\Base\ViewModelBase.cs" />
+ <Compile Include="ViewModels\Base\ViewModelLocator.cs" />
+ <Compile Include="ViewModels\BasketViewModel.cs" />
+ <Compile Include="ViewModels\CampaignDetailsViewModel.cs" />
+ <Compile Include="ViewModels\CampaignViewModel.cs" />
+ <Compile Include="ViewModels\CatalogViewModel.cs" />
+ <Compile Include="ViewModels\CheckoutViewModel.cs" />
+ <Compile Include="ViewModels\LoginViewModel.cs" />
+ <Compile Include="ViewModels\MainViewModel.cs" />
+ <Compile Include="ViewModels\OrderDetailViewModel.cs" />
+ <Compile Include="ViewModels\ProfileViewModel.cs" />
+ <Compile Include="ViewModels\SettingsViewModel.cs" />
+ <Compile Include="Effects\EntryLineColorEffect.cs" />
+ <Compile Include="Effects\ThemeEffects.cs" />
+ <Compile Include="Validations\IsNotNullOrEmptyRule.cs" />
+ <Compile Include="Validations\IValidationRule.cs" />
+ <Compile Include="Validations\IValidity.cs" />
+ <Compile Include="Validations\ValidatableObject.cs" />
+ <Compile Include="GlobalSettings.cs" />
</ItemGroup>
-
<ItemGroup>
- <!-- https://bugzilla.xamarin.com/show_bug.cgi?id=55591 -->
- <None Remove="**\*.xaml" />
-
- <Compile Update="**\*.xaml.cs" DependentUpon="%(Filename)" />
- <EmbeddedResource Include="**\*.xaml" SubType="Designer" Generator="MSBuild:UpdateDesignTimeXaml" />
+ <None Include="app.config" />
+ <None Include="project.json" />
</ItemGroup>
-
-</Project>
+ <ItemGroup>
+ <EmbeddedResource Include="App.xaml">
+ <SubType>Designer</SubType>
+ <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+ </EmbeddedResource>
+ <EmbeddedResource Include="Controls\AddBasketButton.xaml">
+ <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+ </EmbeddedResource>
+ <EmbeddedResource Include="Views\Templates\BasketItemTemplate.xaml">
+ <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+ </EmbeddedResource>
+ <EmbeddedResource Include="Views\Templates\CampaignTemplate.xaml">
+ <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+ </EmbeddedResource>
+ <EmbeddedResource Include="Views\Templates\OrderItemTemplate.xaml">
+ <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+ </EmbeddedResource>
+ <EmbeddedResource Include="Views\Templates\OrderTemplate.xaml">
+ <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+ </EmbeddedResource>
+ <EmbeddedResource Include="Views\Templates\ProductTemplate.xaml">
+ <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+ </EmbeddedResource>
+ <EmbeddedResource Include="Views\BasketView.xaml">
+ <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+ </EmbeddedResource>
+ <EmbeddedResource Include="Views\CampaignDetailsView.xaml">
+ <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+ </EmbeddedResource>
+ <EmbeddedResource Include="Views\CampaignView.xaml">
+ <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+ </EmbeddedResource>
+ <EmbeddedResource Include="Views\CatalogView.xaml">
+ <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+ </EmbeddedResource>
+ <EmbeddedResource Include="Views\SettingsView.xaml">
+ <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+ </EmbeddedResource>
+ <EmbeddedResource Include="Views\ProfileView.xaml">
+ <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+ </EmbeddedResource>
+ <EmbeddedResource Include="Views\OrderDetailView.xaml">
+ <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+ </EmbeddedResource>
+ <EmbeddedResource Include="Views\MainView.xaml">
+ <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+ </EmbeddedResource>
+ <EmbeddedResource Include="Views\LoginView.xaml">
+ <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+ </EmbeddedResource>
+ <EmbeddedResource Include="Views\FiltersView.xaml">
+ <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+ </EmbeddedResource>
+ <EmbeddedResource Include="Views\CustomNavigationView.xaml">
+ <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+ </EmbeddedResource>
+ <EmbeddedResource Include="Views\CheckoutView.xaml">
+ <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+ </EmbeddedResource>
+ </ItemGroup>
+ <ItemGroup>
+ <Folder Include="Animations\" />
+ <Folder Include="Behaviors\" />
+ <Folder Include="Animations\Base\" />
+ <Folder Include="Controls\" />
+ <Folder Include="Helpers\" />
+ <Folder Include="Views\" />
+ <Folder Include="ViewModels\" />
+ <Folder Include="Services\" />
+ <Folder Include="Behaviors\Base\" />
+ <Folder Include="Converters\" />
+ <Folder Include="Validations\" />
+ </ItemGroup>
+ <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
+ <Import Project="..\..\..\..\packages\Xamarin.Forms.2.3.4.270\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets" Condition="Exists('..\..\..\..\packages\Xamarin.Forms.2.3.4.270\build\portable-win+net45+wp80+win81+wpa81+MonoAndroid10+Xamarin.iOS10+xamarinmac20\Xamarin.Forms.targets')" />
+ <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/src/Mobile/eShopOnContainers/eShopOnContainers.Core/eShopOnContainers.Core.csproj.bak b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/eShopOnContainers.Core.csproj.bak
deleted file mode 100644
index 9b2619bc9..000000000
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/eShopOnContainers.Core.csproj.bak
+++ /dev/null
@@ -1,322 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
- <PropertyGroup>
- <MinimumVisualStudioVersion>10.0</MinimumVisualStudioVersion>
- <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProjectGuid>{67F9D3A8-F71E-4428-913F-C37AE82CDB24}</ProjectGuid>
- <OutputType>Library</OutputType>
- <AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>eShopOnContainers.Core</RootNamespace>
- <AssemblyName>eShopOnContainers.Core</AssemblyName>
- <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
- <FileAlignment>512</FileAlignment>
- <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
- <NuGetPackageImportStamp>
- </NuGetPackageImportStamp>
- <TargetFrameworkProfile>Profile111</TargetFrameworkProfile>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <DebugSymbols>true</DebugSymbols>
- <DebugType>full</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>bin\Debug\</OutputPath>
- <DefineConstants>DEBUG;TRACE</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <DebugType>pdbonly</DebugType>
- <Optimize>true</Optimize>
- <OutputPath>bin\Release\</OutputPath>
- <DefineConstants>TRACE</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- </PropertyGroup>
- <ItemGroup>
- <Compile Include="Animations\Base\AnimationBase.cs" />
- <Compile Include="Animations\Base\EasingType.cs" />
- <Compile Include="Animations\FadeToAnimation.cs" />
- <Compile Include="Animations\StoryBoard.cs" />
- <Compile Include="App.xaml.cs">
- <DependentUpon>App.xaml</DependentUpon>
- </Compile>
- <Compile Include="Behaviors\Base\BindableBehavior.cs" />
- <Compile Include="Behaviors\EventToCommandBehavior.cs" />
- <Compile Include="Controls\AddBasketButton.xaml.cs">
- <DependentUpon>AddBasketButton.xaml</DependentUpon>
- </Compile>
- <Compile Include="Controls\CustomTabbedPage.cs" />
- <Compile Include="Controls\ToggleButton.cs" />
- <Compile Include="Converters\DoubleConverter.cs" />
- <Compile Include="Converters\StringNullOrEmptyBoolConverter.cs" />
- <Compile Include="Converters\CountToBoolConverter.cs" />
- <Compile Include="Converters\DatetimeConverter.cs" />
- <Compile Include="Converters\ImageConverter.cs" />
- <Compile Include="Converters\InverseBoolConverter.cs" />
- <Compile Include="Converters\InverseCountToBoolConverter.cs" />
- <Compile Include="Converters\ItemsToHeightConverter.cs" />
- <Compile Include="Converters\ItemTappedEventArgsConverter.cs" />
- <Compile Include="Converters\ToUpperConverter.cs" />
- <Compile Include="Converters\WebNavigatedEventArgsConverter.cs" />
- <Compile Include="Exceptions\ServiceAuthenticationException.cs" />
- <Compile Include="Extensions\ObservableExtension.cs" />
- <Compile Include="GlobalSettings.cs" />
- <Compile Include="Helpers\EasingHelper.cs" />
- <Compile Include="Helpers\RandomNumberGenerator.cs" />
- <Compile Include="Helpers\ServicesHelper.cs" />
- <Compile Include="Helpers\Settings.cs" />
- <Compile Include="Models\Basket\BasketCheckout.cs" />
- <Compile Include="Models\Basket\BasketItem.cs" />
- <Compile Include="Models\Basket\CustomerBasket.cs" />
- <Compile Include="Models\Catalog\CatalogBrand.cs" />
- <Compile Include="Models\Catalog\CatalogItem.cs" />
- <Compile Include="Models\Catalog\CatalogRoot.cs" />
- <Compile Include="Models\Catalog\CatalogType.cs" />
- <Compile Include="Models\Location\Location.cs" />
- <Compile Include="Models\Marketing\CampaignItem.cs" />
- <Compile Include="Models\Marketing\CampaignRoot.cs" />
- <Compile Include="Models\Navigation\TabParameter.cs" />
- <Compile Include="Models\Orders\CancelOrderCommand.cs" />
- <Compile Include="Models\Orders\CardType.CS" />
- <Compile Include="Models\Orders\Order.cs" />
- <Compile Include="Models\Orders\OrderItem.cs" />
- <Compile Include="Models\Orders\OrderStatus.cs" />
- <Compile Include="Models\User\Address.cs" />
- <Compile Include="Models\User\LogoutParameter.cs" />
- <Compile Include="Models\User\PaymentInfo.cs" />
- <Compile Include="Models\User\UserInfo.cs" />
- <Compile Include="Properties\AssemblyInfo.cs" />
- <Compile Include="Services\Basket\BasketMockService.cs" />
- <Compile Include="Services\Basket\BasketService.cs" />
- <Compile Include="Services\Basket\IBasketService.cs" />
- <Compile Include="Services\Catalog\CatalogMockService.cs" />
- <Compile Include="Services\Catalog\CatalogService.cs" />
- <Compile Include="Services\Catalog\ICatalogService.cs" />
- <Compile Include="Services\Common\Common.cs" />
- <Compile Include="Services\Dialog\DialogService.cs" />
- <Compile Include="Services\Dialog\IDialogService.cs" />
- <Compile Include="Services\Identity\IdentityService.cs" />
- <Compile Include="Services\Identity\IIdentityService.cs" />
- <Compile Include="Services\Location\ILocationService.cs" />
- <Compile Include="Services\Location\LocationService.cs" />
- <Compile Include="Services\Marketing\ICampaignService.cs" />
- <Compile Include="Services\Marketing\CampaignMockService.cs" />
- <Compile Include="Services\Marketing\CampaignService.cs" />
- <Compile Include="Services\Navigation\INavigationService.cs" />
- <Compile Include="Services\Navigation\NavigationService.cs" />
- <Compile Include="Services\OpenUrl\IOpenUrlService.cs" />
- <Compile Include="Services\OpenUrl\OpenUrlService.cs" />
- <Compile Include="Services\Order\IOrderService.cs" />
- <Compile Include="Services\Order\OrderMockService.cs" />
- <Compile Include="Services\Order\OrderService.cs" />
- <Compile Include="Services\RequestProvider\HttpRequestExceptionEx.cs" />
- <Compile Include="Services\RequestProvider\IRequestProvider.cs" />
- <Compile Include="Services\RequestProvider\RequestProvider.cs" />
- <Compile Include="Services\User\IUserService.cs" />
- <Compile Include="Services\User\UserMockService.cs" />
- <Compile Include="Services\User\UserService.cs" />
- <Compile Include="Triggers\BeginAnimation.cs" />
- <Compile Include="Validations\IsNotNullOrEmptyRule.cs" />
- <Compile Include="Validations\IValidationRule.cs" />
- <Compile Include="Validations\IValidity.cs" />
- <Compile Include="Validations\ValidatableObject.cs" />
- <Compile Include="ViewModels\Base\ExtendedBindableObject.cs" />
- <Compile Include="ViewModels\Base\MessageKeys.cs" />
- <Compile Include="ViewModels\Base\ViewModelBase.cs" />
- <Compile Include="ViewModels\Base\ViewModelLocator.cs" />
- <Compile Include="ViewModels\BasketViewModel.cs" />
- <Compile Include="ViewModels\CampaignDetailsViewModel.cs" />
- <Compile Include="ViewModels\CampaignViewModel.cs" />
- <Compile Include="ViewModels\CatalogViewModel.cs" />
- <Compile Include="ViewModels\CheckoutViewModel.cs" />
- <Compile Include="ViewModels\LoginViewModel.cs" />
- <Compile Include="ViewModels\MainViewModel.cs" />
- <Compile Include="ViewModels\OrderDetailViewModel.cs" />
- <Compile Include="ViewModels\ProfileViewModel.cs" />
- <Compile Include="ViewModels\SettingsViewModel.cs" />
- <Compile Include="Views\BasketView.xaml.cs">
- <DependentUpon>BasketView.xaml</DependentUpon>
- </Compile>
- <Compile Include="Views\CampaignView.xaml.cs">
- <DependentUpon>CampaignView.xaml</DependentUpon>
- </Compile>
- <Compile Include="Views\CatalogView.xaml.cs">
- <DependentUpon>CatalogView.xaml</DependentUpon>
- </Compile>
- <Compile Include="Views\CampaignDetailsView.xaml.cs">
- <DependentUpon>CampaignDetailsView.xaml</DependentUpon>
- </Compile>
- <Compile Include="Views\CheckoutView.xaml.cs">
- <DependentUpon>CheckoutView.xaml</DependentUpon>
- </Compile>
- <Compile Include="Views\CustomNavigationView.xaml.cs">
- <DependentUpon>CustomNavigationView.xaml</DependentUpon>
- </Compile>
- <Compile Include="Views\FiltersView.xaml.cs">
- <DependentUpon>FiltersView.xaml</DependentUpon>
- </Compile>
- <Compile Include="Views\LoginView.xaml.cs">
- <DependentUpon>LoginView.xaml</DependentUpon>
- </Compile>
- <Compile Include="Views\MainView.xaml.cs">
- <DependentUpon>MainView.xaml</DependentUpon>
- </Compile>
- <Compile Include="Views\OrderDetailView.xaml.cs">
- <DependentUpon>OrderDetailView.xaml</DependentUpon>
- </Compile>
- <Compile Include="Views\ProfileView.xaml.cs">
- <DependentUpon>ProfileView.xaml</DependentUpon>
- </Compile>
- <Compile Include="Views\SettingsView.xaml.cs">
- <DependentUpon>SettingsView.xaml</DependentUpon>
- </Compile>
- <Compile Include="Views\Templates\BasketItemTemplate.xaml.cs">
- <DependentUpon>BasketItemTemplate.xaml</DependentUpon>
- </Compile>
- <Compile Include="Views\Templates\OrderItemTemplate.xaml.cs">
- <DependentUpon>OrderItemTemplate.xaml</DependentUpon>
- </Compile>
- <Compile Include="Views\Templates\OrderTemplate.xaml.cs">
- <DependentUpon>OrderTemplate.xaml</DependentUpon>
- </Compile>
- <Compile Include="Views\Templates\CampaignTemplate.xaml.cs">
- <DependentUpon>CampaignTemplate.xaml</DependentUpon>
- </Compile>
- <Compile Include="Views\Templates\ProductTemplate.xaml.cs">
- <DependentUpon>ProductTemplate.xaml</DependentUpon>
- </Compile>
- <Compile Include="Converters\WebNavigatingEventArgsConverter.cs" />
- <Compile Include="Converters\FirstValidationErrorConverter.cs" />
- <Compile Include="Effects\EntryLineColorEffect.cs" />
- <Compile Include="Behaviors\LineColorBehavior.cs" />
- <Compile Include="Models\Token\UserToken.cs" />
- <Compile Include="Effects\ThemeEffects.cs" />
- </ItemGroup>
- <ItemGroup>
- <None Include="app.config" />
- <None Include="project.json" />
- </ItemGroup>
- <ItemGroup>
- <EmbeddedResource Include="Controls\AddBasketButton.xaml">
- <SubType>Designer</SubType>
- <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
- </EmbeddedResource>
- <EmbeddedResource Include="Views\Templates\BasketItemTemplate.xaml">
- <SubType>Designer</SubType>
- <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
- </EmbeddedResource>
- <EmbeddedResource Include="Views\Templates\OrderItemTemplate.xaml">
- <SubType>Designer</SubType>
- <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
- </EmbeddedResource>
- <EmbeddedResource Include="Views\Templates\OrderTemplate.xaml">
- <SubType>Designer</SubType>
- <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
- </EmbeddedResource>
- <EmbeddedResource Include="Views\Templates\ProductTemplate.xaml">
- <SubType>Designer</SubType>
- <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
- </EmbeddedResource>
- </ItemGroup>
- <ItemGroup>
- <EmbeddedResource Include="Views\BasketView.xaml">
- <SubType>Designer</SubType>
- <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
- </EmbeddedResource>
- </ItemGroup>
- <ItemGroup>
- <EmbeddedResource Include="Views\CatalogView.xaml">
- <SubType>Designer</SubType>
- <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
- </EmbeddedResource>
- </ItemGroup>
- <ItemGroup>
- <EmbeddedResource Include="Views\CheckoutView.xaml">
- <SubType>Designer</SubType>
- <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
- </EmbeddedResource>
- </ItemGroup>
- <ItemGroup>
- <EmbeddedResource Include="Views\CustomNavigationView.xaml">
- <SubType>Designer</SubType>
- <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
- </EmbeddedResource>
- </ItemGroup>
- <ItemGroup>
- <EmbeddedResource Include="Views\FiltersView.xaml">
- <SubType>Designer</SubType>
- <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
- </EmbeddedResource>
- </ItemGroup>
- <ItemGroup>
- <EmbeddedResource Include="Views\LoginView.xaml">
- <SubType>Designer</SubType>
- <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
- </EmbeddedResource>
- </ItemGroup>
- <ItemGroup>
- <EmbeddedResource Include="Views\MainView.xaml">
- <SubType>Designer</SubType>
- <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
- </EmbeddedResource>
- </ItemGroup>
- <ItemGroup>
- <EmbeddedResource Include="Views\OrderDetailView.xaml">
- <SubType>Designer</SubType>
- <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
- </EmbeddedResource>
- </ItemGroup>
- <ItemGroup>
- <EmbeddedResource Include="Views\ProfileView.xaml">
- <SubType>Designer</SubType>
- <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
- </EmbeddedResource>
- </ItemGroup>
- <ItemGroup>
- <EmbeddedResource Include="Views\SettingsView.xaml">
- <SubType>Designer</SubType>
- <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
- </EmbeddedResource>
- </ItemGroup>
- <ItemGroup>
- <EmbeddedResource Include="App.xaml">
- <SubType>Designer</SubType>
- <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
- </EmbeddedResource>
- </ItemGroup>
- <ItemGroup>
- <EmbeddedResource Include="Views\CampaignView.xaml">
- <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
- <SubType>Designer</SubType>
- </EmbeddedResource>
- </ItemGroup>
- <ItemGroup>
- <EmbeddedResource Include="Views\CampaignDetailsView.xaml">
- <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
- <SubType>Designer</SubType>
- </EmbeddedResource>
- </ItemGroup>
- <ItemGroup>
- <EmbeddedResource Include="Views\Templates\CampaignTemplate.xaml">
- <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
- <SubType>Designer</SubType>
- </EmbeddedResource>
- </ItemGroup>
- <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
- <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
- <PropertyGroup>
- <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('..\..\..\..\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'))" />
- </Target>
- <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')" />
- <!-- 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.
- <Target Name="BeforeBuild">
- </Target>
- <Target Name="AfterBuild">
- </Target>
- -->
-</Project>
\ No newline at end of file
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/project.json b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/project.json
new file mode 100644
index 000000000..a832cc982
--- /dev/null
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/project.json
@@ -0,0 +1,24 @@
+{
+ "dependencies": {
+ "Acr.UserDialogs": "6.3.3",
+ "Autofac": "4.5.0",
+ "IdentityModel": "1.3.1",
+ "Microsoft.Bcl": "1.1.10",
+ "Microsoft.Bcl.Build": "1.0.21",
+ "Microsoft.Net.Http": "2.2.29",
+ "modernhttpclient": "2.4.2",
+ "Newtonsoft.Json": "9.0.1",
+ "PCLCrypto": "2.0.147",
+ "SlideOverKit": "2.1.4",
+ "Splat": "1.6.2",
+ "System.ComponentModel.Annotations": "4.3.0",
+ "Xam.Plugin.Geolocator": "3.0.4",
+ "Xam.Plugins.Settings": "2.6.0.12-beta",
+ "Xamarin.FFImageLoading": "2.2.9",
+ "Xamarin.FFImageLoading.Forms": "2.2.9",
+ "Xamarin.Forms": "2.3.4.231"
+ },
+ "frameworks": {
+ ".NETPortable,Version=v4.5,Profile=Profile111": {}
+ }
+}
\ No newline at end of file
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/Resource.Designer.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/Resource.Designer.cs
index 40c675548..2edc879eb 100644
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/Resource.Designer.cs
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/Resources/Resource.Designer.cs
@@ -1,15 +1,15 @@
#pragma warning disable 1591
-// ------------------------------------------------------------------------------
-// <autogenerated>
-// This code was generated by a tool.
-// Mono Runtime Version: 4.0.30319.42000
-//
-// Changes to this file may cause incorrect behavior and will be lost if
-// the code is regenerated.
-// </autogenerated>
-// ------------------------------------------------------------------------------
+//------------------------------------------------------------------------------
+// <auto-generated>
+// This code was generated by a tool.
+// Runtime Version:4.0.30319.42000
+//
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
-[assembly: Android.Runtime.ResourceDesignerAttribute("eShopOnContainers.Droid.Resource", IsApplication=true)]
+[assembly: global::Android.Runtime.ResourceDesignerAttribute("eShopOnContainers.Droid.Resource", IsApplication=true)]
namespace eShopOnContainers.Droid
{
@@ -4399,8 +4399,7 @@ namespace eShopOnContainers.Droid
public partial class Styleable
{
- public static int[] ActionBar = new int[]
- {
+ public static int[] ActionBar = new int[] {
2130772007,
2130772009,
2130772010,
@@ -4510,15 +4509,13 @@ namespace eShopOnContainers.Droid
// aapt resource value: 5
public const int ActionBar_titleTextStyle = 5;
- public static int[] ActionBarLayout = new int[]
- {
+ public static int[] ActionBarLayout = new int[] {
16842931};
// aapt resource value: 0
public const int ActionBarLayout_android_layout_gravity = 0;
- public static int[] ActionMenuItemView = new int[]
- {
+ public static int[] ActionMenuItemView = new int[] {
16843071};
// aapt resource value: 0
@@ -4526,8 +4523,7 @@ namespace eShopOnContainers.Droid
public static int[] ActionMenuView;
- public static int[] ActionMode = new int[]
- {
+ public static int[] ActionMode = new int[] {
2130772007,
2130772013,
2130772014,
@@ -4553,8 +4549,7 @@ namespace eShopOnContainers.Droid
// aapt resource value: 1
public const int ActionMode_titleTextStyle = 1;
- public static int[] ActivityChooserView = new int[]
- {
+ public static int[] ActivityChooserView = new int[] {
2130772035,
2130772036};
@@ -4564,8 +4559,7 @@ namespace eShopOnContainers.Droid
// aapt resource value: 0
public const int ActivityChooserView_initialActivityCount = 0;
- public static int[] AlertDialog = new int[]
- {
+ public static int[] AlertDialog = new int[] {
16842994,
2130772037,
2130772038,
@@ -4591,8 +4585,7 @@ namespace eShopOnContainers.Droid
// aapt resource value: 4
public const int AlertDialog_singleChoiceItemLayout = 4;
- public static int[] AppBarLayout = new int[]
- {
+ public static int[] AppBarLayout = new int[] {
16842964,
2130772032,
2130772215};
@@ -4606,8 +4599,7 @@ namespace eShopOnContainers.Droid
// aapt resource value: 2
public const int AppBarLayout_expanded = 2;
- public static int[] AppBarLayout_LayoutParams = new int[]
- {
+ public static int[] AppBarLayout_LayoutParams = new int[] {
2130772216,
2130772217};
@@ -4617,8 +4609,7 @@ namespace eShopOnContainers.Droid
// aapt resource value: 1
public const int AppBarLayout_LayoutParams_layout_scrollInterpolator = 1;
- public static int[] AppCompatImageView = new int[]
- {
+ public static int[] AppCompatImageView = new int[] {
16843033,
2130772042};
@@ -4628,8 +4619,7 @@ namespace eShopOnContainers.Droid
// aapt resource value: 1
public const int AppCompatImageView_srcCompat = 1;
- public static int[] AppCompatTextView = new int[]
- {
+ public static int[] AppCompatTextView = new int[] {
16842804,
2130772043};
@@ -4639,8 +4629,7 @@ namespace eShopOnContainers.Droid
// aapt resource value: 1
public const int AppCompatTextView_textAllCaps = 1;
- public static int[] AppCompatTheme = new int[]
- {
+ public static int[] AppCompatTheme = new int[] {
16842839,
16842926,
2130772044,
@@ -5090,8 +5079,7 @@ namespace eShopOnContainers.Droid
// aapt resource value: 3
public const int AppCompatTheme_windowNoTitle = 3;
- public static int[] BottomSheetBehavior_Params = new int[]
- {
+ public static int[] BottomSheetBehavior_Params = new int[] {
2130772218,
2130772219};
@@ -5101,15 +5089,13 @@ namespace eShopOnContainers.Droid
// aapt resource value: 0
public const int BottomSheetBehavior_Params_behavior_peekHeight = 0;
- public static int[] ButtonBarLayout = new int[]
- {
+ public static int[] ButtonBarLayout = new int[] {
2130772154};
// aapt resource value: 0
public const int ButtonBarLayout_allowStacking = 0;
- public static int[] CardView = new int[]
- {
+ public static int[] CardView = new int[] {
16843071,
16843072,
2130771995,
@@ -5163,8 +5149,7 @@ namespace eShopOnContainers.Droid
// aapt resource value: 11
public const int CardView_contentPaddingTop = 11;
- public static int[] CollapsingAppBarLayout_LayoutParams = new int[]
- {
+ public static int[] CollapsingAppBarLayout_LayoutParams = new int[] {
2130772220,
2130772221};
@@ -5174,8 +5159,7 @@ namespace eShopOnContainers.Droid
// aapt resource value: 1
public const int CollapsingAppBarLayout_LayoutParams_layout_collapseParallaxMultiplier = 1;
- public static int[] CollapsingToolbarLayout = new int[]
- {
+ public static int[] CollapsingToolbarLayout = new int[] {
2130772009,
2130772222,
2130772223,
@@ -5233,8 +5217,7 @@ namespace eShopOnContainers.Droid
// aapt resource value: 10
public const int CollapsingToolbarLayout_toolbarId = 10;
- public static int[] CompoundButton = new int[]
- {
+ public static int[] CompoundButton = new int[] {
16843015,
2130772155,
2130772156};
@@ -5248,8 +5231,7 @@ namespace eShopOnContainers.Droid
// aapt resource value: 2
public const int CompoundButton_buttonTintMode = 2;
- public static int[] CoordinatorLayout = new int[]
- {
+ public static int[] CoordinatorLayout = new int[] {
2130772235,
2130772236};
@@ -5259,8 +5241,7 @@ namespace eShopOnContainers.Droid
// aapt resource value: 1
public const int CoordinatorLayout_statusBarBackground = 1;
- public static int[] CoordinatorLayout_LayoutParams = new int[]
- {
+ public static int[] CoordinatorLayout_LayoutParams = new int[] {
16842931,
2130772237,
2130772238,
@@ -5282,8 +5263,7 @@ namespace eShopOnContainers.Droid
// aapt resource value: 3
public const int CoordinatorLayout_LayoutParams_layout_keyline = 3;
- public static int[] DesignTheme = new int[]
- {
+ public static int[] DesignTheme = new int[] {
2130772241,
2130772242,
2130772243};
@@ -5297,8 +5277,7 @@ namespace eShopOnContainers.Droid
// aapt resource value: 2
public const int DesignTheme_textColorError = 2;
- public static int[] DrawerArrowToggle = new int[]
- {
+ public static int[] DrawerArrowToggle = new int[] {
2130772157,
2130772158,
2130772159,
@@ -5332,8 +5311,7 @@ namespace eShopOnContainers.Droid
// aapt resource value: 7
public const int DrawerArrowToggle_thickness = 7;
- public static int[] FloatingActionButton = new int[]
- {
+ public static int[] FloatingActionButton = new int[] {
2130772032,
2130772213,
2130772214,
@@ -5367,8 +5345,7 @@ namespace eShopOnContainers.Droid
// aapt resource value: 7
public const int FloatingActionButton_useCompatPadding = 7;
- public static int[] ForegroundLinearLayout = new int[]
- {
+ public static int[] ForegroundLinearLayout = new int[] {
16843017,
16843264,
2130772249};
@@ -5382,8 +5359,7 @@ namespace eShopOnContainers.Droid
// aapt resource value: 2
public const int ForegroundLinearLayout_foregroundInsidePadding = 2;
- public static int[] LinearLayoutCompat = new int[]
- {
+ public static int[] LinearLayoutCompat = new int[] {
16842927,
16842948,
16843046,
@@ -5421,8 +5397,7 @@ namespace eShopOnContainers.Droid
// aapt resource value: 7
public const int LinearLayoutCompat_showDividers = 7;
- public static int[] LinearLayoutCompat_Layout = new int[]
- {
+ public static int[] LinearLayoutCompat_Layout = new int[] {
16842931,
16842996,
16842997,
@@ -5440,8 +5415,7 @@ namespace eShopOnContainers.Droid
// aapt resource value: 1
public const int LinearLayoutCompat_Layout_android_layout_width = 1;
- public static int[] ListPopupWindow = new int[]
- {
+ public static int[] ListPopupWindow = new int[] {
16843436,
16843437};
@@ -5451,8 +5425,7 @@ namespace eShopOnContainers.Droid
// aapt resource value: 1
public const int ListPopupWindow_android_dropDownVerticalOffset = 1;
- public static int[] MediaRouteButton = new int[]
- {
+ public static int[] MediaRouteButton = new int[] {
16843071,
16843072,
2130771994};
@@ -5466,8 +5439,7 @@ namespace eShopOnContainers.Droid
// aapt resource value: 2
public const int MediaRouteButton_externalRouteEnabledDrawable = 2;
- public static int[] MenuGroup = new int[]
- {
+ public static int[] MenuGroup = new int[] {
16842766,
16842960,
16843156,
@@ -5493,8 +5465,7 @@ namespace eShopOnContainers.Droid
// aapt resource value: 2
public const int MenuGroup_android_visible = 2;
- public static int[] MenuItem = new int[]
- {
+ public static int[] MenuItem = new int[] {
16842754,
16842766,
16842960,
@@ -5564,8 +5535,7 @@ namespace eShopOnContainers.Droid
// aapt resource value: 13
public const int MenuItem_showAsAction = 13;
- public static int[] MenuView = new int[]
- {
+ public static int[] MenuView = new int[] {
16842926,
16843052,
16843053,
@@ -5599,8 +5569,7 @@ namespace eShopOnContainers.Droid
// aapt resource value: 7
public const int MenuView_preserveIconSpacing = 7;
- public static int[] NavigationView = new int[]
- {
+ public static int[] NavigationView = new int[] {
16842964,
16842973,
16843039,
@@ -5642,8 +5611,7 @@ namespace eShopOnContainers.Droid
// aapt resource value: 4
public const int NavigationView_menu = 4;
- public static int[] PopupWindow = new int[]
- {
+ public static int[] PopupWindow = new int[] {
16843126,
2130772173};
@@ -5653,15 +5621,13 @@ namespace eShopOnContainers.Droid
// aapt resource value: 1
public const int PopupWindow_overlapAnchor = 1;
- public static int[] PopupWindowBackgroundState = new int[]
- {
+ public static int[] PopupWindowBackgroundState = new int[] {
2130772174};
// aapt resource value: 0
public const int PopupWindowBackgroundState_state_above_anchor = 0;
- public static int[] ProgressWheel = new int[]
- {
+ public static int[] ProgressWheel = new int[] {
2130772284,
2130772285,
2130772286,
@@ -5711,8 +5677,7 @@ namespace eShopOnContainers.Droid
// aapt resource value: 2
public const int ProgressWheel_ahTextSize = 2;
- public static int[] RecyclerView = new int[]
- {
+ public static int[] RecyclerView = new int[] {
16842948,
2130771968,
2130771969,
@@ -5734,22 +5699,19 @@ namespace eShopOnContainers.Droid
// aapt resource value: 4
public const int RecyclerView_stackFromEnd = 4;
- public static int[] ScrimInsetsFrameLayout = new int[]
- {
+ public static int[] ScrimInsetsFrameLayout = new int[] {
2130772256};
// aapt resource value: 0
public const int ScrimInsetsFrameLayout_insetForeground = 0;
- public static int[] ScrollingViewBehavior_Params = new int[]
- {
+ public static int[] ScrollingViewBehavior_Params = new int[] {
2130772257};
// aapt resource value: 0
public const int ScrollingViewBehavior_Params_behavior_overlapTop = 0;
- public static int[] SearchView = new int[]
- {
+ public static int[] SearchView = new int[] {
16842970,
16843039,
16843296,
@@ -5819,8 +5781,7 @@ namespace eShopOnContainers.Droid
// aapt resource value: 12
public const int SearchView_voiceIcon = 12;
- public static int[] SnackbarLayout = new int[]
- {
+ public static int[] SnackbarLayout = new int[] {
16843039,
2130772032,
2130772258};
@@ -5834,8 +5795,7 @@ namespace eShopOnContainers.Droid
// aapt resource value: 2
public const int SnackbarLayout_maxActionInlineWidth = 2;
- public static int[] Spinner = new int[]
- {
+ public static int[] Spinner = new int[] {
16842930,
16843126,
16843131,
@@ -5857,8 +5817,7 @@ namespace eShopOnContainers.Droid
// aapt resource value: 4
public const int Spinner_popupTheme = 4;
- public static int[] SwitchCompat = new int[]
- {
+ public static int[] SwitchCompat = new int[] {
16843044,
16843045,
16843074,
@@ -5900,8 +5859,7 @@ namespace eShopOnContainers.Droid
// aapt resource value: 3
public const int SwitchCompat_track = 3;
- public static int[] TabItem = new int[]
- {
+ public static int[] TabItem = new int[] {
16842754,
16842994,
16843087};
@@ -5915,8 +5873,7 @@ namespace eShopOnContainers.Droid
// aapt resource value: 2
public const int TabItem_android_text = 2;
- public static int[] TabLayout = new int[]
- {
+ public static int[] TabLayout = new int[] {
2130772259,
2130772260,
2130772261,
@@ -5982,8 +5939,7 @@ namespace eShopOnContainers.Droid
// aapt resource value: 9
public const int TabLayout_tabTextColor = 9;
- public static int[] TextAppearance = new int[]
- {
+ public static int[] TextAppearance = new int[] {
16842901,
16842902,
16842903,
@@ -6021,8 +5977,7 @@ namespace eShopOnContainers.Droid
// aapt resource value: 8
public const int TextAppearance_textAllCaps = 8;
- public static int[] TextInputLayout = new int[]
- {
+ public static int[] TextInputLayout = new int[] {
16842906,
16843088,
2130772275,
@@ -6068,8 +6023,7 @@ namespace eShopOnContainers.Droid
// aapt resource value: 2
public const int TextInputLayout_hintTextAppearance = 2;
- public static int[] Toolbar = new int[]
- {
+ public static int[] Toolbar = new int[] {
16842927,
16843072,
2130772009,
@@ -6171,8 +6125,7 @@ namespace eShopOnContainers.Droid
// aapt resource value: 23
public const int Toolbar_titleTextColor = 23;
- public static int[] View = new int[]
- {
+ public static int[] View = new int[] {
16842752,
16842970,
2130772210,
@@ -6194,8 +6147,7 @@ namespace eShopOnContainers.Droid
// aapt resource value: 4
public const int View_theme = 4;
- public static int[] ViewBackgroundHelper = new int[]
- {
+ public static int[] ViewBackgroundHelper = new int[] {
16842964,
2130772213,
2130772214};
@@ -6209,8 +6161,7 @@ namespace eShopOnContainers.Droid
// aapt resource value: 2
public const int ViewBackgroundHelper_backgroundTintMode = 2;
- public static int[] ViewStubCompat = new int[]
- {
+ public static int[] ViewStubCompat = new int[] {
16842960,
16842994,
16842995};
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/eShopOnContainers.Droid.csproj b/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/eShopOnContainers.Droid.csproj
index a96ca94ac..41c864d97 100644
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/eShopOnContainers.Droid.csproj
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/eShopOnContainers.Droid.csproj
@@ -54,9 +54,170 @@
<AndroidLinkMode>SdkOnly</AndroidLinkMode>
</PropertyGroup>
<ItemGroup>
+ <Reference Include="Acr.Support.Android, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\..\..\..\packages\Acr.Support.2.1.0\lib\MonoAndroid10\Acr.Support.Android.dll</HintPath>
+ <Private>True</Private>
+ </Reference>
+ <Reference Include="Acr.UserDialogs, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\..\..\..\packages\Acr.UserDialogs.6.3.3\lib\MonoAndroid10\Acr.UserDialogs.dll</HintPath>
+ <Private>True</Private>
+ </Reference>
+ <Reference Include="Acr.UserDialogs.Interface, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\..\..\..\packages\Acr.UserDialogs.6.3.3\lib\MonoAndroid10\Acr.UserDialogs.Interface.dll</HintPath>
+ <Private>True</Private>
+ </Reference>
+ <Reference Include="AndHUD, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\..\..\..\packages\AndHUD.1.2.0\lib\MonoAndroid\AndHUD.dll</HintPath>
+ <Private>True</Private>
+ </Reference>
+ <Reference Include="FFImageLoading, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\..\..\..\packages\Xamarin.FFImageLoading.2.2.9\lib\MonoAndroid10\FFImageLoading.dll</HintPath>
+ </Reference>
+ <Reference Include="FFImageLoading.Forms, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\..\..\..\packages\Xamarin.FFImageLoading.Forms.2.2.9\lib\MonoAndroid10\FFImageLoading.Forms.dll</HintPath>
+ </Reference>
+ <Reference Include="FFImageLoading.Forms.Droid, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\..\..\..\packages\Xamarin.FFImageLoading.Forms.2.2.9\lib\MonoAndroid10\FFImageLoading.Forms.Droid.dll</HintPath>
+ </Reference>
+ <Reference Include="FFImageLoading.Platform, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\..\..\..\packages\Xamarin.FFImageLoading.2.2.9\lib\MonoAndroid10\FFImageLoading.Platform.dll</HintPath>
+ </Reference>
+ <Reference Include="IdentityModel.Portable, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\..\..\..\packages\IdentityModel.1.3.1\lib\portable-net45+wp80+win8+wpa81\IdentityModel.Portable.dll</HintPath>
+ <Private>True</Private>
+ </Reference>
+ <Reference Include="Microsoft.CSharp" />
+ <Reference Include="ModernHttpClient, Version=2.4.2.0, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\..\..\..\packages\modernhttpclient.2.4.2\lib\MonoAndroid\ModernHttpClient.dll</HintPath>
+ <Private>True</Private>
+ </Reference>
<Reference Include="Mono.Android" />
<Reference Include="mscorlib" />
+ <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+ <HintPath>..\..\..\..\packages\Newtonsoft.Json.9.0.1\lib\portable-net45+wp80+win8+wpa81\Newtonsoft.Json.dll</HintPath>
+ </Reference>
+ <Reference Include="OkHttp, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\..\..\..\packages\modernhttpclient.2.4.2\lib\MonoAndroid\OkHttp.dll</HintPath>
+ <Private>True</Private>
+ </Reference>
+ <Reference Include="PCLCrypto, Version=2.0.0.0, Culture=neutral, PublicKeyToken=d4421c8a4786956c, processorArchitecture=MSIL">
+ <HintPath>..\..\..\..\packages\PCLCrypto.2.0.147\lib\MonoAndroid23\PCLCrypto.dll</HintPath>
+ </Reference>
+ <Reference Include="PInvoke.BCrypt, Version=0.3.0.0, Culture=neutral, PublicKeyToken=9e300f9f87f04a7a, processorArchitecture=MSIL">
+ <HintPath>..\..\..\..\packages\PInvoke.BCrypt.0.3.2\lib\portable-net45+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\PInvoke.BCrypt.dll</HintPath>
+ </Reference>
+ <Reference Include="PInvoke.Kernel32, Version=0.3.0.0, Culture=neutral, PublicKeyToken=9e300f9f87f04a7a, processorArchitecture=MSIL">
+ <HintPath>..\..\..\..\packages\PInvoke.Kernel32.0.3.2\lib\portable-net45+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\PInvoke.Kernel32.dll</HintPath>
+ </Reference>
+ <Reference Include="PInvoke.NCrypt, Version=0.3.0.0, Culture=neutral, PublicKeyToken=9e300f9f87f04a7a, processorArchitecture=MSIL">
+ <HintPath>..\..\..\..\packages\PInvoke.NCrypt.0.3.2\lib\portable-net45+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\PInvoke.NCrypt.dll</HintPath>
+ </Reference>
+ <Reference Include="PInvoke.Windows.Core, Version=0.3.0.0, Culture=neutral, PublicKeyToken=9e300f9f87f04a7a, processorArchitecture=MSIL">
+ <HintPath>..\..\..\..\packages\PInvoke.Windows.Core.0.3.2\lib\portable-net45+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\PInvoke.Windows.Core.dll</HintPath>
+ </Reference>
+ <Reference Include="Plugin.CurrentActivity, Version=1.0.1.0, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\..\..\..\packages\Plugin.CurrentActivity.1.0.1\lib\MonoAndroid10\Plugin.CurrentActivity.dll</HintPath>
+ </Reference>
+ <Reference Include="Plugin.Geolocator, Version=3.0.4.0, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\..\..\..\packages\Xam.Plugin.Geolocator.3.0.4\lib\MonoAndroid10\Plugin.Geolocator.dll</HintPath>
+ </Reference>
+ <Reference Include="Plugin.Geolocator.Abstractions, Version=3.0.4.0, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\..\..\..\packages\Xam.Plugin.Geolocator.3.0.4\lib\MonoAndroid10\Plugin.Geolocator.Abstractions.dll</HintPath>
+ </Reference>
+ <Reference Include="Plugin.Permissions, Version=1.1.6.0, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\..\..\..\packages\Plugin.Permissions.1.1.7\lib\MonoAndroid10\Plugin.Permissions.dll</HintPath>
+ </Reference>
+ <Reference Include="Plugin.Permissions.Abstractions, Version=1.1.6.0, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\..\..\..\packages\Plugin.Permissions.1.1.7\lib\MonoAndroid10\Plugin.Permissions.Abstractions.dll</HintPath>
+ </Reference>
+ <Reference Include="Plugin.Settings, Version=2.6.0.12, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\..\..\..\packages\Xam.Plugins.Settings.2.6.0.12-beta\lib\MonoAndroid10\Plugin.Settings.dll</HintPath>
+ <Private>True</Private>
+ </Reference>
+ <Reference Include="Plugin.Settings.Abstractions, Version=2.6.0.12, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\..\..\..\packages\Xam.Plugins.Settings.2.6.0.12-beta\lib\MonoAndroid10\Plugin.Settings.Abstractions.dll</HintPath>
+ <Private>True</Private>
+ </Reference>
+ <Reference Include="SlideOverKit, Version=1.0.6135.18790, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\..\..\..\packages\SlideOverKit.2.1.4\lib\MonoAndroid10\SlideOverKit.dll</HintPath>
+ <Private>True</Private>
+ </Reference>
+ <Reference Include="SlideOverKit.Droid, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\..\..\..\packages\SlideOverKit.2.1.4\lib\MonoAndroid10\SlideOverKit.Droid.dll</HintPath>
+ <Private>True</Private>
+ </Reference>
+ <Reference Include="Splat, Version=1.6.2.0, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\..\..\..\packages\Splat.1.6.2\lib\monoandroid\Splat.dll</HintPath>
+ <Private>True</Private>
+ </Reference>
<Reference Include="System" />
+ <Reference Include="System.Core" />
+ <Reference Include="System.Net.Http" />
+ <Reference Include="System.Net.Http.Extensions, Version=2.2.29.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+ <HintPath>..\..\..\..\packages\Microsoft.Net.Http.2.2.29\lib\monoandroid\System.Net.Http.Extensions.dll</HintPath>
+ <Private>True</Private>
+ </Reference>
+ <Reference Include="System.Net.Http.Primitives, Version=4.2.29.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+ <HintPath>..\..\..\..\packages\Microsoft.Net.Http.2.2.29\lib\monoandroid\System.Net.Http.Primitives.dll</HintPath>
+ <Private>True</Private>
+ </Reference>
+ <Reference Include="System.ObjectModel" />
+ <Reference Include="System.Xml.Linq" />
+ <Reference Include="System.Xml" />
+ <Reference Include="Validation, Version=2.2.0.0, Culture=neutral, PublicKeyToken=2fc06f0d701809a7, processorArchitecture=MSIL">
+ <HintPath>..\..\..\..\packages\Validation.2.2.8\lib\dotnet\Validation.dll</HintPath>
+ </Reference>
+ <Reference Include="Xamarin.Android.Support.Animated.Vector.Drawable, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\..\..\..\packages\Xamarin.Android.Support.Animated.Vector.Drawable.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.Animated.Vector.Drawable.dll</HintPath>
+ <Private>True</Private>
+ </Reference>
+ <Reference Include="Xamarin.Android.Support.Design, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\..\..\..\packages\Xamarin.Android.Support.Design.23.3.0\lib\MonoAndroid43\Xamarin.Android.Support.Design.dll</HintPath>
+ <Private>True</Private>
+ </Reference>
+ <Reference Include="Xamarin.Android.Support.v4, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\..\..\..\packages\Xamarin.Android.Support.v4.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll</HintPath>
+ <Private>True</Private>
+ </Reference>
+ <Reference Include="Xamarin.Android.Support.v7.AppCompat, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\..\..\..\packages\Xamarin.Android.Support.v7.AppCompat.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.AppCompat.dll</HintPath>
+ <Private>True</Private>
+ </Reference>
+ <Reference Include="Xamarin.Android.Support.v7.CardView, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\..\..\..\packages\Xamarin.Android.Support.v7.CardView.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.CardView.dll</HintPath>
+ <Private>True</Private>
+ </Reference>
+ <Reference Include="Xamarin.Android.Support.v7.MediaRouter">
+ <HintPath>..\..\..\..\packages\Xamarin.Android.Support.v7.MediaRouter.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.MediaRouter.dll</HintPath>
+ <Private>True</Private>
+ </Reference>
+ <Reference Include="Xamarin.Android.Support.v7.RecyclerView, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\..\..\..\packages\Xamarin.Android.Support.v7.RecyclerView.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.RecyclerView.dll</HintPath>
+ <Private>True</Private>
+ </Reference>
+ <Reference Include="Xamarin.Android.Support.Vector.Drawable, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\..\..\..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.Vector.Drawable.dll</HintPath>
+ <Private>True</Private>
+ </Reference>
+ <Reference Include="FormsViewGroup">
+ <HintPath>..\..\..\..\packages\Xamarin.Forms.2.3.4.231\lib\MonoAndroid10\FormsViewGroup.dll</HintPath>
+ </Reference>
+ <Reference Include="Xamarin.Forms.Core">
+ <HintPath>..\..\..\..\packages\Xamarin.Forms.2.3.4.231\lib\MonoAndroid10\Xamarin.Forms.Core.dll</HintPath>
+ </Reference>
+ <Reference Include="Xamarin.Forms.Platform.Android">
+ <HintPath>..\..\..\..\packages\Xamarin.Forms.2.3.4.231\lib\MonoAndroid10\Xamarin.Forms.Platform.Android.dll</HintPath>
+ </Reference>
+ <Reference Include="Xamarin.Forms.Platform">
+ <HintPath>..\..\..\..\packages\Xamarin.Forms.2.3.4.231\lib\MonoAndroid10\Xamarin.Forms.Platform.dll</HintPath>
+ </Reference>
+ <Reference Include="Xamarin.Forms.Xaml">
+ <HintPath>..\..\..\..\packages\Xamarin.Forms.2.3.4.231\lib\MonoAndroid10\Xamarin.Forms.Xaml.dll</HintPath>
+ </Reference>
+ <Reference Include="System.IO.Compression" />
+ <Reference Include="Autofac">
+ <HintPath>..\..\..\..\packages\Autofac.4.5.0\lib\netstandard1.1\Autofac.dll</HintPath>
+ </Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="Activities\MainActivity.cs" />
@@ -85,6 +246,7 @@
<Link>Assets\SourceSansPro-Regular.ttf</Link>
</AndroidAsset>
<None Include="app.config" />
+ <None Include="packages.config" />
<None Include="Resources\AboutResources.txt" />
<None Include="Assets\AboutAssets.txt" />
<AndroidResource Include="Resources\drawable-xxhdpi\switch_off.png" />
@@ -231,34 +393,15 @@
<ItemGroup>
<AndroidResource Include="Resources\drawable\default_campaign.png" />
</ItemGroup>
- <ItemGroup>
- <PackageReference Include="Acr.Support" version="2.1.0" />
- <PackageReference Include="Acr.UserDialogs" version="6.3.3" />
- <PackageReference Include="AndHUD" version="1.2.0" />
- <PackageReference Include="Autofac" version="4.5.0" />
- <PackageReference Include="IdentityModel" version="2.10.0" />
- <PackageReference Include="modernhttpclient" version="2.4.2" />
- <PackageReference Include="NETStandard.Library" version="2.0.0" />
- <PackageReference Include="Newtonsoft.Json" version="10.0.3" />
- <PackageReference Include="PCLCrypto" version="2.0.147" />
- <PackageReference Include="Plugin.CurrentActivity" version="1.0.1" />
- <PackageReference Include="Plugin.Permissions" version="1.1.7" />
- <PackageReference Include="SlideOverKit" version="2.1.4" />
- <PackageReference Include="Splat" version="1.6.2" />
- <PackageReference Include="Validation" version="2.2.8" />
- <PackageReference Include="Xam.Plugin.Geolocator" version="3.0.4" />
- <PackageReference Include="Xam.Plugins.Settings" version="2.6.0.12-beta" />
- <PackageReference Include="Xamarin.Android.Support.Animated.Vector.Drawable" version="23.3.0" />
- <PackageReference Include="Xamarin.Android.Support.Design" version="23.3.0" />
- <PackageReference Include="Xamarin.Android.Support.v4" version="23.3.0" />
- <PackageReference Include="Xamarin.Android.Support.v7.AppCompat" version="23.3.0" />
- <PackageReference Include="Xamarin.Android.Support.v7.CardView" version="23.3.0" />
- <PackageReference Include="Xamarin.Android.Support.v7.MediaRouter" version="23.3.0" />
- <PackageReference Include="Xamarin.Android.Support.v7.RecyclerView" version="23.3.0" />
- <PackageReference Include="Xamarin.Android.Support.Vector.Drawable" version="23.3.0" />
- <PackageReference Include="Xamarin.FFImageLoading" version="2.2.9" />
- <PackageReference Include="Xamarin.FFImageLoading.Forms" version="2.2.9" />
- <PackageReference Include="Xamarin.Forms" version="2.3.4.231" />
- </ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
+ <Import Project="..\..\..\..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets" Condition="Exists('..\..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.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\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets'))" />
+ <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>
+ <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')" />
+ <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')" />
</Project>
\ No newline at end of file
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/packages.config.bak b/src/Mobile/eShopOnContainers/eShopOnContainers.Droid/packages.config
similarity index 100%
rename from src/Mobile/eShopOnContainers/eShopOnContainers.Droid/packages.config.bak
rename to src/Mobile/eShopOnContainers/eShopOnContainers.Droid/packages.config
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/Resources/Resource.Designer.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/Resources/Resource.Designer.cs
index eaa53c623..cbf2a07ea 100644
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/Resources/Resource.Designer.cs
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/Resources/Resource.Designer.cs
@@ -1,15 +1,15 @@
#pragma warning disable 1591
-// ------------------------------------------------------------------------------
-// <autogenerated>
-// This code was generated by a tool.
-// Mono Runtime Version: 4.0.30319.42000
-//
-// Changes to this file may cause incorrect behavior and will be lost if
-// the code is regenerated.
-// </autogenerated>
-// ------------------------------------------------------------------------------
+//------------------------------------------------------------------------------
+// <auto-generated>
+// This code was generated by a tool.
+// Runtime Version:4.0.30319.42000
+//
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
-[assembly: Android.Runtime.ResourceDesignerAttribute("eShopOnContainers.TestRunner.Droid.Resource", IsApplication=true)]
+[assembly: global::Android.Runtime.ResourceDesignerAttribute("eShopOnContainers.TestRunner.Droid.Resource", IsApplication=true)]
namespace eShopOnContainers.TestRunner.Droid
{
@@ -4297,8 +4297,7 @@ namespace eShopOnContainers.TestRunner.Droid
public partial class Styleable
{
- public static int[] ActionBar = new int[]
- {
+ public static int[] ActionBar = new int[] {
2130772007,
2130772009,
2130772010,
@@ -4408,15 +4407,13 @@ namespace eShopOnContainers.TestRunner.Droid
// aapt resource value: 5
public const int ActionBar_titleTextStyle = 5;
- public static int[] ActionBarLayout = new int[]
- {
+ public static int[] ActionBarLayout = new int[] {
16842931};
// aapt resource value: 0
public const int ActionBarLayout_android_layout_gravity = 0;
- public static int[] ActionMenuItemView = new int[]
- {
+ public static int[] ActionMenuItemView = new int[] {
16843071};
// aapt resource value: 0
@@ -4424,8 +4421,7 @@ namespace eShopOnContainers.TestRunner.Droid
public static int[] ActionMenuView;
- public static int[] ActionMode = new int[]
- {
+ public static int[] ActionMode = new int[] {
2130772007,
2130772013,
2130772014,
@@ -4451,8 +4447,7 @@ namespace eShopOnContainers.TestRunner.Droid
// aapt resource value: 1
public const int ActionMode_titleTextStyle = 1;
- public static int[] ActivityChooserView = new int[]
- {
+ public static int[] ActivityChooserView = new int[] {
2130772035,
2130772036};
@@ -4462,8 +4457,7 @@ namespace eShopOnContainers.TestRunner.Droid
// aapt resource value: 0
public const int ActivityChooserView_initialActivityCount = 0;
- public static int[] AlertDialog = new int[]
- {
+ public static int[] AlertDialog = new int[] {
16842994,
2130772037,
2130772038,
@@ -4489,8 +4483,7 @@ namespace eShopOnContainers.TestRunner.Droid
// aapt resource value: 4
public const int AlertDialog_singleChoiceItemLayout = 4;
- public static int[] AppBarLayout = new int[]
- {
+ public static int[] AppBarLayout = new int[] {
16842964,
2130772032,
2130772215};
@@ -4504,8 +4497,7 @@ namespace eShopOnContainers.TestRunner.Droid
// aapt resource value: 2
public const int AppBarLayout_expanded = 2;
- public static int[] AppBarLayout_LayoutParams = new int[]
- {
+ public static int[] AppBarLayout_LayoutParams = new int[] {
2130772216,
2130772217};
@@ -4515,8 +4507,7 @@ namespace eShopOnContainers.TestRunner.Droid
// aapt resource value: 1
public const int AppBarLayout_LayoutParams_layout_scrollInterpolator = 1;
- public static int[] AppCompatImageView = new int[]
- {
+ public static int[] AppCompatImageView = new int[] {
16843033,
2130772042};
@@ -4526,8 +4517,7 @@ namespace eShopOnContainers.TestRunner.Droid
// aapt resource value: 1
public const int AppCompatImageView_srcCompat = 1;
- public static int[] AppCompatTextView = new int[]
- {
+ public static int[] AppCompatTextView = new int[] {
16842804,
2130772043};
@@ -4537,8 +4527,7 @@ namespace eShopOnContainers.TestRunner.Droid
// aapt resource value: 1
public const int AppCompatTextView_textAllCaps = 1;
- public static int[] AppCompatTheme = new int[]
- {
+ public static int[] AppCompatTheme = new int[] {
16842839,
16842926,
2130772044,
@@ -4988,8 +4977,7 @@ namespace eShopOnContainers.TestRunner.Droid
// aapt resource value: 3
public const int AppCompatTheme_windowNoTitle = 3;
- public static int[] BottomSheetBehavior_Params = new int[]
- {
+ public static int[] BottomSheetBehavior_Params = new int[] {
2130772218,
2130772219};
@@ -4999,15 +4987,13 @@ namespace eShopOnContainers.TestRunner.Droid
// aapt resource value: 0
public const int BottomSheetBehavior_Params_behavior_peekHeight = 0;
- public static int[] ButtonBarLayout = new int[]
- {
+ public static int[] ButtonBarLayout = new int[] {
2130772154};
// aapt resource value: 0
public const int ButtonBarLayout_allowStacking = 0;
- public static int[] CardView = new int[]
- {
+ public static int[] CardView = new int[] {
16843071,
16843072,
2130771995,
@@ -5061,8 +5047,7 @@ namespace eShopOnContainers.TestRunner.Droid
// aapt resource value: 11
public const int CardView_contentPaddingTop = 11;
- public static int[] CollapsingAppBarLayout_LayoutParams = new int[]
- {
+ public static int[] CollapsingAppBarLayout_LayoutParams = new int[] {
2130772220,
2130772221};
@@ -5072,8 +5057,7 @@ namespace eShopOnContainers.TestRunner.Droid
// aapt resource value: 1
public const int CollapsingAppBarLayout_LayoutParams_layout_collapseParallaxMultiplier = 1;
- public static int[] CollapsingToolbarLayout = new int[]
- {
+ public static int[] CollapsingToolbarLayout = new int[] {
2130772009,
2130772222,
2130772223,
@@ -5131,8 +5115,7 @@ namespace eShopOnContainers.TestRunner.Droid
// aapt resource value: 10
public const int CollapsingToolbarLayout_toolbarId = 10;
- public static int[] CompoundButton = new int[]
- {
+ public static int[] CompoundButton = new int[] {
16843015,
2130772155,
2130772156};
@@ -5146,8 +5129,7 @@ namespace eShopOnContainers.TestRunner.Droid
// aapt resource value: 2
public const int CompoundButton_buttonTintMode = 2;
- public static int[] CoordinatorLayout = new int[]
- {
+ public static int[] CoordinatorLayout = new int[] {
2130772235,
2130772236};
@@ -5157,8 +5139,7 @@ namespace eShopOnContainers.TestRunner.Droid
// aapt resource value: 1
public const int CoordinatorLayout_statusBarBackground = 1;
- public static int[] CoordinatorLayout_LayoutParams = new int[]
- {
+ public static int[] CoordinatorLayout_LayoutParams = new int[] {
16842931,
2130772237,
2130772238,
@@ -5180,8 +5161,7 @@ namespace eShopOnContainers.TestRunner.Droid
// aapt resource value: 3
public const int CoordinatorLayout_LayoutParams_layout_keyline = 3;
- public static int[] DesignTheme = new int[]
- {
+ public static int[] DesignTheme = new int[] {
2130772241,
2130772242,
2130772243};
@@ -5195,8 +5175,7 @@ namespace eShopOnContainers.TestRunner.Droid
// aapt resource value: 2
public const int DesignTheme_textColorError = 2;
- public static int[] DrawerArrowToggle = new int[]
- {
+ public static int[] DrawerArrowToggle = new int[] {
2130772157,
2130772158,
2130772159,
@@ -5230,8 +5209,7 @@ namespace eShopOnContainers.TestRunner.Droid
// aapt resource value: 7
public const int DrawerArrowToggle_thickness = 7;
- public static int[] FloatingActionButton = new int[]
- {
+ public static int[] FloatingActionButton = new int[] {
2130772032,
2130772213,
2130772214,
@@ -5265,8 +5243,7 @@ namespace eShopOnContainers.TestRunner.Droid
// aapt resource value: 7
public const int FloatingActionButton_useCompatPadding = 7;
- public static int[] ForegroundLinearLayout = new int[]
- {
+ public static int[] ForegroundLinearLayout = new int[] {
16843017,
16843264,
2130772249};
@@ -5280,8 +5257,7 @@ namespace eShopOnContainers.TestRunner.Droid
// aapt resource value: 2
public const int ForegroundLinearLayout_foregroundInsidePadding = 2;
- public static int[] LinearLayoutCompat = new int[]
- {
+ public static int[] LinearLayoutCompat = new int[] {
16842927,
16842948,
16843046,
@@ -5319,8 +5295,7 @@ namespace eShopOnContainers.TestRunner.Droid
// aapt resource value: 7
public const int LinearLayoutCompat_showDividers = 7;
- public static int[] LinearLayoutCompat_Layout = new int[]
- {
+ public static int[] LinearLayoutCompat_Layout = new int[] {
16842931,
16842996,
16842997,
@@ -5338,8 +5313,7 @@ namespace eShopOnContainers.TestRunner.Droid
// aapt resource value: 1
public const int LinearLayoutCompat_Layout_android_layout_width = 1;
- public static int[] ListPopupWindow = new int[]
- {
+ public static int[] ListPopupWindow = new int[] {
16843436,
16843437};
@@ -5349,8 +5323,7 @@ namespace eShopOnContainers.TestRunner.Droid
// aapt resource value: 1
public const int ListPopupWindow_android_dropDownVerticalOffset = 1;
- public static int[] MediaRouteButton = new int[]
- {
+ public static int[] MediaRouteButton = new int[] {
16843071,
16843072,
2130771994};
@@ -5364,8 +5337,7 @@ namespace eShopOnContainers.TestRunner.Droid
// aapt resource value: 2
public const int MediaRouteButton_externalRouteEnabledDrawable = 2;
- public static int[] MenuGroup = new int[]
- {
+ public static int[] MenuGroup = new int[] {
16842766,
16842960,
16843156,
@@ -5391,8 +5363,7 @@ namespace eShopOnContainers.TestRunner.Droid
// aapt resource value: 2
public const int MenuGroup_android_visible = 2;
- public static int[] MenuItem = new int[]
- {
+ public static int[] MenuItem = new int[] {
16842754,
16842766,
16842960,
@@ -5462,8 +5433,7 @@ namespace eShopOnContainers.TestRunner.Droid
// aapt resource value: 13
public const int MenuItem_showAsAction = 13;
- public static int[] MenuView = new int[]
- {
+ public static int[] MenuView = new int[] {
16842926,
16843052,
16843053,
@@ -5497,8 +5467,7 @@ namespace eShopOnContainers.TestRunner.Droid
// aapt resource value: 7
public const int MenuView_preserveIconSpacing = 7;
- public static int[] NavigationView = new int[]
- {
+ public static int[] NavigationView = new int[] {
16842964,
16842973,
16843039,
@@ -5540,8 +5509,7 @@ namespace eShopOnContainers.TestRunner.Droid
// aapt resource value: 4
public const int NavigationView_menu = 4;
- public static int[] PopupWindow = new int[]
- {
+ public static int[] PopupWindow = new int[] {
16843126,
2130772173};
@@ -5551,15 +5519,13 @@ namespace eShopOnContainers.TestRunner.Droid
// aapt resource value: 1
public const int PopupWindow_overlapAnchor = 1;
- public static int[] PopupWindowBackgroundState = new int[]
- {
+ public static int[] PopupWindowBackgroundState = new int[] {
2130772174};
// aapt resource value: 0
public const int PopupWindowBackgroundState_state_above_anchor = 0;
- public static int[] ProgressWheel = new int[]
- {
+ public static int[] ProgressWheel = new int[] {
2130772284,
2130772285,
2130772286,
@@ -5609,8 +5575,7 @@ namespace eShopOnContainers.TestRunner.Droid
// aapt resource value: 2
public const int ProgressWheel_ahTextSize = 2;
- public static int[] RecyclerView = new int[]
- {
+ public static int[] RecyclerView = new int[] {
16842948,
2130771968,
2130771969,
@@ -5632,22 +5597,19 @@ namespace eShopOnContainers.TestRunner.Droid
// aapt resource value: 4
public const int RecyclerView_stackFromEnd = 4;
- public static int[] ScrimInsetsFrameLayout = new int[]
- {
+ public static int[] ScrimInsetsFrameLayout = new int[] {
2130772256};
// aapt resource value: 0
public const int ScrimInsetsFrameLayout_insetForeground = 0;
- public static int[] ScrollingViewBehavior_Params = new int[]
- {
+ public static int[] ScrollingViewBehavior_Params = new int[] {
2130772257};
// aapt resource value: 0
public const int ScrollingViewBehavior_Params_behavior_overlapTop = 0;
- public static int[] SearchView = new int[]
- {
+ public static int[] SearchView = new int[] {
16842970,
16843039,
16843296,
@@ -5717,8 +5679,7 @@ namespace eShopOnContainers.TestRunner.Droid
// aapt resource value: 12
public const int SearchView_voiceIcon = 12;
- public static int[] SnackbarLayout = new int[]
- {
+ public static int[] SnackbarLayout = new int[] {
16843039,
2130772032,
2130772258};
@@ -5732,8 +5693,7 @@ namespace eShopOnContainers.TestRunner.Droid
// aapt resource value: 2
public const int SnackbarLayout_maxActionInlineWidth = 2;
- public static int[] Spinner = new int[]
- {
+ public static int[] Spinner = new int[] {
16842930,
16843126,
16843131,
@@ -5755,8 +5715,7 @@ namespace eShopOnContainers.TestRunner.Droid
// aapt resource value: 4
public const int Spinner_popupTheme = 4;
- public static int[] SwitchCompat = new int[]
- {
+ public static int[] SwitchCompat = new int[] {
16843044,
16843045,
16843074,
@@ -5798,8 +5757,7 @@ namespace eShopOnContainers.TestRunner.Droid
// aapt resource value: 3
public const int SwitchCompat_track = 3;
- public static int[] TabItem = new int[]
- {
+ public static int[] TabItem = new int[] {
16842754,
16842994,
16843087};
@@ -5813,8 +5771,7 @@ namespace eShopOnContainers.TestRunner.Droid
// aapt resource value: 2
public const int TabItem_android_text = 2;
- public static int[] TabLayout = new int[]
- {
+ public static int[] TabLayout = new int[] {
2130772259,
2130772260,
2130772261,
@@ -5880,8 +5837,7 @@ namespace eShopOnContainers.TestRunner.Droid
// aapt resource value: 9
public const int TabLayout_tabTextColor = 9;
- public static int[] TextAppearance = new int[]
- {
+ public static int[] TextAppearance = new int[] {
16842901,
16842902,
16842903,
@@ -5919,8 +5875,7 @@ namespace eShopOnContainers.TestRunner.Droid
// aapt resource value: 8
public const int TextAppearance_textAllCaps = 8;
- public static int[] TextInputLayout = new int[]
- {
+ public static int[] TextInputLayout = new int[] {
16842906,
16843088,
2130772275,
@@ -5966,8 +5921,7 @@ namespace eShopOnContainers.TestRunner.Droid
// aapt resource value: 2
public const int TextInputLayout_hintTextAppearance = 2;
- public static int[] Toolbar = new int[]
- {
+ public static int[] Toolbar = new int[] {
16842927,
16843072,
2130772009,
@@ -6069,8 +6023,7 @@ namespace eShopOnContainers.TestRunner.Droid
// aapt resource value: 23
public const int Toolbar_titleTextColor = 23;
- public static int[] View = new int[]
- {
+ public static int[] View = new int[] {
16842752,
16842970,
2130772210,
@@ -6092,8 +6045,7 @@ namespace eShopOnContainers.TestRunner.Droid
// aapt resource value: 4
public const int View_theme = 4;
- public static int[] ViewBackgroundHelper = new int[]
- {
+ public static int[] ViewBackgroundHelper = new int[] {
16842964,
2130772213,
2130772214};
@@ -6107,8 +6059,7 @@ namespace eShopOnContainers.TestRunner.Droid
// aapt resource value: 2
public const int ViewBackgroundHelper_backgroundTintMode = 2;
- public static int[] ViewStubCompat = new int[]
- {
+ public static int[] ViewStubCompat = new int[] {
16842960,
16842994,
16842995};
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/eShopOnContainers.TestRunner.Droid.csproj b/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/eShopOnContainers.TestRunner.Droid.csproj
index 6cfb21aed..326158569 100644
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/eShopOnContainers.TestRunner.Droid.csproj
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/eShopOnContainers.TestRunner.Droid.csproj
@@ -45,6 +45,174 @@
<WarningLevel>4</WarningLevel>
<AndroidUseSharedRuntime>False</AndroidUseSharedRuntime>
</PropertyGroup>
+ <ItemGroup>
+ <Reference Include="FormsViewGroup, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\..\..\..\packages\Xamarin.Forms.2.3.4.231\lib\MonoAndroid10\FormsViewGroup.dll</HintPath>
+ </Reference>
+ <Reference Include="Mono.Android" />
+ <Reference Include="mscorlib" />
+ <Reference Include="PCLCrypto, Version=2.0.0.0, Culture=neutral, PublicKeyToken=d4421c8a4786956c, processorArchitecture=MSIL">
+ <HintPath>..\..\..\..\packages\PCLCrypto.2.0.147\lib\MonoAndroid23\PCLCrypto.dll</HintPath>
+ </Reference>
+ <Reference Include="PInvoke.BCrypt, Version=0.3.0.0, Culture=neutral, PublicKeyToken=9e300f9f87f04a7a, processorArchitecture=MSIL">
+ <HintPath>..\..\..\..\packages\PInvoke.BCrypt.0.3.2\lib\portable-net45+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\PInvoke.BCrypt.dll</HintPath>
+ </Reference>
+ <Reference Include="PInvoke.Kernel32, Version=0.3.0.0, Culture=neutral, PublicKeyToken=9e300f9f87f04a7a, processorArchitecture=MSIL">
+ <HintPath>..\..\..\..\packages\PInvoke.Kernel32.0.3.2\lib\portable-net45+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\PInvoke.Kernel32.dll</HintPath>
+ </Reference>
+ <Reference Include="PInvoke.NCrypt, Version=0.3.0.0, Culture=neutral, PublicKeyToken=9e300f9f87f04a7a, processorArchitecture=MSIL">
+ <HintPath>..\..\..\..\packages\PInvoke.NCrypt.0.3.2\lib\portable-net45+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\PInvoke.NCrypt.dll</HintPath>
+ </Reference>
+ <Reference Include="PInvoke.Windows.Core, Version=0.3.0.0, Culture=neutral, PublicKeyToken=9e300f9f87f04a7a, processorArchitecture=MSIL">
+ <HintPath>..\..\..\..\packages\PInvoke.Windows.Core.0.3.2\lib\portable-net45+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\PInvoke.Windows.Core.dll</HintPath>
+ </Reference>
+ <Reference Include="Plugin.CurrentActivity, Version=1.0.1.0, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\..\..\..\packages\Plugin.CurrentActivity.1.0.1\lib\MonoAndroid10\Plugin.CurrentActivity.dll</HintPath>
+ </Reference>
+ <Reference Include="Plugin.Geolocator, Version=3.0.4.0, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\..\..\..\packages\Xam.Plugin.Geolocator.3.0.4\lib\MonoAndroid10\Plugin.Geolocator.dll</HintPath>
+ </Reference>
+ <Reference Include="Plugin.Geolocator.Abstractions, Version=3.0.4.0, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\..\..\..\packages\Xam.Plugin.Geolocator.3.0.4\lib\MonoAndroid10\Plugin.Geolocator.Abstractions.dll</HintPath>
+ </Reference>
+ <Reference Include="Plugin.Permissions, Version=1.1.6.0, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\..\..\..\packages\Plugin.Permissions.1.1.7\lib\MonoAndroid10\Plugin.Permissions.dll</HintPath>
+ </Reference>
+ <Reference Include="Plugin.Permissions.Abstractions, Version=1.1.6.0, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\..\..\..\packages\Plugin.Permissions.1.1.7\lib\MonoAndroid10\Plugin.Permissions.Abstractions.dll</HintPath>
+ </Reference>
+ <Reference Include="System" />
+ <Reference Include="System.Core" />
+ <Reference Include="System.Net.Http.Extensions, Version=2.2.29.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+ <HintPath>..\..\..\..\packages\Microsoft.Net.Http.2.2.29\lib\monoandroid\System.Net.Http.Extensions.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Net.Http.Primitives, Version=4.2.29.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+ <HintPath>..\..\..\..\packages\Microsoft.Net.Http.2.2.29\lib\monoandroid\System.Net.Http.Primitives.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Xml.Linq" />
+ <Reference Include="System.Xml" />
+ <Reference Include="Validation, Version=2.2.0.0, Culture=neutral, PublicKeyToken=2fc06f0d701809a7, processorArchitecture=MSIL">
+ <HintPath>..\..\..\..\packages\Validation.2.2.8\lib\dotnet\Validation.dll</HintPath>
+ </Reference>
+ <Reference Include="Xamarin.Android.Support.Animated.Vector.Drawable, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\..\..\..\packages\Xamarin.Android.Support.Animated.Vector.Drawable.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.Animated.Vector.Drawable.dll</HintPath>
+ <Private>True</Private>
+ </Reference>
+ <Reference Include="Xamarin.Android.Support.Design, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\..\..\..\packages\Xamarin.Android.Support.Design.23.3.0\lib\MonoAndroid43\Xamarin.Android.Support.Design.dll</HintPath>
+ <Private>True</Private>
+ </Reference>
+ <Reference Include="Xamarin.Android.Support.v4, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\..\..\..\packages\Xamarin.Android.Support.v4.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v4.dll</HintPath>
+ <Private>True</Private>
+ </Reference>
+ <Reference Include="Xamarin.Android.Support.v7.AppCompat, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\..\..\..\packages\Xamarin.Android.Support.v7.AppCompat.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.AppCompat.dll</HintPath>
+ <Private>True</Private>
+ </Reference>
+ <Reference Include="Xamarin.Android.Support.v7.CardView, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\..\..\..\packages\Xamarin.Android.Support.v7.CardView.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.CardView.dll</HintPath>
+ <Private>True</Private>
+ </Reference>
+ <Reference Include="Xamarin.Android.Support.v7.MediaRouter, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\..\..\..\packages\Xamarin.Android.Support.v7.MediaRouter.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.MediaRouter.dll</HintPath>
+ <Private>True</Private>
+ </Reference>
+ <Reference Include="Xamarin.Android.Support.v7.RecyclerView, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\..\..\..\packages\Xamarin.Android.Support.v7.RecyclerView.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.v7.RecyclerView.dll</HintPath>
+ <Private>True</Private>
+ </Reference>
+ <Reference Include="Xamarin.Android.Support.Vector.Drawable, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\..\..\..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\lib\MonoAndroid403\Xamarin.Android.Support.Vector.Drawable.dll</HintPath>
+ <Private>True</Private>
+ </Reference>
+ <Reference Include="Xamarin.Forms.Core, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\..\..\..\packages\Xamarin.Forms.2.3.4.231\lib\MonoAndroid10\Xamarin.Forms.Core.dll</HintPath>
+ </Reference>
+ <Reference Include="Xamarin.Forms.Platform, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\..\..\..\packages\Xamarin.Forms.2.3.4.231\lib\MonoAndroid10\Xamarin.Forms.Platform.dll</HintPath>
+ </Reference>
+ <Reference Include="Xamarin.Forms.Platform.Android, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\..\..\..\packages\Xamarin.Forms.2.3.4.231\lib\MonoAndroid10\Xamarin.Forms.Platform.Android.dll</HintPath>
+ </Reference>
+ <Reference Include="Xamarin.Forms.Xaml, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\..\..\..\packages\Xamarin.Forms.2.3.4.231\lib\MonoAndroid10\Xamarin.Forms.Xaml.dll</HintPath>
+ </Reference>
+ <Reference Include="xunit.abstractions">
+ <HintPath>..\..\..\..\packages\xunit.abstractions.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.abstractions.dll</HintPath>
+ </Reference>
+ <Reference Include="xunit.core">
+ <HintPath>..\..\..\..\packages\xunit.extensibility.core.2.1.0\lib\dotnet\xunit.core.dll</HintPath>
+ </Reference>
+ <Reference Include="xunit.execution.dotnet">
+ <HintPath>..\..\..\..\packages\xunit.extensibility.execution.2.1.0\lib\monoandroid\xunit.execution.dotnet.dll</HintPath>
+ </Reference>
+ <Reference Include="xunit.runner.utility.dotnet">
+ <HintPath>..\..\..\..\packages\xunit.runner.utility.2.1.0\lib\dotnet\xunit.runner.utility.dotnet.dll</HintPath>
+ </Reference>
+ <Reference Include="xunit.runner.devices">
+ <HintPath>..\..\..\..\packages\xunit.runner.devices.2.1.0\lib\MonoAndroid\xunit.runner.devices.dll</HintPath>
+ </Reference>
+ <Reference Include="Newtonsoft.Json">
+ <HintPath>..\..\..\..\packages\Newtonsoft.Json.9.0.1\lib\portable-net45+wp80+win8+wpa81\Newtonsoft.Json.dll</HintPath>
+ </Reference>
+ <Reference Include="System.IO.Compression" />
+ <Reference Include="System.Net.Http" />
+ <Reference Include="Autofac">
+ <HintPath>..\..\..\..\packages\Autofac.4.5.0\lib\netstandard1.1\Autofac.dll</HintPath>
+ </Reference>
+ <Reference Include="Plugin.Settings.Abstractions">
+ <HintPath>..\..\..\..\packages\Xam.Plugins.Settings.2.6.0.12-beta\lib\MonoAndroid10\Plugin.Settings.Abstractions.dll</HintPath>
+ </Reference>
+ <Reference Include="Plugin.Settings">
+ <HintPath>..\..\..\..\packages\Xam.Plugins.Settings.2.6.0.12-beta\lib\MonoAndroid10\Plugin.Settings.dll</HintPath>
+ </Reference>
+ <Reference Include="xunit.assert">
+ <HintPath>..\..\..\..\packages\xunit.assert.2.2.0\lib\netstandard1.1\xunit.assert.dll</HintPath>
+ </Reference>
+ <Reference Include="SlideOverKit">
+ <HintPath>..\..\..\..\packages\SlideOverKit.2.1.4\lib\MonoAndroid10\SlideOverKit.dll</HintPath>
+ </Reference>
+ <Reference Include="SlideOverKit.Droid">
+ <HintPath>..\..\..\..\packages\SlideOverKit.2.1.4\lib\MonoAndroid10\SlideOverKit.Droid.dll</HintPath>
+ </Reference>
+ <Reference Include="Acr.Support.Android">
+ <HintPath>..\..\..\..\packages\Acr.Support.2.1.0\lib\MonoAndroid10\Acr.Support.Android.dll</HintPath>
+ </Reference>
+ <Reference Include="AndHUD">
+ <HintPath>..\..\..\..\packages\AndHUD.1.2.0\lib\MonoAndroid\AndHUD.dll</HintPath>
+ </Reference>
+ <Reference Include="Splat">
+ <HintPath>..\..\..\..\packages\Splat.1.6.2\lib\monoandroid\Splat.dll</HintPath>
+ </Reference>
+ <Reference Include="Acr.UserDialogs">
+ <HintPath>..\..\..\..\packages\Acr.UserDialogs.6.3.3\lib\MonoAndroid10\Acr.UserDialogs.dll</HintPath>
+ </Reference>
+ <Reference Include="Acr.UserDialogs.Interface">
+ <HintPath>..\..\..\..\packages\Acr.UserDialogs.6.3.3\lib\MonoAndroid10\Acr.UserDialogs.Interface.dll</HintPath>
+ </Reference>
+ <Reference Include="IdentityModel.Portable">
+ <HintPath>..\..\..\..\packages\IdentityModel.1.3.1\lib\portable-net45+wp80+win8+wpa81\IdentityModel.Portable.dll</HintPath>
+ </Reference>
+ <Reference Include="FFImageLoading">
+ <HintPath>..\..\..\..\packages\Xamarin.FFImageLoading.2.2.9\lib\MonoAndroid10\FFImageLoading.dll</HintPath>
+ </Reference>
+ <Reference Include="FFImageLoading.Platform">
+ <HintPath>..\..\..\..\packages\Xamarin.FFImageLoading.2.2.9\lib\MonoAndroid10\FFImageLoading.Platform.dll</HintPath>
+ </Reference>
+ <Reference Include="FFImageLoading.Forms">
+ <HintPath>..\..\..\..\packages\Xamarin.FFImageLoading.Forms.2.2.9\lib\MonoAndroid10\FFImageLoading.Forms.dll</HintPath>
+ </Reference>
+ <Reference Include="FFImageLoading.Forms.Droid">
+ <HintPath>..\..\..\..\packages\Xamarin.FFImageLoading.Forms.2.2.9\lib\MonoAndroid10\FFImageLoading.Forms.Droid.dll</HintPath>
+ </Reference>
+ <Reference Include="ModernHttpClient">
+ <HintPath>..\..\..\..\packages\modernhttpclient.2.4.2\lib\MonoAndroid\ModernHttpClient.dll</HintPath>
+ </Reference>
+ <Reference Include="OkHttp">
+ <HintPath>..\..\..\..\packages\modernhttpclient.2.4.2\lib\MonoAndroid\OkHttp.dll</HintPath>
+ </Reference>
+ </ItemGroup>
<ItemGroup>
<Compile Include="MainActivity.cs" />
<Compile Include="MainApplication.cs" />
@@ -53,6 +221,9 @@
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
+ <None Include="packages.config">
+ <SubType>Designer</SubType>
+ </None>
<None Include="Resources\AboutResources.txt" />
<None Include="Assets\AboutAssets.txt" />
</ItemGroup>
@@ -70,43 +241,6 @@
<ItemGroup>
<None Include="Properties\AndroidManifest.xml" />
</ItemGroup>
- <ItemGroup>
- <Reference Include="Mono.Android" />
- <Reference Include="mscorlib" />
- <Reference Include="System" />
- </ItemGroup>
- <ItemGroup>
- <PackageReference Include="Acr.Support" version="2.1.0" />
- <PackageReference Include="Acr.UserDialogs" version="6.3.3" />
- <PackageReference Include="AndHUD" version="1.2.0" />
- <PackageReference Include="Autofac" version="4.5.0" />
- <PackageReference Include="IdentityModel" version="2.10.0" />
- <PackageReference Include="modernhttpclient" version="2.4.2" />
- <PackageReference Include="NETStandard.Library" version="2.0.0" />
- <PackageReference Include="Newtonsoft.Json" version="10.0.3" />
- <PackageReference Include="PCLCrypto" version="2.0.147" />
- <PackageReference Include="Plugin.CurrentActivity" version="1.0.1" />
- <PackageReference Include="Plugin.Permissions" version="1.1.7" />
- <PackageReference Include="SlideOverKit" version="2.1.4" />
- <PackageReference Include="Splat" version="1.6.2" />
- <PackageReference Include="Validation" version="2.2.8" />
- <PackageReference Include="Xam.Plugin.Geolocator" version="3.0.4" />
- <PackageReference Include="Xam.Plugins.Settings" version="2.6.0.12-beta" />
- <PackageReference Include="Xamarin.Android.Support.Animated.Vector.Drawable" version="23.3.0" />
- <PackageReference Include="Xamarin.Android.Support.Design" version="23.3.0" />
- <PackageReference Include="Xamarin.Android.Support.v4" version="23.3.0" />
- <PackageReference Include="Xamarin.Android.Support.v7.AppCompat" version="23.3.0" />
- <PackageReference Include="Xamarin.Android.Support.v7.CardView" version="23.3.0" />
- <PackageReference Include="Xamarin.Android.Support.v7.MediaRouter" version="23.3.0" />
- <PackageReference Include="Xamarin.Android.Support.v7.RecyclerView" version="23.3.0" />
- <PackageReference Include="Xamarin.Android.Support.Vector.Drawable" version="23.3.0" />
- <PackageReference Include="Xamarin.FFImageLoading" version="2.2.9" />
- <PackageReference Include="Xamarin.FFImageLoading.Forms" version="2.2.9" />
- <PackageReference Include="Xamarin.Forms" version="2.3.4.231" />
- <PackageReference Include="xunit.runner.devices">
- <Version>2.2.0</Version>
- </PackageReference>
- </ItemGroup>
<ItemGroup>
<ProjectReference Include="..\eShopOnContainers.UnitTests\eShopOnContainers.UnitTests.csproj">
<Project>{f7b6a162-bc4d-4924-b16a-713f9b0344e7}</Project>
@@ -114,4 +248,22 @@
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
+ <Import Project="..\..\..\..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets" Condition="Exists('..\..\..\..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.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\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Xamarin.Android.Support.Vector.Drawable.23.3.0\build\Xamarin.Android.Support.Vector.Drawable.targets'))" />
+ <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'))" />
+ </Target>
+ <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')" />
+ <!-- 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.
+ <Target Name="BeforeBuild">
+ </Target>
+ <Target Name="AfterBuild">
+ </Target>
+ -->
+ <Import Project="..\..\..\..\packages\xunit.runner.devices.2.1.0\build\MonoAndroid\xunit.runner.devices.targets" Condition="Exists('..\..\..\..\packages\xunit.runner.devices.2.1.0\build\MonoAndroid\xunit.runner.devices.targets')" />
+ <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/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Windows/eShopOnContainers.TestRunner.Windows.csproj b/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Windows/eShopOnContainers.TestRunner.Windows.csproj
index 2e01e5b11..2496f8b50 100755
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Windows/eShopOnContainers.TestRunner.Windows.csproj
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Windows/eShopOnContainers.TestRunner.Windows.csproj
@@ -11,14 +11,13 @@
<AssemblyName>eShopOnContainers.TestRunner.Windows</AssemblyName>
<DefaultLanguage>en-US</DefaultLanguage>
<TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
- <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.16267.0</TargetPlatformVersion>
- <TargetPlatformMinVersion>10.0.16267.0</TargetPlatformMinVersion>
+ <TargetPlatformVersion>10.0.10586.0</TargetPlatformVersion>
+ <TargetPlatformMinVersion>10.0.10586.0</TargetPlatformMinVersion>
<MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<WindowsXamlEnableOverview>true</WindowsXamlEnableOverview>
<PackageCertificateKeyFile>eShopOnContainers.TestRunner.Windows_TemporaryKey.pfx</PackageCertificateKeyFile>
- <RuntimeIdentifiers>win10-arm;win10-arm-aot;win10-x86;win10-x86-aot;win10-x64;win10-x64-aot</RuntimeIdentifiers>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
<DebugSymbols>true</DebugSymbols>
@@ -89,6 +88,10 @@
<Prefer32Bit>true</Prefer32Bit>
<UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
</PropertyGroup>
+ <ItemGroup>
+ <!-- A reference to the entire .Net Framework and Windows SDK are automatically included -->
+ <None Include="project.json" />
+ </ItemGroup>
<ItemGroup>
<Compile Include="App.xaml.cs">
<DependentUpon>App.xaml</DependentUpon>
@@ -127,17 +130,6 @@
<Name>eShopOnContainers.UnitTests</Name>
</ProjectReference>
</ItemGroup>
- <ItemGroup>
- <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
- <Version>6.0.0-preview1-25611-03</Version>
- </PackageReference>
- <PackageReference Include="Xamarin.Forms">
- <Version>2.3.4.231</Version>
- </PackageReference>
- <PackageReference Include="xunit.runner.devices">
- <Version>2.1.0</Version>
- </PackageReference>
- </ItemGroup>
<PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' < '14.0' ">
<VisualStudioVersion>14.0</VisualStudioVersion>
</PropertyGroup>
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Windows/project.json b/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Windows/project.json
new file mode 100644
index 000000000..f32fb6319
--- /dev/null
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Windows/project.json
@@ -0,0 +1,18 @@
+{
+ "dependencies": {
+ "Microsoft.NETCore.UniversalWindowsPlatform": "5.3.3",
+ "Xamarin.Forms": "2.3.4.231",
+ "xunit.runner.devices": "2.1.0"
+ },
+ "frameworks": {
+ "uap10.0": {}
+ },
+ "runtimes": {
+ "win10-arm": {},
+ "win10-arm-aot": {},
+ "win10-x86": {},
+ "win10-x86-aot": {},
+ "win10-x64": {},
+ "win10-x64-aot": {}
+ }
+}
\ No newline at end of file
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.iOS/eShopOnContainers.TestRunner.iOS.csproj b/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.iOS/eShopOnContainers.TestRunner.iOS.csproj
index 6ff33a496..78410457a 100644
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.iOS/eShopOnContainers.TestRunner.iOS.csproj
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.iOS/eShopOnContainers.TestRunner.iOS.csproj
@@ -106,37 +106,130 @@
<None Include="Info.plist" />
<Compile Include="Properties\AssemblyInfo.cs" />
<InterfaceDefinition Include="Resources\LaunchScreen.xib" />
+ <None Include="packages.config" />
+ </ItemGroup>
+ <ItemGroup>
+ <Reference Include="PCLCrypto, Version=2.0.0.0, Culture=neutral, PublicKeyToken=d4421c8a4786956c, processorArchitecture=MSIL">
+ <HintPath>..\..\..\..\packages\PCLCrypto.2.0.147\lib\xamarinios10\PCLCrypto.dll</HintPath>
+ </Reference>
+ <Reference Include="PInvoke.BCrypt, Version=0.3.0.0, Culture=neutral, PublicKeyToken=9e300f9f87f04a7a, processorArchitecture=MSIL">
+ <HintPath>..\..\..\..\packages\PInvoke.BCrypt.0.3.2\lib\portable-net45+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\PInvoke.BCrypt.dll</HintPath>
+ </Reference>
+ <Reference Include="PInvoke.Kernel32, Version=0.3.0.0, Culture=neutral, PublicKeyToken=9e300f9f87f04a7a, processorArchitecture=MSIL">
+ <HintPath>..\..\..\..\packages\PInvoke.Kernel32.0.3.2\lib\portable-net45+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\PInvoke.Kernel32.dll</HintPath>
+ </Reference>
+ <Reference Include="PInvoke.NCrypt, Version=0.3.0.0, Culture=neutral, PublicKeyToken=9e300f9f87f04a7a, processorArchitecture=MSIL">
+ <HintPath>..\..\..\..\packages\PInvoke.NCrypt.0.3.2\lib\portable-net45+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\PInvoke.NCrypt.dll</HintPath>
+ </Reference>
+ <Reference Include="PInvoke.Windows.Core, Version=0.3.0.0, Culture=neutral, PublicKeyToken=9e300f9f87f04a7a, processorArchitecture=MSIL">
+ <HintPath>..\..\..\..\packages\PInvoke.Windows.Core.0.3.2\lib\portable-net45+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\PInvoke.Windows.Core.dll</HintPath>
+ </Reference>
+ <Reference Include="System" />
+ <Reference Include="System.Net.Http.Extensions, Version=2.2.29.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+ <HintPath>..\..\..\..\packages\Microsoft.Net.Http.2.2.29\lib\Xamarin.iOS10\System.Net.Http.Extensions.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Net.Http.Primitives, Version=4.2.29.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+ <HintPath>..\..\..\..\packages\Microsoft.Net.Http.2.2.29\lib\Xamarin.iOS10\System.Net.Http.Primitives.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Xml" />
+ <Reference Include="System.Core" />
+ <Reference Include="Validation, Version=2.2.0.0, Culture=neutral, PublicKeyToken=2fc06f0d701809a7, processorArchitecture=MSIL">
+ <HintPath>..\..\..\..\packages\Validation.2.2.8\lib\dotnet\Validation.dll</HintPath>
+ </Reference>
+ <Reference Include="Xamarin.Forms.Core, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\..\..\..\packages\Xamarin.Forms.2.3.4.231\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll</HintPath>
+ </Reference>
+ <Reference Include="Xamarin.Forms.Platform, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\..\..\..\packages\Xamarin.Forms.2.3.4.231\lib\Xamarin.iOS10\Xamarin.Forms.Platform.dll</HintPath>
+ </Reference>
+ <Reference Include="Xamarin.Forms.Platform.iOS, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\..\..\..\packages\Xamarin.Forms.2.3.4.231\lib\Xamarin.iOS10\Xamarin.Forms.Platform.iOS.dll</HintPath>
+ </Reference>
+ <Reference Include="Xamarin.Forms.Xaml, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\..\..\..\packages\Xamarin.Forms.2.3.4.231\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.dll</HintPath>
+ </Reference>
+ <Reference Include="Xamarin.iOS" />
+ <Reference Include="xunit.abstractions">
+ <HintPath>..\..\..\..\packages\xunit.abstractions.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.abstractions.dll</HintPath>
+ </Reference>
+ <Reference Include="xunit.core">
+ <HintPath>..\..\..\..\packages\xunit.extensibility.core.2.1.0\lib\dotnet\xunit.core.dll</HintPath>
+ </Reference>
+ <Reference Include="xunit.execution.dotnet">
+ <HintPath>..\..\..\..\packages\xunit.extensibility.execution.2.1.0\lib\xamarinios\xunit.execution.dotnet.dll</HintPath>
+ </Reference>
+ <Reference Include="xunit.runner.utility.dotnet">
+ <HintPath>..\..\..\..\packages\xunit.runner.utility.2.1.0\lib\dotnet\xunit.runner.utility.dotnet.dll</HintPath>
+ </Reference>
+ <Reference Include="xunit.runner.devices">
+ <HintPath>..\..\..\..\packages\xunit.runner.devices.2.1.0\lib\Xamarin.iOS\xunit.runner.devices.dll</HintPath>
+ </Reference>
+ <Reference Include="System.IO.Compression" />
+ <Reference Include="System.Net.Http" />
+ <Reference Include="xunit.assert">
+ <HintPath>..\..\..\..\packages\xunit.assert.2.2.0\lib\netstandard1.1\xunit.assert.dll</HintPath>
+ </Reference>
+ <Reference Include="Newtonsoft.Json">
+ <HintPath>..\..\..\..\packages\Newtonsoft.Json.9.0.1\lib\portable-net45+wp80+win8+wpa81\Newtonsoft.Json.dll</HintPath>
+ </Reference>
+ <Reference Include="Autofac">
+ <HintPath>..\..\..\..\packages\Autofac.4.5.0\lib\netstandard1.1\Autofac.dll</HintPath>
+ </Reference>
+ <Reference Include="Plugin.Settings.Abstractions">
+ <HintPath>..\..\..\..\packages\Xam.Plugins.Settings.2.6.0.12-beta\lib\Xamarin.iOS10\Plugin.Settings.Abstractions.dll</HintPath>
+ </Reference>
+ <Reference Include="Plugin.Settings">
+ <HintPath>..\..\..\..\packages\Xam.Plugins.Settings.2.6.0.12-beta\lib\Xamarin.iOS10\Plugin.Settings.dll</HintPath>
+ </Reference>
+ <Reference Include="SlideOverKit">
+ <HintPath>..\..\..\..\packages\SlideOverKit.2.1.4\lib\Xamarin.iOS10\SlideOverKit.dll</HintPath>
+ </Reference>
+ <Reference Include="SlideOverKit.iOS">
+ <HintPath>..\..\..\..\packages\SlideOverKit.2.1.4\lib\Xamarin.iOS10\SlideOverKit.iOS.dll</HintPath>
+ </Reference>
+ <Reference Include="Acr.Support.iOS">
+ <HintPath>..\..\..\..\packages\Acr.Support.2.1.0\lib\Xamarin.iOS10\Acr.Support.iOS.dll</HintPath>
+ </Reference>
+ <Reference Include="Splat">
+ <HintPath>..\..\..\..\packages\Splat.1.6.2\lib\Xamarin.iOS10\Splat.dll</HintPath>
+ </Reference>
+ <Reference Include="Acr.UserDialogs">
+ <HintPath>..\..\..\..\packages\Acr.UserDialogs.6.3.3\lib\Xamarin.iOS10\Acr.UserDialogs.dll</HintPath>
+ </Reference>
+ <Reference Include="Acr.UserDialogs.Interface">
+ <HintPath>..\..\..\..\packages\Acr.UserDialogs.6.3.3\lib\Xamarin.iOS10\Acr.UserDialogs.Interface.dll</HintPath>
+ </Reference>
+ <Reference Include="IdentityModel.Portable">
+ <HintPath>..\..\..\..\packages\IdentityModel.1.3.1\lib\portable-net45+wp80+win8+wpa81\IdentityModel.Portable.dll</HintPath>
+ </Reference>
+ <Reference Include="WebP.Touch">
+ <HintPath>..\..\..\..\packages\WebP.Touch.1.0.3\lib\Xamarin.iOS10\WebP.Touch.dll</HintPath>
+ </Reference>
+ <Reference Include="FFImageLoading">
+ <HintPath>..\..\..\..\packages\Xamarin.FFImageLoading.2.2.9\lib\Xamarin.iOS10\FFImageLoading.dll</HintPath>
+ </Reference>
+ <Reference Include="FFImageLoading.Platform">
+ <HintPath>..\..\..\..\packages\Xamarin.FFImageLoading.2.2.9\lib\Xamarin.iOS10\FFImageLoading.Platform.dll</HintPath>
+ </Reference>
+ <Reference Include="FFImageLoading.Forms">
+ <HintPath>..\..\..\..\packages\Xamarin.FFImageLoading.Forms.2.2.9\lib\Xamarin.iOS10\FFImageLoading.Forms.dll</HintPath>
+ </Reference>
+ <Reference Include="FFImageLoading.Forms.Touch">
+ <HintPath>..\..\..\..\packages\Xamarin.FFImageLoading.Forms.2.2.9\lib\Xamarin.iOS10\FFImageLoading.Forms.Touch.dll</HintPath>
+ </Reference>
+ <Reference Include="ModernHttpClient">
+ <HintPath>..\..\..\..\packages\modernhttpclient.2.4.2\lib\Xamarin.iOS10\ModernHttpClient.dll</HintPath>
+ </Reference>
+ <Reference Include="Plugin.Geolocator.Abstractions">
+ <HintPath>..\..\..\..\packages\Xam.Plugin.Geolocator.3.0.4\lib\Xamarin.iOS10\Plugin.Geolocator.Abstractions.dll</HintPath>
+ </Reference>
+ <Reference Include="Plugin.Geolocator">
+ <HintPath>..\..\..\..\packages\Xam.Plugin.Geolocator.3.0.4\lib\Xamarin.iOS10\Plugin.Geolocator.dll</HintPath>
+ </Reference>
</ItemGroup>
<ItemGroup>
<Content Include="Entitlements.plist" />
</ItemGroup>
- <ItemGroup>
- <Reference Include="System" />
- <Reference Include="System.Core" />
- <Reference Include="Xamarin.iOS" />
- </ItemGroup>
- <ItemGroup>
- <PackageReference Include="Acr.Support" version="2.1.0" />
- <PackageReference Include="Acr.UserDialogs" version="6.3.3" />
- <PackageReference Include="Autofac" version="4.5.0" />
- <PackageReference Include="IdentityModel" version="2.10.0" />
- <PackageReference Include="modernhttpclient" version="2.4.2" />
- <PackageReference Include="NETStandard.Library" version="2.0.0" />
- <PackageReference Include="Newtonsoft.Json" version="10.0.3" />
- <PackageReference Include="PCLCrypto" version="2.0.147" />
- <PackageReference Include="SlideOverKit" version="2.1.4" />
- <PackageReference Include="Splat" version="1.6.2" />
- <PackageReference Include="Validation" version="2.2.8" />
- <PackageReference Include="WebP.Touch" version="1.0.3" />
- <PackageReference Include="Xam.Plugin.Geolocator" version="3.0.4" />
- <PackageReference Include="Xam.Plugins.Settings" version="2.6.0.12-beta" />
- <PackageReference Include="Xamarin.FFImageLoading" version="2.2.9" />
- <PackageReference Include="Xamarin.FFImageLoading.Forms" version="2.2.9" />
- <PackageReference Include="Xamarin.Forms" version="2.3.4.231" />
- <PackageReference Include="xunit.runner.devices">
- <Version>2.2.0</Version>
- </PackageReference>
- </ItemGroup>
<ItemGroup>
<ProjectReference Include="..\eShopOnContainers.UnitTests\eShopOnContainers.UnitTests.csproj">
<Project>{f7b6a162-bc4d-4924-b16a-713f9b0344e7}</Project>
@@ -144,4 +237,13 @@
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.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\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'))" />
+ </Target>
+ <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')" />
+ <Import Project="..\..\..\..\packages\xunit.runner.devices.2.1.0\build\Xamarin.iOS\xunit.runner.devices.targets" Condition="Exists('..\..\..\..\packages\xunit.runner.devices.2.1.0\build\Xamarin.iOS\xunit.runner.devices.targets')" />
+ <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/src/Mobile/eShopOnContainers/eShopOnContainers.UITests/eShopOnContainers.UITests.csproj b/src/Mobile/eShopOnContainers/eShopOnContainers.UITests/eShopOnContainers.UITests.csproj
index faef9f61f..aa4f41fa2 100644
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.UITests/eShopOnContainers.UITests.csproj
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.UITests/eShopOnContainers.UITests.csproj
@@ -28,15 +28,32 @@
<ConsolePause>false</ConsolePause>
</PropertyGroup>
<ItemGroup>
+ <Reference Include="nunit.core, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+ <HintPath>..\..\..\..\packages\NUnitTestAdapter.2.0.0\lib\nunit.core.dll</HintPath>
+ <Private>False</Private>
+ </Reference>
+ <Reference Include="nunit.core.interfaces, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+ <HintPath>..\..\..\..\packages\NUnitTestAdapter.2.0.0\lib\nunit.core.interfaces.dll</HintPath>
+ <Private>False</Private>
+ </Reference>
+ <Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+ <HintPath>..\..\..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
+ <Private>True</Private>
+ </Reference>
+ <Reference Include="nunit.util, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+ <HintPath>..\..\..\..\packages\NUnitTestAdapter.2.0.0\lib\nunit.util.dll</HintPath>
+ <Private>False</Private>
+ </Reference>
+ <Reference Include="NUnit.VisualStudio.TestAdapter, Version=2.0.0.0, Culture=neutral, PublicKeyToken=4cb40d35494691ac, processorArchitecture=MSIL">
+ <HintPath>..\..\..\..\packages\NUnitTestAdapter.2.0.0\lib\NUnit.VisualStudio.TestAdapter.dll</HintPath>
+ <Private>False</Private>
+ </Reference>
<Reference Include="System" />
+ <Reference Include="Xamarin.UITest, Version=2.0.3.0, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\..\..\..\packages\Xamarin.UITest.2.0.3\lib\Xamarin.UITest.dll</HintPath>
+ <Private>True</Private>
+ </Reference>
</ItemGroup>
-
- <ItemGroup>
- <PackageReference Include="NUnit" version="2.6.4" targetFramework="net45" />
- <PackageReference Include="NUnitTestAdapter" version="2.0.0" targetFramework="net45" />
- <PackageReference Include="Xamarin.UITest" version="2.0.3" targetFramework="net45" />
- </ItemGroup>
-
<ItemGroup>
<Compile Include="Tests.cs" />
<Compile Include="AppInitializer.cs" />
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/eShopOnContainers.UnitTests.csproj b/src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/eShopOnContainers.UnitTests.csproj
index 757dc43e5..e69a6340b 100644
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/eShopOnContainers.UnitTests.csproj
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/eShopOnContainers.UnitTests.csproj
@@ -1,20 +1,61 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <TargetFramework>netstandard2.0</TargetFramework>
- <PackageTargetFallback>portable-net45+win8+wpa81+wp8</PackageTargetFallback>
- <DebugType>full</DebugType>
- <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ProjectGuid>{6E4285E7-7611-4440-A1B5-3513EBB13807}</ProjectGuid>
+ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+ <UseMSBuildEngine>true</UseMSBuildEngine>
+ <OutputType>Library</OutputType>
+ <RootNamespace>eShopOnContainers.UnitTests</RootNamespace>
+ <AssemblyName>eShopOnContainers.UnitTests</AssemblyName>
+ <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+ <TargetFrameworkProfile>Profile111</TargetFrameworkProfile>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <DebugSymbols>true</DebugSymbols>
+ <DebugType>full</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>bin\Debug</OutputPath>
+ <DefineConstants>DEBUG;</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <Optimize>true</Optimize>
+ <OutputPath>bin\Release</OutputPath>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
</PropertyGroup>
-
<ItemGroup>
- <PackageReference Include="xunit" Version="2.2.0" />
- <PackageReference Include="xunit.runner.console" Version="2.2.0" />
- <PackageReference Include="Xamarin.Forms" Version="2.3.4.231" />
+ <Compile Include="Properties\AssemblyInfo.cs" />
+ <Compile Include="ViewModels\CatalogViewModelTests.cs" />
+ <Compile Include="ViewModels\MainViewModelTests.cs" />
+ <Compile Include="ViewModels\MarketingViewModelTests.cs" />
+ <Compile Include="ViewModels\MockViewModelTests.cs" />
+ <Compile Include="ViewModels\OrderViewModelTests.cs" />
+ <Compile Include="Services\BasketServiceTests.cs" />
+ <Compile Include="Services\CatalogServiceTests.cs" />
+ <Compile Include="Services\MarketingServiceTests.cs" />
+ <Compile Include="Services\OrdersServiceTests.cs" />
+ <Compile Include="Mocks\MockEventToCommandBehavior.cs" />
+ <Compile Include="Mocks\MockViewModel.cs" />
</ItemGroup>
-
<ItemGroup>
- <ProjectReference Include="..\eShopOnContainers.Core\eShopOnContainers.Core.csproj" />
+ <None Include="app.config" />
+ <None Include="project.json" />
</ItemGroup>
-
+ <ItemGroup>
+ <Folder Include="Mocks\" />
+ <Folder Include="Services\" />
+ <Folder Include="ViewModels\" />
+ <Folder Include="Behaviors\" />
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\eShopOnContainers.Core\eShopOnContainers.Core.csproj">
+ <Project>{BA96A12C-4EE3-46C4-BB3F-F811B554CD01}</Project>
+ <Name>eShopOnContainers.Core</Name>
+ </ProjectReference>
+ </ItemGroup>
+ <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
</Project>
\ No newline at end of file
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/eShopOnContainers.UnitTests.csproj.bak b/src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/eShopOnContainers.UnitTests.csproj.bak
deleted file mode 100644
index fd8c23eca..000000000
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.UnitTests/eShopOnContainers.UnitTests.csproj.bak
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
- <PropertyGroup>
- <MinimumVisualStudioVersion>10.0</MinimumVisualStudioVersion>
- <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProjectGuid>{F7B6A162-BC4D-4924-B16A-713F9B0344E7}</ProjectGuid>
- <OutputType>Library</OutputType>
- <AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>eShopOnContainers.UnitTests</RootNamespace>
- <AssemblyName>eShopOnContainers.UnitTests</AssemblyName>
- <DefaultLanguage>es-ES</DefaultLanguage>
- <FileAlignment>512</FileAlignment>
- <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
- <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
- <TargetFrameworkProfile>Profile111</TargetFrameworkProfile>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <DebugSymbols>true</DebugSymbols>
- <DebugType>full</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>bin\Debug\</OutputPath>
- <DefineConstants>DEBUG;TRACE</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <DebugType>pdbonly</DebugType>
- <Optimize>true</Optimize>
- <OutputPath>bin\Release\</OutputPath>
- <DefineConstants>TRACE</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- </PropertyGroup>
- <ItemGroup>
- <Compile Include="Properties\AssemblyInfo.cs" />
- <Compile Include="Mocks\MockEventToCommandBehavior.cs" />
- <Compile Include="Services\BasketServiceTests.cs" />
- <Compile Include="Services\CatalogServiceTests.cs" />
- <Compile Include="Services\MarketingServiceTests.cs" />
- <Compile Include="ViewModels\CatalogViewModelTests.cs" />
- <Compile Include="ViewModels\MainViewModelTests.cs" />
- <Compile Include="ViewModels\MarketingViewModelTests.cs" />
- <Compile Include="ViewModels\OrderViewModelTests.cs" />
- <Compile Include="Services\OrdersServiceTests.cs" />
- <Compile Include="Behaviors\EventToCommandBehaviorTests.cs" />
- <Compile Include="Mocks\MockViewModel.cs" />
- <Compile Include="ViewModels\MockViewModelTests.cs" />
- </ItemGroup>
- <ItemGroup>
- <None Include="app.config" />
- <None Include="project.json" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\eShopOnContainers.Core\eShopOnContainers.Core.csproj">
- <Project>{67f9d3a8-f71e-4428-913f-c37ae82cdb24}</Project>
- <Name>eShopOnContainers.Core</Name>
- </ProjectReference>
- </ItemGroup>
- <ItemGroup />
- <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
- <!-- 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.
- <Target Name="BeforeBuild">
- </Target>
- <Target Name="AfterBuild">
- </Target>
- -->
- <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')" />
-</Project>
\ No newline at end of file
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Windows/eShopOnContainers.Windows.csproj b/src/Mobile/eShopOnContainers/eShopOnContainers.Windows/eShopOnContainers.Windows.csproj
index 5f9a72577..342acf6b2 100644
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.Windows/eShopOnContainers.Windows.csproj
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Windows/eShopOnContainers.Windows.csproj
@@ -11,16 +11,14 @@
<AssemblyName>eShopOnContainers.Windows</AssemblyName>
<DefaultLanguage>en-US</DefaultLanguage>
<TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
- <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.16267.0</TargetPlatformVersion>
- <TargetPlatformMinVersion>10.0.16267.0</TargetPlatformMinVersion>
+ <TargetPlatformVersion>10.0.10586.0</TargetPlatformVersion>
+ <TargetPlatformMinVersion>10.0.10586.0</TargetPlatformMinVersion>
<MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
<EnableDotNetNativeCompatibleProfile>true</EnableDotNetNativeCompatibleProfile>
- <WindowsXamlEnableOverview>true</WindowsXamlEnableOverview>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<PackageCertificateKeyFile>Windows_TemporaryKey.pfx</PackageCertificateKeyFile>
<SkipValidatePackageReferences>true</SkipValidatePackageReferences>
- <RuntimeIdentifiers>win10-arm;win10-arm-aot;win10-x86;win10-x86-aot;win10-x64;win10-x64-aot</RuntimeIdentifiers>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM'">
<DebugSymbols>true</DebugSymbols>
@@ -102,6 +100,7 @@
<Content Include="..\CommonResources\Fonts\SourceSansPro-Regular.ttf">
<Link>Assets\Fonts\SourceSansPro-Regular.ttf</Link>
</Content>
+ <None Include="project.json" />
</ItemGroup>
<ItemGroup>
<Compile Include="App.xaml.cs">
@@ -172,52 +171,18 @@
<SubType>Designer</SubType>
</Page>
</ItemGroup>
+ <ItemGroup>
+ <SDKReference Include="WindowsMobile, Version=10.0.10586.0">
+ <Name>Windows Mobile Extensions for the UWP</Name>
+ </SDKReference>
+ </ItemGroup>
<ItemGroup>
<ProjectReference Include="..\eShopOnContainers.Core\eShopOnContainers.Core.csproj">
<Project>{67f9d3a8-f71e-4428-913f-c37ae82cdb24}</Project>
<Name>eShopOnContainers.Core</Name>
</ProjectReference>
</ItemGroup>
- <ItemGroup>
- <PackageReference Include="Acr.UserDialogs">
- <Version>6.3.3</Version>
- </PackageReference>
- <PackageReference Include="IdentityModel">
- <Version>2.10.0</Version>
- </PackageReference>
- <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
- <Version>6.0.0-preview1-25611-03</Version>
- </PackageReference>
- <PackageReference Include="Newtonsoft.Json">
- <Version>10.0.3</Version>
- </PackageReference>
- <PackageReference Include="PCLCrypto">
- <Version>2.0.147</Version>
- </PackageReference>
- <PackageReference Include="SlideOverKit">
- <Version>2.1.4</Version>
- </PackageReference>
- <PackageReference Include="Xam.Plugin.Geolocator">
- <Version>3.0.4</Version>
- </PackageReference>
- <PackageReference Include="Xam.Plugins.Settings">
- <Version>2.6.0.12-beta</Version>
- </PackageReference>
- <PackageReference Include="Xamarin.FFImageLoading">
- <Version>2.2.9</Version>
- </PackageReference>
- <PackageReference Include="Xamarin.FFImageLoading.Forms">
- <Version>2.2.9</Version>
- </PackageReference>
- <PackageReference Include="Xamarin.Forms">
- <Version>2.3.4.231</Version>
- </PackageReference>
- </ItemGroup>
- <ItemGroup>
- <SDKReference Include="WindowsMobile, Version=10.0.16267.0">
- <Name>Windows Mobile Extensions for the UWP</Name>
- </SDKReference>
- </ItemGroup>
+ <ItemGroup />
<PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' < '14.0' ">
<VisualStudioVersion>14.0</VisualStudioVersion>
</PropertyGroup>
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Windows/project.json b/src/Mobile/eShopOnContainers/eShopOnContainers.Windows/project.json
new file mode 100644
index 000000000..faafe1f18
--- /dev/null
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Windows/project.json
@@ -0,0 +1,26 @@
+{
+ "dependencies": {
+ "Acr.UserDialogs": "6.3.3",
+ "IdentityModel": "1.3.1",
+ "Microsoft.NETCore.UniversalWindowsPlatform": "5.3.3",
+ "Newtonsoft.Json": "9.0.1",
+ "PCLCrypto": "2.0.147",
+ "SlideOverKit": "2.1.4",
+ "Xam.Plugin.Geolocator": "3.0.4",
+ "Xam.Plugins.Settings": "2.6.0.12-beta",
+ "Xamarin.FFImageLoading": "2.2.9",
+ "Xamarin.FFImageLoading.Forms": "2.2.9",
+ "Xamarin.Forms": "2.3.4.231"
+ },
+ "frameworks": {
+ "uap10.0": {}
+ },
+ "runtimes": {
+ "win10-arm": {},
+ "win10-arm-aot": {},
+ "win10-x86": {},
+ "win10-x86-aot": {},
+ "win10-x64": {},
+ "win10-x64-aot": {}
+ }
+}
\ No newline at end of file
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/Info.plist b/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/Info.plist
index fb995405e..588aafed9 100644
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/Info.plist
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/Info.plist
@@ -20,7 +20,7 @@
<string>UIInterfaceOrientationLandscapeRight</string>
</array>
<key>MinimumOSVersion</key>
- <string>6.0</string>
+ <string>9.0</string>
<key>CFBundleDisplayName</key>
<string>eShopOnContainers</string>
<key>CFBundleIdentifier</key>
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/Resources/LaunchScreen.storyboard b/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/Resources/LaunchScreen.storyboard
index 2a0cc5633..b071203b7 100644
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/Resources/LaunchScreen.storyboard
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/Resources/LaunchScreen.storyboard
@@ -1,7 +1,8 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="6245" systemVersion="13F34" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="X5k-f2-b5h">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13196" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="X5k-f2-b5h">
<dependencies>
- <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6238"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13173"/>
+ <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
<!--View Controller-->
@@ -16,12 +17,12 @@
<rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
- <imageView userInteractionEnabled="NO" contentMode="scaleToFill" image="Logo.png" translatesAutoresizingMaskIntoConstraints="NO" id="23" misplaced="YES">
+ <imageView userInteractionEnabled="NO" contentMode="scaleToFill" misplaced="YES" image="Logo.png" translatesAutoresizingMaskIntoConstraints="NO" id="23">
<rect key="frame" x="270" y="270" width="60" height="60"/>
<rect key="contentStretch" x="0.0" y="0.0" width="0.0" height="0.0"/>
</imageView>
</subviews>
- <color key="backgroundColor" colorSpace="calibratedRGB" red="0.11764705882352941" green="0.6470588235294118" blue="0.615686274509804" alpha="1"/>
+ <color key="backgroundColor" red="0.11764705882352941" green="0.6470588235294118" blue="0.61568627450980395" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="23" firstAttribute="centerY" secondItem="yd7-JS-zBw" secondAttribute="centerY" priority="1" id="39"/>
<constraint firstItem="23" firstAttribute="centerX" secondItem="yd7-JS-zBw" secondAttribute="centerX" priority="1" id="41"/>
@@ -34,22 +35,30 @@
</scene>
</scenes>
<resources>
+ <image name="Logo.png" width="152" height="152"/>
<image name="Icon-60.png" width="60" height="60"/>
- <image name="app_settings.png" width="44" height="44"/>
- <image name="Default.png" width="320" height="480"/>
- <image name="fake_product_01.png" width="650" height="500"/>
- <image name="fake_product_02.png" width="650" height="500"/>
- <image name="fake_product_03.png" width="650" height="500"/>
- <image name="fake_product_04.png" width="650" height="427"/>
- <image name="fake_product_05.png" width="650" height="500"/>
<image name="Icon-Small-40.png" width="40" height="40"/>
<image name="Icon-Small.png" width="29" height="29"/>
+ <image name="fake_product_01.png" width="650" height="500"/>
+ <image name="fake_product_03.png" width="650" height="500"/>
+ <image name="fake_product_02.png" width="650" height="500"/>
+ <image name="fake_product_04.png" width="650" height="427"/>
+ <image name="fake_product_05.png" width="650" height="500"/>
<image name="menu_cart.png" width="17" height="15"/>
<image name="menu_filter.png" width="12" height="11"/>
<image name="menu_profile.png" width="13" height="13"/>
<image name="product_add.png" width="10" height="10"/>
+ <image name="app_settings.png" width="44" height="44"/>
<image name="switchOff.png" width="23" height="11"/>
<image name="switchOn.png" width="23" height="11"/>
- <image name="Logo.png" width="152" height="152"/>
+ <image name="Default.png" width="320" height="480"/>
+ <image name="noimage.png" width="650" height="500"/>
+ <image name="default_product.png" width="650" height="500"/>
+ <image name="banner.png" width="500" height="632"/>
+ <image name="Default-568h.png" width="320" height="568"/>
+ <image name="Default-Portrait.png" width="768" height="1024"/>
+ <image name="Icon-76.png" width="76" height="76"/>
+ <image name="fake_campaign_01.png" width="370" height="241"/>
+ <image name="fake_campaign_02.png" width="372" height="243"/>
</resources>
</document>
\ No newline at end of file
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/eShopOnContainers.iOS.csproj b/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/eShopOnContainers.iOS.csproj
index 5cc36912e..205112e74 100644
--- a/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/eShopOnContainers.iOS.csproj
+++ b/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/eShopOnContainers.iOS.csproj
@@ -122,6 +122,7 @@
<Compile Include="Properties\AssemblyInfo.cs" />
<ITunesArtwork Include="iTunesArtwork" />
<ITunesArtwork Include="iTunesArtwork@2x" />
+ <None Include="packages.config" />
<Compile Include="Effects\CircleEffect.cs" />
</ItemGroup>
<ItemGroup>
@@ -131,9 +132,118 @@
<InterfaceDefinition Include="Resources\LaunchScreen.storyboard" />
</ItemGroup>
<ItemGroup>
+ <Reference Include="Acr.Support.iOS, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\..\..\..\packages\Acr.Support.2.1.0\lib\Xamarin.iOS10\Acr.Support.iOS.dll</HintPath>
+ <Private>True</Private>
+ </Reference>
+ <Reference Include="Acr.UserDialogs, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\..\..\..\packages\Acr.UserDialogs.6.3.3\lib\Xamarin.iOS10\Acr.UserDialogs.dll</HintPath>
+ <Private>True</Private>
+ </Reference>
+ <Reference Include="Acr.UserDialogs.Interface, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\..\..\..\packages\Acr.UserDialogs.6.3.3\lib\Xamarin.iOS10\Acr.UserDialogs.Interface.dll</HintPath>
+ <Private>True</Private>
+ </Reference>
+ <Reference Include="FFImageLoading, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\..\..\..\packages\Xamarin.FFImageLoading.2.2.9\lib\Xamarin.iOS10\FFImageLoading.dll</HintPath>
+ </Reference>
+ <Reference Include="FFImageLoading.Forms, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\..\..\..\packages\Xamarin.FFImageLoading.Forms.2.2.9\lib\Xamarin.iOS10\FFImageLoading.Forms.dll</HintPath>
+ </Reference>
+ <Reference Include="FFImageLoading.Forms.Touch, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\..\..\..\packages\Xamarin.FFImageLoading.Forms.2.2.9\lib\Xamarin.iOS10\FFImageLoading.Forms.Touch.dll</HintPath>
+ </Reference>
+ <Reference Include="FFImageLoading.Platform, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\..\..\..\packages\Xamarin.FFImageLoading.2.2.9\lib\Xamarin.iOS10\FFImageLoading.Platform.dll</HintPath>
+ </Reference>
+ <Reference Include="IdentityModel.Portable, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\..\..\..\packages\IdentityModel.1.3.1\lib\portable-net45+wp80+win8+wpa81\IdentityModel.Portable.dll</HintPath>
+ <Private>True</Private>
+ </Reference>
+ <Reference Include="ModernHttpClient, Version=2.4.2.0, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\..\..\..\packages\modernhttpclient.2.4.2\lib\Xamarin.iOS10\ModernHttpClient.dll</HintPath>
+ <Private>True</Private>
+ </Reference>
+ <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+ <HintPath>..\..\..\..\packages\Newtonsoft.Json.9.0.1\lib\portable-net45+wp80+win8+wpa81\Newtonsoft.Json.dll</HintPath>
+ <Private>True</Private>
+ </Reference>
+ <Reference Include="PCLCrypto, Version=2.0.0.0, Culture=neutral, PublicKeyToken=d4421c8a4786956c, processorArchitecture=MSIL">
+ <HintPath>..\..\..\..\packages\PCLCrypto.2.0.147\lib\xamarinios10\PCLCrypto.dll</HintPath>
+ </Reference>
+ <Reference Include="PInvoke.BCrypt, Version=0.3.0.0, Culture=neutral, PublicKeyToken=9e300f9f87f04a7a, processorArchitecture=MSIL">
+ <HintPath>..\..\..\..\packages\PInvoke.BCrypt.0.3.2\lib\portable-net45+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\PInvoke.BCrypt.dll</HintPath>
+ </Reference>
+ <Reference Include="PInvoke.Kernel32, Version=0.3.0.0, Culture=neutral, PublicKeyToken=9e300f9f87f04a7a, processorArchitecture=MSIL">
+ <HintPath>..\..\..\..\packages\PInvoke.Kernel32.0.3.2\lib\portable-net45+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\PInvoke.Kernel32.dll</HintPath>
+ </Reference>
+ <Reference Include="PInvoke.NCrypt, Version=0.3.0.0, Culture=neutral, PublicKeyToken=9e300f9f87f04a7a, processorArchitecture=MSIL">
+ <HintPath>..\..\..\..\packages\PInvoke.NCrypt.0.3.2\lib\portable-net45+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\PInvoke.NCrypt.dll</HintPath>
+ </Reference>
+ <Reference Include="PInvoke.Windows.Core, Version=0.3.0.0, Culture=neutral, PublicKeyToken=9e300f9f87f04a7a, processorArchitecture=MSIL">
+ <HintPath>..\..\..\..\packages\PInvoke.Windows.Core.0.3.2\lib\portable-net45+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\PInvoke.Windows.Core.dll</HintPath>
+ </Reference>
+ <Reference Include="Plugin.Settings, Version=2.6.0.12, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\..\..\..\packages\Xam.Plugins.Settings.2.6.0.12-beta\lib\Xamarin.iOS10\Plugin.Settings.dll</HintPath>
+ <Private>True</Private>
+ </Reference>
+ <Reference Include="Plugin.Settings.Abstractions, Version=2.6.0.12, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\..\..\..\packages\Xam.Plugins.Settings.2.6.0.12-beta\lib\Xamarin.iOS10\Plugin.Settings.Abstractions.dll</HintPath>
+ <Private>True</Private>
+ </Reference>
+ <Reference Include="SlideOverKit, Version=1.0.6135.18790, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\..\..\..\packages\SlideOverKit.2.1.4\lib\Xamarin.iOS10\SlideOverKit.dll</HintPath>
+ <Private>True</Private>
+ </Reference>
+ <Reference Include="SlideOverKit.iOS, Version=1.0.6135.18893, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\..\..\..\packages\SlideOverKit.2.1.4\lib\Xamarin.iOS10\SlideOverKit.iOS.dll</HintPath>
+ <Private>True</Private>
+ </Reference>
+ <Reference Include="Splat, Version=1.6.2.0, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\..\..\..\packages\Splat.1.6.2\lib\Xamarin.iOS10\Splat.dll</HintPath>
+ <Private>True</Private>
+ </Reference>
<Reference Include="System" />
+ <Reference Include="System.Net.Http.Extensions, Version=2.2.29.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+ <HintPath>..\..\..\..\packages\Microsoft.Net.Http.2.2.29\lib\Xamarin.iOS10\System.Net.Http.Extensions.dll</HintPath>
+ <Private>True</Private>
+ </Reference>
+ <Reference Include="System.Net.Http.Primitives, Version=4.2.29.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+ <HintPath>..\..\..\..\packages\Microsoft.Net.Http.2.2.29\lib\Xamarin.iOS10\System.Net.Http.Primitives.dll</HintPath>
+ <Private>True</Private>
+ </Reference>
+ <Reference Include="System.Xml" />
<Reference Include="System.Core" />
+ <Reference Include="Validation, Version=2.2.0.0, Culture=neutral, PublicKeyToken=2fc06f0d701809a7, processorArchitecture=MSIL">
+ <HintPath>..\..\..\..\packages\Validation.2.2.8\lib\dotnet\Validation.dll</HintPath>
+ </Reference>
+ <Reference Include="WebP.Touch, Version=1.0.6230.37678, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\..\..\..\packages\WebP.Touch.1.0.3\lib\Xamarin.iOS10\WebP.Touch.dll</HintPath>
+ </Reference>
<Reference Include="Xamarin.iOS" />
+ <Reference Include="System.IO.Compression" />
+ <Reference Include="System.Net.Http" />
+ <Reference Include="Autofac">
+ <HintPath>..\..\..\..\packages\Autofac.4.5.0\lib\netstandard1.1\Autofac.dll</HintPath>
+ </Reference>
+ <Reference Include="Xamarin.Forms.Core">
+ <HintPath>..\..\..\..\packages\Xamarin.Forms.2.3.4.231\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll</HintPath>
+ </Reference>
+ <Reference Include="Xamarin.Forms.Platform">
+ <HintPath>..\..\..\..\packages\Xamarin.Forms.2.3.4.231\lib\Xamarin.iOS10\Xamarin.Forms.Platform.dll</HintPath>
+ </Reference>
+ <Reference Include="Xamarin.Forms.Platform.iOS">
+ <HintPath>..\..\..\..\packages\Xamarin.Forms.2.3.4.231\lib\Xamarin.iOS10\Xamarin.Forms.Platform.iOS.dll</HintPath>
+ </Reference>
+ <Reference Include="Xamarin.Forms.Xaml">
+ <HintPath>..\..\..\..\packages\Xamarin.Forms.2.3.4.231\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.dll</HintPath>
+ </Reference>
+ <Reference Include="Plugin.Geolocator.Abstractions">
+ <HintPath>..\..\..\..\packages\Xam.Plugin.Geolocator.3.0.4\lib\Xamarin.iOS10\Plugin.Geolocator.Abstractions.dll</HintPath>
+ </Reference>
+ <Reference Include="Plugin.Geolocator">
+ <HintPath>..\..\..\..\packages\Xam.Plugin.Geolocator.3.0.4\lib\Xamarin.iOS10\Plugin.Geolocator.dll</HintPath>
+ </Reference>
</ItemGroup>
<ItemGroup>
<BundleResource Include="Resources\fake_product_01.png" />
@@ -326,24 +436,13 @@
<ItemGroup>
<AndroidResource Include="Resources\default_campaign.png" />
</ItemGroup>
- <ItemGroup>
- <PackageReference Include="Acr.Support" version="2.1.0" />
- <PackageReference Include="Acr.UserDialogs" version="6.3.3" />
- <PackageReference Include="Autofac" version="4.5.0" />
- <PackageReference Include="IdentityModel" version="2.10.0" />
- <PackageReference Include="modernhttpclient" version="2.4.2" />
- <PackageReference Include="NETStandard.Library" version="2.0.0" />
- <PackageReference Include="Newtonsoft.Json" version="10.0.3" />
- <PackageReference Include="PCLCrypto" version="2.0.147" />
- <PackageReference Include="SlideOverKit" version="2.1.4" />
- <PackageReference Include="Splat" version="1.6.2" />
- <PackageReference Include="Validation" version="2.2.8" />
- <PackageReference Include="WebP.Touch" version="1.0.3" />
- <PackageReference Include="Xam.Plugin.Geolocator" version="3.0.4" />
- <PackageReference Include="Xam.Plugins.Settings" version="2.6.0.12-beta" />
- <PackageReference Include="Xamarin.FFImageLoading" version="2.2.9" />
- <PackageReference Include="Xamarin.FFImageLoading.Forms" version="2.2.9" />
- <PackageReference Include="Xamarin.Forms" version="2.3.4.231" />
- </ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.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>
+ <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')" />
+ <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')" />
</Project>
\ No newline at end of file
diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/packages.config.bak b/src/Mobile/eShopOnContainers/eShopOnContainers.iOS/packages.config
similarity index 100%
rename from src/Mobile/eShopOnContainers/eShopOnContainers.iOS/packages.config.bak
rename to src/Mobile/eShopOnContainers/eShopOnContainers.iOS/packages.config