2426 Commits

Author SHA1 Message Date
David Britch
89769133c8 Organised using statements. 2018-01-17 12:35:57 +00:00
David Britch
473c38e643 Unit tests fixed. 2018-01-17 11:07:03 +00:00
David Britch
648b1b3585 Android settings implementation. 2018-01-16 17:21:53 +00:00
David Britch
a86a11694a SettingsService works on iOS. 2018-01-16 16:00:25 +00:00
David Britch
1a8215a822 Merge branch 'dev' into xamarin-settings 2018-01-16 15:24:13 +00:00
David Britch
e358099bcc Work in progress. 2018-01-16 15:02:18 +00:00
David Britch
d2e27b770a
Merge pull request from dotnet-architecture/xamarin-tinyioc
Replace Autofac with TinyIoC in the mobile app
2018-01-16 14:59:20 +00:00
David Britch
e98651b256 Moved TinyIoC location. 2018-01-16 14:54:25 +00:00
David Britch
2ded6b8cfa Unit tests all passing. 2018-01-16 14:21:34 +00:00
David Britch
69073af45a Replaced Autofac with TinyIoC on iOS and Android. 2018-01-16 14:06:45 +00:00
David Britch
ad63dd49f3
Merge pull request from dotnet-architecture/xamarin-netstandard
Xamarin netstandard
2018-01-15 15:30:42 +00:00
David Britch
8ea5a80306 Added missing dependency. 2018-01-15 15:25:05 +00:00
David Britch
0dd9fbf5d3 Merge branch 'xamarin-netstandard' of https://github.com/dotnet-architecture/eShopOnContainers into xamarin-netstandard 2018-01-15 14:31:10 +00:00
David Britch
1dbca234cf Removed references to Microsoft.CSharp as packages.config references newer versions.
Removes two more warnings.
2018-01-15 14:30:57 +00:00
David Britch
397ccd30d9 AssertTargetFallbacks removed. 2018-01-15 14:23:33 +00:00
David Britch
f8b41f23a2 AssertTargetFallback added. 2018-01-15 14:18:45 +00:00
David Britch
dd9a97a8b0 Added AssertTargetFallback. 2018-01-15 14:14:59 +00:00
David Britch
89c3bcdfe6 Merge branch 'xamarin-netstandard' of https://github.com/dotnet-architecture/eShopOnContainers into xamarin-netstandard 2018-01-15 13:55:31 +00:00
David Britch
d5aef48025 Removed UITest folder. 2018-01-15 13:55:22 +00:00
David Britch
d7b47cff8f Added package dependency. 2018-01-15 13:54:23 +00:00
David Britch
83478af9bc Package consolidation. 2018-01-15 13:43:06 +00:00
David Britch
796dd002af Consolidated Xamarin.Forms packages. 2018-01-15 13:34:23 +00:00
David Britch
cc4fb9b5fa Reduced number of warnings. 2018-01-15 13:06:29 +00:00
David Britch
df086fe0de Added AuthorizeRequest class, which is no longer present in IdentityModel.Client.
Note that this will ultimately be eliminated when moving to using
OIDCClient.
2018-01-15 11:46:34 +00:00
Cesar De la Torre
02ed89f4fc
Merge pull request from yanchenw/dev
Set triggers for npm operation at SPA app in the csproj instead of dockerfile
2018-01-13 18:48:54 -08:00
David Britch
5a12965695 Windows projects build. 2018-01-12 16:33:53 +00:00
David Britch
18057d0498 Moved eShopOnContainers.Core back to correct location. 2018-01-12 16:25:14 +00:00
David Britch
17bc31a9d5 Readded CardType with correct casing and fixed .csproj. 2018-01-12 16:10:12 +00:00
David Britch
b0fa87934e File deleted. 2018-01-12 16:08:39 +00:00
David Britch
6b1cffad9d Refactored unit tests to remove compiler warnings. 2018-01-12 16:04:10 +00:00
David Britch
c666c36cec Windows apps migrated to .NET Standard. 2018-01-12 15:50:18 +00:00
David Britch
972ff42d94 Changes to move the unit tests to .NET Standard. 2018-01-10 17:41:34 +00:00
David Britch
447a23db5d First batch of changes to move the Xamarin app to .NET Standard. 2018-01-10 17:41:04 +00:00
Cesar De la Torre Llorente
08a5eeea71 Downgraded version of docker-compose files to 3.3 (instead 3.4) since VSTS agent still doesn't support it plus other versions of Docker. We'll upgrade to 3.4 soon, though. When VSTS supports it.
Error in VSTS:
3 error(s), 1 warning(s)
Phase 1 - 3 error(s), 1 warning(s)
Version in "/opt/vsts/work/1/s/docker-compose.yml" is unsupported. You might be seeing this error because you're using the wrong Compose file version. Either specify a supported version (e.g "2.2" or "3.3") and place your service definitions under the `services` key, or omit the `version` key and place your service definitions at the root of the file to use version 1.
For more on the Compose file format versions, see https://docs.docker.com/compose/compose-file/
/usr/local/bin/docker-compose failed with return code: 1
2018-01-09 11:01:04 -08:00
Cesar De la Torre Llorente
1a4205491b Setting SA_PASSWORD for the SQL Server Linux container config instead MSSQL__SA_PASSWORD, so it could be compatible for SQL Server on Windows Containers, too. 2018-01-09 10:02:29 -08:00
Cesar De la Torre Llorente
bc619b8c4b Fixed issue with SQL container config for Linux container instead Windows Container config in docker-compose.override.yml 2018-01-09 09:35:41 -08:00
Cesar De la Torre Llorente
14da2c3885 Fixed SQL pwd in docker-compose for Linux 2018-01-09 09:23:47 -08:00
yanchenw
3186c63482 Bug fix 2018-01-05 14:33:04 -08:00
yanchenw
56a60e3d2f Try to fix windows container build error 2018-01-05 14:15:20 -08:00
Cesar De la Torre
60fc141792 Fixed SQL parameters for the new SQL Server image 2018-01-05 12:38:03 -08:00
Cesar De la Torre
f149734db7 Fixed image name for SQL Server on Windows Container. It changed from microsoft/mssql-server-windows to microsoft/mssql-server-windows-developer 2018-01-05 12:30:10 -08:00
Cesar De la Torre
6ccec8bded Fixed issue with dockerfile position for the webmvc app in docker-compose-windows 2018-01-05 10:28:05 -08:00
David Britch
690f0fd03a All projects build on Windows. 2018-01-05 12:14:30 +00:00
David Britch
1a8cafa1c8 Ensured that reference to eShopOnContainers.Core is present in all projects. 2018-01-05 11:49:31 +00:00
Cesar De la Torre
76a1c8c967
Update start-windows-containers.ps1
No need to build the .NET bits when using Docker Multi-Stage build, as we use now.
2018-01-04 16:41:21 -08:00
Cesar De la Torre
03c5063634
Merge pull request from yanchenw/dev
Optimize multistage build
2018-01-04 15:37:05 -08:00
yanchenw
607a30491e Optimize multistage build 2018-01-04 15:00:05 -08:00
Cesar De la Torre
9e8f6329c9
Merge pull request from yanchenw/dev
Optimize multi-stage build Dockerfile
2018-01-04 12:47:45 -08:00
CESARDELATORRE
2f14b0341b New/Updated the eShopOnContainers.sln global solution so either the containers/web apps and the mobile apps work properly. 2018-01-04 11:40:28 -08:00
yanchenw
e4fa15b813 Optimize multi-stage build Dockerfile
Remove explicitly copied dependencies, copy entire solution
into the conainter and depends on the cache to reduce build
time.

Addd temporary solution file which does not contains the
dcproj file to work around the issue that the dotnet cli
cannot handle dcproj.
2018-01-04 11:01:45 -08:00